I have updated versions of the shorewall, shorewall6, and shorewall-core packages that I would like approval to upload. The changes consist of:
shorewall - fix README.Debian to reference correct location for default configuration (Closes: #687437) shorewall6 - same README.Debian fix (no separate bug for this one) shorewall-core - fix a patch for the lockfile location; the current patch is a carry-over from many years ago and uses a hardcoded path, which results in an unnecessary 60 second boot-time delay for users with both shorewall and shorewall6 installed All three debdiffs are attached for review. Regards, -Roberto -- Roberto C. Sánchez http://people.connexer.com/~roberto http://www.connexer.com
diff -Nru shorewall-core-4.5.5.3/debian/changelog shorewall-core-4.5.5.3/debian/changelog --- shorewall-core-4.5.5.3/debian/changelog 2012-07-02 19:26:37.000000000 -0400 +++ shorewall-core-4.5.5.3/debian/changelog 2012-09-15 15:10:57.000000000 -0400 @@ -1,3 +1,9 @@ +shorewall-core (4.5.5.3-2) unstable; urgency=low + + * Update lockfile relocation patch + + -- Roberto C. Sanchez <[email protected]> Sat, 15 Sep 2012 15:10:40 -0400 + shorewall-core (4.5.5.3-1) unstable; urgency=low * New Upstream Version diff -Nru shorewall-core-4.5.5.3/debian/patches/99_lockfile_relocation.patch shorewall-core-4.5.5.3/debian/patches/99_lockfile_relocation.patch --- shorewall-core-4.5.5.3/debian/patches/99_lockfile_relocation.patch 2012-07-02 19:26:37.000000000 -0400 +++ shorewall-core-4.5.5.3/debian/patches/99_lockfile_relocation.patch 2012-09-15 15:10:57.000000000 -0400 @@ -8,7 +8,7 @@ local lockf - lockf=${LOCKFILE:=${VARDIR}/lock} + # lockf=${LOCKFILE:=${VARDIR}/lock} -+ local lockf=/var/lock/shorewall ++ local lockf=/var/lock/$g_product local lockpid MUTEX_TIMEOUT=${MUTEX_TIMEOUT:-60} @@ -18,6 +18,6 @@ { - rm -f ${LOCKFILE:=${VARDIR}/lock} + # rm -f ${LOCKFILE:=${VARDIR}/lock} -+ rm -f /var/lock/shorewall ++ rm -f /var/lock/$g_product }
diff -Nru shorewall6-4.5.5.3/debian/README.Debian shorewall6-4.5.5.3/debian/README.Debian
--- shorewall6-4.5.5.3/debian/README.Debian 2012-07-02 19:27:19.000000000 -0400
+++ shorewall6-4.5.5.3/debian/README.Debian 2012-09-15 15:10:25.000000000 -0400
@@ -27,7 +27,7 @@
package update
The default upstream configuration files are installed, just as an example, in
-/usr/share/doc/shorewall6/default-config/. The only files that can be used
+/usr/share/shorewall6/configfiles/. The only files that can be used
'as is' are the ones installed by the package (N.B. Debian policy, point 12,
requires that file installed under /usr/share/doc/XXX/ should be compressed;
for this reason packaging tools automatically compress some of the
diff -Nru shorewall6-4.5.5.3/debian/changelog shorewall6-4.5.5.3/debian/changelog
--- shorewall6-4.5.5.3/debian/changelog 2012-07-02 19:27:19.000000000 -0400
+++ shorewall6-4.5.5.3/debian/changelog 2012-09-15 15:10:25.000000000 -0400
@@ -1,3 +1,10 @@
+shorewall6 (4.5.5.3-2) unstable; urgency=low
+
+ * Update README.Debian to identify correct location for default
+ configuration files
+
+ -- Roberto C. Sanchez <[email protected]> Sat, 15 Sep 2012 15:10:17 -0400
+
shorewall6 (4.5.5.3-1) unstable; urgency=low
* New Upstream Version
diff -Nru shorewall-4.5.5.3/debian/README.Debian shorewall-4.5.5.3/debian/README.Debian
--- shorewall-4.5.5.3/debian/README.Debian 2012-07-02 19:27:01.000000000 -0400
+++ shorewall-4.5.5.3/debian/README.Debian 2012-09-15 15:09:51.000000000 -0400
@@ -27,7 +27,7 @@
package update
The default upstream configuration files are installed, just as an example, in
-/usr/share/doc/shorewall/default-config/. The only files that can be used
+/usr/share/shorewall/configfiles/. The only files that can be used
'as is' are the ones installed by the package (N.B. Debian policy, point 12,
requires that file installed under /usr/share/doc/XXX/ should be compressed;
for this reason packaging tools automatically compress some of the
diff -Nru shorewall-4.5.5.3/debian/changelog shorewall-4.5.5.3/debian/changelog
--- shorewall-4.5.5.3/debian/changelog 2012-07-02 19:27:01.000000000 -0400
+++ shorewall-4.5.5.3/debian/changelog 2012-09-15 15:09:51.000000000 -0400
@@ -1,3 +1,10 @@
+shorewall (4.5.5.3-2) unstable; urgency=low
+
+ * Update README.Debian to identify correct location for default
+ configuration files (Closes: #687437)
+
+ -- Roberto C. Sanchez <[email protected]> Sat, 15 Sep 2012 15:09:32 -0400
+
shorewall (4.5.5.3-1) unstable; urgency=low
* New Upstream Version
signature.asc
Description: Digital signature
