SPECS (AC-branch): ipp2p.spec - merge from LINUX_2_6_22 branch, old one in ...
glen
glen at pld-linux.org
Thu Jul 3 15:45:09 CEST 2008
Author: glen Date: Thu Jul 3 13:45:09 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch; rel 66
---- Files affected:
SPECS:
ipp2p.spec (1.52.2.26 -> 1.52.2.27)
---- Diffs:
================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.52.2.26 SPECS/ipp2p.spec:1.52.2.27
--- SPECS/ipp2p.spec:1.52.2.26 Wed Feb 20 20:37:48 2008
+++ SPECS/ipp2p.spec Thu Jul 3 15:45:03 2008
@@ -3,8 +3,6 @@
# Conditional build:
%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
-%bcond_without up # don't build UP module
-%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
@@ -21,20 +19,27 @@
%define iptables_ver 1.3.3
%define pname ipp2p
+%define rel 66
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}
-BuildRequires: rpmbuild(macros) >= 1.330
+%if %{with kernel}
+%if %{with dist_kernel}
+BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2
+%endif
+%endif
+BuildRequires: rpmbuild(macros) >= 1.452
BuildRequires: sed >= 4.0
Buildroot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,9 +72,11 @@
%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}}
+Obsoletes: kernel%{_alt_kernel}-smp-net-ipp2p
%description -n kernel%{_alt_kernel}-net-ipp2p
IPP2P is a netfilter extension to identify P2P filesharing traffic.
@@ -101,46 +108,10 @@
Ten pakiet zawiera moduł jądra Linuksa.
-%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
-Group: Base/Kernel
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
-Requires(post,postun): /sbin/depmod
-
-%description -n kernel%{_alt_kernel}-smp-net-ipp2p
-IPP2P is a netfilter extension to identify P2P filesharing traffic.
-The main goal for developing IPP2P was giving the adminstrator a
-dynamic tool to filter the traffic in an intelligent way. So it
-doesn't aim at prohibiting all P2P traffic but make it possible to
-shape this traffic to a given rate. For this purpose IPP2P searchs the
-payload of TCP packets for signaling patterns of P2P networks. As
-these patterns are not being present in all P2P packets we had to use
-some other netfilter extensions in order to get the whole IPP2P
-package working as already described. IPP2P works together with
-connection tracking and connection marking - in that way you can catch
-the bigger part of all P2P packets and limit the bandwidth rate.
-
-This package contains Linux SMP kernel module.
-
-%description -n kernel%{_alt_kernel}-smp-net-ipp2p -l pl.UTF-8
-IPP2P to rozszerzenie netfiltra służące do identyfikowania ruchu
-związanego z dzieleniem plików P2P. Głównym celem tworzenia IPP2P jest
-udostępnienie administratorowi dynamicznego narzędzia do filtrowania
-ruchu w inteligentny sposób. Nie jest nim zablokowanie całego ruchu
-P2P, ale umożliwienie ograniczenia tego ruchu do danej przepustowości.
-W tym celu IPP2P przeszukuje zawartość (payload) pakietów TCP pod
-kątem wzorców sygnalizujących sieci P2P. Jeśli tych wzorców nie ma w
-pakietach, muszą być użyte inne rozszerzenia netfiltra, aby IPP2P
-działało zgodnie z opisem. IPP2P współpracuje ze śledzeniem oraz
-znakowaniem połączeń - w ten sposób można wychwycić większą część
-pakietów P2P i ograniczyć wykorzystanie łącza przez nie.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
%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
@@ -177,20 +148,20 @@
jądra IPP2P.
%prep
-%setup -q -n %{pname}-%{version}
+%setup -q
+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}
@@ -219,26 +190,12 @@
%postun -n kernel%{_alt_kernel}-net-ipp2p
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-net-ipp2p
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-ipp2p
-%depmod %{_kernel_ver}smp
-
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-net-ipp2p
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_%{pname}.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-ipp2p
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/net/ipv4/netfilter/ipt_%{pname}.ko*
-%endif
-%endif
-
%if %{with userspace}
%files -n iptables-ipp2p
%defattr(644,root,root,755)
@@ -251,83 +208,82 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.52.2.26 2008/02/20 19:37:48 glen
-- release 64
-
-Revision 1.52.2.25 2008-02-15 14:12:53 glen
-- fix for: ld: unrecognized option '-Wl,--as-needed'
+Revision 1.52.2.27 2008/07/03 13:45:03 glen
+- merge from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch; rel 66
-Revision 1.52.2.24 2008-02-15 13:55:15 glen
-- convert to utf8
+Revision 1.73.2.3 2008-04-04 19:37:12 glen
+- release 65
-Revision 1.52.2.23 2008-02-15 01:29:33 glen
-- use kernel vermagic in deps
+Revision 1.73.2.2 2008-04-04 18:52:17 glen
+- keep up with ac releases
-Revision 1.52.2.22 2008-02-12 11:01:11 glen
-- release 61 (kernel-2.6.16.60-4)
+Revision 1.73.2.1 2008-04-04 18:43:34 glen
+- ac kernel macros
-Revision 1.52.2.21 2008-01-28 09:33:20 glen
-- rel 60 (kernel-2.6.16.60-1)
+Revision 1.73 2008-04-03 20:52:19 glen
+- alt kernel fixes from AC-branch
-Revision 1.52.2.20 2008-01-21 08:28:15 glen
-- rel 59 (2.6.16.59-2)
+Revision 1.72 2008-03-27 20:56:04 glen
+- rel 14 (2.6.22.19-5)
-Revision 1.52.2.19 2008-01-18 12:26:08 glen
-- rel 58 (2.6.16.58-1)
+Revision 1.71 2008-03-13 20:20:53 arekm
+- release 13
-Revision 1.52.2.18 2007/11/06 18:28:31 glen
-- rel 57 (2.6.16.57-1)
+Revision 1.70 2008-02-15 14:14:41 glen
+- use %{rpmldflags} instead of hardcoding ld --as-needed
-Revision 1.52.2.17 2007/11/04 21:23:09 glen
-- cleanup
+Revision 1.69 2008-02-11 13:00:44 arekm
+- rel 12
-Revision 1.52.2.16 2007/11/04 20:22:05 glen
-- prefix src package with alt kernel if present
+Revision 1.68 2008-01-22 22:53:40 glen
+- rel 11 (2.6.16.59-2)
-Revision 1.52.2.15 2007/11/01 08:24:18 adamg
-- release 56 (rebuild against 2.6.16.56-1)
+Revision 1.67 2007-12-17 14:17:43 arekm
+- rel 11
-Revision 1.52.2.14 2007/10/22 20:41:53 glen
-- disable userspace for alt kernel
+Revision 1.66 2007-12-15 11:57:27 arekm
+- rel 10
-Revision 1.52.2.13 2007/10/22 20:24:59 glen
-- unify kernel macros
+Revision 1.65 2007-11-29 08:01:42 arekm
+- rel 9
-Revision 1.52.2.12 2007/10/22 19:48:29 glen
-- allow build without up kernel
+Revision 1.64 2007-11-25 10:33:36 arekm
+- rel 8
-Revision 1.52.2.11 2007/10/15 08:26:44 glen
-- rel 55 (kernel 2.6.16.55)
+Revision 1.63 2007-10-24 09:46:54 arekm
+- rel 7
-Revision 1.52.2.10 2007/10/15 08:21:38 glen
-- rel drbd.spec (2.6.16.55)
+Revision 1.62 2007/10/24 09:35:24 zbyniu
+- added patch for kernels 2.6.21 .22
-Revision 1.52.2.9 2007/10/01 21:25:45 glen
-- rel 54
+Revision 1.61 2007/10/12 12:48:52 arekm
+- rel 6
-Revision 1.52.2.8 2007/09/30 22:17:50 adamg
-- release 53.1 (rebuild against 2.6.16.53-2)
+Revision 1.60 2007/06/08 21:41:49 arekm
+- rel 5
-Revision 1.52.2.7 2007/09/05 19:30:12 glen
-- rel 53 (kernel 2.6.16.53)
+Revision 1.59 2007/04/12 15:16:42 shadzik
+- proper kernel-module-build version
-Revision 1.52.2.6 2007/06/04 08:09:08 glen
-- rel 52 (2.6.16.52)
+Revision 1.58 2007/03/25 16:06:55 shadzik
+- use new kernel macros
+- fix --as-needed (thx japhy)
+- remove smp stuff and bconds ('up' too)
-Revision 1.52.2.5 2007/05/11 06:38:50 glen
-- rel 51 (2.6.16.51)
+Revision 1.57 2007/03/15 23:01:58 glen
+- up bcond
-Revision 1.52.2.4 2007/05/08 12:10:09 glen
-- rel 50 (kernel 2.6.16.50)
+Revision 1.56 2007/02/21 08:50:31 mguevara
+- api change in checkentry was in 2.6.19 not .17, sorry
-Revision 1.52.2.3 2007/04/25 22:11:37 glen
-- rel 6 (kernel 2.6.16.49)
+Revision 1.55 2007/02/21 08:46:21 mguevara
+- rel 4, added patch ipp2p-2.6.17.patch for api change in checkentry
-Revision 1.52.2.2 2007/03/27 22:17:58 glen
-- rel 5 (kernel 2.6.16.45)
+Revision 1.54 2007/02/13 08:06:35 glen
+- tabs in preamble
-Revision 1.52.2.1 2007/03/15 23:05:04 glen
-- rel 4
+Revision 1.53 2007/02/12 00:48:57 baggins
+- converted to UTF-8
Revision 1.52 2007/01/23 18:28:05 hawk
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ipp2p.spec?r1=1.52.2.26&r2=1.52.2.27&f=u
More information about the pld-cvs-commit
mailing list