Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (58c22dc458cd709d9348a2efed18cc441eb4feff)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (58c22dc458cd709d9348a2efed18cc441eb4feff)
  • Date: Tue, 11 Oct 2016 18:22:53 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

net/iproute2/BUILD | 6 ++++++
net/iproute2/HISTORY | 5 +++++
net/iproute2/INSTALL | 3 ++-
net/iproute2/PRE_BUILD | 5 -----
net/iproute2/no-arpd.diff | 40 ----------------------------------------
5 files changed, 13 insertions(+), 46 deletions(-)

New commits:
commit 58c22dc458cd709d9348a2efed18cc441eb4feff
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

net/iproute2: postupdate fixes about db dependency and default_install

diff --git a/net/iproute2/BUILD b/net/iproute2/BUILD
index 19fa3c4..765cabb 100755
--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -8,6 +8,12 @@ if ! is_depends_enabled $SPELL libselinux; then
sedit "/^HAVE_SELINUX/d" Config
fi &&

+if ! is_depends_enabled ${SPELL} db
+then
+ sedit "/^HAVE_BERKELEY_DB/d" Config &&
+ sedit "/ARPDDIR/d" Makefile
+fi &&
+
echo "CFLAGS += -I$INSTALL_ROOT/usr/include/libnl3" >> ip/Makefile &&

if gcc -include netinet/in.h -E - < /dev/null | grep -q IPPROTO_SCTP ; then
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 63fccb4..74bcdc2 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,8 @@
+2016-10-11 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: added check for db dependency
+ * PRE_BUILD, no-arpd.diff: removed obsolete patch
+ * INSTALL: use default_install now
+
2016-10-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.8.0

diff --git a/net/iproute2/INSTALL b/net/iproute2/INSTALL
index 5496482..05576f1 100755
--- a/net/iproute2/INSTALL
+++ b/net/iproute2/INSTALL
@@ -1,3 +1,4 @@
-make install &&
+default_install &&
+
# Tools from debian expect /bin/ip, others may do so, too.
test -e $INSTALL_ROOT/bin/ip || ln -s ../sbin/ip $INSTALL_ROOT/bin/
diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index 305a26d..8f1677d 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -11,9 +11,4 @@ sedit 's:$(DESTDIR)/lib/:$(LIBDIR):' netem/Makefile
&&
# Fix document install directory
if [ "$BUILD_DOCS" = y ]; then
sedit
"s:PAGESPERPAGE=2:PAGESPERPAGE=2\nDOCDIR=${INSTALL_ROOT}/usr/share/doc/${SPELL}:"
doc/Makefile
-fi &&
-
-if ! is_depends_enabled ${SPELL} db
-then
- patch -p1 < ${SCRIPT_DIRECTORY}/no-arpd.diff
fi
diff --git a/net/iproute2/no-arpd.diff b/net/iproute2/no-arpd.diff
deleted file mode 100644
index 66ea1af..0000000
--- a/net/iproute2/no-arpd.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nuar iproute2-2.6.22-070710.orig/misc/Makefile
iproute2-2.6.22-070710/misc/Makefile
---- iproute2-2.6.22-070710.orig/misc/Makefile 2007-07-11 06:34:14.000000000
+0500
-+++ iproute2-2.6.22-070710/misc/Makefile 2007-07-25 23:55:37.000000000
+0500
-@@ -1,7 +1,7 @@
- SSOBJ=ss.o ssfilter.o
- LNSTATOBJ=lnstat.o lnstat_util.o
-
--TARGETS=ss nstat ifstat rtacct arpd lnstat
-+TARGETS=ss nstat ifstat rtacct lnstat
-
- include ../Config
-
-@@ -18,9 +18,6 @@
- rtacct: rtacct.c
- $(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm
-
--arpd: arpd.c
-- $(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c
$(LIBNETLINK) -ldb -lpthread
--
- ssfilter.c: ssfilter.y
- bison ssfilter.y -o ssfilter.c
-
---- iproute2-3.16.0/Makefile.orig 2014-08-04 23:43:46.000000000 +0400
-+++ iproute2-3.16.0/Makefile 2015-04-25 18:39:35.103844472 +0300
-@@ -6,7 +6,6 @@
- DATADIR=$(PREFIX)/share
- DOCDIR=$(DATADIR)/doc/iproute2
- MANDIR=$(DATADIR)/man
--ARPDDIR=/var/lib/arpd
-
- # Path to db_185.h include
- DBM_INCLUDE:=$(ROOTDIR)/usr/include
-@@ -52,7 +51,6 @@
- install: all
- install -m 0755 -d $(DESTDIR)$(SBINDIR)
- install -m 0755 -d $(DESTDIR)$(CONFDIR)
-- install -m 0755 -d $(DESTDIR)$(ARPDDIR)
- install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
- install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
- install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1
-type f) \



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (58c22dc458cd709d9348a2efed18cc441eb4feff), Pavel Vinogradov, 10/11/2016

Archive powered by MHonArc 2.6.24.

Top of Page