Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2012-01-05 13:48:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipset", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ipset.new/ipset.changes 2012-01-05 13:48:11.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Jan 1 03:17:39 UTC 2012 - [email protected] + +- Populate ipset package on build.opensuse.org after disabling + ipset-genl compilation in xtables-addons New: ---- ipset-6.10+git9.tar.xz ipset-preamble ipset.changes ipset.spec kernel-3_3.diff no-static.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ # # spec file for package ipset # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ipset %define lname libipset1 Version: 6.10+git9 Release: 0 Group: Productivity/Networking/Security Summary: Netfilter ipset administration utility License: GPL-2.0 URL: http://ipset.netfilter.org/ #Git-Clone: git://git.netfilter.org/ipset #Git-Web: http://git.netfilter.org/ Source: %name-%version.tar.xz Source3: %name-preamble Patch1: no-static.diff Patch2: kernel-3_3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf, automake, libtool BuildRequires: pkgconfig >= 0.23, pkgconfig(libmnl) >= 1, xz %if 0%{?suse_version} BuildRequires: %kernel_module_package_buildreqs BuildRequires: kernel-syms >= 2.6.39 Recommends: %name-kmp %endif %kernel_module_package -p %name-preamble %description IP sets are a framework inside the Linux kernel, which can be administered by the ipset utility. Depending on the type, currently an IP set may store IP addresses, (TCP/UDP) port numbers or IP addresses with MAC addresses in a way, which ensures lightning speed when matching an entry against a set. ipset can: * store multiple IP addresses or port numbers and match against the collection by iptables at one swoop; * dynamically update iptables rules against IP addresses or ports without performance penalty; * express complex IP address and ports based rulesets with one single iptables rule and benefit from the speed of IP sets %package KMP Group: System/Kernel Summary: Netfilter ipset kernel modules %description KMP IP sets are a framework inside the Linux kernel, which can be administered by the ipset utility. Depending on the type, currently an IP set may store IP addresses, (TCP/UDP) port numbers or IP addresses with MAC addresses in a way, which ensures lightning speed when matching an entry against a set. This package contains a version update to the in-kernel ipset modules. %package -n %lname Summary: Userspace library for the in-kernel Netfilter ipset interface Group: System/Libraries %description -n %lname IP sets are a framework inside the Linux kernel, which can be administered by the ipset utility. Depending on the type, currently an IP set may store IP addresses, (TCP/UDP) port numbers or IP addresses with MAC addresses in a way, which ensures lightning speed when matching an entry against a set. %package devel Summary: Development files for ipset extensions Group: Development/Libraries/C and C++ Requires: %lname = %version %description devel IP sets are a framework inside the Linux kernel, which can be administered by the ipset utility. Depending on the type, currently an IP set may store IP addresses, (TCP/UDP) port numbers or IP addresses with MAC addresses in a way, which ensures lightning speed when matching an entry against a set. %prep %setup -q %patch -P 1 -P 2 -p1 %build if [ ! -e configure ]; then ./autogen.sh; fi; pushd ../; for flavor in %flavors_to_build; do cp -a "%name-%version" "%name-$flavor-%version"; pushd "%name-$flavor-%version/"; # ksource: it just checks for a header %configure --disable-static \ --with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor" \ --with-ksource="/usr/src/linux"; make %{?_smp_mflags} all modules; popd; done; %install b="%buildroot"; pushd ../; for flavor in %flavors_to_build; do pushd "%name-$flavor-%version/"; make %{?_smp_mflags} install modules_install \ DESTDIR="$b" INSTALL_MOD_PATH="$b"; popd; done; rm -f "$b/%_libdir"/*.la; %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) %_sbindir/ipset %_mandir/man*/* %files -n %lname %defattr(-,root,root) %_libdir/libipset.so.1* %files devel %defattr(-,root,root) %_libdir/libipset.so %_includedir/libipset %changelog ++++++ ipset-preamble ++++++ Enhances: kernel-%1 Requires: kernel-%1 Supplements: packageand(kernel-%1:ipset) ++++++ kernel-3_3.diff ++++++ parent 5f5e497db1f0810ce50bc8807836312c75511079 (v6.10-9-g5f5e497) commit b2d4e4b4e6c48dc0d53eeab3b52ce56f01a29397 Author: Jan Engelhardt <[email protected]> Date: Sat Dec 31 02:22:10 2011 +0100 kernel 3.2 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 @@ #include <linux/icmp.h> #include <linux/icmpv6.h> #include <linux/sctp.h> +#include <linux/version.h> #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, { int protoff; u8 nexthdr; + __be16 frag_off; nexthdr = ipv6_hdr(skb)->nexthdr; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr); +#else + protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr, &frag_off); +#endif 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) static inline void hash_ip6_data_copy(struct hash_ip6_elem *dst, const struct hash_ip6_elem *src) { - ipv6_addr_copy(&dst->ip.in6, &src->ip.in6); + dst->ip.in6 = src->ip.in6; } 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 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; } -- # Created with git-export-patch ++++++ no-static.diff ++++++ --- src/Makefile.am | 1 - 1 file changed, 1 deletion(-) Index: ipset-6.10+git9/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_LDADD = ../lib/libipset.la -AM_LDFLAGS = -static dist_man_MANS = ipset.8 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
