Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package smcroute for openSUSE:Factory checked in at 2021-11-21 23:52:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smcroute (Old) and /work/SRC/openSUSE:Factory/.smcroute.new.1895 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smcroute" Sun Nov 21 23:52:16 2021 rev:8 rq:932782 version:2.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/smcroute/smcroute.changes 2021-11-20 02:40:07.132586388 +0100 +++ /work/SRC/openSUSE:Factory/.smcroute.new.1895/smcroute.changes 2021-11-21 23:52:46.122139466 +0100 @@ -1,0 +2,18 @@ +Sun Nov 21 08:48:26 UTC 2021 - Martin Hauke <[email protected]> + +- Update to version 2.5.5 + Fixes + * Parse error in /etc/smcroute.conf. SMCRoute fails to start on + interfaces with mrdisc disabled, when built with mrdisc + support and -N passed on command line. +- Update to version 2.5.4 + Fixes + * Avoid trying to delete inactive VIFs. Fixing an annoying bogus + error: "Failed deleting VIF for iface lo: Resource temporarily + unavailable". + * Too small string buffer for IPv6 address causing garbled output + in periodic expiry callback. + * Fix too small buffer for IPv6 address in mroute display + functions. + +------------------------------------------------------------------- Old: ---- smcroute-2.5.3.tar.gz New: ---- smcroute-2.5.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smcroute.spec ++++++ --- /var/tmp/diff_new_pack.8aaRmS/_old 2021-11-21 23:52:46.622137854 +0100 +++ /var/tmp/diff_new_pack.8aaRmS/_new 2021-11-21 23:52:46.622137854 +0100 @@ -18,14 +18,14 @@ Name: smcroute -Version: 2.5.3 +Version: 2.5.5 Release: 0 Summary: Static multicast routing for UNIX License: GPL-3.0-only Group: Productivity/Networking/Routing URL: https://troglobit.com/projects/smcroute/ #Git-Clone: https://github.com/troglobit/smcroute.git -Source: https://github.com/troglobit/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://github.com/troglobit/smcroute/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: harden_smcroute.service.patch BuildRequires: autoconf BuildRequires: automake ++++++ smcroute-2.5.3.tar.gz -> smcroute-2.5.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smcroute-2.5.3/.gitignore new/smcroute-2.5.5/.gitignore --- old/smcroute-2.5.3/.gitignore 2021-09-23 13:01:05.000000000 +0200 +++ new/smcroute-2.5.5/.gitignore 2021-11-21 09:38:26.000000000 +0100 @@ -27,3 +27,4 @@ stamp-h1 *.tar.* .dirstamp +.gdb_history diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smcroute-2.5.3/ChangeLog.md new/smcroute-2.5.5/ChangeLog.md --- old/smcroute-2.5.3/ChangeLog.md 2021-09-23 13:01:05.000000000 +0200 +++ new/smcroute-2.5.5/ChangeLog.md 2021-11-21 09:38:26.000000000 +0100 @@ -4,6 +4,33 @@ All notable changes to the project are documented in this file. +[v2.5.5][] - 2021-11-21 +----------------------- + +### Changes +- Revert extraction of version from GIT tag. Incompatible with systems + that do `autoreconf` on a dist. tarball + +### Fixes +- Fix #175: Parse error in `/etc/smcroute.conf`. SMCRoute fails to + start on interfaces with `mrdisc` disabled, when built with mrdisc + support and `-N` passed on command line + + +[v2.5.4][] - 2021-11-13 +----------------------- + +### Changes +- Automatically extract new version from GIT tag + +### Fixes +- Avoid trying to delete inactive VIFs. Fixing an annoying bogus error: + *"Failed deleting VIF for iface lo: Resource temporarily unavailable"* +- Fix #171: too small string buffer for IPv6 address causing garbled + output in periodic expiry callback +- Fix too small buffer for IPv6 address in mroute display functions + + [v2.5.3][] - 2021-09-23 ----------------------- @@ -590,7 +617,9 @@ [mrdisc]: https://github.com/troglobit/mrdisc [RFC4286]: https://tools.ietf.org/html/rfc4286 -[UNRELEASED]: https://github.com/troglobit/smcroute/compare/2.5.3...HEAD +[UNRELEASED]: https://github.com/troglobit/smcroute/compare/2.5.5...HEAD +[v2.5.5]: https://github.com/troglobit/smcroute/compare/2.5.4...2.5.5 +[v2.5.4]: https://github.com/troglobit/smcroute/compare/2.5.3...2.5.4 [v2.5.3]: https://github.com/troglobit/smcroute/compare/2.5.2...2.5.3 [v2.5.2]: https://github.com/troglobit/smcroute/compare/2.5.1...2.5.2 [v2.5.1]: https://github.com/troglobit/smcroute/compare/2.5.0...2.5.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smcroute-2.5.3/configure.ac new/smcroute-2.5.5/configure.ac --- old/smcroute-2.5.3/configure.ac 2021-09-23 13:01:05.000000000 +0200 +++ new/smcroute-2.5.5/configure.ac 2021-11-21 09:38:26.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(SMCRoute, 2.5.3, https://github.com/troglobit/smcroute/issues, smcroute, https://troglobit.com/smcroute.html) +AC_INIT(SMCRoute, 2.5.5, https://github.com/troglobit/smcroute/issues, smcroute, https://troglobit.com/smcroute.html) AC_CONFIG_AUX_DIR(aux) AM_INIT_AUTOMAKE([1.11 foreign]) AM_SILENT_RULES([yes]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smcroute-2.5.3/doc/TODO.md new/smcroute-2.5.5/doc/TODO.md --- old/smcroute-2.5.3/doc/TODO.md 2021-09-23 13:01:05.000000000 +0200 +++ new/smcroute-2.5.5/doc/TODO.md 2021-11-21 09:38:26.000000000 +0100 @@ -1,3 +1,13 @@ + +Refactor MRDISC Support +----------------------- + +The current MRDISC implementation is fragile (see issue #175 for an +example), and it also does not work on non-Linux systems. So the +implementation really needs to be refactored, not just for this but also +for adding IPv6 support (below). + + Add Support for IPv6 MRDISC --------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smcroute-2.5.3/src/mrdisc.c new/smcroute-2.5.5/src/mrdisc.c --- old/smcroute-2.5.3/src/mrdisc.c 2021-09-23 13:01:05.000000000 +0200 +++ new/smcroute-2.5.5/src/mrdisc.c 2021-11-21 09:38:26.000000000 +0100 @@ -325,8 +325,7 @@ return 0; } - errno = ENOENT; - return -1; + return 0; } void mrdisc_send(void *arg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smcroute-2.5.3/src/mroute.c new/smcroute-2.5.5/src/mroute.c --- old/smcroute-2.5.3/src/mroute.c 2021-09-23 13:01:05.000000000 +0200 +++ new/smcroute-2.5.5/src/mroute.c 2021-11-21 09:38:26.000000000 +0100 @@ -298,6 +298,9 @@ if (iface->mrdisc) rc = mrdisc_deregister(iface->vif); + if (iface->vif == ALL_VIFS) + return 0; + if (kern_vif_del(iface)) { switch (errno) { case ENOENT: @@ -446,7 +449,7 @@ clock_gettime(CLOCK_MONOTONIC, &now); TAILQ_FOREACH_SAFE(entry, &kern_list, link, tmp) { - char origin[INET_ADDRSTRLEN], group[INET_ADDRSTRLEN]; + char origin[INET_ADDRSTR_LEN], group[INET_ADDRSTR_LEN]; struct iface *iface; /* XXX: only consider (*,G) routes, not pure (S,G), and no overlap handling for now */ @@ -910,6 +913,9 @@ { int rc = 0; + if (iface->mif == ALL_VIFS) + return 0; + if (kern_mif_del(iface) && errno != ENOENT) { switch (errno) { case ENOENT: @@ -1095,11 +1101,11 @@ static int show_mroute(int sd, struct mroute *r, int inw, int detail) { - char src[INET_ADDRSTRLEN] = "*"; + char src[INET_ADDRSTR_LEN] = "*"; char src_len[5] = ""; - char grp[INET_ADDRSTRLEN]; + char grp[INET_ADDRSTR_LEN]; char grp_len[5] = ""; - char sg[(INET_ADDRSTRLEN + 3) * 2 + 5]; + char sg[(INET_ADDRSTR_LEN + 3) * 2 + 5]; char buf[MAX_MC_VIFS * 17 + 80]; struct iface *iface; int max_len; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smcroute-2.5.3/test/ipv6.sh new/smcroute-2.5.5/test/ipv6.sh --- old/smcroute-2.5.3/test/ipv6.sh 2021-09-23 13:01:05.000000000 +0200 +++ new/smcroute-2.5.5/test/ipv6.sh 2021-11-21 09:38:26.000000000 +0100 @@ -13,6 +13,7 @@ ip addr add 2001:1::1/64 dev a1 ip addr add fc00::1/64 dev a1 ip addr add 2001:2::1/64 dev a2 +ip addr add 2001:2:3:4:6:7:12:1/64 dev a2 ip -br a print "Creating config ..." @@ -26,11 +27,13 @@ mgroup from a1 group ff2e::42 mroute from a1 group ff2e::42 to a2 + +mroute from a1 group ff2e::7 to a2 EOF cat "/tmp/$NM/conf" print "Starting smcrouted ..." -../src/smcrouted -f "/tmp/$NM/conf" -n -N -P "/tmp/$NM/pid" -l debug -u "/tmp/$NM/sock" & +../src/smcrouted -c 5 -f "/tmp/$NM/conf" -n -N -P "/tmp/$NM/pid" -l debug -u "/tmp/$NM/sock" & sleep 1 echo "-----------------------------------------------------------------------------------" @@ -53,6 +56,7 @@ ping -6 -c 3 -W 1 -I 2001:1::1 -t 3 ff2e::42 >/dev/null ping -6 -c 3 -W 1 -I 2001:1::1 -t 3 ff2e::43 >/dev/null ping -6 -c 3 -W 1 -I fc00::1 -t 3 ff2e::44 >/dev/null +ping -6 -c 3 -W 1 -I 2001:2:3:4:6:7:12:1 -t 3 ff2e::7 >/dev/null show_mroute print "Analyzing ..." @@ -66,6 +70,9 @@ echo " => $lines3 for group ff2e::43, expected => 2" echo " => $lines4 for group ff2e::44, expected => 3" +sleep 10 +show_mroute + ########################################################################### DONE # one frame lost due to initial (*,G) -> (S,G) route setup # no frames lost in pure (S,G) route
