Control: tags 813760 + pending Dear maintainer,
I've prepared an NMU for ebtables (versioned as 2.0.10.4-3.2) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. diff -Nru ebtables-2.0.10.4/debian/changelog ebtables-2.0.10.4/debian/changelog --- ebtables-2.0.10.4/debian/changelog 2016-02-05 02:11:20.000000000 +0100 +++ ebtables-2.0.10.4/debian/changelog 2016-02-05 13:29:41.000000000 +0100 @@ -1,3 +1,13 @@ +ebtables (2.0.10.4-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/lockdirfix.patch: Move the lock file to /run instead of + /var/lib/ebtables directory (Closes: #813760) + * debian/ebtables.postinst: Remove /var/lib/ebtables during upgrade, that + directory was created by ebtables but not tracked by the package. + + -- Laurent Bigonville <[email protected]> Fri, 05 Feb 2016 13:29:39 +0100 + ebtables (2.0.10.4-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru ebtables-2.0.10.4/debian/ebtables.postinst ebtables-2.0.10.4/debian/ebtables.postinst --- ebtables-2.0.10.4/debian/ebtables.postinst 1970-01-01 01:00:00.000000000 +0100 +++ ebtables-2.0.10.4/debian/ebtables.postinst 2016-02-05 13:26:39.000000000 +0100 @@ -0,0 +1,29 @@ +#!/bin/sh +# postinst script for ebtables +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + configure) + if dpkg --compare-versions "$2" le-nl "2.0.10.4-3.2~"; then + rmdir --ignore-fail-on-non-empty /var/lib/ebtables + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru ebtables-2.0.10.4/debian/patches/lockdirfix.patch ebtables-2.0.10.4/debian/patches/lockdirfix.patch --- ebtables-2.0.10.4/debian/patches/lockdirfix.patch 1970-01-01 01:00:00.000000000 +0100 +++ ebtables-2.0.10.4/debian/patches/lockdirfix.patch 2016-02-05 13:12:16.000000000 +0100 @@ -0,0 +1,54 @@ +Description: Move the lockfile from /var/lib/ebtables/lock to /run/ebtables.lock +Origin: http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-2.0.10-linkfix.patch +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813760 + +diff -up ebtables-v2.0.10-4/ebtables.8.lockdirfix ebtables-v2.0.10-4/ebtables.8 +--- ebtables-v2.0.10-4/ebtables.8.lockdirfix 2016-01-18 11:13:21.707069702 -0500 ++++ ebtables-v2.0.10-4/ebtables.8 2016-01-18 11:13:40.554953365 -0500 +@@ -1103,7 +1103,7 @@ arp message and the hardware address len + .br + .SH FILES + .I /etc/ethertypes +-.I /var/lib/ebtables/lock ++.I /run/ebtables.lock + .SH ENVIRONMENT VARIABLES + .I EBTABLES_ATOMIC_FILE + .SH MAILINGLISTS +diff -up ebtables-v2.0.10-4/INSTALL.lockdirfix ebtables-v2.0.10-4/INSTALL +--- ebtables-v2.0.10-4/INSTALL.lockdirfix 2016-01-18 11:15:31.458268826 -0500 ++++ ebtables-v2.0.10-4/INSTALL 2016-01-18 11:15:53.890130367 -0500 +@@ -31,7 +31,7 @@ WHAT GETS INSTALLED AND WHAT OPTIONS ARE + copied to /etc/rc.d/init.d (change with option INITDIR) + - The ebtables configuration file (ebtables-config) is copied to /etc/sysconfig + - ebtables can use a lock file to enable concurrent execution of the ebtables +- tool. The standard location of the lock file is /var/lib/ebtables/lock. ++ tool. The standard location of the lock file is /run/ebtables.lock. + Include LOCKFILE=<<path-to-file>> if you want to use another file. + + That's all +diff -up ebtables-v2.0.10-4/libebtc.c.lockdirfix ebtables-v2.0.10-4/libebtc.c +--- ebtables-v2.0.10-4/libebtc.c.lockdirfix 2016-01-18 11:12:14.347485472 -0500 ++++ ebtables-v2.0.10-4/libebtc.c 2016-01-18 11:13:06.515163472 -0500 +@@ -134,8 +134,8 @@ void ebt_list_extensions() + } + + #ifndef LOCKFILE +-#define LOCKDIR "/var/lib/ebtables" +-#define LOCKFILE LOCKDIR"/lock" ++#define LOCKDIR "/run" ++#define LOCKFILE LOCKDIR"/ebtables.lock" + #endif + static int lockfd = -1, locked; + int use_lockfd; +diff -up ebtables-v2.0.10-4/Makefile.lockdirfix ebtables-v2.0.10-4/Makefile +--- ebtables-v2.0.10-4/Makefile.lockdirfix 2016-01-18 11:14:10.715767201 -0500 ++++ ebtables-v2.0.10-4/Makefile 2016-01-18 11:15:20.506336425 -0500 +@@ -5,7 +5,7 @@ PROGRELEASE:=4 + PROGVERSION_:=2.0.10 + PROGVERSION:=$(PROGVERSION_)-$(PROGRELEASE) + PROGDATE:=December\ 2011 +-LOCKFILE?=/var/lib/ebtables/lock ++LOCKFILE?=/run/ebtables.lock + LOCKDIR:=$(shell echo $(LOCKFILE) | sed 's/\(.*\)\/.*/\1/')/ + + # default paths diff -Nru ebtables-2.0.10.4/debian/patches/series ebtables-2.0.10.4/debian/patches/series --- ebtables-2.0.10.4/debian/patches/series 2016-02-05 02:19:11.000000000 +0100 +++ ebtables-2.0.10.4/debian/patches/series 2016-02-05 13:05:42.000000000 +0100 @@ -2,3 +2,4 @@ makefile_adjustments.patch manpage.patch compensate-for-missing-aligned-u64.patch +lockdirfix.patch
