Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2012-02-10 17:14:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipset", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ipset/ipset.changes 2012-01-05 13:48:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ipset.new/ipset.changes 2012-02-10 17:14:29.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Jan 20 17:27:01 UTC 2012 - [email protected] + +- Update to new upstream release 6.11 +* libipset is now complete; ipset is just a frontend +* Log warning when a hash type of set gets full +* Exceptions support added to hash:*net* types +* hash:net,iface timeout bug fixed +* Support hostnames and service names with dash + + +------------------------------------------------------------------- Old: ---- ipset-6.10+git9.tar.xz New: ---- ipset-6.11.tar.xz linux-export.h.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ --- /var/tmp/diff_new_pack.2z5vEJ/_old 2012-02-10 17:14:30.000000000 +0100 +++ /var/tmp/diff_new_pack.2z5vEJ/_new 2012-02-10 17:14:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ipset # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: ipset -%define lname libipset1 -Version: 6.10+git9 +%define lname libipset2 +Version: 6.11 Release: 0 Group: Productivity/Networking/Security Summary: Netfilter ipset administration utility License: GPL-2.0 -URL: http://ipset.netfilter.org/ +Url: http://ipset.netfilter.org/ #Git-Clone: git://git.netfilter.org/ipset #Git-Web: http://git.netfilter.org/ @@ -30,10 +32,11 @@ Source3: %name-preamble Patch1: no-static.diff Patch2: kernel-3_3.diff +Patch3: linux-export.h.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf, automake, libtool -BuildRequires: pkgconfig >= 0.23, pkgconfig(libmnl) >= 1, xz +BuildRequires: autoconf automake libtool +BuildRequires: pkgconfig >= 0.21 pkgconfig(libmnl) >= 1 xz %if 0%{?suse_version} BuildRequires: %kernel_module_package_buildreqs BuildRequires: kernel-syms >= 2.6.39 @@ -95,12 +98,13 @@ %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build -if [ ! -e configure ]; then - ./autogen.sh; -fi; +./autogen.sh; # got patches +#if [ ! -e configure ]; then +# ./autogen.sh; +#fi; pushd ../; for flavor in %flavors_to_build; do cp -a "%name-%version" "%name-$flavor-%version"; @@ -135,7 +139,7 @@ %files -n %lname %defattr(-,root,root) -%_libdir/libipset.so.1* +%_libdir/libipset.so.2* %files devel %defattr(-,root,root) ++++++ kernel-3_3.diff ++++++ --- /var/tmp/diff_new_pack.2z5vEJ/_old 2012-02-10 17:14:31.000000000 +0100 +++ /var/tmp/diff_new_pack.2z5vEJ/_new 2012-02-10 17:14:31.000000000 +0100 @@ -3,18 +3,18 @@ Author: Jan Engelhardt <[email protected]> Date: Sat Dec 31 02:22:10 2011 +0100 -kernel 3.2 support +kernel 3.3 support --- kernel/net/netfilter/ipset/ip_set_getport.c | 6 ++++++ kernel/net/netfilter/ipset/ip_set_hash_ip.c | 2 +- kernel/net/netfilter/ipset/ip_set_hash_net.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) -diff --git a/kernel/net/netfilter/ipset/ip_set_getport.c b/kernel/net/netfilter/ipset/ip_set_getport.c -index 58ca4e1..836855f 100644 ---- a/kernel/net/netfilter/ipset/ip_set_getport.c -+++ b/kernel/net/netfilter/ipset/ip_set_getport.c -@@ -12,6 +12,7 @@ +Index: ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c +=================================================================== +--- ipset-6.11.orig/kernel/net/netfilter/ipset/ip_set_getport.c ++++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c +@@ -16,6 +16,7 @@ #include <linux/icmp.h> #include <linux/icmpv6.h> #include <linux/sctp.h> @@ -22,7 +22,7 @@ #include <linux/netfilter_ipv6/ip6_tables.h> #include <net/ip.h> #include <net/ipv6.h> -@@ -115,9 +116,14 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src, +@@ -119,9 +120,14 @@ ip_set_get_ip6_port(const struct sk_buff { int protoff; u8 nexthdr; @@ -37,11 +37,11 @@ if (protoff < 0) return false; -diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ip.c b/kernel/net/netfilter/ipset/ip_set_hash_ip.c -index 14a8628..5139dea 100644 ---- a/kernel/net/netfilter/ipset/ip_set_hash_ip.c -+++ b/kernel/net/netfilter/ipset/ip_set_hash_ip.c -@@ -241,7 +241,7 @@ hash_ip6_data_isnull(const struct hash_ip6_elem *elem) +Index: ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_ip.c +=================================================================== +--- ipset-6.11.orig/kernel/net/netfilter/ipset/ip_set_hash_ip.c ++++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_ip.c +@@ -241,7 +241,7 @@ hash_ip6_data_isnull(const struct hash_i static inline void hash_ip6_data_copy(struct hash_ip6_elem *dst, const struct hash_ip6_elem *src) { @@ -50,18 +50,16 @@ } static inline void -diff --git a/kernel/net/netfilter/ipset/ip_set_hash_net.c b/kernel/net/netfilter/ipset/ip_set_hash_net.c -index 48e35ba..5a4457a 100644 ---- a/kernel/net/netfilter/ipset/ip_set_hash_net.c -+++ b/kernel/net/netfilter/ipset/ip_set_hash_net.c -@@ -267,7 +267,7 @@ static inline void +Index: ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c +=================================================================== +--- ipset-6.11.orig/kernel/net/netfilter/ipset/ip_set_hash_net.c ++++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c +@@ -295,7 +295,7 @@ static inline void hash_net6_data_copy(struct hash_net6_elem *dst, const struct hash_net6_elem *src) { - ipv6_addr_copy(&dst->ip.in6, &src->ip.in6); + dst->ip.in6 = src->ip.in6; dst->cidr = src->cidr; + dst->nomatch = src->nomatch; } - --- -# Created with git-export-patch ++++++ linux-export.h.diff ++++++ parent fe8800c8ad505196d4cde9fca21d868751760c9f (v6.11) commit 94daadfc825c504dcb9bd510b895c6c673229b60 Author: Henry Culver <[email protected]> Date: Fri Jan 20 13:40:55 2012 +0100 Fix the inclusion of linux/export.h The tests for inclusion of linux/export.h in ipset-6.11:kernel/net/netfilter/ipset/{ip_set_getport.c,pfxlen.c} are incorrect, linux/export.h did not go in until 3.2.0. --- kernel/net/netfilter/ipset/ip_set_getport.c | 2 +- kernel/net/netfilter/ipset/pfxlen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/net/netfilter/ipset/ip_set_getport.c b/kernel/net/netfilter/ipset/ip_set_getport.c index 0f77a53..a66c67b 100644 --- a/kernel/net/netfilter/ipset/ip_set_getport.c +++ b/kernel/net/netfilter/ipset/ip_set_getport.c @@ -8,7 +8,7 @@ /* Get Layer-4 data from the packets */ #include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) #include <linux/export.h> #endif #include <linux/ip.h> diff --git a/kernel/net/netfilter/ipset/pfxlen.c b/kernel/net/netfilter/ipset/pfxlen.c index c5191c7..56ca480 100644 --- a/kernel/net/netfilter/ipset/pfxlen.c +++ b/kernel/net/netfilter/ipset/pfxlen.c @@ -1,5 +1,5 @@ #include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) #include <linux/export.h> #endif #include <linux/netfilter/ipset/pfxlen.h> -- # Created with git-export-patch ++++++ no-static.diff ++++++ --- /var/tmp/diff_new_pack.2z5vEJ/_old 2012-02-10 17:14:31.000000000 +0100 +++ /var/tmp/diff_new_pack.2z5vEJ/_new 2012-02-10 17:14:31.000000000 +0100 @@ -2,13 +2,13 @@ src/Makefile.am | 1 - 1 file changed, 1 deletion(-) -Index: ipset-6.10+git9/src/Makefile.am +Index: ipset-6.11/src/Makefile.am =================================================================== ---- ipset-6.10+git9.orig/src/Makefile.am -+++ ipset-6.10+git9/src/Makefile.am -@@ -15,7 +15,6 @@ ipset_SOURCES = ipset.c \ - ipset_list_set.c \ - ui.c +--- ipset-6.11.orig/src/Makefile.am ++++ ipset-6.11/src/Makefile.am +@@ -3,7 +3,6 @@ include $(top_srcdir)/Make_global.am + sbin_PROGRAMS = ipset + ipset_SOURCES = ipset.c ui.c ipset_LDADD = ../lib/libipset.la -AM_LDFLAGS = -static -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
