diff -Naur --exclude=CVS ipcop-1.4.13-ORG/src/ROOTFILES.i386 ipcop-1.4.13/src/ROOTFILES.i386 --- ipcop-1.4.13-ORG/src/ROOTFILES.i386 2007-01-09 00:17:14.000000000 +0000 +++ ipcop-1.4.13/src/ROOTFILES.i386 2007-02-02 08:14:00.000000000 +0000 @@ -22538,8 +22538,8 @@ lib/iptables/libipt_udp.so lib/iptables/libipt_unclean.so sbin/iptables -#sbin/iptables-restore -#sbin/iptables-save +sbin/iptables-restore +sbin/iptables-save #usr/share/man/man8/iptables-restore.8 #usr/share/man/man8/iptables-save.8 #usr/share/man/man8/iptables.8 @@ -25043,6 +25043,25 @@ ## sbin/vconfig ## +## cutter-1.03 +## +usr/bin/cutter +## +## rope +## +etc/rope.d +etc/rc.d/rc.p2p-rope +usr/lib/rope +usr/bin/rope +usr/bin/ropec +usr/bin/rddump +lib/iptables/libipt_rope.so +## +## ipset +## +usr/sbin/ipset +usr/lib/ipset +## ## installer extension ## usr/local/bin/install2 diff -Naur --exclude=CVS ipcop-1.4.13-ORG/lfs/cutter ipcop-1.4.13/lfs/cutter --- ipcop-1.4.13-ORG/lfs/cutter 1970-01-01 00:00:00.000000000 +0000 +++ ipcop-1.4.13/lfs/cutter 2007-02-02 08:14:00.000000000 +0000 @@ -0,0 +1,82 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +# LFS build file for cutter - for IPCop 1.4.x +# Cutter home page (include documentation) is at: +# http://www.lowth.com/cutter + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.03 + +THISAPP = cutter-$(VER) +DL_FILE = $(THISAPP).tgz +DL_FROM = http://www.lowth.com/cutter/software +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 50093db9b64277643969ee75b83ebbd1 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make + cd $(DIR_APP) && install -m 0755 cutter /usr/bin + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff -Naur --exclude=CVS ipcop-1.4.13-ORG/lfs/gcc ipcop-1.4.13/lfs/gcc --- ipcop-1.4.13-ORG/lfs/gcc 2006-01-22 21:58:23.000000000 +0000 +++ ipcop-1.4.13/lfs/gcc 2007-02-02 08:14:00.000000000 +0000 @@ -120,9 +120,9 @@ @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_SRC) && tar jxf $(DIR_DL)/gcc-g++-$(VER).tar.bz2 # fix a macro in gcc3.3.3 hurting gcc4.x ! - cd $(DIR_APP) && sed -i "s/\*((void \*\*)__o.*;/*((void **)__o->next_free) = ((void *)datum); __o->next_free += sizeof(void *);/" include/obstack.h + cd $(DIR_APP) && /tools/bin/sed -i "s/\*((void \*\*)__o.*;/*((void **)__o->next_free) = ((void *)datum); __o->next_free += sizeof(void *);/" include/obstack.h cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/gcc-3.3-ssp-4.patch - cd $(DIR_APP) && sed -i -e 's|^\(LIBGCC2_CFLAGS.*\)$$|\1 -D_LIBC_PROVIDES_SSP_|' gcc/Makefile.in + cd $(DIR_APP) && /tools/bin/sed -i -e 's|^\(LIBGCC2_CFLAGS.*\)$$|\1 -D_LIBC_PROVIDES_SSP_|' gcc/Makefile.in ifeq "$(ROOT)" "" cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-no_fixincludes-1.patch else @@ -144,8 +144,8 @@ SSP_PROT_ALL_STRING="%{G*} %{!fno-stack-protector: %{!fno-stack-protector-all: %{!D__KERNEL__: -fstack-protector %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: -fstack-protector-all} } } } } } }"; \ fi; \ mv -f $${GCC_SPECS} $${GCC_SPECS}.noprot; \ - sed "/cc1:/{n;d}" $${GCC_SPECS}.noprot > $${GCC_SPECS}.tmp; \ - sed "s/cc1:/cc1:\n$${SSP_PROT_ALL_STRING}/" $${GCC_SPECS}.tmp > $${GCC_SPECS}.prot; \ + /tools/bin/sed "/cc1:/{n;d}" $${GCC_SPECS}.noprot > $${GCC_SPECS}.tmp; \ + /tools/bin/sed "s/cc1:/cc1:\n$${SSP_PROT_ALL_STRING}/" $${GCC_SPECS}.tmp > $${GCC_SPECS}.prot; \ rm -f $${GCC_SPECS}.tmp; \ cp -f $${GCC_SPECS}.prot $${GCC_SPECS} else @@ -158,8 +158,8 @@ SSP_PROT_ALL_STRING="%{G*} %{!fno-stack-protector: %{!fno-stack-protector-all: %{!D__KERNEL__: -fstack-protector %{!nostartfiles: %{!nodefaultlibs: %{!nostdlib: %{!nostdinc: -fstack-protector-all} } } } } } }"; \ fi; \ mv -f $${GCC_SPECS} $${GCC_SPECS}.noprot; \ - sed "/cc1:/{n;d}" $${GCC_SPECS}.noprot > $${GCC_SPECS}.tmp; \ - sed "s/cc1:/cc1:\n$${SSP_PROT_ALL_STRING}/" $${GCC_SPECS}.tmp > $${GCC_SPECS}.prot; \ + /tools/bin/sed "/cc1:/{n;d}" $${GCC_SPECS}.noprot > $${GCC_SPECS}.tmp; \ + /tools/bin/sed "s/cc1:/cc1:\n$${SSP_PROT_ALL_STRING}/" $${GCC_SPECS}.tmp > $${GCC_SPECS}.prot; \ rm -f $${GCC_SPECS}.tmp; \ cp -f $${GCC_SPECS}.prot $${GCC_SPECS} endif diff -Naur --exclude=CVS ipcop-1.4.13-ORG/lfs/ipset ipcop-1.4.13/lfs/ipset --- ipcop-1.4.13-ORG/lfs/ipset 1970-01-01 00:00:00.000000000 +0000 +++ ipcop-1.4.13/lfs/ipset 2007-02-02 08:14:00.000000000 +0000 @@ -0,0 +1,84 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +# Created by: # +# 28-December-2005 Chris Lowth # +# - Makefile for IPSET in IPCop build # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +# VER = 2.2.1-20050419 +VER = 2.2.9-20060508 + +THISAPP = ipset-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://ipset.netfilter.org +DIR_APP = $(DIR_SRC)/ipset/ipset-2.2.9 +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b86efac9457e992d2633e9b4176f8ca9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + mkdir -p $(DIR_SRC)/ipset \ + && rm -rf $(DIR_SRC)/ipset/ipset* \ + && cd $(DIR_SRC)/ipset \ + && tar jxf $(DIR_DL)/$(DL_FILE) + sed "s/ ipporthash//" < $(DIR_APP)/Makefile > $(DIR_APP)/Makefile2 + cd $(DIR_APP) && make -f Makefile2 PREFIX=/usr install + @$(POSTBUILD) diff -Naur --exclude=CVS ipcop-1.4.13-ORG/lfs/iptables ipcop-1.4.13/lfs/iptables --- ipcop-1.4.13-ORG/lfs/iptables 2006-12-08 06:58:20.000000000 +0000 +++ ipcop-1.4.13/lfs/iptables 2007-02-02 08:14:00.000000000 +0000 @@ -83,6 +83,10 @@ # hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile + # ROPE module extension + cd /usr/src/rope-* && make IPTABLES_DIR=$(DIR_APP) patch-iptables + echo -e '#! /bin/sh\necho rope' > $(DIR_APP)/extensions/.rope-test + cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man LIBDIR=/lib install @rm -rf $(DIR_APP) diff -Naur --exclude=CVS ipcop-1.4.13-ORG/lfs/linux ipcop-1.4.13/lfs/linux --- ipcop-1.4.13-ORG/lfs/linux 2007-01-02 18:47:50.000000000 +0000 +++ ipcop-1.4.13/lfs/linux 2007-02-02 08:14:00.000000000 +0000 @@ -181,7 +181,7 @@ IPV4OPTSSTRIP NETLINK NETMAP REJECT SAME TARPIT TTL connlimit cuseeme-nat dstlimit \ fuzzy h323-conntrack-nat iprange mms-conntrack-nat mport nf-log nth pool \ pptp-conntrack-nat psd quake3-conntrack-nat quota random raw realm rtsp-conntrack \ - set string time u32 + string time u32 CONNMARK # More recent pom-ng snapshot with updates for # ipv4options, osf @@ -191,7 +191,7 @@ cd $(DIR_SRC)/patch-o-matic-ng-20051229 && ./runme --batch \ --kernel-path=$(ROOT)/usr/src/linux/ \ --iptables-path=$(ROOT)/usr/src/iptables/ \ - ipv4options osf + ipv4options osf set # This patch changes /proc/net/ip_conntrack to mode 0440 # and messes up the connections.cgi page. So remove it for now. @@ -257,7 +257,21 @@ cd $(DIR_APP) && sed -i -e 's/-O2/-Os/g' Makefile endif - cd $(DIR_APP) && make CC="$(KGCC)" oldconfig + cd $(DIR_APP) && make CC="$(KGCC)" oldconfig \ + CONFIG_IP_NF_CONNTRACK_MARK=y CONFIG_IP_NF_MATCH_CONNMARK=m CONFIG_IP_NF_TARGET_CONNMARK=m + +ifeq "$(SMP)" "" + # Add ROPE on non-SNP kernels + cd /usr/src/rope-* && make KERNEL_DIR=$(DIR_APP) patch-kernel default-kernel-config + cd $(DIR_APP) && \ + S=`echo /usr/src/rope-*/extend_ipset.pl`; \ + if [ -f $$S ]; then \ + sed 's/|| die;/|| return;/g' < $$S > /tmp/ex.pl; \ + perl /tmp/ex.pl; \ + rm -f /tmp/ex.pl; \ + fi +endif + cd $(DIR_APP) && make CC="$(KGCC)" dep cd $(DIR_APP) && make CC="$(KGCC)" clean if [ "$(MACHINE)" = "i386" -a "$(SMP)" = "" ]; then \ diff -Naur --exclude=CVS ipcop-1.4.13-ORG/lfs/rope ipcop-1.4.13/lfs/rope --- ipcop-1.4.13-ORG/lfs/rope 1970-01-01 00:00:00.000000000 +0000 +++ ipcop-1.4.13/lfs/rope 2007-02-16 07:45:21.000000000 +0000 @@ -0,0 +1,79 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +# Created by: # +# 28-December-2005 Chris Lowth # +# - Makefile for ROPE in IPCop build # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 20070215 + +THISAPP = rope-$(VER) +DL_FILE = $(THISAPP).tgz +DL_FROM = http://www.lowth.com/rope/attach/Download +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c5445aa4ff79220e359752b14b3fe893 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_SRC)/rope-* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make PREFIX=/usr install + @$(POSTBUILD) diff -Naur --exclude=CVS ipcop-1.4.13-ORG/make.sh ipcop-1.4.13/make.sh --- ipcop-1.4.13-ORG/make.sh 2007-01-09 06:58:57.000000000 +0000 +++ ipcop-1.4.13/make.sh 2007-02-21 08:32:43.000000000 +0000 @@ -501,6 +501,11 @@ ipcopmake ppp ipcopmake rp-pppoe ipcopmake unzip + + # www.lowth.com add-ons + ipcopmake rope + ipcopmake cutter + # Do SMP now. SMP drivers are built in 'SMP version' because just before # the kernel was SMP. When you rebuild/test/update, to get SMP version for a # driver, you must rebuild linux SMP & linux ! (erase log/linux-ipcop-KVER{,-smp} @@ -530,6 +535,7 @@ ipcopmake wanpipe SMP=1 fi ipcopmake linux LFS_PASS=ipcop + ipcopmake ipset ipcopmake 3cp4218 ipcopmake amedyn ipcopmake cxacru @@ -743,8 +749,8 @@ -e "s|KERNEL memtest|KERNEL $VERSION/memtest|" \ $LFS/usr/src/config/kernel/syslinux.cfg \ > $LFS/tmp/pxelinux.cfg/$SNAME-pxe-$VERSION.model - sed -i -e "s|: vmlinuz|: $VERSION/vmlinuz|" $LFS/tmp/$VERSION/f2.txt - sed -i -e "s|: vmlinuz|: $VERSION/vmlinuz|" $LFS/tmp/$VERSION/f3.txt + /tools/bin/sed -i -e "s|: vmlinuz|: $VERSION/vmlinuz|" $LFS/tmp/$VERSION/f2.txt + /tools/bin/sed -i -e "s|: vmlinuz|: $VERSION/vmlinuz|" $LFS/tmp/$VERSION/f3.txt cd $LFS/tmp && tar cvzf \ $LFS/install/images/$SNAME-$VERSION-install-pxe.$MACHINE.tgz \ * >> $LOGFILE 2>&1 @@ -1095,8 +1101,28 @@ fi fi ;; +ropepatch) + KERVER=`awk '$1 == "VER" && $2 == "=" { print $3 }' < lfs/linux` + ROPEVER=`echo build/usr/src/rope-* | cut -f2 -d-` + cd build || exit 2 + tar cvfz ../rope-${ROPEVER}-ipcop-${VERSION}-binary-i386.tgz \ + etc/rope.d \ + etc/rc.d/rc.p2p-rope \ + usr/bin/rope \ + usr/bin/ropec \ + usr/bin/rddump \ + usr/lib/rope \ + usr/sbin/ipset \ + usr/lib/ipset \ + usr/bin/cutter \ + lib/modules/$KERVER/kernel/net/ipv4/netfilter/*.o.gz \ + boot/*-$KERVER \ + lib/iptables/libipt_{rope,set,SET,CONNMARK,connmark}.so \ + sbin/iptables-{save,restore} + ;; + *) - echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|getothersrc|gettoolchain|newupdate|othersrc|prefetch|rootfiles|shell|toolchain}" + echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|getothersrc|gettoolchain|newupdate|othersrc|prefetch|rootfiles|shell|toolchain|ropepatch}" cat doc/make.sh-usage exit 1 ;;