webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 02:12:58 +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

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