diff --git a/ipset.changes b/ipset.changes index 7f0f1e0..0b80ea7 100644 --- a/ipset.changes +++ b/ipset.changes @@ -7,6 +7,7 @@ Tue Sep 16 06:27:32 UTC 2014 - jengelh@inai.de class and/or hardware queue parameters together with the set elements and then attach them to the matchig packets by the SET target. +- Add sovers.diff to counter missing symbol errors ------------------------------------------------------------------- Wed Mar 5 08:47:39 UTC 2014 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index 2aeda60..20df292 100644 --- a/ipset.spec +++ b/ipset.spec @@ -30,6 +30,7 @@ Url: http://ipset.netfilter.org/ #Git-Web: http://git.netfilter.org/ Source: ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2 Source3: %name-preamble +Patch1: sovers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -102,15 +103,11 @@ addresses with MAC addresses in a way, which ensures lightning speed when matching an entry against a set. %prep -%if 0%{?__xz:1} %setup -q -%else -tar --use=xz -xf "%{S:0}"; -%setup -DTq -%endif -autoreconf -fi +%patch -P 1 -p1 %build +autoreconf -fi %if 0%{?with_kmp} for flavor in %flavors_to_build; do cp -a . "../%name-$flavor-%version"; diff --git a/sovers.diff b/sovers.diff new file mode 100644 index 0000000..2124962 --- /dev/null +++ b/sovers.diff @@ -0,0 +1,45 @@ +Date: 2014-09-21 10:41:20.781875821 +0200 +References: http://marc.info/?l=netfilter-devel&m=141123569528296&w=2 + +Yes, that's right - I have forgotten to update the library map file +and bump the library number. I'm going to fix it at the weekend. + -Jozsef Kadlecsik + +Immediate patch for openSUSE. + -Jan Engelhardt + +--- + Make_global.am | 2 +- + lib/libipset.map | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +Index: ipset/Make_global.am +=================================================================== +--- ipset.orig/Make_global.am ++++ ipset/Make_global.am +@@ -69,7 +69,7 @@ + # interface. + + # curr:rev:age +-LIBVERSION = 7:0:4 ++LIBVERSION = 8:0:5 + + AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \ + -I/usr/local/include +Index: ipset/lib/libipset.map +=================================================================== +--- ipset.orig/lib/libipset.map ++++ ipset/lib/libipset.map +@@ -144,3 +144,12 @@ global: + ipset_parse_mark; + ipset_print_mark; + } LIBIPSET_4.1; ++ ++LIBIPSET_4.2PLUS { ++global: ++ ipset_parse_uint16; ++ ipset_parse_skbmark; ++ ipset_parse_skbprio; ++ ipset_print_skbmark; ++ ipset_print_skbprio; ++} LIBIPSET_4.2;