Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f8bfd137214d1bb0e09048b71d5bac619e1dc11a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f8bfd137214d1bb0e09048b71d5bac619e1dc11a)
  • Date: Sat, 25 Apr 2015 10:52:06 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/iproute2/BUILD | 8 ++++++++
net/iproute2/DEPENDS | 6 ++++--
net/iproute2/DETAILS | 2 +-
net/iproute2/HISTORY | 8 ++++++++
net/iproute2/no-arpd.diff | 19 +++++++++++++++++++
5 files changed, 40 insertions(+), 3 deletions(-)

New commits:
commit 33f90b5941f9cbe71a6c80257ddbbf4e18a88e3f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

iproute2: fixed dependencies

diff --git a/net/iproute2/BUILD b/net/iproute2/BUILD
index 31036fd..19fa3c4 100755
--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -1,5 +1,13 @@
./configure &&

+if ! is_depends_enabled $SPELL iptables; then
+ sedit "/^TC_CONFIG_XT/d" Config
+fi &&
+
+if ! is_depends_enabled $SPELL libselinux; then
+ sedit "/^HAVE_SELINUX/d" Config
+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/DEPENDS b/net/iproute2/DEPENDS
index 19a2a22..8a4f089 100755
--- a/net/iproute2/DEPENDS
+++ b/net/iproute2/DEPENDS
@@ -1,5 +1,4 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
+depends flex &&
depends bison &&
depends libnl &&

@@ -9,4 +8,7 @@ if [ "$BUILD_DOCS" == "y" ]; then
depends texlive
fi &&

+optional_depends iptables "" "" "for ipt/xt module" &&
+optional_depends libselinux "" "" "for SELinux support" &&
+
optional_depends db "" "" "to build arpd"
diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index b7ae81f..960a04b 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,6 +1,6 @@
SPELL=iproute2
VERSION=3.16.0
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:82491f9c73500c3378088947c0745b3a34fdcfc4202df47bef356c2a9330f915987d45ecd58ba163efd23a42a6b263de569953cdeb0adb46bfdd882da6b93219
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=${SOURCE}.sign
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 6ef335e..641fd9b 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,11 @@
+2015-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * DEPENDS: added missing dependencies -- required (flex), optional
+ (iptables, libselinux); removed useless functions include
+ * BUILD: respect dependency selection
+ * no-arpd.diff: extended, to not install arpd run directory if db
+ dependency had not been chosen
+
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* TRIGGERS: added triggers to recheck on iptables upgrade
diff --git a/net/iproute2/no-arpd.diff b/net/iproute2/no-arpd.diff
index 65d1e66..66ea1af 100644
--- a/net/iproute2/no-arpd.diff
+++ b/net/iproute2/no-arpd.diff
@@ -19,3 +19,22 @@ diff -Nuar iproute2-2.6.22-070710.orig/misc/Makefile
iproute2-2.6.22-070710/misc
-
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 Vlad Glagolev (f8bfd137214d1bb0e09048b71d5bac619e1dc11a), Vlad Glagolev, 04/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page