SPECS (LINUX_2_6_16): ipp2p.spec - fixes from LINUX_2_6_22, build for 2.6.6...

[glen]

Author: glen                         Date: Fri Oct 17 00:05:50 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- fixes from LINUX_2_6_22, build for 2.6.60.62

---- Files affected:
SPECS:
   ipp2p.spec (1.52.2.26 -> 1.52.2.26.2.1) 

---- Diffs:

================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.52.2.26 SPECS/ipp2p.spec:1.52.2.26.2.1
--- SPECS/ipp2p.spec:1.52.2.26	Wed Feb 20 20:37:48 2008
+++ SPECS/ipp2p.spec	Fri Oct 17 02:05:45 2008
@@ -21,16 +21,19 @@
 
 %define		iptables_ver	1.3.3
 %define		pname	ipp2p
+%define		rel		67
 Summary:	IPP2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	IPP2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
 Name:		%{pname}%{_alt_kernel}
 Version:	0.8.2
-Release:	64
+Release:	%{rel}
 Epoch:		1
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://www.ipp2p.org/downloads/%{pname}-%{version}.tar.gz
 # Source0-md5:	9dd745830f302d70d0b728013c1d6a0c
+Patch0:		%{pname}-2.6.19.patch
+Patch1:		%{pname}-2.6.21.patch
 URL:		http://www.ipp2p.org/
 %{?with_userspace:BuildRequires:	iptables-devel >= 1.3.3}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
@@ -67,9 +70,10 @@
 %package -n kernel%{_alt_kernel}-net-ipp2p
 Summary:	IPP2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	IPP2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-net-ipp2p
 IPP2P is a netfilter extension to identify P2P filesharing traffic.
@@ -104,9 +108,10 @@
 %package -n kernel%{_alt_kernel}-smp-net-ipp2p
 Summary:	IPP2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	IPP2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-smp-net-ipp2p
 IPP2P is a netfilter extension to identify P2P filesharing traffic.
@@ -141,6 +146,7 @@
 %package -n iptables-ipp2p
 Summary:	IPP2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	IPP2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
+Release:	%{rel}
 Group:		Base/Kernel
 Requires:	iptables
 
@@ -178,19 +184,19 @@
 
 %prep
 %setup -q -n %{pname}-%{version}
+sed -i "s:shell iptables:shell %{_sbindir}/iptables:" Makefile
+%patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with userspace}
 %{__cc} %{rpmcflags} -DIPTABLES_VERSION='"%{iptables_ver}"' -fPIC -c libipt_ipp2p.c
 #%{__cc} %{rpmldflags} -shared libipt_ipp2p.o -o libipt_ipp2p.so
 # using CC issues:
-#libipt_ipp2p.o: In function `_init':
-#libipt_ipp2p.c:(.text+0x720): multiple definition of `_init'
-#/usr/bin/ld: size of bfd_vma > size of splay_tree types
-#/usr/bin/ld: BFD (Linux/GNU Binutils) 2.18.50.0.4.20080208 internal error, aborting at arange-set.c line 202 in arange_set_new
-#/usr/bin/ld: Please report this bug.
-#collect2: ld returned 1 exit status
-%{__ld} %(echo %{rpmldflags} | sed -e 's/-Wl,\(.*\)/\1/g') -shared -o libipt_ipp2p.so libipt_ipp2p.o
+#libipt_ipp2p.o(.text+0x720): In function `_init':
+#libipt_ipp2p.c: multiple definition of `_init'
+#/usr/lib/gcc-lib/i686-pld-linux/3.3.6/../../../crti.o(.init+0x0):/home/users/builder/rpm/BUILD/glibc-2.3.6/builddir/csu/crti.S:12: first defined here
+%{__ld} %(echo %{rpmldflags} | sed -e 's/-Wl,\([^ ]*\)/\1/g') -shared -o libipt_ipp2p.so libipt_ipp2p.o
 %endif
 
 %if %{with kernel}
@@ -251,6 +257,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52.2.26.2.1  2008/10/17 00:05:45  glen
+- fixes from LINUX_2_6_22, build for 2.6.60.62
+
 Revision 1.52.2.26  2008/02/20 19:37:48  glen
 - release 64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ipp2p.spec?r1=1.52.2.26&r2=1.52.2.26.2.1&f=u