commit f2437d4ccc18344748a7313b6b19e52fe240b391
Author: Jakub Bogusz <[email protected]>
Date: Wed Oct 10 17:47:43 2012 +0200
- updated to 6.14 (note: new libipset soname)
- removed obsolete hash-net-if-fix patch
ipset-hash-net-if-fix.patch | 30 ------------------------------
ipset.spec | 11 +++++------
2 files changed, 5 insertions(+), 36 deletions(-)
---
diff --git a/ipset.spec b/ipset.spec
index f6ee734..af58eb1 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,26 +20,26 @@
%define _enable_debug_packages 0
%endif
-%define rel 19
+%define rel 1
%define pname ipset
Summary: IP sets utility
Summary(pl.UTF-8): Narzędzie do zarządzania zbiorami IP
Name: %{pname}%{_alt_kernel}
-Version: 6.12.1
+Version: 6.14
Release: %{rel}
License: GPL v2
Group: Networking/Admin
#Source0Download: http://ipset.netfilter.org/install.html
Source0: http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: 80df500a4d93cb14e1373ae290716cda
+# Source0-md5: 70f2d4c054592236dcda285855a4ee58
Source1: %{pname}.init
Patch0: %{pname}-no_kernel.patch
-Patch1: %{pname}-hash-net-if-fix.patch
URL: http://ipset.netfilter.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.38.6}
BuildRequires: libmnl-devel >= 1
+BuildRequires: libltdl-devel
BuildRequires: libtool >= 2:2.0
%{?with_userspace:BuildRequires: linux-libc-headers >= 7:2.6.38.6}
BuildRequires: pkgconfig
@@ -134,7 +134,6 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla
zbiorów IP.
%prep
%setup -q -n %{pname}-%{version}
%{!?with_kernel:%patch0 -p1}
-%patch1 -p1
%build
%{__libtoolize}
@@ -199,7 +198,7 @@ fi
%doc ChangeLog ChangeLog.ippool README UPGRADE
%attr(755,root,root) %{_sbindir}/ipset
%attr(755,root,root) %{_libdir}/libipset.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libipset.so.2
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.3
%{_mandir}/man8/ipset.8*
%files devel
diff --git a/ipset-hash-net-if-fix.patch b/ipset-hash-net-if-fix.patch
deleted file mode 100644
index dc75fb7..0000000
--- a/ipset-hash-net-if-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN ipset-6.8.orig/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
ipset-6.8/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
---- ipset-6.8.orig/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
2011-07-08 10:13:53.000000000 +0200
-+++ ipset-6.8/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
2011-08-13 09:58:01.456999822 +0200
-@@ -41,25 +41,7 @@
- static inline long
- ifname_compare(const char *_a, const char *_b)
- {
-- const long *a = (const long *)_a;
-- const long *b = (const long *)_b;
--
-- BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
-- if (a[0] != b[0])
-- return a[0] - b[0];
-- if (IFNAMSIZ > sizeof(long)) {
-- if (a[1] != b[1])
-- return a[1] - b[1];
-- }
-- if (IFNAMSIZ > 2 * sizeof(long)) {
-- if (a[2] != b[2])
-- return a[2] - b[2];
-- }
-- if (IFNAMSIZ > 3 * sizeof(long)) {
-- if (a[3] != b[3])
-- return a[3] - b[3];
-- }
-- return 0;
-+ return strcmp(_a, _b);
- }
-
- static void
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ipset.git/commitdiff/f2437d4ccc18344748a7313b6b19e52fe240b391
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
