[xtables-addons/el7] squashed merge master to el7
commit 7e4f7f5fe985bfc615d5a61138d97f519370829b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Jul 3 19:07:34 2017 +0200
squashed merge master to el7
.gitignore | 2 +-
ipset-config | 28 ------
ipset.init | 247 ----------------------------------------------------
sources | 2 +-
xtables-addons.spec | 52 ++---------
5 files changed, 11 insertions(+), 320 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 340c3df..ac352a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xtables-addons-2.5.tar.xz
+xtables-addons-*.tar.xz
diff --git a/sources b/sources
index 72f6a6c..7e187ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-335663ece5fb17c7d0bb24dbdc697eb1 xtables-addons-2.5.tar.xz
+be20b0b9c4b001b364431a836e361d33 xtables-addons-2.13.tar.xz
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 27d6118..687e84c 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,23 +1,18 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 2.5
+Version: 2.13
Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
Group: System Environment/Base
URL: http://xtables-addons.sourceforge.net
-Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/%{version}/xtable...
-Source1: ipset.init
-Source2: ipset-config
+Source0: http://dl.sourceforge.net/xtables-addons/Xtables-addons/xtables-addons-%{...
+
+BuildRequires: gcc
BuildRequires: iptables-devel >= 1.4.5
BuildRequires: autoconf automake libtool
Provides: %{name}-kmod-common = %{version}
Requires: %{name}-kmod >= %{version}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(postun): initscripts
Requires: ipset >= 6.11
Obsoletes: %{name}-devel < 1.27-1
@@ -33,21 +28,14 @@ in the %{name}-kmod package. You must also install the
%prep
%setup -q -n %{name}-%{version}
./autogen.sh
-if [ ! -e /%{_lib}/xtables/libxt_CHECKSUM.so ]; then
- sed -i 's/build_CHECKSUM=/build_CHECKSUM=m/' mconfig
-fi
-if [ ! -e /%{_lib}/xtables/libxt_TEE.so ]; then
- sed -i 's/build_TEE=/build_TEE=m/' mconfig
-fi
-sed -i 's/build_ipset6=/build_ipset6=m/' mconfig
%build
%configure --without-kbuild
-make V=1 %{?_smp_mflags}
+%make_build V=1
%install
-make DESTDIR=%{buildroot} install
+%make_install
# We add xt_geoip database scripts manually
rm -rf %{buildroot}%{_libexecdir}
@@ -57,40 +45,18 @@ chmod 0644 geoip/*
# There is no -devel package. So no need for these files
rm -f %{buildroot}%{_libdir}/*.{la,so}
-# install init scripts and configuration files
-install -D -pm 0755 %{SOURCE1} %{buildroot}%{_initddir}/ipset
-install -D -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ipset-config
-
-%post
-/sbin/ldconfig
-/sbin/chkconfig --add ipset
-
-%preun
-if [ $1 = 0 ] ; then
- /sbin/service ipset stop >/dev/null 2>&1
- /sbin/chkconfig --del ipset
-fi
-
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
- /sbin/service ipset condrestart >/dev/null 2>&1 || :
-fi
-
-%clean
-rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc LICENSE README doc/* geoip
-%attr(0755,root,root) %{_initddir}/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
%{_libdir}/xtables/*.so
%{_libdir}/*.so.*
%{_sbindir}/iptaccount
%{_mandir}/man?/*
%changelog
+* Mon Jul 03 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.13-1
+- Update to 2.13
+
* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5-1
- Update to 2.5