Merge pull request #2650 from ertugerata/master

iptables and iproute2 update

network/filter/iproute2/actions.py

@@ -21,5 +21,4 @@ def install():
                           MANDIR=/usr/share/man \
                           " % (get.installDIR(), get.docDIR(), get.srcNAME()))
 
-    #pisitools.dodir("/usr/sbin")
     pisitools.dodir("/var/lib/arpd")

network/filter/iproute2/files/0001-make-iproute2-fhs-compliant.patch

@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ Makefile       |  2 +-
+ netem/Makefile |  4 ++--
+ tc/q_netem.c   |  2 +-
+ tc/tc_util.c   | 15 +++++++++++++++
+ tc/tc_util.h   |  1 +
+ 5 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index eb571a5..db0a04c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include
+ 
+ SHARED_LIBS = y
+ 
+-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\"
+ ifneq ($(SHARED_LIBS),y)
+ DEFINES+= -DNO_SHARED_LIBS
+ endif
+diff --git a/netem/Makefile b/netem/Makefile
+index e52e125..5b4d283 100644
+--- a/netem/Makefile
++++ b/netem/Makefile
+@@ -20,9 +20,9 @@ stats: stats.c
+ 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+-	mkdir -p $(DESTDIR)$(LIBDIR)/tc
++	mkdir -p $(DESTDIR)$(DATADIR)/tc
+ 	for i in $(DISTDATA); \
+-	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++	do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \
+ 	done
+ 
+ clean:
+diff --git a/tc/q_netem.c b/tc/q_netem.c
+index 8fe2204..a15a5c7 100644
+--- a/tc/q_netem.c
++++ b/tc/q_netem.c
+@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata)
+ 	char *line = NULL;
+ 	char name[128];
+ 
+-	snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type);
++	snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type);
+ 	if ((f = fopen(name, "r")) == NULL) {
+ 		fprintf(stderr, "No distribution data for %s (%s: %s)\n",
+ 			type, name, strerror(errno));
+diff --git a/tc/tc_util.c b/tc/tc_util.c
+index afc4cf5..728b854 100644
+--- a/tc/tc_util.c
++++ b/tc/tc_util.c
+@@ -32,6 +32,10 @@
+ #define LIBDIR "/usr/lib"
+ #endif
+ 
++#ifndef DATADIR
++#define DATADIR "/usr/share"
++#endif
++
+ static struct db_names *cls_names;
+ 
+ #define NAMES_DB "/etc/iproute2/tc_cls"
+@@ -73,6 +77,17 @@ const char *get_tc_lib(void)
+ 	return lib_dir;
+ }
+ 
++const char *get_tc_datadir(void)
++{
++	const char *data_dir;
++
++	data_dir = getenv("TC_DATA_DIR");
++	if (!data_dir)
++		data_dir = DATADIR "/tc/";
++
++	return data_dir;
++}
++
+ int get_qdisc_handle(__u32 *h, const char *str)
+ {
+ 	__u32 maj;
+diff --git a/tc/tc_util.h b/tc/tc_util.h
+index 61e60b1..6d448de 100644
+--- a/tc/tc_util.h
++++ b/tc/tc_util.h
+@@ -55,6 +55,7 @@ struct exec_util {
+ };
+ 
+ const char *get_tc_lib(void);
++const char *get_tc_datadir(void);
+ 
+ struct qdisc_util *get_qdisc_kind(const char *str);
+ struct filter_util *get_filter_kind(const char *str);

network/filter/iproute2/pspec.xml

@@ -12,19 +12,20 @@
         <IsA>app:console</IsA>
         <Summary>Kernel routing and traffic control utilities</Summary>
         <Description>Iproute2 is a collection of utilites for controlling TCP/IP networking and traffic control in Linux.</Description>
-        <Archive sha1sum="eba7c753918ddcf8b3890718391fb795f8dd023b" type="tarxz">https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.8.0.tar.xz</Archive>
+        <Archive sha1sum="fc28f956a7a9695473312d0ed35dc24a7ef9d7f6" type="tarxz">https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.9.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="1.6.0">iptables-devel</Dependency>
-            <Dependency>linux-atm-devel</Dependency>
             <Dependency>db-devel</Dependency>
             <Dependency>elfutils</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch>0001-make-iproute2-fhs-compliant.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
         <Name>iproute2</Name>
         <RuntimeDependencies>
-            <Dependency>linux-atm</Dependency>
             <Dependency versionFrom="1.6.0">iptables</Dependency>
             <Dependency>db</Dependency>
             <Dependency>elfutils</Dependency>
@@ -32,9 +33,8 @@
         <Files>
             <Path fileType="config">/etc</Path>
             <Path fileType="executable">/sbin</Path>
-            <!--Path fileType="executable">/usr/sbin</Path-->
-            <Path fileType="library">/lib</Path>
             <Path fileType="library">/usr/lib</Path>
+            <Path fileType="data">/usr/share/tc</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="data">/usr/share/bash-completion</Path>
@@ -43,6 +43,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2017-01-29</Date>
+            <Version>4.9.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="3">
             <Date>2016-10-19</Date>
             <Version>4.8.0</Version>

network/filter/iptables/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Firewall, NAT and packet mangling tools</Summary>
         <Description>Contains iptables firewall, NAT and packet mangling tools.</Description>
-        <Archive sha1sum="21a694e75b0d6863cc001f85fb15915d12b8cc22" type="tarbz2">ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.0.tar.bz2</Archive>
+        <Archive sha1sum="b2592490ca7a6c2cd0f069e167a4337c86acdf91" type="tarbz2">ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.1.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>libnfnetlink-devel</Dependency>
         </BuildDependencies>
@@ -61,6 +61,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-01-29</Date>
+            <Version>1.6.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2016-06-09</Date>
             <Version>1.6.0</Version>

network/misc/libnfnetlink/pspec.xml

@@ -35,6 +35,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-01-29</Date>
+            <Version>1.0.1</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2016-06-09</Date>
             <Version>1.0.1</Version>