Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: freeze-exception
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Dear Release Team:
I would like to request a freeze exception/unblock for tomcat7_7.0.28-2.
The package contains fixes for 2 severity important bugs, #680844 (FTBFS
when user home dir doesn't exist) and #681160 (fix to always generate
MD5SUM in postrm; prior to this, the source package upload contained the
postrm with the calculated sum and thus subsequent builds wouldn't
regenerate it).
Thank you,
tony
unblock tomcat7/7.0.28-2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBAgAGBQJP/yWMAAoJECHSBYmXSz6WIWAP/RotiKsP2SsqnaQaRogw3qb5
9/bTW8lgteCM1vQ3SmZKNep0VLEhN4F8SG9xOitvX67UZEmSzgLm1X1LoBzxOKC2
LOSUh7/39PPnYvpJ8o8Ox+qBqm3tYRVfbWgz7GJiiIDsqFd881tz4xLAEZpjmmhj
jtvX8UwWBBTswY2hz1SiYE0YKEL9gzanI9aZCJNj+8m/CDkrN5iHi5IdADq3ahNB
J/tt2qxgbYHp/mj2w4zpny8NioHeYLw7mP8MjieiOPoss2uG0UqpQd3ACrvyFnTn
sGyWVyHJxf8ciUYQ1XxkGKzdLXzaAigdhk285G3LdgfVdEvzu9aToCUgJJhZER4o
uoNvAB7/xzdmQXFBJo57TL7p4aoPfIyPbgt882XH5Rub8vrD27TSnfy4oONUVsbQ
fDZChA5r1iAMcSTEXaFBhSjDPPNFHU44aATNiSWAGh1HItRiQlTGB/vTX9/NX7Ij
Ux2nYyZYsArmRcjRn373WTWhML+iNflBhwAWGTqAjpkdG85eufg/sEtIepEiXLxC
SXOQjZTYgk9OeW2ySXnuhxP5Tg3o7C957NHaT0X0VDmOrIvAGmaLjpYOBYszS6uA
VDnZVexw072VXQwh8gZ5KQxpACkl2bdIs7Z08DV6assrxKImFG5QbL1wW9iXtcGI
+OPjoa2yWhFnuWPC/cto
=xP3c
-----END PGP SIGNATURE-----
diff -Nru tomcat7-7.0.28/debian/changelog tomcat7-7.0.28/debian/changelog
--- tomcat7-7.0.28/debian/changelog 2012-06-22 07:07:39.000000000 -0700
+++ tomcat7-7.0.28/debian/changelog 2012-07-10 22:13:47.000000000 -0700
@@ -1,3 +1,15 @@
+tomcat7 (7.0.28-2) unstable; urgency=low
+
+ [ Jakub Adam ]
+ * Ensure webapps/examples/WEB-INF/lib exists before files are
+ copied there.
+ * Fix FTBFS when user home dir doesn't exist (Closes: #680844).
+
+ [ tony mancill ]
+ * Fix build to generate postrm from postrm.in (Closes: #681160)
+
+ -- tony mancill <tmanc...@debian.org> Tue, 10 Jul 2012 17:29:30 -0700
+
tomcat7 (7.0.28-1) unstable; urgency=low
[ Miguel Landaeta ]
diff -Nru tomcat7-7.0.28/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch tomcat7-7.0.28/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
--- tomcat7-7.0.28/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch 1969-12-31 16:00:00.000000000 -0800
+++ tomcat7-7.0.28/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch 2012-07-10 22:13:47.000000000 -0700
@@ -0,0 +1,20 @@
+From: Jakub Adam <jakub.a...@ktknet.cz>
+Date: Mon, 9 Jul 2012 20:53:38 +0000
+Subject: 0013-dont-look-for-build-properties-in-user-home
+
+---
+ build.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 14340db..ae86842 100644
+--- a/build.xml
++++ b/build.xml
+@@ -425,7 +425,6 @@
+ <!-- Property that determines if manifests need updating -->
+ <uptodate property="manifests.uptodate"
+ targetfile="${tomcat.manifests}/default.manifest" >
+- <srcfiles file="${user.home}/build.properties" />
+ <srcfiles file="${basedir}/build.properties" />
+ <srcfiles file="${basedir}/build.properties.default" />
+ <srcfiles file="${basedir}/build.xml" />
diff -Nru tomcat7-7.0.28/debian/patches/series tomcat7-7.0.28/debian/patches/series
--- tomcat7-7.0.28/debian/patches/series 2012-06-22 07:07:39.000000000 -0700
+++ tomcat7-7.0.28/debian/patches/series 2012-07-10 22:13:47.000000000 -0700
@@ -8,3 +8,4 @@
0010-debianize-build-xml.patch
0011-fix-classpath-lintian-warnings.patch
0012-java7-compat.patch
+0013-dont-look-for-build-properties-in-user-home.patch
diff -Nru tomcat7-7.0.28/debian/rules tomcat7-7.0.28/debian/rules
--- tomcat7-7.0.28/debian/rules 2012-06-22 07:07:39.000000000 -0700
+++ tomcat7-7.0.28/debian/rules 2012-07-10 22:13:47.000000000 -0700
@@ -56,6 +56,7 @@
build-stamp:
dh_testdir
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+ mkdir -p webapps/examples/WEB-INF/lib
cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
cp /usr/share/java/standard.jar webapps/examples/WEB-INF/lib/standard.jar
$(ANT_INVOKE) deploy test
@@ -75,6 +76,7 @@
rm -rf "output/"
rm -rf webapps/examples/WEB-INF/lib/*.jar
rm -f build-stamp modules/jdbc-pool/output/resources/MANIFEST.MF
+ rm -f debian/tomcat7.postrm
dh_clean
mh_clean
@@ -163,7 +165,7 @@
# update the checksum for the root webapp
unset rwmd5sum \
&& rwmd5sum=`cat $(RWFILES) | md5sum - 2>/dev/null | cut -d " " -f1` \
- && sed -i "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm
+ && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm.in > debian/tomcat7.postrm
jh_manifest
dh_compress
dh_fixperms
diff -Nru tomcat7-7.0.28/debian/tomcat7.postrm tomcat7-7.0.28/debian/tomcat7.postrm
--- tomcat7-7.0.28/debian/tomcat7.postrm 2012-06-22 07:07:39.000000000 -0700
+++ tomcat7-7.0.28/debian/tomcat7.postrm 1969-12-31 16:00:00.000000000 -0800
@@ -1,80 +0,0 @@
-#!/bin/sh
-set -e
-
-#DEBHELPER#
-
-CONFFILE=/etc/default/tomcat7
-
-# Remove cached files and auto-generated catalina.policy
-rm -rf /var/cache/tomcat7/*
-
-case "$1" in
- remove)
- # Remove ROOT webapp if not modified
- RWLOC="/var/lib/tomcat7/webapps/ROOT"
- RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
- if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
- = "@ROOT_WEBAPP_MD5SUM@" ] ; then
- rm $RWFILES
- rmdir --ignore-fail-on-non-empty \
- /var/lib/tomcat7/webapps/ROOT/META-INF \
- /var/lib/tomcat7/webapps/ROOT \
- /var/lib/tomcat7/webapps \
- /var/lib/tomcat7 || true
- fi
- if [ -d /var/lib/tomcat7/common ] && [ -z "`(find var/lib/tomcat7/common/classes -type f)`" ] ; then
- rmdir --ignore-fail-on-non-empty \
- /var/lib/tomcat7/common/classes \
- /var/lib/tomcat7/common || true
- fi
- if [ -d /var/lib/tomcat7/server ] && [ -z "`(find var/lib/tomcat7/server/classes -type f)`" ] ; then
- rmdir --ignore-fail-on-non-empty \
- /var/lib/tomcat7/server/classes \
- /var/lib/tomcat7/server || true
- fi
- if [ -d /var/lib/tomcat7/shared ] && [ -z "`(find var/lib/tomcat7/shared/classes -type f)`" ] ; then
- rmdir --ignore-fail-on-non-empty \
- /var/lib/tomcat7/shared/classes \
- /var/lib/tomcat7/shared || true
- fi
- if [ -d "/var/cache/tomcat7" ] ; then
- rm -rf /var/cache/tomcat7
- fi
- ;;
-
- purge)
- # ignore errors during purge
- set +e
- if [ -x "/usr/bin/ucf" ]; then
- ucf --purge $CONFFILE
- fi
- rm -rf /var/log/tomcat7 /var/lib/tomcat7/temp $CONFFILE
- if [ -d "/var/lib/tomcat7" ] ; then
- rmdir --ignore-fail-on-non-empty /var/lib/tomcat7
- fi
- rmdir --ignore-fail-on-non-empty /etc/tomcat7/policy.d \
- /etc/tomcat7/Catalina/localhost /etc/tomcat7/Catalina /etc/tomcat7
- # clean up /etc/authbind after conffiles have been removed
- rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind
- # Put all files owned by group tomcat7 back into root group before deleting
- # the tomcat7 user and group
- chown -Rhf root:root /etc/tomcat7/ || true
- # Remove user/group and log files (don't remove everything under
- # /var/lib/tomcat7 because there might be user-installed webapps)
- db_get tomcat7/username && TOMCAT7_USER="$RET" || TOMCAT7_USER="tomcat7"
- db_get tomcat7/groupname && TOMCAT7_GROUP="$RET" || TOMCAT7_GROUP="tomcat7"
- deluser $TOMCAT7_USER
- delgroup $TOMCAT7_GROUP
-
- set -e
- ;;
-
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- # Nothing to do here
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
diff -Nru tomcat7-7.0.28/debian/tomcat7.postrm.in tomcat7-7.0.28/debian/tomcat7.postrm.in
--- tomcat7-7.0.28/debian/tomcat7.postrm.in 1969-12-31 16:00:00.000000000 -0800
+++ tomcat7-7.0.28/debian/tomcat7.postrm.in 2012-07-10 22:13:47.000000000 -0700
@@ -0,0 +1,80 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+CONFFILE=/etc/default/tomcat7
+
+# Remove cached files and auto-generated catalina.policy
+rm -rf /var/cache/tomcat7/*
+
+case "$1" in
+ remove)
+ # Remove ROOT webapp if not modified
+ RWLOC="/var/lib/tomcat7/webapps/ROOT"
+ RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
+ if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
+ = "@ROOT_WEBAPP_MD5SUM@" ] ; then
+ rm $RWFILES
+ rmdir --ignore-fail-on-non-empty \
+ /var/lib/tomcat7/webapps/ROOT/META-INF \
+ /var/lib/tomcat7/webapps/ROOT \
+ /var/lib/tomcat7/webapps \
+ /var/lib/tomcat7 || true
+ fi
+ if [ -d /var/lib/tomcat7/common ] && [ -z "`(find var/lib/tomcat7/common/classes -type f)`" ] ; then
+ rmdir --ignore-fail-on-non-empty \
+ /var/lib/tomcat7/common/classes \
+ /var/lib/tomcat7/common || true
+ fi
+ if [ -d /var/lib/tomcat7/server ] && [ -z "`(find var/lib/tomcat7/server/classes -type f)`" ] ; then
+ rmdir --ignore-fail-on-non-empty \
+ /var/lib/tomcat7/server/classes \
+ /var/lib/tomcat7/server || true
+ fi
+ if [ -d /var/lib/tomcat7/shared ] && [ -z "`(find var/lib/tomcat7/shared/classes -type f)`" ] ; then
+ rmdir --ignore-fail-on-non-empty \
+ /var/lib/tomcat7/shared/classes \
+ /var/lib/tomcat7/shared || true
+ fi
+ if [ -d "/var/cache/tomcat7" ] ; then
+ rm -rf /var/cache/tomcat7
+ fi
+ ;;
+
+ purge)
+ # ignore errors during purge
+ set +e
+ if [ -x "/usr/bin/ucf" ]; then
+ ucf --purge $CONFFILE
+ fi
+ rm -rf /var/log/tomcat7 /var/lib/tomcat7/temp $CONFFILE
+ if [ -d "/var/lib/tomcat7" ] ; then
+ rmdir --ignore-fail-on-non-empty /var/lib/tomcat7
+ fi
+ rmdir --ignore-fail-on-non-empty /etc/tomcat7/policy.d \
+ /etc/tomcat7/Catalina/localhost /etc/tomcat7/Catalina /etc/tomcat7
+ # clean up /etc/authbind after conffiles have been removed
+ rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind
+ # Put all files owned by group tomcat7 back into root group before deleting
+ # the tomcat7 user and group
+ chown -Rhf root:root /etc/tomcat7/ || true
+ # Remove user/group and log files (don't remove everything under
+ # /var/lib/tomcat7 because there might be user-installed webapps)
+ db_get tomcat7/username && TOMCAT7_USER="$RET" || TOMCAT7_USER="tomcat7"
+ db_get tomcat7/groupname && TOMCAT7_GROUP="$RET" || TOMCAT7_GROUP="tomcat7"
+ deluser $TOMCAT7_USER
+ delgroup $TOMCAT7_GROUP
+
+ set -e
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ # Nothing to do here
+ ;;
+
+ *)
+ echo "$0 called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
