Package: php5
Version: 5.3.9-4
Severity: important
Tags: patch
--- Please enter the report below this line. ---
creation of Sources fails, if the suhosin.patch is not applied and suhosin is
reenabled.
Quick and dirty solution: return 0 if suhosin is not in series.
dh_testroot
QUILT_PATCHES=debian/patches \
quilt --quiltrc /dev/null delete debian/patches/suhosin.patch
|| return 0
Patch debian/patches/suhosin.patch is not in series
rm -f configure-apache2-stamp build-apache2-stamp
--- System information. ---
Architecture: amd64
Kernel: Linux 3.2-2.towo.1-siduction-amd64
Debian Release: wheezy/sid
980 experimental-snapshots qt-kde.debian.net
500 unstable packages.siduction.org
500 unstable ftp.debian.org
500 testing ftp.debian.org
500 stable www.scootersoftware.com
500 stable ftp.debian.org
500 stable dl.google.com
1 experimental ftp.debian.org
--- Package information. ---
Depends (Version) | Installed
===========================================-+-==============
libapache2-mod-php5 (>= 5.3.9-4) | 5.3.9-4
OR libapache2-mod-php5filter (>= 5.3.9-4) |
OR php5-cgi (>= 5.3.9-4) | 5.3.9-4
OR php5-fpm (>= 5.3.9-4) | 5.3.9-4
php5-common (>= 5.3.9-4) | 5.3.9-4
Package's Recommends field is empty.
Package's Suggests field is empty.
diff --git a/debian/changelog b/debian/changelog
index a7587f9..6677034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php5 (5.3.9-4.1) unstable; urgency=low
+
+ * suhosin patch reenabled
+
+ -- Alf Gaida <[email protected]> Sun, 29 Jan 2012 01:20:26 +0100
+
php5 (5.3.9-4) unstable; urgency=low
* Remove suhosin patch from description and add short NEWS about
diff --git a/debian/rules b/debian/rules
index bd35eda..1750c3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
# package.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -17,7 +17,7 @@ export DH_OPTIONS
PHP5_COMPAT=no
# Set this flag to 'yes' if you want to compile PHP5 with suhosin patch
-PHP5_SUHOSIN=no
+PHP5_SUHOSIN=yes
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -410,7 +410,7 @@ clean: unprepared unpatch
ifeq (yes,$(PHP5_SUHOSIN))
QUILT_PATCHES=$(QUILT_PATCH_DIR) \
- quilt --quiltrc /dev/null delete debian/patches/suhosin.patch
+ quilt --quiltrc /dev/null delete debian/patches/suhosin.patch || return 0
endif
rm -f configure-apache2-stamp build-apache2-stamp
