updated netfilter packages

docbook2X-0.8.8-5
libnftnl-1.1.4-1
iptables-1.8.3-1
nftables-0.9.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12170 ec354946-7b23-47d6-9f5a-488ba84defc7

d/docbook2X/docbook2X-vl.spec

@@ -1,6 +1,6 @@
 Name:           docbook2X
 Version:        0.8.8
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 Summary:        Convert DocBook documents into man and Texinfo
 Summary(ja):    DocBook ドキュメントを man と Texinfo へ変換
 
@@ -9,6 +9,9 @@ License:        BSD
 URL:            http://docbook2x.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/docbook2x/docbook2X-%{version}.tar.gz
 
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 Patch0:        01_fix_static_datadir_evaluation.patch
 Patch1:        02_fix_418703_dont_use_abbreviated_sfnet_address.patch
 Patch2:        03_fix_420153_filename_whitespace_handling.patch
@@ -92,6 +95,9 @@ fi
 
 
 %changelog
+* Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.8.8-5
+- rebuild with perl-5.26.
+
 * Wed Jul  8 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.8.8-4
 - rebuilt to fix dependency.
 

i/iptables/iptables-vl.spec

@@ -1,7 +1,7 @@
 Summary: Packet filtering tool
 Summary(ja): パケットフィルタリングツール
 Name: iptables
-Version: 1.6.2
+Version: 1.8.3
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Base
@@ -145,20 +145,20 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc COPYING INSTALL INCOMPATIBILITIES
+%license COPYING
+%doc INSTALL INCOMPATIBILITIES
 %attr(0755,root,root) /etc/rc.d/init.d/iptables
 %config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config
 %config(noreplace) %attr(0600,root,root) /etc/ethertypes
-/sbin/arptables-compat
-/sbin/ebtables-compat
+/sbin/arptables*
+/sbin/ebtables*
 /sbin/iptables*
 /sbin/nfbpf_compile
 /sbin/nfnl_osf
-/sbin/xtables-compat-multi
-/sbin/xtables-multi
-%{_mandir}/man1/iptables-xml*
-%{_mandir}/man8/iptables*
-%{_mandir}/man8/nfnl_osf.8*
+/sbin/xtables-*
+%{_mandir}/man1/*
+%{_mandir}/man8/*
+%exclude %{_mandir}/man8/ip6tables*
 %dir /%{_lib}/xtables
 /%{_lib}/xtables/libarpt*
 /%{_lib}/xtables/libebt*
@@ -196,6 +196,9 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.3-1
+- new upstream release.
+
 * Sat Feb 24 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.2-1
 - new upstream release.
 

lib/libn/libnftnl/libnftnl-vl.spec

@@ -1,7 +1,7 @@
 #global snapdate 20140903
 
 Name:           libnftnl
-Version:        1.0.9
+Version:        1.1.4
 Release:        1%{?_dist_release}
 Summary:        Library for low-level interaction with nftables Netlink's API over libmnl
 
@@ -63,7 +63,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %files
-%doc COPYING
+%license COPYING
 %{_libdir}/*.so.*
 
 %files devel
@@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_includedir}/libnftnl
 
 %changelog
+* Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-1
+- new upstream release.
+
 * Sat Feb 24 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.9-1
 - new upstream release.
 

n/nftables/nftables-vl.spec

@@ -1,13 +1,18 @@
 Name:           nftables
-Version:        0.8.2
+Version:        0.9.2
 Release:        1%{?_dist_release}
 Summary:        Netfilter Tables userspace utillites
 
 License:        GPLv2
-Group:		System Environment/Base
+Group:          System Environment/Base
 URL:            http://netfilter.org/projects/nftables/
 
 Source0:        http://ftp.netfilter.org/pub/nftables/nftables-%{version}.tar.bz2
+Source1:        nftables.init
+Source2:        nftables.conf
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 #BuildRequires: autogen
 #BuildRequires: autoconf
@@ -19,10 +24,23 @@ BuildRequires: libmnl-devel
 BuildRequires: gmp-devel
 BuildRequires: readline-devel
 BuildRequires: libnftnl-devel
+BuildRequires: asciidoc
 BuildRequires: docbook2X
+BuildRequires: jansson-devel
+BuildRequires: iptables-devel
+BuildRequires: python-rpm-macros
 
 %description
-Netfilter Tables userspace utilities.
+ Netfilter Tables userspace utilities.
+
+%package        devel
+Summary:        Development library for nftables / libnftables
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description devel
+ Development tools and static libraries and header files for
+the libnftables library.
 
 %prep
 #setup -q -n nftables-%{snapdate}
@@ -30,21 +48,65 @@ Netfilter Tables userspace utilities.
 
 %build
 #./autogen.sh
-%configure --disable-silent-rules
+%configure --disable-silent-rules --with-xtables --with-json --enable-python=no
 make %{?_smp_mflags}
 
 %install
 %make_install
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+chmod 644 %{buildroot}/%{_mandir}/man8/nft*
+
+# Don't ship static lib (for now at least)
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libnftables.a
+
 chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man8/nft*
 
+mkdir -p $RPM_BUILD_ROOT/%{_initdir}
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initdir}/nftables
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/
+chmod 600 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/nftables.conf
+
+mkdir -m 700 -p $RPM_BUILD_ROOT/%{_sysconfdir}/nftables
+chmod 600 $RPM_BUILD_ROOT/%{_sysconfdir}/nftables/*.nft
+chmod 700 $RPM_BUILD_ROOT/%{_sysconfdir}/nftables
+
+rm -rf %{buildroot}%{python_sitelib}/*
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add nftables
+
+%preun
+if [ "$1" = 0 ]; then
+	/sbin/chkconfig --del nftables
+fi
+
+%postun -p /sbin/ldconfig
+
 %files
-%doc COPYING TODO
+%license COPYING
+%doc TODO
 %config(noreplace) %{_sysconfdir}/nftables/
+%config(noreplace) %{_sysconfdir}/sysconfig/nftables.conf
+%{_libdir}/*.so.*
 %{_sbindir}/nft
+%{_mandir}/man5/libnftables-json*
 %{_mandir}/man8/nft*
+%{_initdir}/nftables
+
+%files devel
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+%{_includedir}/*
+%{_mandir}/man3/libnftables*
+
 
 %changelog
+* Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.2-1
+- new upstream release.
+
 * Sun Feb 25 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.2-1
 - new upstream release.
 - dropped Patch0: fixed in upstream.