Attachment 3515 Details for Bug 9061 – the fix

[patch] the fix

ipset.spec.diff (text/plain), 3.43 KB, created by Oden Eriksson on 2013-02-13 12:46:44 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Oden Eriksson

Created: 2013-02-13 12:46:44 CET

Size: 3.43 KB

patch

obsolete

>Index: ipset.spec
>===================================================================
>--- ipset.spec	(revision 398198)
>+++ ipset.spec	(working copy)
>@@ -1,3 +1,7 @@
>+%define major 3
>+%define libname %mklibname %{name} %{major}
>+%define develname %mklibname -d %{name}
>+
> %ifarch %{arm}
> %define kflavour kirkwood
> %else
>@@ -7,13 +11,13 @@
> Summary:	Tools for managing sets of IP or ports with iptables
> Name:		ipset
> Version:	6.16.1
>-Release:	%mkrel 2
>+Release:	%mkrel 3
> License:	GPLv2+
> Group:		System/Kernel and hardware
> Url:		http://ipset.netfilter.org/
> Source0:	http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
>-Requires:	libmnl
> BuildRequires:	mnl-devel
>+BuildRequires:	autoconf automake libtool libtool-devel
> BuildRequires:	kernel-%{kflavour}-devel-latest
> 
> %description
>@@ -34,6 +38,35 @@
>  o express complex IP address and ports based rulesets with one single iptables
>    rule and benefit from the speed of IP sets 
> 
>+%package -n	%{libname}
>+Summary:	Shared %{name} library
>+Group:          System/Libraries
>+
>+%description -n	%{libname}
>+IP sets are a framework inside the Linux kernel since 2.4.x, 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 the shared %{name} library.
>+
>+%package -n	%{develname}
>+Summary:	Development files for %{name}
>+Group:		Development/C
>+Provides:	%{name}-devel = %{version}
>+Requires:	%{libname} = %{version}
>+Conflicts:	ipset < 6.16.1-3
>+
>+%description -n	%{develname}
>+IP sets are a framework inside the Linux kernel since 2.4.x, 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 the development files for %{name}.
>+
> %prep
> %setup -q
> 
>@@ -42,14 +75,25 @@
> autoreconf -fi
> KPKG=$(rpm -q --requires kernel-%{kflavour}-devel-latest | grep kernel-%{kflavour}-devel)
> KDIR=$(rpm -ql $KPKG | grep '/usr/src/[^/]*$')
>-%configure2_5x --with-kbuild=$KDIR --disable-shared
>+%configure2_5x \
>+    --enable-shared \
>+    --disable-static \
>+    --disable-ltdl-install \
>+    --without-included-ltdl \
>+    --with-ltdl-include=%{_includedir} \
>+    --with-ltdl-lib=%{_libdir} \
>+    --enable-settype-modules \
>+    --with-settype-modules-list="all" \
>+    --with-kbuild=$KDIR
>+
> %make
> 
> %install
> rm -rf %{buildroot}
>+
> %makeinstall_std
> 
>-rm -f %buildroot%_libdir/*.la %buildroot%_libdir/*.a
>+rm -f %{buildroot}%{_libdir}/*.*a %{buildroot}%{_libdir}/%{name}/*.*a
> 
> %clean
> rm -rf %{buildroot}
>@@ -58,5 +102,23 @@
> %doc ChangeLog ChangeLog.ippool
> %{_sbindir}/*
> %{_mandir}/man8/*.8*
>+
>+%files -n %{libname}
>+%{_libdir}/*.so.%{major}*
>+%dir %{_libdir}/%{name}
>+%{_libdir}/%{name}/ipset_bitmap_ipmac.so
>+%{_libdir}/%{name}/ipset_bitmap_ip.so
>+%{_libdir}/%{name}/ipset_bitmap_port.so
>+%{_libdir}/%{name}/ipset_hash_ipportip.so
>+%{_libdir}/%{name}/ipset_hash_ipportnet.so
>+%{_libdir}/%{name}/ipset_hash_ipport.so
>+%{_libdir}/%{name}/ipset_hash_ip.so
>+%{_libdir}/%{name}/ipset_hash_netiface.so
>+%{_libdir}/%{name}/ipset_hash_netport.so
>+%{_libdir}/%{name}/ipset_hash_net.so
>+%{_libdir}/%{name}/ipset_list_set.so
>+
>+%files -n %{develname}
> %dir %{_includedir}/libipset/
> %{_includedir}/libipset/*
>+%{_libdir}/*.so

Index: ipset.spec
===================================================================
--- ipset.spec	(revision 398198)
+++ ipset.spec	(working copy)
@@ -1,3 +1,7 @@
+%define major 3
+%define libname %mklibname %{name} %{major}
+%define develname %mklibname -d %{name}
+
 %ifarch %{arm}
 %define kflavour kirkwood
 %else
@@ -7,13 +11,13 @@
 Summary:	Tools for managing sets of IP or ports with iptables
 Name:		ipset
 Version:	6.16.1
-Release:	%mkrel 2
+Release:	%mkrel 3
 License:	GPLv2+
 Group:		System/Kernel and hardware
 Url:		http://ipset.netfilter.org/
 Source0:	http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
-Requires:	libmnl
 BuildRequires:	mnl-devel
+BuildRequires:	autoconf automake libtool libtool-devel
 BuildRequires:	kernel-%{kflavour}-devel-latest
 
 %description
@@ -34,6 +38,35 @@
  o express complex IP address and ports based rulesets with one single iptables
    rule and benefit from the speed of IP sets 
 
+%package -n	%{libname}
+Summary:	Shared %{name} library
+Group:          System/Libraries
+
+%description -n	%{libname}
+IP sets are a framework inside the Linux kernel since 2.4.x, 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 the shared %{name} library.
+
+%package -n	%{develname}
+Summary:	Development files for %{name}
+Group:		Development/C
+Provides:	%{name}-devel = %{version}
+Requires:	%{libname} = %{version}
+Conflicts:	ipset < 6.16.1-3
+
+%description -n	%{develname}
+IP sets are a framework inside the Linux kernel since 2.4.x, 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 the development files for %{name}.
+
 %prep
 %setup -q
 
@@ -42,14 +75,25 @@
 autoreconf -fi
 KPKG=$(rpm -q --requires kernel-%{kflavour}-devel-latest | grep kernel-%{kflavour}-devel)
 KDIR=$(rpm -ql $KPKG | grep '/usr/src/[^/]*$')
-%configure2_5x --with-kbuild=$KDIR --disable-shared
+%configure2_5x \
+    --enable-shared \
+    --disable-static \
+    --disable-ltdl-install \
+    --without-included-ltdl \
+    --with-ltdl-include=%{_includedir} \
+    --with-ltdl-lib=%{_libdir} \
+    --enable-settype-modules \
+    --with-settype-modules-list="all" \
+    --with-kbuild=$KDIR
+
 %make
 
 %install
 rm -rf %{buildroot}
+
 %makeinstall_std
 
-rm -f %buildroot%_libdir/*.la %buildroot%_libdir/*.a
+rm -f %{buildroot}%{_libdir}/*.*a %{buildroot}%{_libdir}/%{name}/*.*a
 
 %clean
 rm -rf %{buildroot}
@@ -58,5 +102,23 @@
 %doc ChangeLog ChangeLog.ippool
 %{_sbindir}/*
 %{_mandir}/man8/*.8*
+
+%files -n %{libname}
+%{_libdir}/*.so.%{major}*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/ipset_bitmap_ipmac.so
+%{_libdir}/%{name}/ipset_bitmap_ip.so
+%{_libdir}/%{name}/ipset_bitmap_port.so
+%{_libdir}/%{name}/ipset_hash_ipportip.so
+%{_libdir}/%{name}/ipset_hash_ipportnet.so
+%{_libdir}/%{name}/ipset_hash_ipport.so
+%{_libdir}/%{name}/ipset_hash_ip.so
+%{_libdir}/%{name}/ipset_hash_netiface.so
+%{_libdir}/%{name}/ipset_hash_netport.so
+%{_libdir}/%{name}/ipset_hash_net.so
+%{_libdir}/%{name}/ipset_list_set.so
+
+%files -n %{develname}
 %dir %{_includedir}/libipset/
 %{_includedir}/libipset/*
+%{_libdir}/*.so

Actions: View | Diff

Attachments on bug 9061: 3515