Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dhcpcd for openSUSE:Factory checked
in at 2025-02-26 17:25:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dhcpcd (Old)
and /work/SRC/openSUSE:Factory/.dhcpcd.new.1873 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcpcd"
Wed Feb 26 17:25:11 2025 rev:6 rq:1248739 version:10.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/dhcpcd/dhcpcd.changes 2025-02-24
15:51:55.819187190 +0100
+++ /work/SRC/openSUSE:Factory/.dhcpcd.new.1873/dhcpcd.changes 2025-02-26
17:29:34.206917683 +0100
@@ -1,0 +2,7 @@
+Wed Feb 26 13:56:29 UTC 2025 - Jorik Cronenberg <jorik.cronenb...@suse.com>
+
+- Update to 10.2.2
+ * DHCP6: Fix dhcpcd vendor class option
+ * options: Allow interface block to be pattern matching
+
+-------------------------------------------------------------------
Old:
----
dhcpcd-10.2.1.tar.xz
dhcpcd-10.2.1.tar.xz.asc
New:
----
dhcpcd-10.2.2.tar.xz
dhcpcd-10.2.2.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcpcd.spec ++++++
--- /var/tmp/diff_new_pack.pSd9Lr/_old 2025-02-26 17:29:35.078954177 +0100
+++ /var/tmp/diff_new_pack.pSd9Lr/_new 2025-02-26 17:29:35.082954345 +0100
@@ -17,7 +17,7 @@
Name: dhcpcd
-Version: 10.2.1
+Version: 10.2.2
Release: 0
Summary: Minimal DHCPv4 and DHCPv6 client
License: BSD-2-Clause
++++++ dhcpcd-10.2.1.tar.xz -> dhcpcd-10.2.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dhcpcd-10.2.1/Makefile new/dhcpcd-10.2.2/Makefile
--- old/dhcpcd-10.2.1/Makefile 2025-02-23 21:38:43.000000000 +0100
+++ new/dhcpcd-10.2.2/Makefile 2025-02-25 13:37:57.000000000 +0100
@@ -71,7 +71,7 @@
${SHA256} ${DISTFILE} >${DISTINFO}
wc -c <${DISTFILE} \
| xargs printf 'Size (${DISTFILE}) = %s\n' >>${DISTINFO}
- ${PGP} --armour --detach-sign ${DISTFILE}
+ ${PGP} --sign --armour --detach ${DISTFILE}
chmod 644 ${DISTSIGN}
ls -l ${DISTFILE} ${DISTINFO} ${DISTSIGN}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dhcpcd-10.2.1/Makefile.inc
new/dhcpcd-10.2.2/Makefile.inc
--- old/dhcpcd-10.2.1/Makefile.inc 2025-02-23 21:38:43.000000000 +0100
+++ new/dhcpcd-10.2.2/Makefile.inc 2025-02-25 13:37:57.000000000 +0100
@@ -15,12 +15,10 @@
SED?= sed
HOST_SH?= /bin/sh
-# This isn't very portable, but I generaly make releases from DragonFlyBSD
+# This isn't very portable, but I generaly make releases from NetBSD
SHA256?= sha256
-PGP?= gpg
-# old NetBSD defs
-#SHA256?= cksum -a SHA256
-#PGP?= netpgp
+# Force gpg2 to avoid SHA1 signatures from gpg1
+PGP?= gpg2
SCRIPT= ${LIBEXECDIR}/dhcpcd-run-hooks
HOOKDIR= ${LIBEXECDIR}/dhcpcd-hooks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dhcpcd-10.2.1/src/defs.h new/dhcpcd-10.2.2/src/defs.h
--- old/dhcpcd-10.2.1/src/defs.h 2025-02-23 21:38:43.000000000 +0100
+++ new/dhcpcd-10.2.2/src/defs.h 2025-02-25 13:37:57.000000000 +0100
@@ -29,7 +29,7 @@
#define DEFS_H
#define PACKAGE "dhcpcd"
-#define VERSION "10.2.1"
+#define VERSION "10.2.2"
#ifndef PRIVSEP_USER
# define PRIVSEP_USER "_" PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dhcpcd-10.2.1/src/dhcp6.c
new/dhcpcd-10.2.2/src/dhcp6.c
--- old/dhcpcd-10.2.1/src/dhcp6.c 2025-02-23 21:38:43.000000000 +0100
+++ new/dhcpcd-10.2.2/src/dhcp6.c 2025-02-25 13:37:57.000000000 +0100
@@ -331,8 +331,9 @@
p += vivco->len;
}
} else if (ifo->vendorclassid[0] != '\0') {
+ optlen = sizeof(uint32_t) + sizeof(uint16_t) + vlen;
o.code = htons(D6_OPTION_VENDOR_CLASS);
- o.len = htons((uint16_t)len);
+ o.len = htons((uint16_t)optlen);
memcpy(p, &o, sizeof(o));
p += sizeof(o);
pen = htonl(DHCPCD_IANA_PEN);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dhcpcd-10.2.1/src/dhcpcd.conf.5.in
new/dhcpcd-10.2.2/src/dhcpcd.conf.5.in
--- old/dhcpcd-10.2.1/src/dhcpcd.conf.5.in 2025-02-23 21:38:43.000000000
+0100
+++ new/dhcpcd-10.2.2/src/dhcpcd.conf.5.in 2025-02-25 13:37:57.000000000
+0100
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd February 23, 2025
+.Dd February 24, 2025
.Dt DHCPCD.CONF 5
.Os
.Sh NAME
@@ -446,6 +446,8 @@
.It Ic interface Ar interface
Subsequent options are only parsed for this
.Ar interface .
+Pattern matching is allowed by
+.Xr fnmatch 3 .
.It Ic ipv4ll_time Ar seconds
Wait for
.Ar seconds
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dhcpcd-10.2.1/src/if-options.c
new/dhcpcd-10.2.2/src/if-options.c
--- old/dhcpcd-10.2.1/src/if-options.c 2025-02-23 21:38:43.000000000 +0100
+++ new/dhcpcd-10.2.2/src/if-options.c 2025-02-25 13:37:57.000000000 +0100
@@ -33,6 +33,7 @@
#include <ctype.h>
#include <errno.h>
+#include <fnmatch.h>
#include <getopt.h>
#include <grp.h>
#include <inttypes.h>
@@ -2875,7 +2876,7 @@
skip = 1;
continue;
}
- if (ifname && strcmp(line, ifname) == 0)
+ if (ifname && fnmatch(line, ifname, 0) == 0)
skip = 0;
else
skip = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dhcpcd-10.2.1/src/if.c new/dhcpcd-10.2.2/src/if.c
--- old/dhcpcd-10.2.1/src/if.c 2025-02-23 21:38:43.000000000 +0100
+++ new/dhcpcd-10.2.2/src/if.c 2025-02-25 13:37:57.000000000 +0100
@@ -250,7 +250,7 @@
int i;
for (i = 0; i < ctx->ifcc; i++) {
- if (strcmp(ctx->ifcv[i], ifname) == 0)
+ if (fnmatch(ctx->ifcv[i], ifname, 0) == 0)
return 1;
}
return 0;
