Date: Tuesday, December 13, 2022 @ 12:00:49
  Author: freswa
Revision: 464242

use db5.3 instead of db due to licensing issues

Added:
  iproute2/trunk/bdb5.3.patch
Modified:
  iproute2/trunk/PKGBUILD

--------------+
 PKGBUILD     |   16 +++++++++++-----
 bdb5.3.patch |   22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-12-13 09:57:05 UTC (rev 464241)
+++ PKGBUILD    2022-12-13 12:00:49 UTC (rev 464242)
@@ -4,13 +4,14 @@
 
 pkgname=iproute2
 pkgver=6.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='IP Routing Utilities'
 arch=('x86_64')
 license=('GPL2')
 url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
 depends=('glibc' 'iptables' 'libelf' 'libbpf')
-optdepends=('db: userspace arp daemon'
+makedepends=('db5.3')
+optdepends=('db5.3: userspace arp daemon'
             'libcap: tipc'
             'linux-atm: ATM support')
 provides=('iproute')
@@ -27,10 +28,12 @@
 options=('staticlibs' 'debug')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
 
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-v${pkgver}.tar."{xz,sign}
-        '0001-make-iproute2-fhs-compliant.patch')
+        '0001-make-iproute2-fhs-compliant.patch'
+        'bdb5.3.patch')
 sha256sums=('b58b95f34c5b6e8171d1833ccfcf43c86aaa064c99419bd1b2a2eb7ee741f089'
             'SKIP'
-            '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d')
+            '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
+            '908de44ee99bf78669e7c513298fc2a22ca9d7e816a8f99788b1e9b091035cf4')
 
 prepare() {
   cd "${srcdir}/${pkgname}-v${pkgver}"
@@ -38,6 +41,9 @@
   # set correct fhs structure
   patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
 
+  # use Berkeley DB 5.3
+  patch -Np1 -i "${srcdir}"/bdb5.3.patch
+
   # do not treat warnings as errors
   sed -i 's/-Werror//' Makefile
 
@@ -49,7 +55,7 @@
   export CFLAGS+=' -ffat-lto-objects'
 
   ./configure
-  make
+  make DBM_INCLUDE='/usr/include/db5.3'
 }
 
 package() {

Added: bdb5.3.patch
===================================================================
--- bdb5.3.patch                                (rev 0)
+++ bdb5.3.patch        2022-12-13 12:00:49 UTC (rev 464242)
@@ -0,0 +1,22 @@
+--- 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

Reply via email to