[php-maint] Bug#440624: php5: Fix broken memory_limit in php.ini

[Soren Hansen]

Package: php5
Version: 5.2.3-1
Severity: normal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1



*** ../bug-body.txt
In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/rules:
    - Fix broken memory_limit mangling for php5-cli. (LP: #109079)
  * debian/php5-cli.postinst, debian/rules:
    - Use same php.ini-dist for all flavours. The only difference used to be
      cli having a higher memory_limit value, but upstream has changed this to
      128MB, which is higher than both of the previous values.

We thought you might be interested in doing the same. 


- -- System Information:
Debian Release: lenny/sid
  APT prefers gutsy
  APT policy: (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-10-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFG28IlonjfXui9pOMRAkQKAJwNq+pfKsLTZAzkLvIHfVYIlHWVXgCfWy8A
Jv8XxCI9ITdtTGe19/lhpNM=
=QqwO
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -u php5-5.2.3/debian/php5-cli.postinst php5-5.2.3/debian/php5-cli.postinst
--- php5-5.2.3/debian/php5-cli.postinst
+++ php5-5.2.3/debian/php5-cli.postinst
@@ -22,13 +22,13 @@
 		oldmd5=`md5sum $phpini | cut -d' ' -f1`
 		if [ "$oldmd5" = "c85605baab79fbcd3c289e442eb3caa2" ]; then
 			# then silently update it before registering via ucf
-			cp /usr/share/php5/php.ini-dist.cli $phpini
+			cp /usr/share/php5/php.ini-dist $phpini
 		fi
 	fi
 fi
 # END LEGACY SUPPORT
 
-ucf /usr/share/php5/php.ini-dist.cli $phpini
+ucf /usr/share/php5/php.ini-dist $phpini
 
 update-alternatives \
 	--install /usr/bin/php php /usr/bin/php5 50 \
diff -u php5-5.2.3/debian/rules php5-5.2.3/debian/rules
--- php5-5.2.3/debian/rules
+++ php5-5.2.3/debian/rules
@@ -326,7 +325,6 @@
 
 	# sanitize php.ini file
 	cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/php5/php.ini-dist
-	cat php.ini-dist | tr "\t" " " | sed -e'/memory_limit =/ s/8M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli
 	cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-dist
 	cat php.ini-recommended | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-recommended
 	cat php.ini-paranoid | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-paranoid