[php-pear-CAS/f13/master] Update to 1.1.2 - fix CVE-2010-2795, CVE-2010-2796, #620753

[Remi Collet]

commit a083a54533a745fcc4bb1884d662f1e9245d5ae6
Author: remi <fedora at famillecollet.com>
Date:   Tue Aug 3 18:08:28 2010 +0200

    Update to 1.1.2 - fix  CVE-2010-2795, CVE-2010-2796, #620753

 .gitignore                    |    3 +++
 php-pear-CAS-systemlibs.patch |   30 +++++++++++++++---------------
 php-pear-CAS.spec             |    6 +++++-
 sources                       |    2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..f9722d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
+package-*.xml
+CAS-1.1.1.tgz
+CAS-1.1.2.tgz
diff --git a/php-pear-CAS-systemlibs.patch b/php-pear-CAS-systemlibs.patch
index 44b89f2..5b18b15 100644
--- a/php-pear-CAS-systemlibs.patch
+++ b/php-pear-CAS-systemlibs.patch
@@ -1,32 +1,32 @@
-diff -up CAS-1.1.1/CAS.php.systemlib CAS-1.1.1/CAS.php
---- CAS-1.1.1/CAS.php.systemlib	2010-05-20 19:51:33.000000000 +0200
-+++ CAS-1.1.1/CAS.php	2010-05-20 19:51:27.000000000 +0200
+diff -up CAS-1.1.2/CAS.php.systemlib CAS-1.1.2/CAS.php
+--- CAS-1.1.2/CAS.php.systemlib	2010-08-03 17:58:12.000000000 +0200
++++ CAS-1.1.2/CAS.php	2010-08-03 18:00:12.000000000 +0200
 @@ -40,7 +40,7 @@ if (!$_SERVER['REQUEST_URI']) {
  // another one by Vangelis Haniotakis also to make phpCAS work with PHP5
  //
- if (version_compare(PHP_VERSION, '5', '>=')) {
+ if (version_compare(PHP_VERSION, '5', '>=') && !(function_exists('domxml_new_doc'))) {
 -	require_once (dirname(__FILE__) . '/CAS/domxml-php4-to-php5.php');
 +	require_once('/usr/share/php/domxml-php4-php5/domxml-php4-to-php5.php');
  }
  
  /**
-diff -up CAS-1.1.1/php-pear-CAS.xml.systemlib CAS-1.1.1/php-pear-CAS.xml
---- CAS-1.1.1/php-pear-CAS.xml.systemlib	1970-01-01 10:13:08.000000000 +0100
-+++ CAS-1.1.1/php-pear-CAS.xml	2010-05-20 19:51:46.000000000 +0200
+diff -up CAS-1.1.2/php-pear-CAS.xml.systemlib CAS-1.1.2/php-pear-CAS.xml
+--- CAS-1.1.2/php-pear-CAS.xml.systemlib	1970-01-01 10:13:08.000000000 +0100
++++ CAS-1.1.2/php-pear-CAS.xml	2010-08-03 18:02:37.000000000 +0200
 @@ -51,7 +51,6 @@ see http://www.ja-sig.org/wiki/display/C
     <file baseinstalldir="/" md5sum="9162d942d32ac8bdc01d409c07f41a0f" name="CAS/PGTStorage/pgt-file.php" role="php" />
     <file baseinstalldir="/" md5sum="4bd67b4d6d6021504c00eff90e577ac0" name="CAS/PGTStorage/pgt-main.php" role="php" />
-    <file baseinstalldir="/" md5sum="b9c07025eef0c13593773be0c4f48e21" name="CAS/client.php" role="php" />
+    <file baseinstalldir="/" md5sum="5801f35b93c6bc68a3d2eedc75ad325a" name="CAS/client.php" role="php" />
 -   <file baseinstalldir="/" md5sum="e9ce7e11f871d8206b0abc2f608b0277" name="CAS/domxml-php4-to-php5.php" role="php" />
-    <file baseinstalldir="/" md5sum="a8e731ea0f492255d0121047f88a66e8" name="docs/api/annotated.html" role="doc" />
-    <file baseinstalldir="/" md5sum="c6548ef25563a0be9a536cdfaa432114" name="docs/api/CAS_8php.html" role="doc" />
-    <file baseinstalldir="/" md5sum="36a457969af7c786fecf8cc6860edff8" name="docs/api/CAS_8php_source.html" role="doc" />
-@@ -192,7 +191,7 @@ see http://www.ja-sig.org/wiki/display/C
-    <file baseinstalldir="/" md5sum="e14db513fb966a6ac042001eb35a43c2" name="docs/ChangeLog" role="doc" />
+    <file baseinstalldir="/" md5sum="a97168f2ce407585f975df370f3f192c" name="docs/api/annotated.html" role="doc" />
+    <file baseinstalldir="/" md5sum="39288f88be2912de1677afe29e288d2b" name="docs/api/bc_s.png" role="doc" />
+    <file baseinstalldir="/" md5sum="f5fe33865e6d29c81114cbd9341f8fb8" name="docs/api/CAS_8php.html" role="doc" />
+@@ -198,7 +197,7 @@ see http://www.ja-sig.org/wiki/display/C
+    <file baseinstalldir="/" md5sum="abb6f52f3b53449eb7306094f541ead4" name="docs/ChangeLog" role="doc" />
     <file baseinstalldir="/" md5sum="8b55ff8b0efc4d70a30e3d282f4ef188" name="docs/index.html" role="doc" />
     <file baseinstalldir="/" md5sum="d153a0effa32fbccded9387ea5310df6" name="docs/README" role="doc" />
--   <file baseinstalldir="/" md5sum="8de4941eed30099e1a867f8e05414f6e" name="CAS.php" role="php" />
-+   <file baseinstalldir="/" md5sum="4dcda9e7e1019d1e1ba477e982e30e7e" name="CAS.php" role="php" />
+-   <file baseinstalldir="/" md5sum="9f6b5dd62d82281ae1858ef3d23b2496" name="CAS.php" role="php" />
++   <file baseinstalldir="/" md5sum="523247e23198f31464558e4a09856d99" name="CAS.php" role="php" />
    </dir>
   </contents>
   <dependencies>
diff --git a/php-pear-CAS.spec b/php-pear-CAS.spec
index a793444..4d3ca45 100644
--- a/php-pear-CAS.spec
+++ b/php-pear-CAS.spec
@@ -5,7 +5,7 @@
 
 
 Name:           php-pear-CAS
-Version:        1.1.1
+Version:        1.1.2
 Release:        %{?prever:0.}1%{?prever:.}%{?prever}%{?dist}
 Summary:        Central Authentication Service client library in php
 
@@ -95,6 +95,10 @@ fi
 
 
 %changelog
+* Tue Aug 03 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.1.2-1
+- update to 1.1.2
+- fix  CVE-2010-2795, CVE-2010-2796, #620753
+
 * Thu May 20 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.1.1-1
 - update to 1.1.1
 
diff --git a/sources b/sources
index 224ecd5..865c68f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b030865bf1382d5128f8ffbd830631e  CAS-1.1.1.tgz
+1609e2d8afef1adf850d638901ee4516  CAS-1.1.2.tgz