Bug#924045: unblock: smcroute/2.4.2-4
Control: tag -1 -moreinfo
On 09.03.19 12:26, Jonathan Wiltshire wrote:
Control: tag -1 confirmed moreinfo
On Fri, Mar 08, 2019 at 09:35:29PM +0100, Micha Lenk wrote:
Because of the included cosmetic changes, the package isn't uploadede to
unstable yet. It is currently only available on mentors.d.n as
https://mentors.debian.net/debian/pool/main/s/smcroute/smcroute_2.4.2-4.dsc
Please go ahead and remove the moreinfo tag when it is ready to unblock.
I've just uploaded smcroute 2.4.2-4 to unstable, so I consider it ready
to unblock.
I should mention that compared to the initial debdiff I've amended only
the debian/changelog to include also the missing "closes: #924044". You
can find the updated debdiff attached to this mail.
Kind regards,
Micha
diff -Nru smcroute-2.4.2/debian/changelog smcroute-2.4.2/debian/changelog
--- smcroute-2.4.2/debian/changelog 2018-09-23 22:40:04.0 +0200
+++ smcroute-2.4.2/debian/changelog 2019-03-07 06:40:19.0 +0100
@@ -1,3 +1,17 @@
+smcroute (2.4.2-4) unstable; urgency=medium
+
+ * Import upstream fix for malfunctioning 'stop' command to init script,
+closes: #924044
+ * Import upstream fix to allow same outbound interface as inbound when
+routing. This is slightly hairy, but previous releases of SMCRoute
+supported this and the unit tests rely on this to work
+ * Fix unit tests, with upstream and test setup fixes, closes: #921577
+ * Bump Standards-Version to 4.3.0, no changes needed
+ * Use debhelper maintscript to relocate old /etc/startup.sh script
+to /etc/smcroute. Fixes an outstanding lintian warning
+
+ -- Joachim Nilsson Thu, 07 Mar 2019 06:40:19 +0100
+
smcroute (2.4.2-3) unstable; urgency=medium
* Add missing Build-Depends for systemd, needed for unit file path
diff -Nru smcroute-2.4.2/debian/control smcroute-2.4.2/debian/control
--- smcroute-2.4.2/debian/control 2018-09-21 21:54:23.0 +0200
+++ smcroute-2.4.2/debian/control 2019-03-07 06:40:19.0 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Joachim Nilsson
Build-Depends: debhelper (>= 10), libcap-dev, systemd, pkg-config
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
Homepage: http://troglobit.com/smcroute.html
Vcs-Browser: https://salsa.debian.org/debian/smcroute
Vcs-Git: https://salsa.debian.org/debian/smcroute.git
diff -Nru smcroute-2.4.2/debian/gitlab-ci.yml smcroute-2.4.2/debian/gitlab-ci.yml
--- smcroute-2.4.2/debian/gitlab-ci.yml 1970-01-01 01:00:00.0 +0100
+++ smcroute-2.4.2/debian/gitlab-ci.yml 2019-03-07 06:40:19.0 +0100
@@ -0,0 +1,9 @@
+image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest
+
+build:
+ artifacts:
+paths:
+- "*.deb"
+expire_in: 1 day
+ script:
+- gitlab-ci-git-buildpackage-all
diff -Nru smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch
--- smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch 1970-01-01 01:00:00.0 +0100
+++ smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch 2019-03-07 06:40:19.0 +0100
@@ -0,0 +1,96 @@
+commit 802d82eb5c571afe2a294fd302745bf37cc13a1d
+Author: Joachim Nilsson
+Date: Sun Feb 10 13:56:17 2019 +0100
+
+Allow same outbound interface as inbound, only warn user
+
+Routing back multicast to the same interface it ingressed on is
+quite a bit dangerous, but there may be use-cases where this is
+a requirement so we should not artificially limit the user.
+
+Also, allowing this means enabling unit testing on systems with
+only one interface.
+
+Signed-off-by: Joachim Nilsson
+
+diff --git a/src/conf.c b/src/conf.c
+index 974871a..d1fbeed 100644
+--- a/src/conf.c
b/src/conf.c
+@@ -31,6 +31,8 @@
+ #define MAX_LINE_LEN 512
+ #define DEBUG(fmt, args...) \
+ smclog(LOG_DEBUG, "%s:%02d: " fmt, conf, lineno, ##args)
++#define INFO(fmt, args...) \
++ smclog(LOG_INFO, "%s:%02d: " fmt, conf, lineno, ##args)
+ #define WARN(fmt, args...) \
+ smclog(LOG_WARNING, "%s:%02d: " fmt, conf, lineno, ##args)
+
+@@ -166,13 +168,9 @@ static int add_mroute(int lineno, char *ifname, char *group, char *source, char
+ iface_match_init(_out);
+ while ((mif = iface_match_mif_by_name(outbound[i], _out, )) >= 0) {
+ if (mif == mroute.inbound) {
+- state_out.match_count--;
+- /* In case of wildcard matches, in==out is
+- * quite normal, so don't complain
+- */
++ /* In case of wildcard match in==out is normal, so don't complain */
+ if (!ifname_is_wildcard(ifname) && !ifname_is_wildcard(outbound[i]))
+- WARN("Same outbound IPv6 interface (%s) as inbound (%s)?", outbound[i], ifname);
+- continue;
++ INFO("Same outbound IPv6 interface (%s) as inbound (%s) may cause routing loops.", outbound[i], ifname);
+ }
+
+ /* Use a TTL threshold to
Bug#924045: unblock: smcroute/2.4.2-4
Control: tag -1 confirmed moreinfo On Fri, Mar 08, 2019 at 09:35:29PM +0100, Micha Lenk wrote: > Because of the included cosmetic changes, the package isn't uploadede to > unstable yet. It is currently only available on mentors.d.n as > https://mentors.debian.net/debian/pool/main/s/smcroute/smcroute_2.4.2-4.dsc Please go ahead and remove the moreinfo tag when it is ready to unblock. Thanks, -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
Bug#924045: unblock: smcroute/2.4.2-4
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock We are not in full freeze yet, but according to the announced schedule, it looks like 2.4.2-4 won't make it into buster even if uploaded yesterday. So, please unblock package smcroute, because * it fixes Debian bug #924044, broken init script not working for 'stop' command, which is a regression compared to the version in Debian stretch. * it fixes Debian bug #921577, autopkgtests fail consistently, and some related issues with the autopkgtests (referenced as unit tests in the debian/changelog). The proposed upload also contains rather cosmetic changes, i.e. * Bumping the Debian policy version. This is hopefully acceptable because no source changes were needed. * Removing all explicit maintainer scripts in favour of managing the snippets for moving the configuration file via debhelper. I personally checked that the resulting binary packages' maintainer scripts are bitwise identical after this change. So, hopefully this is acceptable too. Because of the included cosmetic changes, the package isn't uploadede to unstable yet. It is currently only available on mentors.d.n as https://mentors.debian.net/debian/pool/main/s/smcroute/smcroute_2.4.2-4.dsc unblock smcroute/2.4.2-4 Thank you for considering, Micha diff -Nru smcroute-2.4.2/debian/changelog smcroute-2.4.2/debian/changelog --- smcroute-2.4.2/debian/changelog 2018-09-23 20:40:04.0 + +++ smcroute-2.4.2/debian/changelog 2019-03-07 05:40:19.0 + @@ -1,3 +1,16 @@ +smcroute (2.4.2-4) unstable; urgency=medium + + * Import upstream fix for malfunctioning 'stop' command to init script + * Import upstream fix to allow same outbound interface as inbound when +routing. This is slightly hairy, but previous releases of SMCRoute +supported this and the unit tests rely on this to work + * Fix unit tests, with upstream and test setup fixes, closes: #921577 + * Bump Standards-Version to 4.3.0, no changes needed + * Use debhelper maintscript to relocate old /etc/startup.sh script +to /etc/smcroute. Fixes an outstanding lintian warning + + -- Joachim Nilsson Thu, 07 Mar 2019 06:40:19 +0100 + smcroute (2.4.2-3) unstable; urgency=medium * Add missing Build-Depends for systemd, needed for unit file path diff -Nru smcroute-2.4.2/debian/control smcroute-2.4.2/debian/control --- smcroute-2.4.2/debian/control 2018-09-21 19:54:23.0 + +++ smcroute-2.4.2/debian/control 2019-03-07 05:40:19.0 + @@ -3,7 +3,7 @@ Priority: optional Maintainer: Joachim Nilsson Build-Depends: debhelper (>= 10), libcap-dev, systemd, pkg-config -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Homepage: http://troglobit.com/smcroute.html Vcs-Browser: https://salsa.debian.org/debian/smcroute Vcs-Git: https://salsa.debian.org/debian/smcroute.git diff -Nru smcroute-2.4.2/debian/gitlab-ci.yml smcroute-2.4.2/debian/gitlab-ci.yml --- smcroute-2.4.2/debian/gitlab-ci.yml 1970-01-01 00:00:00.0 + +++ smcroute-2.4.2/debian/gitlab-ci.yml 2019-03-07 05:40:19.0 + @@ -0,0 +1,9 @@ +image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest + +build: + artifacts: +paths: +- "*.deb" +expire_in: 1 day + script: +- gitlab-ci-git-buildpackage-all diff -Nru smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch --- smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch 1970-01-01 00:00:00.0 + +++ smcroute-2.4.2/debian/patches/0004-Allow-same-outbound-interface-as-inbound.patch 2019-03-07 05:40:19.0 + @@ -0,0 +1,96 @@ +commit 802d82eb5c571afe2a294fd302745bf37cc13a1d +Author: Joachim Nilsson +Date: Sun Feb 10 13:56:17 2019 +0100 + +Allow same outbound interface as inbound, only warn user + +Routing back multicast to the same interface it ingressed on is +quite a bit dangerous, but there may be use-cases where this is +a requirement so we should not artificially limit the user. + +Also, allowing this means enabling unit testing on systems with +only one interface. + +Signed-off-by: Joachim Nilsson + +diff --git a/src/conf.c b/src/conf.c +index 974871a..d1fbeed 100644 +--- a/src/conf.c b/src/conf.c +@@ -31,6 +31,8 @@ + #define MAX_LINE_LEN 512 + #define DEBUG(fmt, args...) \ + smclog(LOG_DEBUG, "%s:%02d: " fmt, conf, lineno, ##args) ++#define INFO(fmt, args...)\ ++ smclog(LOG_INFO, "%s:%02d: " fmt, conf, lineno, ##args) + #define WARN(fmt, args...)\ + smclog(LOG_WARNING, "%s:%02d: " fmt, conf, lineno, ##args) + +@@ -166,13 +168,9 @@ static int add_mroute(int lineno, char *ifname, char *group, char *source, char +
