webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated kernel to 2.6.24.7

Browse Source 
Updated iptables to 1.4.0
Updated mISDN to 1-1-8
Updated openswan to 2.6.14

This version is not completed yet
todo:
-natt patch
-check if other kernel patches still needed (CoreTemp ...)
-check rootfiles (iptables, openswan)
-fix asterix
-fix linux-fusion
This commit is contained in:
Arne Fitzenreiter
2008-07-13 19:09:48 +02:00
parent 8a8e094a3c
commit 64cf4991cc
22 changed files with 82880 additions and 1903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1509
config/kernel/kernel.config.i586
View File

File diff suppressed because it is too large Load Diff

1520
config/kernel/kernel.config.i586.smp
View File

File diff suppressed because it is too large Load Diff

1054
config/rootfiles/common/klibc
View File

File diff suppressed because it is too large Load Diff

64
config/rootfiles/core/16/files
View File

@@ -1,61 +1,9 @@
lib/modules/KVER-ipfire/kernel/net/ipsec/ipsec.ko
lib/modules/KVER-ipfire-smp/kernel/net/ipsec/ipsec.ko
usr/lib/ipsec
usr/libexec/ipsec
usr/sbin/ipsec
var/run/pluto
lib/libpcre.so.0
lib/libpcre.so.0.0.1
#usr/bin/pcre-config
#usr/bin/pcregrep
#usr/bin/pcretest
#usr/include/pcre.h
#usr/include/pcre_scanner.h
#usr/include/pcre_stringpiece.h
#usr/include/pcrecpp.h
#usr/include/pcrecpparg.h
#usr/include/pcreposix.h
#usr/lib/libpcre.a
#usr/lib/libpcre.la
usr/lib/libpcre.so
#usr/lib/libpcrecpp.a
#usr/lib/libpcrecpp.la
#usr/lib/libpcrecpp.so
#usr/lib/libpcrecpp.so.0
#usr/lib/libpcrecpp.so.0.0.0
#usr/lib/libpcreposix.a
#usr/lib/libpcreposix.la
#usr/lib/libpcreposix.so
#usr/lib/libpcreposix.so.0
#usr/lib/libpcreposix.so.0.0.0
#usr/lib/pkgconfig/libpcre.pc
#usr/man/man1/pcregrep.1
#usr/man/man1/pcretest.1
#usr/man/man3/pcre.3
#usr/man/man3/pcre_compile.3
#usr/man/man3/pcre_compile2.3
#usr/man/man3/pcre_config.3
#usr/man/man3/pcre_copy_named_substring.3
#usr/man/man3/pcre_copy_substring.3
#usr/man/man3/pcre_dfa_exec.3
#usr/man/man3/pcre_exec.3
#usr/man/man3/pcre_free_substring.3
#usr/man/man3/pcre_free_substring_list.3
#usr/man/man3/pcre_fullinfo.3
#usr/man/man3/pcre_get_named_substring.3
#usr/man/man3/pcre_get_stringnumber.3
#usr/man/man3/pcre_get_stringtable_entries.3
#usr/man/man3/pcre_get_substring.3
#usr/man/man3/pcre_get_substring_list.3
#usr/man/man3/pcre_info.3
#usr/man/man3/pcre_maketables.3
#usr/man/man3/pcre_refcount.3
#usr/man/man3/pcre_study.3
#usr/man/man3/pcre_version.3
#usr/man/man3/pcreapi.3
#usr/man/man3/pcrebuild.3
#usr/man/man3/pcrecallout.3
#usr/man/man3/pcrecompat.3
#usr/man/man3/pcrecpp.3
#usr/man/man3/pcrematching.3
#usr/man/man3/pcrepartial.3
#usr/man/man3/pcrepattern.3
#usr/man/man3/pcreperform.3
#usr/man/man3/pcreposix.3
#usr/man/man3/pcreprecompile.3
#usr/man/man3/pcresample.3
#usr/man/man3/pcrestack.3

0
config/rootfiles/packages/asterisk → config/rootfiles/defekt/asterisk
View File

0
config/rootfiles/packages/zaptel → config/rootfiles/defekt/zaptel
View File

1946
config/rootfiles/updater/filelists/klibc Normal file
View File

File diff suppressed because it is too large Load Diff

73
config/rootfiles/updater/filelists/udev Normal file
View File

@@ -0,0 +1,73 @@
etc/scsi_id.config
etc/modprobe.d/blacklist
etc/udev
#etc/udev/rules.d
#etc/udev/rules.d/05-udev-early.rules
#etc/udev/rules.d/25-lfs.rules
#etc/udev/rules.d/26-modprobe.rules
#etc/udev/rules.d/27-firmware.rules
#etc/udev/rules.d/60-persistent-storage.rules
#etc/udev/rules.d/81-cdrom.rules
#etc/udev/udev.conf
lib/firmware
lib/libvolume_id.so.0
lib/libvolume_id.so.0.66.0
lib/udev
#lib/udev/ata_id
#lib/udev/cdrom_id
#lib/udev/create_floppy_devices
#lib/udev/devices
#lib/udev/devices/core
#lib/udev/devices/fd
#lib/udev/devices/null
#lib/udev/devices/pts
#lib/udev/devices/shm
#lib/udev/devices/stderr
#lib/udev/devices/stdin
#lib/udev/devices/stdout
#lib/udev/edd_id
#lib/udev/firmware.sh
#lib/udev/path_id
#lib/udev/scsi_id
#lib/udev/usb_id
#lib/udev/vol_id
sbin/scsi_id
sbin/udevcontrol
sbin/udevd
sbin/udevsettle
sbin/udevtrigger
usr/bin/udevinfo
usr/bin/udevtest
#usr/include/libvolume_id.h
#usr/lib/libvolume_id.a
usr/lib/libvolume_id.so
#usr/lib/pkgconfig/libvolume_id.pc
usr/sbin/udevmonitor
#usr/share/doc/udev-096
#usr/share/doc/udev-096/index.html
#usr/share/man/man7/udev.7
#usr/share/man/man8/ata_id.8
#usr/share/man/man8/cdrom_id.8
#usr/share/man/man8/edd_id.8
#usr/share/man/man8/scsi_id.8
#usr/share/man/man8/udevcontrol.8
#usr/share/man/man8/udevd.8
#usr/share/man/man8/udevinfo.8
#usr/share/man/man8/udevmonitor.8
#usr/share/man/man8/udevsettle.8
#usr/share/man/man8/udevtest.8
#usr/share/man/man8/udevtrigger.8
#usr/share/man/man8/vol_id.8
lib/initcpio/hooks/udev
lib/initcpio/install/udev
#lib/initcpio/udev
lib/initcpio/udev/cdrom_id
lib/initcpio/udev/firmware.sh
lib/initcpio/udev/load-modules.sh
lib/initcpio/udev/start_udev
lib/initcpio/udev/udev.rules
lib/initcpio/udev/udevd
lib/initcpio/udev/udevsettle
lib/initcpio/udev/udevtrigger
etc/udev/dvb.sh
etc/udev/rules.d/10-dvb.rules

2
config/rootfiles/updater/update.sh
View File

@@ -26,7 +26,7 @@
#
OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
NEWVERSION="2.3"
KVER="2.6.20.21"
KVER="2.6.24.7"
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden

20
doc/packages-list.txt
View File

@@ -1,4 +1,4 @@
== List of softwares used to build IPFire Version: 2.3-beta1 ==
== List of softwares used to build IPFire Version: 2.3-test ==
* Archive-Tar-1.29
* Archive-Zip-1.16
* BerkeleyDB-0.27
@@ -39,7 +39,6 @@
* arptables-v0.0.3-3
* as86-0.16.17
* asterisk-1.4.18
* atl1-1.2.40.2
* atl2-2.0.4
* autoconf-2.59
* automake-1.9.6
@@ -128,16 +127,15 @@
* inetutils-1.4.2
* ipaddr-1.2
* ipfireseeder-1.00
* ipp2p-0.8.2
* ipp2p-0.8.2-iptables
* iproute2-2.6.16-060323
* iptables-1.3.8
* iptables-1.4.0
* iptstate-2.1
* iputils-ss020927
* java-1.5.0_06-for-ipfire
* jpegsrc.v6b
* kbd-1.12
* klibc-1.5
* klibc-1.5.10
* kqemu-1.3.0pre11
* kudzu-1.2.64
* l7-protocols-2007-10-10
@@ -167,9 +165,8 @@
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.20.21
* linux-2.6.24.7
* linux-atm-2.4.1
* linux-fusion-7.0.1
* linux-libc-headers-2.6.12.0
* linuxigd-0.95
* lm_sensors-3.0.2
@@ -178,7 +175,7 @@
* lsof-4.78
* lzo-2.02
* m4-1.4.4
* mISDNuser-1_1_5
* mISDNuser-1_1_8
* madwifi-0.9.4-wlan
* make-3.81
* man-db-2.4.3
@@ -219,8 +216,8 @@
* openmailadmin-1.0.0
* openssh-4.7p1
* openssl-0.9.8g
* openswan-2.4.13
* openswan-2.4.13-kmod
* openswan-2.6.14
* openswan-2.6.14-kmod
* openvpn-2.0.9
* pam_mysql-0.7RC1
* patch-2.5.4
@@ -238,8 +235,6 @@
* procps-3.2.6
* psmisc-22.2
* qemu-0.9.1
* r8168-8.005.00
* r8169-6.005.00
* readline-5.1
* reiser4progs-1.0.5
* reiserfsprogs-3.6.19
@@ -304,5 +299,4 @@
* wpa_supplicant-0.5.10
* xfsprogs-2.9.4
* xvidcore-1.1.0
* zaptel-1.4.4
* zlib-1.2.3

6
lfs/asterisk
View File

@@ -36,7 +36,7 @@ PAK_VER = 3
CHAN_CAPI = chan_capi-1.0.2
DEPS = "sox zaptel libpri spandsp libmad"
DEPS = "sox libpri spandsp libmad"
###############################################################################
# Top-level Rules
@@ -99,8 +99,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/$(CHAN_CAPI) \
$(DIR_SRC)/agx-ast-addons && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire
cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts \
menuselect.makeopts
# cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts \
# menuselect.makeopts
cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-alaw-1.4.8.tar.gz \
$(DIR_APP)/sounds/asterisk-core-sounds-en-alaw-1.4.8.tar.gz
cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-alaw-1.4.7.tar.gz \

45
lfs/iptables
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.3.8
VER = 1.4.0
THISAPP = iptables-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -37,18 +37,18 @@ TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
objects = $(DL_FILE) \
netfilter-layer7-v2.18.tar.gz \
libnfnetlink-0.0.25.tar.bz2 \
libnetfilter_queue-0.0.13.tar.bz2
libnfnetlink-0.0.39.tar.bz2 \
libnetfilter_queue-0.0.16.tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
netfilter-layer7-v2.18.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
libnfnetlink-0.0.25.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-0.0.25.tar.bz2
libnetfilter_queue-0.0.13.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.13.tar.bz2
libnfnetlink-0.0.39.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-0.0.39.tar.bz2
libnetfilter_queue-0.0.16.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.16.tar.bz2
$(DL_FILE)_MD5 = 0a9209f928002e5eee9cdff8fef4d4b3
$(DL_FILE)_MD5 = 90cfa8a554a29b0b859a625e701af2a7
netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2
libnfnetlink-0.0.25.tar.bz2_MD5 = fc915a2e66d282e524af6ef939042d7d
libnetfilter_queue-0.0.13.tar.bz2_MD5 = 660cbfd3dc8c10bf9b1803cd2b688256
libnfnetlink-0.0.39.tar.bz2_MD5 = 348fed8c1edbe5b873ffc7b192140093
libnetfilter_queue-0.0.16.tar.bz2_MD5 = b36664e6cd39edbfe46b416a86118add
install : $(TARGET)
@@ -77,15 +77,17 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.13
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/iptables-1.3-for-kernel-2.6.20forward-layer7-2.18.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/iptables-1.4-for-kernel-2.6.20forward-layer7-2.18.patch
chmod +x $(DIR_APP)/extensions/.layer7-test*
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.3.0-imq1.diff
chmod +x $(DIR_APP)/extensions/.IMQ-test* $(DIR_APP)/extensions/.layer7-test*
chmod +x $(DIR_APP)/extensions/.IMQ-test*
# 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
cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr/src/linux LIBDIR=/lib $(MAKETUNING)
@@ -95,14 +97,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && cp -vf include/libiptc/{libiptc.h,ipt_kernel_headers.h} \
/usr/include/libiptc
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.25.tar.bz2
cd $(DIR_SRC)/libnfnetlink-0.0.25 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnfnetlink-0.0.25 && make
cd $(DIR_SRC)/libnfnetlink-0.0.25 && make install
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.39.tar.bz2
cd $(DIR_SRC)/libnfnetlink-0.0.39 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnfnetlink-0.0.39 && make
cd $(DIR_SRC)/libnfnetlink-0.0.39 && make install
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.13.tar.bz2
cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make
cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make install
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.13
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.16.tar.bz2
cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make
cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make install
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
@$(POSTBUILD)

4
lfs/klibc
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.5
VER = 1.5.10
THISAPP = klibc-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz
$(DL_FILE)_MD5 = d55ce89c0656a7d6896ec0b2af07b5dc
$(DL_FILE)_MD5 = baf6b522e427aae9c8f511b9c57193bd
klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b
install : $(TARGET)

2
lfs/kqemu
View File

@@ -80,10 +80,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(SMP)" "1"
mkdir -p /lib/modules/$(KVER)-ipfire-smp/misc/
cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire-smp/build/
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire-smp/misc/
else
mkdir -p /lib/modules/$(KVER)-ipfire/misc/
cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire/build/
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire/misc/

37
lfs/linux
View File

@@ -24,8 +24,8 @@
include Config
PATCHLEVEL = .21
VER = 2.6.20.21
PATCHLEVEL = .7
VER = 2.6.24.7
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -47,22 +47,22 @@ endif
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
mISDN-1_1_5.tar.gz \
mISDN-1_1_8.tar.gz \
squashfs3.3.tgz \
netfilter-layer7-v2.18.tar.gz \
patch-2.6.16-nath323-1.3.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.18.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.3.tgz = $(URL_IPFIRE)/squashfs3.3.tgz
mISDN-1_1_5.tar.gz = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz
mISDN-1_1_8.tar.gz = $(URL_IPFIRE)/mISDN-1_1_8.tar.gz
$(DL_FILE)_MD5 = fbedc192e654735936cc780da8deeba4
$(DL_FILE)_MD5 = 40a73780d51525d28d36dec852c680c4
netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.3.tgz_MD5 = 95c40fca0d886893631b5de14a0af25b
mISDN-1_1_5.tar.gz_MD5 = 93b1cff7817b82638a0475c2b7b7f1b6
mISDN-1_1_8.tar.gz_MD5 = 29c55ffe0b35668a41eaed3b1c3ddfe2
install : $(TARGET)
@@ -95,42 +95,42 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -s linux-$(VER) /usr/src/linux
# Security fix for CIFS & Netfilter SNMP
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-additional_check_on_BER_decoding.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-additional_check_on_BER_decoding.patch
# Temperatursensoren von Intel Core & Core 2 Prozessoren
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-hwmon-coretemp.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-hwmon-coretemp.patch
# Add USB ID of US-Robotics USR805423 to ZD1211 driver
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-zd1211-usrobotics-usbid.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-zd1211-usrobotics-usbid.patch
# Openswan nat-t
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20.21-natt.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.6.14-kernel-2.6.24.7-natt.patch
# Reiser4
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.20.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.24.patch
# SquashFS
cd $(DIR_SRC) && rm -rf squashfs*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.3.tgz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.20/squashfs3.3-patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.24/squashfs3.3-patch
# ip_conntrack permissions from 440 to 444
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
# Layer7-patch
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.18
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/for_older_kernels/kernel-2.6.20-2.6.21-layer7-2.16.1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/for_older_kernels/kernel-2.6.22-2.6.24-layer7-2.18.patch
# Linux Intermediate Queueing Device
ifeq "$(XEN)" ""
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-imq.diff
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.24-imq.diff
endif
# mISDN
cd $(DIR_SRC) && rm -rf mISDN-*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_5.tar.gz
cd $(DIR_SRC)/mISDN-1_1_5 && yes 'yes' | ./std2kern -k /usr/src/linux
cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_8.tar.gz
cd $(DIR_SRC)/mISDN-1_1_8 && yes 'yes' | ./std2kern -k /usr/src/linux
cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch
@@ -173,3 +173,4 @@ endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)

4
lfs/mISDN
View File

@@ -24,7 +24,7 @@
include Config
VER = 1_1_5
VER = 1_1_8
THISAPP = mISDNuser-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 45bf90350ac8f8e1845c02e293126d70
$(DL_FILE)_MD5 = 7cf66625608736eb939cfcb2308f3edf
install : $(TARGET)

24
lfs/openswan
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.4.13
VER = 2.6.14
THISAPP = openswan-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -48,7 +48,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0c2505cf2639a7de051e815f41e8e1f4
#$(DL_FILE)_MD5 = 0c2505cf2639a7de051e815f41e8e1f4
$(DL_FILE)_MD5 = 44dc3cb98b9cb4e3fa03b82967d08b78
install : $(TARGET)
@@ -78,14 +79,17 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(KMOD)" "1"
cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
cd $(DIR_APP) && make minstall
else
cd $(DIR_APP) && sed -i \
-e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
cd $(DIR_APP) && sed -i \
-e 's/-Werror//g' programs/Makefile.program
ifeq "$(KMOD)" "1"
cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
cd $(DIR_APP) && make minstall
else
cd $(DIR_APP) && make programs
cd $(DIR_APP) && make install
@@ -100,10 +104,10 @@ else
ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
ln -sf $(CONFIG_ROOT)/crls /etc/ipsec.d/crls
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.12-startklips-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.14-startklips-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.14-updown-1.patch
# cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
# cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
endif
#@rm -rf $(DIR_APP)
@$(POSTBUILD)

28
make.sh
View File

@@ -24,7 +24,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.3-beta1"
VERSION="2.3-test"
GIT_BRANCH=master:master # Version number
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -333,12 +333,12 @@ buildipfire() {
ipfiremake rp-pppoe
ipfiremake unzip
ipfiremake linux SMP=1
ipfiremake linux-fusion SMP=1
ipfiremake ipp2p SMP=1
ipfiremake zaptel SMP=1
ipfiremake r8169 SMP=1
ipfiremake r8168 SMP=1
ipfiremake atl1 SMP=1
# ipfiremake linux-fusion SMP=1
# ipfiremake ipp2p SMP=1
# ipfiremake zaptel SMP=1
# ipfiremake r8169 SMP=1
# ipfiremake r8168 SMP=1
# ipfiremake atl1 SMP=1
ipfiremake atl2 SMP=1
ipfiremake kqemu SMP=1
ipfiremake v4l-dvb SMP=1
@@ -346,12 +346,12 @@ buildipfire() {
ipfiremake sane KMOD=1 SMP=1
ipfiremake openswan KMOD=1 SMP=1
ipfiremake linux
ipfiremake linux-fusion
ipfiremake ipp2p
ipfiremake zaptel
ipfiremake r8169
ipfiremake r8168
ipfiremake atl1
# ipfiremake linux-fusion
# ipfiremake ipp2p
# ipfiremake zaptel
# ipfiremake r8169
# ipfiremake r8168
# ipfiremake atl1
ipfiremake atl2
ipfiremake kqemu
ipfiremake v4l-dvb
@@ -465,7 +465,6 @@ buildipfire() {
ipfiremake noip_updater
ipfiremake ntp
ipfiremake openssh
ipfiremake openswan
ipfiremake rrdtool
ipfiremake setserial
ipfiremake setup
@@ -547,6 +546,7 @@ buildipfire() {
ipfiremake sysstat
ipfiremake vsftpd
ipfiremake which
ipfiremake openswan
ipfiremake lsof
ipfiremake centerim
ipfiremake br2684ctl

129
src/patches/openswan-2.6.14-kernel-2.6.24.7-natt.patch Normal file
View File

@@ -0,0 +1,129 @@
--- /dev/null Tue Mar 11 13:02:56 2003
+++ nat-t/include/net/xfrmudp.h Mon Feb 9 13:51:03 2004
@@ -0,0 +1,10 @@
+/*
+ * pointer to function for type that xfrm4_input wants, to permit
+ * decoupling of XFRM from udp.c
+ */
+#define HAVE_XFRM4_UDP_REGISTER
+
+typedef int (*xfrm4_rcv_encap_t)(struct sk_buff *skb, __u16 encap_type);
+extern int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
+ , xfrm4_rcv_encap_t *oldfunc);
+extern int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func);
--- /distros/kernel/linux-2.6.11.2/net/ipv4/Kconfig 2005-03-09 03:12:33.000000000 -0500
+++ swan26/net/ipv4/Kconfig 2005-04-04 18:46:13.000000000 -0400
@@ -351,2 +351,8 @@
+config IPSEC_NAT_TRAVERSAL
+ bool "IPSEC NAT-Traversal (KLIPS compatible)"
+ depends on INET
+ ---help---
+ Includes support for RFC3947/RFC3948 NAT-Traversal of ESP over UDP.
+
config IP_TCPDIAG
--- plain26/net/ipv4/udp.c.orig 2006-12-28 20:53:17.000000000 -0500
+++ plain26/net/ipv4/udp.c 2007-05-11 10:22:50.000000000 -0400
@@ -108,6 +108,7 @@
#include <net/inet_common.h>
#include <net/checksum.h>
#include <net/xfrm.h>
+#include <net/xfrmudp.h>
/*
* Snmp MIB for the UDP layer
@@ -881,6 +882,31 @@
sk_common_release(sk);
}
+#if defined(CONFIG_XFRM) || defined(CONFIG_IPSEC_NAT_TRAVERSAL)
+
+static xfrm4_rcv_encap_t xfrm4_rcv_encap_func = NULL;
+int udp4_register_esp_rcvencap(xfrm4_rcv_encap_t func
+ , xfrm4_rcv_encap_t *oldfunc)
+{
+ if(oldfunc != NULL) {
+ *oldfunc = xfrm4_rcv_encap_func;
+ }
+
+ xfrm4_rcv_encap_func = func;
+ return 0;
+}
+
+int udp4_unregister_esp_rcvencap(xfrm4_rcv_encap_t func)
+{
+ if(xfrm4_rcv_encap_func != func)
+ return -1;
+
+ xfrm4_rcv_encap_func = NULL;
+ return 0;
+}
+#endif /* CONFIG_XFRM_MODULE || CONFIG_IPSEC_NAT_TRAVERSAL */
+
+
/* return:
* 1 if the the UDP system should process it
* 0 if we should drop this packet
@@ -888,9 +914,9 @@
*/
static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
{
-#ifndef CONFIG_XFRM
+#if !defined(CONFIG_XFRM) && !defined(CONFIG_IPSEC_NAT_TRAVERSAL)
return 1;
-#else
+#else /* either CONFIG_XFRM or CONFIG_IPSEC_NAT_TRAVERSAL */
struct udp_sock *up = udp_sk(sk);
struct udphdr *uh;
struct iphdr *iph;
@@ -1018,10 +1044,27 @@
return 0;
}
if (ret < 0) {
- /* process the ESP packet */
- ret = xfrm4_rcv_encap(skb, up->encap_type);
- UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
- return -ret;
+ if(xfrm4_rcv_encap_func != NULL)
+ ret = (*xfrm4_rcv_encap_func)(skb, up->encap_type);
+
+ switch(ret) {
+ case 1:
+ /* FALLTHROUGH to send-up */;
+ break;
+
+ case 0:
+ /* PROCESSED, free it */
+ UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
+ return 0;
+
+ case -1:
+ /* PACKET wasn't for _func, or no func, pass it
+ * to stock function
+ */
+ ret = xfrm4_rcv_encap(skb, up->encap_type);
+ UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS);
+ return -ret;
+ }
}
/* FALLTHROUGH -- it's a UDP Packet */
}
@@ -1110,7 +1153,6 @@
/*
* All we need to do is get the socket, and then do a checksum.
*/
-
int udp_rcv(struct sk_buff *skb)
{
struct sock *sk;
@@ -1599,3 +1641,9 @@
EXPORT_SYMBOL(udp_proc_register);
EXPORT_SYMBOL(udp_proc_unregister);
#endif
+
+#if defined(CONFIG_IPSEC_NAT_TRAVERSAL)
+EXPORT_SYMBOL(udp4_register_esp_rcvencap);
+EXPORT_SYMBOL(udp4_unregister_esp_rcvencap);
+#endif
+
make[1]: Leaving directory `/usr/src/openswan-2.6.14'

55
src/patches/openswan-2.6.14-startklips-1.patch Normal file
View File

@@ -0,0 +1,55 @@
--- _startklips.orig 2008-07-11 01:55:19.000000000 +0200
+++ _startklips 2008-07-12 09:11:56.000000000 +0200
@@ -149,23 +149,35 @@
# figure out ifconfig for interface
addr=
- eval `ifconfig $phys |
- awk '$1 == "inet" && $2 ~ /^addr:/ && $NF ~ /^Mask:/ {
- gsub(/:/, " ", $0)
- print "addr=" $3
- other = $5
- if ($4 == "Bcast")
- print "type=broadcast"
- else if ($4 == "P-t-P")
- print "type=pointopoint"
- else if (NF == 5) {
- print "type="
- other = ""
- } else
- print "type=unknown"
- print "otheraddr=" other
- print "mask=" $NF
- }'`
+ eval `ip addr show $phys | awk '$3 ~ /BROADCAST|POINTOPOINT/ {
+ if ($3 ~ /BROADCAST/)
+ print "type=broadcast";
+ else if ($3 ~ /POINTOPOINT/)
+ print "type=pointopoint";
+ else {
+ print "type=";
+ }
+ }'`
+
+ if [ "$type" == "broadcast" ]; then
+ eval `ip addr show $phys | awk '$1 == "inet" { gsub(/\//, " ");
+ print "addr=" $2;
+ print "mask=" $3;
+ print "otheraddr=" $5;
+ }'`
+ elif [ "$type" == "pointopoint" ]; then
+ eval `ip addr show $phys | awk '$1 == "inet" { gsub(/\//, " ");
+ print "addr=" $2;
+ print "mask=" $5;
+ print "otheraddr=" $4;
+ }'`
+ else
+ type="unknown"
+ otheraddr=
+ fi
+
+ eval `whatmask /$mask | awk -F': ' '$1 ~ /^Netmask =/ { print "mask=" $2 }'`
+
if test " $addr" = " "
then
echo "unable to determine address of \`$phys'"

30
src/patches/openswan-2.6.14-updown-1.patch Normal file
View File

@@ -0,0 +1,30 @@
--- _updown.klips.orig 2008-07-11 01:55:19.000000000 +0200
+++ _updown.klips 2008-07-12 09:20:26.000000000 +0200
@@ -407,8 +407,8 @@
# opportunistic encryption work around
# need to provide route that eclipses default, without
# replacing it.
- it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
- ip route $1 128.0.0.0/1 $parms2 $parms3"
+ #it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
+ # ip route $1 128.0.0.0/1 $parms2 $parms3"
;;
*) it="ip route $1 $parms $parms2 $parms3"
;;
@@ -432,13 +432,13 @@
prepare-host:*|prepare-client:*)
# delete possibly-existing route (preliminary to adding a route)
case "$PLUTO_PEER_CLIENT" in
- "0.0.0.0/0")
+ "0.0.0.0/0")
# need to provide route that eclipses default, without
# replacing it.
parms1="0.0.0.0/1"
parms2="128.0.0.0/1"
- it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
- oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
+ # it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
+ # oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
;;
*)
parms="$PLUTO_PEER_CLIENT $IPROUTEARGS"

78231
src/patches/reiser4-for-2.6.24.patch Executable file
View File

File diff suppressed because it is too large Load Diff