Merge ~rafaeldtinoco/ubuntu/+source/ebtables:merge into ubuntu/+source/ebtables:debian/sid

[Rafael David Tinoco]

* Merge with Debian unstable (LP: #1836770). Remaining changes:

    - Never return failure during ebtables.init stop(), it can cause
      errors during package upgrade
    - Add version number check to prerm script, to only ignore
      failed upgrade for older versions instead of all versions.

[Rafael David Tinoco (rafaeldtinoco)]

PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1836770
BUG: https://bugs.launchpad.net/ubuntu/+source/ebtables/+bug/1836770

Thanks for reviewing this.

[Christian Ehrhardt  (paelzer)]

No full review, but something to note on the *tables context.
iptables | 1.8.3-2 | unstable
iptables | 1.6.1-2ubuntu3 | eoan
And that usually was a task of the security Team and I pinged them a while ago, but got no feedback so far.

review: Approve

[Christian Ehrhardt  (paelzer)]

On the merge itself it seems this is a straight forward merge only picking up Debian packaging changes.
- all delta is retained and still applies - ok
- changelog - ok
- Debian changes - ok
  - the removal of init/service was interestign but I think it is safe
- testing - I found no issues when playing (just a bit) with the PPA

[Christian Ehrhardt  (paelzer)]

One thing, it seems that the delta that we have was never reported to Debian.
So this will forever be a merge.
You could talk to ddstreet who added them for #1774120 if he would consider prepping and reporting them to Debian as well.
An alternative to that is if we can identify a clear "end" of the need to carry the Delta.
In that case mark them as then by adding at least in the commits something like: "can be dropped >20.04". This might happen if no affected upgrade path is left anymore.

[Christian Ehrhardt  (paelzer)]

+1 for this MP
Once you are also happy with testing let us know so we can tag and sponsor it accordingly

review: Approve

[Christian Ehrhardt  (paelzer)]

We are so far after FF that this won't happen anymore I think.
But that should be ok, marking the MP as Rejected to get out of the overviews.

review: Disapprove

[Rafael David Tinoco (rafaeldtinoco)]

Yep, I vote to deal with this with the next ebtables merge (w/ Debian since Upstream is dead, right ?).

For the SRUs (done by ddstreet), they've merged dpkg-compare tests to return the correct exit code for upgrade paths:

+ # Ignore failed prerm on old versions; see LP: #1774120
+ dpkg --compare-versions "$2" lt "2.0.10.4-3.5ubuntu5" && exit 0

And its better for us to check this next time we do merges, if they exist, to ebtables. This also answers your comment on 2019-07-17 about delta being taken to Debian (does not make sense for this case).

review: Disapprove

Unmerged commits

d576ab5... by Rafael David Tinoco on 2019-07-16

update-maintainer

0d87799... by Rafael David Tinoco on 2019-07-16

reconstruct-changelog

81700f8... by Rafael David Tinoco on 2019-07-16

merge-changelogs

ff04d78... by Karl Stenerud on 2019-01-22

  * Add version number check to prerm script, to only ignore
    failed upgrade for older versions instead of all versions.

934e824... by Karl Stenerud on 2019-01-22

  * Never return failure during ebtables.init stop(), it can cause
    errors during package upgrade

diff --git a/debian/changelog b/debian/changelog
index ae98152..0bb46d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ebtables (2.0.10.4+snapshot20181205-3ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable (LP: #1836770). Remaining changes:
+    - Never return failure during ebtables.init stop(), it can cause
+      errors during package upgrade
+    - Add version number check to prerm script, to only ignore
+      failed upgrade for older versions instead of all versions.
+
+ -- Rafael David Tinoco <[e-mail]>  Tue, 16 Jul 2019 15:50:48 +0000
+
 ebtables (2.0.10.4+snapshot20181205-3) unstable; urgency=medium
 
   [ Arturo Borrero Gonzalez ]
@@ -32,6 +42,24 @@ ebtables (2.0.10.4+snapshot20181205-2) unstable; urgency=medium
 
  -- Alberto Molina Coballes <[e-mail]>  Sat, 02 Feb 2019 19:31:28 +0000
 
+ebtables (2.0.10.4+snapshot20181205-1ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1812847). Remaining changes:
+    - Never return failure during ebtables.init stop(), it can cause
+      errors during package upgrade
+    - Add version number check to prerm script, to only ignore
+      failed upgrade for older versions instead of all versions.
+  * Dropped changes:
+    - Link ebtables with --no-as-needed and adjust the link order to fix
+      crash when running ebtables.
+      [fixed upstream commit 131920089dc21db43e7dba7104c15889701230ea]
+    - Use real locking in ebtables
+      [fixed upstream commit 6a826591878db3fa9e2a94b87a3d5edd8e0fc442]
+    - Fix check of fcntl errno value, to allow lockfile contention to work.
+      [fixed upstream commit 6a826591878db3fa9e2a94b87a3d5edd8e0fc442]
+
+ -- Karl Stenerud <[e-mail]>  Thu, 24 Jan 2019 11:28:57 +0100
+
 ebtables (2.0.10.4+snapshot20181205-1) unstable; urgency=medium
 
   * [6222d5e] New upstream version 2.0.10.4+snapshot20181205
@@ -76,6 +104,45 @@ ebtables (2.0.10.4-4) unstable; urgency=medium
 
  -- Alberto Molina Coballes <[e-mail]>  Thu, 26 Apr 2018 09:12:22 +0000
 
+ebtables (2.0.10.4-3.5ubuntu5) cosmic; urgency=medium
+
+  * Add version number check to prerm script, to only ignore
+    failed upgrade for older versions instead of all versions.
+
+ -- Dan Streetman <[e-mail]>  Mon, 11 Jun 2018 15:56:23 -0400
+
+ebtables (2.0.10.4-3.5ubuntu4) cosmic; urgency=medium
+
+  * Never return failure during ebtables.init stop(), it can cause
+    errors during package upgrade (LP: #1774120)
+
+ -- Dan Streetman <[e-mail]>  Thu, 31 May 2018 08:46:43 -0400
+
+ebtables (2.0.10.4-3.5ubuntu3) cosmic; urgency=medium
+
+  * Fix check of fcntl errno value, to allow lockfile contention to work.
+    (LP: #1772456)
+
+ -- Dan Streetman <[e-mail]>  Mon, 21 May 2018 13:20:15 -0400
+
+ebtables (2.0.10.4-3.5ubuntu2) artful; urgency=medium
+
+  * Use real locking in ebtables (LP: #1645324)
+    - Prior use of locking by file exclusive access is inadequate
+      because if ebtables crashes or is killed it will leave a
+      stale lock file behind which then blocks new ebtables from
+      running.
+
+ -- Dragan Stancevic <[e-mail]>  Tue, 18 Apr 2017 17:32:38 -0500
+
+ebtables (2.0.10.4-3.5ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian unstable.  Remaining changes:
+    - Link ebtables with --no-as-needed and adjust the link order to fix
+      crash when running ebtables. (LP: #899315)
+
+ -- Martin Pitt <[e-mail]>  Thu, 28 Jul 2016 14:38:18 +0200
+
 ebtables (2.0.10.4-3.5) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -86,6 +153,14 @@ ebtables (2.0.10.4-3.5) unstable; urgency=medium
 
  -- Andreas Henriksson <[e-mail]>  Wed, 25 May 2016 20:34:14 +0200
 
+ebtables (2.0.10.4-3.4ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable (LP: #1556300).  Remaining changes:
+    - Link ebtables with --no-as-needed and adjust the link order to fix
+      crash when running ebtables.
+
+ -- Nishanth Aravamudan <[e-mail]>  Fri, 11 Mar 2016 14:12:56 -0800
+
 ebtables (2.0.10.4-3.4) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -123,6 +198,14 @@ ebtables (2.0.10.4-3.1) unstable; urgency=medium
 
  -- Laurent Bigonville <[e-mail]>  Fri, 05 Feb 2016 02:11:19 +0100
 
+ebtables (2.0.10.4-3ubuntu1) trusty; urgency=low
+
+  * Merge with Debian.  Remaining changes:
+    - Link ebtables with --no-as-needed and adjust the link order to fix
+      crash when running ebtables.
+
+ -- Iain Lane <[e-mail]>  Fri, 22 Nov 2013 11:42:46 +0000
+
 ebtables (2.0.10.4-3) unstable; urgency=low
 
   * packaging update:
@@ -130,6 +213,20 @@ ebtables (2.0.10.4-3) unstable; urgency=low
 
  -- William Dauchy <[e-mail]>  Mon, 06 May 2013 14:06:02 +0000
 
+ebtables (2.0.10.4-2ubuntu2) saucy; urgency=low
+
+  * Add trailing "." to update-rc.d arguments (LP: #1176436) 
+
+ -- Iain Lane <[e-mail]>  Sun, 05 May 2013 20:14:40 +0100
+
+ebtables (2.0.10.4-2ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Link ebtables with --no-as-needed and adjust the link order to fix
+      crash when running ebtables.
+
+ -- Colin Watson <[e-mail]>  Sat, 04 May 2013 11:06:40 -0700
+
 ebtables (2.0.10.4-2) unstable; urgency=low
 
   * packaging update:
@@ -140,6 +237,14 @@ ebtables (2.0.10.4-2) unstable; urgency=low
 
  -- William Dauchy <[e-mail]>  Tue, 20 Mar 2013 15:46:02 +0000
 
+ebtables (2.0.10.4-1ubuntu1) raring; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Link ebtables with --no-as-needed and adjust the link order to fix
+      crash when running ebtables.
+
+ -- Colin Watson <[e-mail]>  Mon, 26 Nov 2012 17:42:18 +0000
+
 ebtables (2.0.10.4-1) unstable; urgency=low
 
   * New upstream release
@@ -169,6 +274,29 @@ ebtables (2.0.9.2-2.1) unstable; urgency=high
 
  -- Cyril Brulebois <[e-mail]>  Sat, 03 Mar 2012 15:24:02 +0000
 
+ebtables (2.0.9.2-2ubuntu3) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <[e-mail]>  Mon, 01 Oct 2012 21:01:35 +0100
+
+ebtables (2.0.9.2-2ubuntu2) precise; urgency=low
+
+  * Add patch 05link_with_no-as-needed.patch to link ebtables with
+    --no-as-needed and adjust the link order to fix crash when running
+    ebtables (LP: #899315)
+  * debian/rules: add -g option to DEBCFLAGS, so symbols can be extracted
+    into an ebtables-dbgsym package
+
+ -- Albert Damen <[e-mail]>  Sun, 04 Dec 2011 21:19:58 +0100
+
+ebtables (2.0.9.2-2ubuntu1) precise; urgency=low
+
+  * Add 04define__aligned_u64.patch to define __aligned_u64
+    before including linux/if_packet.h, resolving FTBFS.
+
+ -- Adam Conrad <[e-mail]>  Fri, 02 Dec 2011 00:25:41 -0700
+
 ebtables (2.0.9.2-2) unstable; urgency=low
 
   * Add a lintian override concerning the usage of -rpath that got lost
diff --git a/debian/control b/debian/control
index 77e551d..f76b8f1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ebtables
 Section: net
 Priority: optional
-Maintainer: Debian Netfilter Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Netfilter Packaging Team <[e-mail]>
 Uploaders: Alberto Molina Coballes <[e-mail]>
 Standards-Version: 4.3.0
 Build-Depends: debhelper (>= 11)
diff --git a/debian/ebtables.prerm b/debian/ebtables.prerm
index 1e4b23f..61b99b8 100644
--- a/debian/ebtables.prerm
+++ b/debian/ebtables.prerm
@@ -17,4 +17,9 @@ if [ "$1" = "remove" ] ; then
     fi
 fi
 
+if [ "$1" = "failed-upgrade" ]; then
+  # Ignore failed prerm on old versions; see LP: #1774120
+  dpkg --compare-versions "$2" lt "2.0.10.4-3.5ubuntu5" && exit 0
+fi
+
 #DEBHELPER#
diff --git a/debian/examples/sysvinit/ebtables.init b/debian/examples/sysvinit/ebtables.init
index 06bf57f..b800521 100644
--- a/debian/examples/sysvinit/ebtables.init
+++ b/debian/examples/sysvinit/ebtables.init
@@ -49,7 +49,7 @@ function get_supported_tables() {
 	/sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission
 	if [ $? -eq 0 ]; then
 		log_failure_msg "Error: insufficient privileges to access the ebtables rulesets."
-		exit 1
+		return
 	fi
 	for table in filter nat broute; do
 		/sbin/ebtables -t $table -L &> /dev/null
@@ -140,6 +140,9 @@ case "$1" in
   stop)
 	[ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
 	clear
+	# Never return failure for stop; it's not helpful, and causes problems
+	# in some cases during pkg upgrade, e.g. LP: #1774120
+	RETVAL=0
 	;;
   restart|reload|force-reload)
 	[ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save