[prev in list] [next in list] [prev in thread] [next in thread]
List: annvix-cvs
Subject: [cvs] CVS commit in packages/iptables on 2005/06/11 21:30:01
From: cvsrep () annvix ! org
Date: 2005-06-11 21:30:01
Message-ID: E1DhDYH-0006H1-8N () build ! annvix ! org
[Download RAW message or body]
Module name: packages/iptables
Changes by: vdanen
Date: 2005/06/11 21:30:01
Commit log:
- 1.3.1
- rediff P1
- sync kernel headers with 2.4.31-1avx
- get rid of this vanilla vs. avx crap; one iptables to rule them all
Index: iptables.init
===================================================================
RCS file: /work/annvix/cvsroot/packages/iptables/iptables.init,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- iptables.init 29 Mar 2005 03:50:20 -0000 1.3
+++ iptables.init 11 Jun 2005 21:30:01 -0000 1.3.4.1
@@ -47,20 +47,8 @@
}
check() {
- if [ -n "$1" ]; then
- rm -f /lib/iptables
- ln -s /lib/iptables-${1} /lib/iptables
- iftable nat -N __IPTCHECK__${1}__ >/dev/null 2>&1
- iftable nat -A __IPTCHECK__${1}__ -j MASQUERADE >/dev/null 2>&1
- res=$?
- iftable nat -F __IPTCHECK__${1}__ >/dev/null 2>&1
- iftable nat -X __IPTCHECK__${1}__ >/dev/null 2>&1
- return $res
- else
- /sbin/modprobe ipt_MASQUERADE >/dev/null 2>&1
- check avx || check vanilla
- /sbin/modprobe -r ipt_MASQUERADE >/dev/null 2>&1
- fi
+ /sbin/modprobe ipt_MASQUERADE >/dev/null 2>&1
+ /sbin/modprobe -r ipt_MASQUERADE >/dev/null 2>&1
}
start() {
Index: iptables.spec
===================================================================
RCS file: /work/annvix/cvsroot/packages/iptables/iptables.spec,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- iptables.spec 29 Mar 2005 03:50:20 -0000 1.3
+++ iptables.spec 11 Jun 2005 21:30:01 -0000 1.3.4.1
@@ -1,6 +1,15 @@
-%define name iptables
-%define version 1.2.9
-%define release 6avx
+#
+# spec file for package iptables
+#
+# Package for the Annvix Linux distribution: http://annvix.org/
+#
+# Please submit bugfixes or comments via http://bugs.annvix.org/
+#
+
+
+%define name iptables
+%define version 1.3.1
+%define release 1avx
Summary: Tools for managing Linux kernel packet filtering capabilities
Name: %{name}
@@ -9,18 +18,20 @@
License: GPL
Group: System/Kernel and hardware
URL: http://netfilter.org/
+
Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2
+Source6: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2.sig
Source1: iptables.init
Source2: ip6tables.init
Source3: iptables.config
Source4: ip6tables.config
Source5: iptables-kernel-headers.tar.bz2
-Patch1: iptables-1.2.9-stealth_grsecurity.patch.bz2
+Patch1: iptables-1.3.1-stealth_grsecurity.patch.bz2
Patch2: iptables-1.2.8-imq.patch.bz2
Patch3: iptables-1.2.8-libiptc.h.patch.bz2
Patch4: iptables-1.2.9-CAN-2004-0986.patch.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
BuildPrereq: perl
BuildRequires: kernel-source >= 2.4.24-3avx
@@ -66,56 +77,44 @@
%prep
%setup -q -a 5
-%patch1 -p1 -b .stealth
-%patch2 -p1 -b .imq
-%patch3 -p1 -b .libiptc
-%patch4 -p1 -b .can-2004-0986
+#%patch1 -p1 -b .stealth
+#%patch2 -p1 -b .imq
+#%patch3 -p1 -b .libiptc
+#%patch4 -p1 -b .can-2004-0986
-chmod +x extensions/.IMQ-test
+#chmod +x extensions/.IMQ-test
find . -type f | xargs perl -pi -e "s,/usr/local,%{_prefix},g"
+
%build
%serverbuild
%ifarch alpha
-OPT=`echo $RPM_OPT_FLAGS | sed -e "s/-O./-O1/"`
+ OPT=`echo %{optflags} | sed -e "s/-O./-O1/"`
%else
-OPT="$RPM_OPT_FLAGS -DNDEBUG"
+ OPT="%{optflags} -DNDEBUG"
%endif
-# build against "vanilla" headers
-%make COPT_FLAGS="$OPT -I linux-2.6/include" LIBDIR=/lib all
-for i in extensions/*.so;do mv $i $i.vanilla;done
-%make clean
-# build against avx headers with pptp_conntrack
+
%make COPT_FLAGS="$OPT -I linux-2.4/include" LIBDIR=/lib all experimental
%install
[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
# Dunno why this happens. -- Geoff
-%makeinstall_std BINDIR=/sbin MANDIR=%{_mandir} LIBDIR=/lib \
COPT_FLAGS="$RPM_OPT_FLAGS -DNETLINK_NFLOG=4" install-experimental +%makeinstall_std \
BINDIR=/sbin MANDIR=%{_mandir} LIBDIR=/lib COPT_FLAGS="$RPM_OPT_FLAGS \
-DNETLINK_NFLOG=4" KERNEL_DIR=/usr install-experimental make install-devel \
DESTDIR=%{buildroot} KERNEL_DIR=/usr BINDIR=/sbin LIBDIR=%{_libdir} MANDIR=%{_mandir} \
-mv %{buildroot}/lib/iptables %{buildroot}/lib/iptables-avx
-mkdir %{buildroot}/lib/iptables-vanilla
-cd extensions
-for i in *.so.vanilla;do
- if cmp -s $i ${i%.vanilla}; then
- ln %{buildroot}/lib/iptables-avx/${i%.vanilla} \
%{buildroot}/lib/iptables-vanilla/${i%.vanilla}
- else
- cp $i %{buildroot}/lib/iptables-vanilla/${i%.vanilla}
- fi
-done
-cd ..
-install -c -D -m755 %{SOURCE1} %{buildroot}%{_initrddir}/iptables
-install -c -D -m755 %{SOURCE2} %{buildroot}%{_initrddir}/ip6tables
-install -c -D -m644 %{SOURCE3} iptables.sample
-install -c -D -m644 %{SOURCE4} ip6tables.sample
+install -c -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/iptables
+install -c -D -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/ip6tables
+install -c -D -m 0644 %{SOURCE3} iptables.sample
+install -c -D -m 0644 %{SOURCE4} ip6tables.sample
+
%clean
[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/file.list.%{name}
+
%post
%_post_service iptables
# run only on fresh install
@@ -123,20 +122,25 @@
/sbin/service iptables check
fi
+
%triggerpostun -- iptables =< 1.2.9-1avx
# fix upgrade from older versions
/sbin/service iptables check
+
%preun
%_preun_service iptables
%_preun_service iptables
+
%post ipv6
%_post_service ip6tables
+
%preun ipv6
%_preun_service ip6tables
+
%files
%defattr(-,root,root,0755)
%doc INSTALL INCOMPATIBILITIES iptables.sample
@@ -145,10 +149,9 @@
/sbin/iptables-save
/sbin/iptables-restore
%{_mandir}/*/iptables*
-%dir /lib/iptables-avx
-/lib/iptables-avx/libipt*
-%dir /lib/iptables-vanilla
-/lib/iptables-vanilla/libipt*
+%dir /lib/iptables
+/lib/iptables/libipt*
+
%files ipv6
%defattr(-,root,root,0755)
@@ -158,8 +161,8 @@
/sbin/ip6tables-save
/sbin/ip6tables-restore
%{_mandir}/*/ip6tables*
-/lib/iptables-avx/libip6t*
-/lib/iptables-vanilla/libip6t*
+/lib/iptables/libip6t*
+
%files devel
%defattr(-,root,root,0755)
@@ -168,7 +171,14 @@
%{_libdir}/libiptc.a
%{_mandir}/man3/*
+
%changelog
+* Sat Jun 11 2005 Vincent Danen <vdanen@annvix.org> 1.3.1-1avx
+- 1.3.1
+- rediff P1
+- sync kernel headers with 2.4.31-1avx
+- get rid of this vanilla vs. avx crap; one iptables to rule them all
+
* Thu Nov 18 2004 Vincent Danen <vdanen@annvix.org> 1.2.9-6avx
- fix iptables.init: s/sls/avx/
_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic