[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#927299: unblock: arptables/0.0.4+snapshot20181021-4



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package arptables

A serious bug was opened on ebtables and arptables regarding an issue
with usr merged systems. This patch solves this issue.

The debdiff also includes a previous minor commit including salsa CI files, if you
consider this must not be included, please let me know.

unblock arptables/0.0.4+snapshot20181021-4

Thanks
diff -Nru arptables-0.0.4+snapshot20181021/debian/arptables.prerm arptables-0.0.4+snapshot20181021/debian/arptables.prerm
--- arptables-0.0.4+snapshot20181021/debian/arptables.prerm	2019-01-07 19:23:02.000000000 +0000
+++ arptables-0.0.4+snapshot20181021/debian/arptables.prerm	2019-04-15 09:20:31.000000000 +0000
@@ -7,12 +7,14 @@
 fi
 
 if [ "$1" = "remove" ] ; then
-    LIST="arptables arptables-save arptables-restore"
-    for i in $LIST ; do
-	if [ -L "/sbin/$i" ] ; then
-	    rm /sbin/$i
-	fi
-    done
+    if [ ! -L /sbin ] || [ "$(readlink /sbin)" != "usr/sbin" ]; then
+	LIST="arptables arptables-save arptables-restore"
+	for i in $LIST ; do
+	    if [ -L "/sbin/$i" ] ; then
+		rm /sbin/$i
+	    fi
+	done
+    fi
 fi
 
 #DEBHELPER#
diff -Nru arptables-0.0.4+snapshot20181021/debian/changelog arptables-0.0.4+snapshot20181021/debian/changelog
--- arptables-0.0.4+snapshot20181021/debian/changelog	2019-01-11 17:02:26.000000000 +0000
+++ arptables-0.0.4+snapshot20181021/debian/changelog	2019-04-17 15:24:53.000000000 +0000
@@ -1,3 +1,14 @@
+arptables (0.0.4+snapshot20181021-4) unstable; urgency=medium
+
+  [ Arturo Borrero Gonzalez ]
+  * [88703e1] src:arptables: add salsa CI integration
+
+  [ Alberto Molina Coballes ]
+  * [eb7a44d] d/arptables.prerm: Remove /sbin symlinks on not usr-merged systems
+    (Closes: #926728)
+
+ -- Alberto Molina Coballes <alb.molina@gmail.com>  Wed, 17 Apr 2019 15:24:53 +0000
+
 arptables (0.0.4+snapshot20181021-3) unstable; urgency=medium
 
   * [090bcbc] d/dirs: /sbin no longer required
diff -Nru arptables-0.0.4+snapshot20181021/debian/gitlab-ci.yml arptables-0.0.4+snapshot20181021/debian/gitlab-ci.yml
--- arptables-0.0.4+snapshot20181021/debian/gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ arptables-0.0.4+snapshot20181021/debian/gitlab-ci.yml	2019-03-02 18:04:21.000000000 +0000
@@ -0,0 +1,6 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ RELEASE: 'unstable'

Reply to: