Date: Monday, February 20, 2023 @ 19:34:28
Author: eworm
Revision: 469300
upgpkg: iproute2 6.2.0-1: new upstream release
Added:
iproute2/trunk/0002-bdb-5-3.patch
Modified:
iproute2/trunk/PKGBUILD
Deleted:
iproute2/trunk/bdb5.3.patch
iproute2/trunk/fix_overlapping_buffers.patch
-------------------------------+
0002-bdb-5-3.patch | 22 +++++++++++++++++++
PKGBUILD | 6 ++---
bdb5.3.patch | 22 -------------------
fix_overlapping_buffers.patch | 46 ----------------------------------------
4 files changed, 25 insertions(+), 71 deletions(-)
Added: 0002-bdb-5-3.patch
===================================================================
--- 0002-bdb-5-3.patch (rev 0)
+++ 0002-bdb-5-3.patch 2023-02-20 19:34:28 UTC (rev 469300)
@@ -0,0 +1,22 @@
+--- a/configure 2022-12-13 01:08:01.607329918 +0100
++++ b/configure 2022-12-13 01:08:58.083857594 +0100
+@@ -433,7 +433,7 @@
+ return 0;
+ }
+ EOF
+- if $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null
2>&1; then
++ if $CC -I$INCLUDE -I/usr/include/db5.3 -o $TMPDIR/dbtest $TMPDIR/dbtest.c
-ldb-5.3 >/dev/null 2>&1; then
+ echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
+ echo "yes"
+ else
+--- a/misc/Makefile 2022-12-13 12:21:04.709608051 +0100
++++ b/misc/Makefile 2022-12-13 12:21:19.966264418 +0100
+@@ -25,7 +25,7 @@
+ $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rtacct rtacct.c
$(LDLIBS) -lm
+
+ arpd: arpd.c
+- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o
arpd arpd.c $(LDLIBS) -ldb
++ $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o
arpd arpd.c $(LDLIBS) -ldb-5.3
+
+ ssfilter.tab.c: ssfilter.y
+ $(QUIET_YACC)$(YACC) -b ssfilter ssfilter.y
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-20 19:29:31 UTC (rev 469299)
+++ PKGBUILD 2023-02-20 19:34:28 UTC (rev 469300)
@@ -29,11 +29,11 @@
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
'0001-make-iproute2-fhs-compliant.patch'
- 'bdb5.3.patch')
+ '0002-bdb-5-3.patch')
sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
'SKIP'
'758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
- '908de44ee99bf78669e7c513298fc2a22ca9d7e816a8f99788b1e9b091035cf4')
+ '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -42,7 +42,7 @@
patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
# use Berkeley DB 5.3
- patch -Np1 -i "${srcdir}"/bdb5.3.patch
+ patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
# do not treat warnings as errors
sed -i 's/-Werror//' Makefile
Deleted: bdb5.3.patch
===================================================================
--- bdb5.3.patch 2023-02-20 19:29:31 UTC (rev 469299)
+++ bdb5.3.patch 2023-02-20 19:34:28 UTC (rev 469300)
@@ -1,22 +0,0 @@
---- aaa/configure 2022-12-13 01:08:01.607329918 +0100
-+++ bbb/configure 2022-12-13 01:08:58.083857594 +0100
-@@ -433,7 +433,7 @@
- return 0;
- }
- EOF
-- if $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null
2>&1; then
-+ if $CC -I$INCLUDE -I/usr/include/db5.3 -o $TMPDIR/dbtest $TMPDIR/dbtest.c
-ldb-5.3 >/dev/null 2>&1; then
- echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
- echo "yes"
- else
---- aaa/misc/Makefile 2022-12-13 12:21:04.709608051 +0100
-+++ bbb/misc/Makefile 2022-12-13 12:21:19.966264418 +0100
-@@ -25,7 +25,7 @@
- $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rtacct rtacct.c
$(LDLIBS) -lm
-
- arpd: arpd.c
-- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o
arpd arpd.c $(LDLIBS) -ldb
-+ $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o
arpd arpd.c $(LDLIBS) -ldb-5.3
-
- ssfilter.tab.c: ssfilter.y
- $(QUIET_YACC)$(YACC) -b ssfilter ssfilter.y
Deleted: fix_overlapping_buffers.patch
===================================================================
--- fix_overlapping_buffers.patch 2023-02-20 19:29:31 UTC (rev 469299)
+++ fix_overlapping_buffers.patch 2023-02-20 19:34:28 UTC (rev 469300)
@@ -1,46 +0,0 @@
-Fix overlapping buffers passed to strncpy which is UB. format_host_rta_r writes
-to the buffer passed to it, so hostname (derived from b1) & b1 partly overlap.
-
-This gets worse with sys-libs/glibc-2.37 where the ip route output can be
truncated,
-but it was UB anyway and you can see it occurring w/ glibc-2.36.
-
-Bug:
https://lore.kernel.org/netdev/[email protected]/T/#u
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30112
-Thanks-to: Doug Freed <[email protected]>
-Signed-off-by: Sam James <[email protected]>
----
- ip/iproute.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/ip/iproute.c b/ip/iproute.c
-index 0bab0fdf..a7cd9543 100644
---- a/ip/iproute.c
-+++ b/ip/iproute.c
-@@ -748,6 +748,7 @@ int print_route(struct nlmsghdr *n, void *arg)
- int ret;
-
- SPRINT_BUF(b1);
-+ SPRINT_BUF(b2);
-
- if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
- fprintf(stderr, "Not a route: %08x %08x %08x\n",
-@@ -809,7 +810,7 @@ int print_route(struct nlmsghdr *n, void *arg)
- r->rtm_dst_len);
- } else {
- const char *hostname = format_host_rta_r(family,
tb[RTA_DST],
-- b1, sizeof(b1));
-+ b2, sizeof(b2));
- if (hostname)
- strncpy(b1, hostname, sizeof(b1) - 1);
- }
-@@ -832,7 +833,7 @@ int print_route(struct nlmsghdr *n, void *arg)
- r->rtm_src_len);
- } else {
- const char *hostname = format_host_rta_r(family,
tb[RTA_SRC],
-- b1, sizeof(b1));
-+ b2, sizeof(b2));
- if (hostname)
- strncpy(b1, hostname, sizeof(b1) - 1);
- }
---
-2.39.1
