webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 12:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated openswan (2.6.24).

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-01-11 02:03:55 +01:00
parent af01fabe57
commit 8993193ebd
7 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/common/openswan
View File

@@ -44,14 +44,11 @@ usr/lib/ipsec
#usr/lib/ipsec/_realsetup
#usr/lib/ipsec/_secretcensor
#usr/lib/ipsec/_startklips
#usr/lib/ipsec/_startklips.old
#usr/lib/ipsec/_startnetkey
#usr/lib/ipsec/_updown
#usr/lib/ipsec/_updown.klips
#usr/lib/ipsec/_updown.klips.old
#usr/lib/ipsec/_updown.klips~
#usr/lib/ipsec/_updown.mast
#usr/lib/ipsec/_updown.mast.old
#usr/lib/ipsec/_updown.netkey
usr/libexec/ipsec
#usr/libexec/ipsec/_pluto_adns
@@ -185,6 +182,7 @@ usr/sbin/ipsec
#usr/share/doc/openswan/index.html
#usr/share/doc/openswan/ipsec.8.html
#usr/share/doc/openswan/ipsec.conf-sample
#usr/share/doc/openswan/ipsec.conf.5.html
#usr/share/doc/openswan/ipsec.secrets.5.html
#usr/share/doc/openswan/ipsec__confread.8.html
#usr/share/doc/openswan/ipsec__copyright.8.html

2
config/rootfiles/core/35/exclude
View File

@@ -0,0 +1,2 @@
etc/ipsec.conf
etc/ipsec.secrets

1
config/rootfiles/core/35/filelists/openswan Symbolic link
View File

@@ -0,0 +1 @@
../../../common/openswan

2
config/rootfiles/core/35/filelists/openswan-modules Normal file
View File

@@ -0,0 +1,2 @@
lib/modules/2.6.27.42-ipfire-xen/kernel/net/ipsec/ipsec.ko
lib/modules/2.6.27.42-ipfire/kernel/net/ipsec/ipsec.ko

6
doc/packages-list.txt
View File

@@ -258,9 +258,9 @@
* openmailadmin-1.0.0
* openssh-5.2p1
* openssl-0.9.8k
* openswan-2.6.23
* openswan-2.6.23-kmod-2.6.27.42-ipfire
* openswan-2.6.23-kmod-2.6.27.42-ipfire-xen
* openswan-2.6.24
* openswan-2.6.24-kmod-2.6.27.42-ipfire
* openswan-2.6.24-kmod-2.6.27.42-ipfire-xen
* openvpn-2.1_rc20
* p7zip_4.65
* pam_mysql-0.7RC1

6
lfs/openswan
View File

@@ -30,7 +30,7 @@ else
VERSUFIX=ipfire
endif
VER = 2.6.23
VER = 2.6.24
THISAPP = openswan-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83
$(DL_FILE)_MD5 = 1c76b6982c05392f7c360afb92699661
install : $(TARGET)
@@ -92,7 +92,7 @@ else
-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' \
-e 's%^XMLTO.*$$%#&%' Makefile.inc
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.20_noxmlto.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.24_noxmlto.patch
cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program

48
src/patches/openswan-2.6.20_noxmlto.patch → src/patches/openswan-2.6.24_noxmlto.patch
View File

@@ -1,7 +1,25 @@
diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/programs/pluto/Makefile
--- openswan-2.6.20dr2.old/programs/pluto/Makefile 2008-12-20 19:53:00.000000000 +0100
+++ openswan-2.6.20dr2/programs/pluto/Makefile 2008-12-20 20:14:07.000000000 +0100
@@ -171,7 +171,7 @@
diff -Naur openswan-2.6.24.org/programs/_confread/Makefile openswan-2.6.24/programs/_confread/Makefile
--- openswan-2.6.24.org/programs/_confread/Makefile 2010-01-10 02:34:38.000000000 +0100
+++ openswan-2.6.24/programs/_confread/Makefile 2010-01-10 22:44:33.000000000 +0100
@@ -16,7 +16,13 @@
OPENSWANSRCDIR?=$(shell cd ../..; pwd)
include ${OPENSWANSRCDIR}/Makefile.inc
-EXTRA5MAN=ipsec.conf.5
+SUBDIRS=doc lib programs testing
+ifeq ($(findstring $(SUBDIRS),doc),doc)
+ EXTRA5MAN=ipsec.conf.5
+else
+ EXTRA5MAN=
+endif
+
CONFFILES=ipsec.conf
EXCONFILES=ipsec.win2k.conf
SOURCEDIR=_confread
diff -Naur openswan-2.6.24.org/programs/pluto/Makefile openswan-2.6.24/programs/pluto/Makefile
--- openswan-2.6.24.org/programs/pluto/Makefile 2010-01-10 02:34:38.000000000 +0100
+++ openswan-2.6.24/programs/pluto/Makefile 2010-01-10 22:51:15.000000000 +0100
@@ -172,7 +172,7 @@
all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
clean: cleanall
@@ -10,16 +28,16 @@ diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/prog
endif
doinstall: all
@@ -187,6 +187,9 @@
@@ -188,6 +188,9 @@
$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
#$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS) $(LIBEXECDIR) ; fi
+
+ifeq ($(findstring $(SUBDIRS),doc),doc)
+doinstalldoc:
( cd ${OPENSWANSRCDIR}/programs/pluto ; xmlto man pluto.8.xml ; mv ipsec_pluto.8 pluto.8; xmlto man ipsec.secrets.5.xml)
$(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
while read from to ; \
@@ -201,10 +204,7 @@
ln -s -f $$from $(FMANDIR)/$$to; \
done
@@ -48,21 +66,3 @@ diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/prog
alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB)
$(CC) -o $@ $^ $(LDFLAGS) $(LIBSPLUTO)
diff -Nur openswan-2.6.20dr2.old/programs/_confread/Makefile openswan-2.6.20dr2/programs/_confread/Makefile
--- openswan-2.6.20dr2.old/programs/_confread/Makefile 2008-12-20 19:53:00.000000000 +0100
+++ openswan-2.6.20dr2/programs/_confread/Makefile 2008-12-21 00:13:23.000000000 +0100
@@ -16,7 +16,13 @@
OPENSWANSRCDIR?=$(shell cd ../..; pwd)
include ${OPENSWANSRCDIR}/Makefile.inc
-EXTRA5MAN=ipsec.conf.5
+SUBDIRS=doc lib programs testing
+ifeq ($(findstring $(SUBDIRS),doc),doc)
+ EXTRA5MAN=ipsec.conf.5
+else
+ EXTRA5MAN=
+endif
+
CONFFILES=ipsec.conf
EXCONFILES=ipsec.win2k.conf
SOURCEDIR=_confread