[Pkg-php-commits] r912 - php5/trunk/debian

Sean Finney seanius at alioth.debian.org
Wed Oct 24 19:51:39 UTC 2007


Author: seanius
Date: 2007-10-24 19:51:39 +0000 (Wed, 24 Oct 2007)
New Revision: 912

Added:
   php5/trunk/debian/compat
   php5/trunk/debian/php5.lintian-overrides
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/control
   php5/trunk/debian/php5-common.dirs
   php5/trunk/debian/rules
Log:
some lintian stuff and prep for upload

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2007-10-23 23:47:08 UTC (rev 911)
+++ php5/trunk/debian/changelog	2007-10-24 19:51:39 UTC (rev 912)
@@ -1,7 +1,14 @@
-php5 (5.2.4-2) UNRELEASED; urgency=low
+php5 (5.2.4-2) unstable; urgency=low
 
   [ sean finney ]
-  * NOT RELEASED YET
+  * for posterity revised previous changelog to reference the CVE id's
+    of security issues resolved by the latest upstream release.
+  * lintian: use debian/compat instead of DH_COMPAT in debian/rules.
+  * lintian: use source:Version and binary:Version where appropriate,
+    instead of Source-Version
+  * lintian: remove a couple pieces of cruft in the changelog that were causing
+    false-postive wrong-bug-number-in-closes, but were generally useless
+    anyway.
 
   [ Raphael Geissert ]
   * Using test-results.txt as a target
@@ -32,11 +39,14 @@
     There are still several other failing tests, but these are not false
     positives and remain enabled pending investigation.
 
- -- Steve Langasek <vorlon at debian.org>  Sun, 21 Oct 2007 02:18:07 -0700
+ -- sean finney <seanius at debian.org>  Wed, 24 Oct 2007 21:51:14 +0200
 
 php5 (5.2.4-1) unstable; urgency=low
 
   * New upstream release.
+  * Security issues resolved in the latest release:
+    - CVE-2007-2519 - Directory traversal vulnerability in PEAR
+  
 
   [ sean finney ]
   * patch from Jan Wagner to be able to conditionally disable any
@@ -2377,7 +2387,7 @@
   * Install not so many docs (only in -dev now).
   * Enable calendar and sockets modules.
   * Rearange package descriptions so module-specific comments
-    go first (closes: # oh great leader).
+    go first.
   * Create domxml module aka xmlv2.
   * Fix spelling wan't -> want (closes: #70544).
   * Add libraries for gd module only when linking this one
@@ -2394,7 +2404,7 @@
   * Install not so many docs (only in -dev now).
   * Enable calendar and sockets modules.
   * Rearange package descriptions so module-specific comments
-    go first (closes: # oh great leader).
+    go first.
   * Create domxml module aka xmlv2.
   * Fix building (small typo).
   * Compile with libmysqlclient9-dev installed.

Added: php5/trunk/debian/compat
===================================================================
--- php5/trunk/debian/compat	                        (rev 0)
+++ php5/trunk/debian/compat	2007-10-24 19:51:39 UTC (rev 912)
@@ -0,0 +1 @@
+4

Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control	2007-10-23 23:47:08 UTC (rev 911)
+++ php5/trunk/debian/control	2007-10-24 19:51:39 UTC (rev 912)
@@ -9,7 +9,7 @@
 
 Package: php5
 Architecture: all
-Depends: libapache2-mod-php5 (>= ${Source-Version}) | php5-cgi (>= ${Source-Version}), php5-common (>= ${Source-Version})
+Depends: libapache2-mod-php5 (>= ${source:Version}) | php5-cgi (>= ${source:Version}), php5-common (>= ${source:Version})
 Description: server-side, HTML-embedded scripting language (meta-package)
  This package is a meta-package that, when installed, guarantees that you
  have at least one of the four server-side versions of the PHP5 interpreter
@@ -41,7 +41,7 @@
 
 Package: libapache2-mod-php5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${Source-Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf
 Conflicts: libapache2-mod-php4
 Provides: ${php:Provides}
 Suggests: php-pear
@@ -61,7 +61,7 @@
 
 Package: php5-cgi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${Source-Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf
 Provides: ${php:Provides}
 Conflicts: php3 (<= 3.0.18-1)
 Suggests: php-pear
@@ -82,7 +82,7 @@
 
 Package: php5-cli
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${Source-Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf
 Provides: ${php:Provides}
 Conflicts: php3 (<= 3.0.18-1)
 Suggests: php-pear
@@ -101,7 +101,7 @@
  Homepage: http://www.php.net/
 
 Package: php5-dev
-Depends: autoconf, automake1.4, libssl-dev, libtool, shtool, php5-common (>= ${Source-Version})
+Depends: autoconf, automake1.4, libssl-dev, libtool, shtool, php5-common (>= ${binary:Version})
 Section: devel
 Architecture: any
 Description: Files for PHP5 module development
@@ -115,7 +115,7 @@
 
 Package: php-pear
 Architecture: all
-Depends: php5-cli | php4-cli, php5-common (>= ${Source-Version})
+Depends: php5-cli | php4-cli, php5-common (>= ${source:Version})
 Recommends: gnupg
 Suggests: php5-dev | php4-dev
 Replaces: php4-pear (<< 4:4.4.0-0)
@@ -133,7 +133,7 @@
 
 Package: php5-curl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: CURL module for php5
  CURL is a library for getting files from  FTP, GOPHER, HTTP server.
  .
@@ -144,7 +144,7 @@
 
 Package: php5-gd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: GD module for php5
  This package provides a module for handling graphics directly from PHP
  scripts. It supports the PNG, JPEG, XPM formats as well as Freetype/ttf fonts.
@@ -156,7 +156,7 @@
 
 Package: php5-gmp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: GMP module for php5
  This package provides a module for arbitrary precision arithmetic via the 
  GNU Multiple Precision (GMP) Arithmetic Library.
@@ -168,7 +168,7 @@
 
 Package: php5-imap
 Architecture: any
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version})
 Description: IMAP module for php5
  This package provides a module for IMAP functions in PHP scripts.
  .
@@ -179,7 +179,7 @@
 
 Package: php5-interbase
 Architecture: i386 amd64 powerpc sparc
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version})
 Description: interbase/firebird module for php5
  This package provides a module for interbase/firebird functions in PHP scripts.
  .
@@ -190,7 +190,7 @@
 
 Package: php5-ldap
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: LDAP module for php5
  This package provides a module for LDAP functions in PHP scripts.
  .
@@ -201,7 +201,7 @@
 
 Package: php5-mcrypt
 Architecture: any
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version})
 Description: MCrypt module for php5
  This package provides a module for MCrypt functions in PHP scripts.
  .
@@ -212,7 +212,7 @@
 
 Package: php5-mhash
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: MHASH module for php5
  This package provides a module for mhash functions in PHP scripts.
  .
@@ -223,7 +223,7 @@
 
 Package: php5-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Conflicts: php5-mysqli
 Replaces: php5-mysqli
 Description: MySQL module for php5
@@ -240,7 +240,7 @@
 
 Package: php5-odbc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: ODBC module for php5
  This package provides a module for database access through ODBC drivers.
  It uses the unixODBC library as an ODBC provider.  It also contains the
@@ -253,7 +253,7 @@
 
 Package: php5-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: PostgreSQL module for php5
  This package provides a module for PostgreSQL database connections
  directly from PHP scripts.  It also includes the pdo_pgsql module for
@@ -266,7 +266,7 @@
 
 Package: php5-pspell
 Architecture: any
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version})
 Description: pspell module for php5
  This package provides a module for pspell functions in PHP scripts.
  .
@@ -277,7 +277,7 @@
 
 Package: php5-recode
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: recode module for php5
  This package provides a module for recode - character set recoding.
  .
@@ -288,7 +288,7 @@
 
 Package: php5-snmp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: SNMP module for php5
  This package provides a module for SNMP functions in PHP scripts.
  .
@@ -299,7 +299,7 @@
 
 Package: php5-sqlite
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: SQLite module for php5
  This package provides a module allowing you to use the SQLite self-contained
  database engine from within your PHP scripts, eliminating the need for a full
@@ -313,7 +313,7 @@
 
 Package: php5-sybase
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Provides: php5-mssql
 Description: Sybase / MS SQL Server module for php5
  This package provides a module for Sybase and Microsoft SQL Server
@@ -327,7 +327,7 @@
 
 Package: php5-tidy
 Architecture: any
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version})
 Description: tidy module for php5
  This package provides a module for tidy functions in PHP scripts.
  .
@@ -343,7 +343,7 @@
 
 Package: php5-xmlrpc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: XML-RPC module for php5
  This package provides a module for XML-RPC functions in PHP scripts.
  .
@@ -354,7 +354,7 @@
 
 Package: php5-xsl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Description: XSL module for php5
  This package provides a module for XSL using the libxslt XSL parser.
  .

Modified: php5/trunk/debian/php5-common.dirs
===================================================================
--- php5/trunk/debian/php5-common.dirs	2007-10-23 23:47:08 UTC (rev 911)
+++ php5/trunk/debian/php5-common.dirs	2007-10-24 19:51:39 UTC (rev 912)
@@ -1,4 +1,5 @@
 /usr/lib/php5/libexec
+/usr/share/lintian/overrides
 /usr/share/doc/php5-common/examples
 /usr/share/doc/php5-common/PEAR
 /usr/share/php5

Added: php5/trunk/debian/php5.lintian-overrides
===================================================================
--- php5/trunk/debian/php5.lintian-overrides	                        (rev 0)
+++ php5/trunk/debian/php5.lintian-overrides	2007-10-24 19:51:39 UTC (rev 912)
@@ -0,0 +1 @@
+php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2007-10-23 23:47:08 UTC (rev 911)
+++ php5/trunk/debian/rules	2007-10-24 19:51:39 UTC (rev 912)
@@ -9,9 +9,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -402,6 +399,9 @@
 	# install common files
 	install -m755 debian/maxlifetime debian/php5-common/usr/lib/php5
 
+	# install lintian overrides
+	cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common
+
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -484,8 +484,6 @@
 	dh_link -s
 	dh_compress -s -Xphp.ini
 	dh_fixperms -s -X /var/lib/php5
-	mkdir -p debian/php5-common/usr/share/lintian/overrides
-	echo "php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755" >> debian/php5-common/usr/share/lintian/overrides/php5-common
 	mkdir -p debian/php5-common/usr/share/linda/overrides
 	echo "Tag: non-standard-dir-perm" >> debian/php5-common/usr/share/linda/overrides/php5-common
 	echo "Data: /var/lib/php5.*" >> debian/php5-common/usr/share/linda/overrides/php5-common




More information about the Pkg-php-commits mailing list