Hello community, here is the log from the commit of package ipset for openSUSE:Factory checked in at 2016-01-21 23:44:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipset (Old) and /work/SRC/openSUSE:Factory/.ipset.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipset" Changes: -------- --- /work/SRC/openSUSE:Factory/ipset/ipset.changes 2015-07-03 00:06:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ipset.new/ipset.changes 2016-01-22 01:09:40.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Jan 18 15:42:54 UTC 2016 - kstreit...@suse.com + +- update to 6.27: + * kernel part changes + * fix reported memory size for hash:* types + * fix hash type expire: release empty hash bucket block + * fix hash type expiration: incorrect index fixed + * collapse same condition body to a single one + * fix extension alignment + * compatibility: include linux/export.h when needed + * compatibility: make sure vmalloc.h is included for kvfree() + * compatibility: Fix detecting 'struct net' in 'struct tcf_ematch' + * compatibility: Protect definition of RCU_INIT_POINTER in + compatibility header file + * netfilter: ipset: Fix sleeping memory allocation in atomic + context (Nikolay Borisov) + * userspace changes + * handle uint64_t alignment issue in ipset tool +- disable KMP build as we support the in-kernel version instead. + Remove ipset-preamble file that is no longer needed [bsc#962345] +- run spec-cleaner + +------------------------------------------------------------------- +Sun Aug 30 11:23:27 UTC 2015 - jeng...@inai.de + +- Update to new upstream release 6.26 +* Out of bound access in hash:net* types fixed +* Make struct htype per ipset family +* Optimize hash creation routine + +------------------------------------------------------------------- Old: ---- ipset-6.25.1.tar.bz2 ipset-preamble New: ---- ipset-6.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipset.spec ++++++ --- /var/tmp/diff_new_pack.8ntovu/_old 2016-01-22 01:09:42.000000000 +0100 +++ /var/tmp/diff_new_pack.8ntovu/_new 2016-01-22 01:09:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ipset # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,38 +16,24 @@ # -Name: ipset %define lname libipset3 -Version: 6.25.1 +Name: ipset +Version: 6.27 Release: 0 Summary: Netfilter ipset administration utility License: GPL-2.0 Group: Productivity/Networking/Security Url: http://ipset.netfilter.org/ - #Git-Clone: git://git.netfilter.org/ipset #Git-Web: http://git.netfilter.org/ -Source: ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2 -Source3: %name-preamble - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: ftp://ftp.netfilter.org/pub/ipset/%{name}-%{version}.tar.bz2 BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: linux-glibc-devel >= 2.6.24 BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig(libmnl) >= 1 -# Make quilt happy -%if 0%{?kernel_module_package_buildreqs:1} -%define with_kmp 1 -BuildRequires: %kernel_module_package_buildreqs -%endif -BuildRequires: kernel-syms >= 2.6.39 -Recommends: %name-kmp - -%if 0%{?with_kmp:1} -%kernel_module_package -p %name-preamble -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description IP sets are a framework inside the Linux kernel, which can be @@ -64,24 +50,11 @@ * express complex IP address and ports based rulesets with one single iptables rule and benefit from the speed of IP sets -%package KMP -Summary: Netfilter ipset kernel modules -Group: System/Kernel - -%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 +%package -n %{lname} Summary: Userspace library for the in-kernel Netfilter ipset interface Group: System/Libraries -%description -n %lname +%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 @@ -91,7 +64,7 @@ %package devel Summary: Development files for ipset extensions Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel IP sets are a framework inside the Linux kernel, which can be @@ -104,54 +77,32 @@ %setup -q %build -%if 0%{?with_kmp} -for flavor in %flavors_to_build; do - cp -a . "../%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" \ - --includedir="%_includedir/pkg/%name" - make %{?_smp_mflags} all modules; - popd; -done; -%else -%configure --disable-static --with-kmod=no \ - --includedir="%_includedir/pkg/%name" +%configure --disable-static \ + --with-kmod=no \ + --includedir="%{_includedir}/pkg/%{name}" make %{?_smp_mflags}; -%endif %install -b="%buildroot"; -%if 0%{?with_kmp} -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; -%else -make %{?_smp_mflags} install DESTDIR="$b"; -%endif -find "$b/%_libdir" -type f -name "*.la" -delete; +make %{?_smp_mflags} install DESTDIR="%{buildroot}"; +find %{buildroot} -type f -name "*.la" -delete -print + +%post -n %{lname} -p /sbin/ldconfig -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %files %defattr(-,root,root) -%_sbindir/ipset -%_mandir/man*/* +%{_sbindir}/ipset +%{_mandir}/man*/* -%files -n %lname +%files -n %{lname} %defattr(-,root,root) -%_libdir/libipset.so.3* +%{_libdir}/libipset.so.3* %files devel %defattr(-,root,root) -%_libdir/libipset.so -%_libdir/pkgconfig/libipset.pc -%_includedir/pkg/ +%{_libdir}/libipset.so +%{_libdir}/pkgconfig/libipset.pc +%{_includedir}/pkg/ %changelog ++++++ ipset-6.25.1.tar.bz2 -> ipset-6.27.tar.bz2 ++++++ ++++ 2211 lines of diff (skipped)