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

IPSec/OpenSWAN-Update

Browse Source 
UTF8-Patch im Kernel.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@549 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-05-10 21:36:03 +00:00
parent 4aedc9624f
commit 224bbb4e8e
7 changed files with 2545 additions and 3778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/configroot
View File

@@ -143,7 +143,7 @@ var/ipfire/vpn
#var/ipfire/vpn/settings
var/ipfire/wakeonlan
#var/ipfire/wakeonlan/clients.conf
#var/ipfire/wireless
var/ipfire/wireless
#var/ipfire/wireless/config
#var/ipfire/wireless/settings
var/ipfire/xtaccess

1
doc/packages-list.txt
View File

@@ -188,6 +188,7 @@
* openssh-4.3p2
* openssl-0.9.8d
* openswan-2.4.8rc1
* openswan-2.5.13
* openvpn-2.0.9
* pam_mysql-0.7RC1
* patch-2.5.4

22
lfs/linux
View File

@@ -53,7 +53,8 @@ objects =$(DL_FILE) \
iptables-1.3.5.tar.bz2 \
patch-o-matic-ng-20061210.tar.bz2 \
netfilter-layer7-v2.9.tar.gz \
patch-2.6.16-nath323-1.3.bz2
patch-2.6.16-nath323-1.3.bz2 \
openswan-2.5.13.tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
patch-o-matic-ng-20061210.tar.bz2 = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
@@ -62,6 +63,7 @@ netfilter-layer7-v2.9.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.2-r2.tar.gz = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
mISDN-CVS-2007-01-26.tar.bz2 = $(URL_IPFIRE)/mISDN-CVS-2007-01-26.tar.bz2
openswan-2.5.13.tar.gz = $(URL_IPFIRE)/openswan-2.5.13.tar.gz
$(DL_FILE)_MD5 = cc2106c6188675187d636aa518b04958
patch-o-matic-ng-20061210.tar.bz2_MD5 = 76edac76301b45f89e467b41c8cf4393
@@ -70,6 +72,7 @@ netfilter-layer7-v2.9.tar.gz_MD5 = ebf9043a5352ebe6dbd721989ef83dee
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.2-r2.tar.gz_MD5 = bf360b92eba9e6d5610196ce2e02fcd1
mISDN-CVS-2007-01-26.tar.bz2_MD5 = 844c70dc851faffcae7549fd738c7b49
openswan-2.5.13.tar.gz_MD5 = b83a42ea00ee24ed34413bc122cada51
install : $(TARGET)
@@ -101,14 +104,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ln -s linux-$(VER) /usr/src/linux
# An UTF8 patch from LFS
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch
# Openswan 2
cd $(DIR_SRC) && rm -rf openswan-*
cd $(DIR_SRC) && tar xfvz $(DIR_DL)/openswan-2.4.8rc1.tar.gz
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan26_netkey.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.8rc1.kernel-2.6-natt.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.8rc1.kernel-2.6-klips.patch
cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.5.13.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.5.13.kernel-2.6-klips.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.5.13.kernel-2.6-natt.patch
cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
# H323 conntrack
@@ -179,7 +183,7 @@ ifeq "$(SMP)" "1"
ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
mkdir -p /usr/src/openswan-2.4.8rc1/modobj26/null
mkdir -p /usr/src/openswan-2.5.13/modobj26/null
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
else
@@ -192,7 +196,7 @@ else
ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
mkdir -p /usr/src/openswan-2.4.8rc1/modobj26/null
mkdir -p /usr/src/openswan-2.5.13/modobj26/null
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
endif

6
lfs/openswan
View File

@@ -26,7 +26,7 @@
include Config
VER = 2.4.8rc1
VER = 2.5.13
THISAPP = openswan-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 873613c7e691e1fd8cedfeb6dc71a729
$(DL_FILE)_MD5 = b83a42ea00ee24ed34413bc122cada51
install : $(TARGET)
@@ -76,6 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-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/CWARNINGS = -Werror/CWARNINGS =/' \
lib/liblwres/Makefile
cd $(DIR_APP) && make programs
cd $(DIR_APP) && make install
#mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/

1
make.sh
View File

@@ -385,7 +385,6 @@ buildipfire() {
ipfiremake capi4k-utils
ipfiremake cdrtools
ipfiremake dnsmasq
ipfiremake libaal
ipfiremake dosfstools
ipfiremake reiserfsprogs
ipfiremake squashfstools

6289
src/patches/openswan-2.4.8rc1.kernel-2.6-klips.patch → src/patches/openswan-2.5.13.kernel-2.6-klips.patch
View File

File diff suppressed because it is too large Load Diff

2
src/patches/openswan-2.4.8rc1.kernel-2.6-natt.patch → src/patches/openswan-2.5.13.kernel-2.6-natt.patch
View File

@@ -68,7 +68,7 @@ packaging/utils/nattpatch 2.6
+ xfrm4_rcv_encap_func = NULL;
+ return 0;
+}
+#endif /* CONFIG_XFRM || defined(CONFIG_IPSEC_NAT_TRAVERSAL)*/
+#endif /* CONFIG_XFRM_MODULE || CONFIG_IPSEC_NAT_TRAVERSAL */
+
+
/* return: