X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fopenswan%2Fpatches%2F120-no_manpages.patch;h=0ce520c55a89bfe74cccec2e100a904e60d91cfb;hb=763d3232b5dddea863a62300b419b6a13f766961;hp=32a938a91f166430ebcb3357c3dddab8a4a1a436;hpb=a6fe9a836acec7d50235f5602f1b068c86daa004;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/openswan/patches/120-no_manpages.patch b/net/openswan/patches/120-no_manpages.patch
index 32a938a91f..0ce520c55a 100644
--- a/net/openswan/patches/120-no_manpages.patch
+++ b/net/openswan/patches/120-no_manpages.patch
@@ -1,24 +1,60 @@
-diff -urN openswan-2.6.22/programs/Makefile.program openswan-2.6.22.new/programs/Makefile.program
---- openswan-2.6.22/programs/Makefile.program	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22.new/programs/Makefile.program	2009-08-23 15:35:32.000000000 +0200
-@@ -92,7 +92,7 @@
- all: ${PROGRAM}
- programs: all
- clean:	cleanall
--install: doinstall
-+install:
+--- a/programs/_confread/Makefile
++++ b/programs/_confread/Makefile
+@@ -16,7 +16,6 @@
+ OPENSWANSRCDIR?=$(shell cd ../..; pwd)
+ include ${OPENSWANSRCDIR}/Makefile.inc
  
- endif
+-EXTRA5MAN=ipsec.conf.5
+ CONFFILES=ipsec.conf
+ EXCONFILES=ipsec.win2k.conf
+ SOURCEDIR=_confread
+@@ -26,11 +25,3 @@ CONFDFILES=clear clear-or-private privat
  
-diff -urN openswan-2.6.22/programs/pluto/Makefile openswan-2.6.22.new/programs/pluto/Makefile
---- openswan-2.6.22/programs/pluto/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22.new/programs/pluto/Makefile	2009-08-23 15:40:30.000000000 +0200
-@@ -171,7 +171,7 @@
- all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT) 
- programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
- clean:	cleanall
--install: doinstall
-+install:
- endif
+ include ${srcdir}../Makefile.program
  
- doinstall: all
+-ipsec.conf.5: ${srcdir}ipsec.conf.5.xml
+-
+-${srcdir}ipsec.conf.5.xml: $(wildcard d.ipsec.conf/*.xml) ${srcdir}d.ipsec.conf/order.txt
+-	cd ${srcdir} && cat `cat ${srcdir}d.ipsec.conf/order.txt` >ipsec.conf.5.xml
+-
+-diff:	ipsec.conf.5.xml
+-	diff -B -w -u ipsec.conf.5.xml ipsec.conf.5.xml-ref
+-
+--- a/programs/pluto/Makefile
++++ b/programs/pluto/Makefile
+@@ -191,35 +191,11 @@ doinstall: all
+ 	$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
+ 	#$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
+ 	if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
+-	$(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
+-	sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
+-		while read from to ; \
+-		do \
+-			ln -s -f ipsec_$$from $(PMANDIR)/$$to; \
+-		done
+-	$(INSTALL) $(INSTMANFLAGS) ${srcdir}ipsec.secrets.5 $(FMANDIR)
+-	sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}ipsec.secrets.5 | \
+-		while read from to ; \
+-		do \
+-		 ln -s -f $$from $(FMANDIR)/$$to; \
+-		done
+ 
+ install_file_list:
+ 	@echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
+ 	@if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
+ 	@echo $(LIBEXECDIR)/$(BINNAMEWHACK)
+-	@echo $(PMANDIR)/ipsec_pluto.8
+-	@sh ${OPENSWANSRCDIR}/packaging/utils/manlink pluto.8 | \
+-		while read from to; \
+-		do\
+-			 echo $(PMANDIR)/$$to; \
+-		done
+-	@echo $(FMANDIR)/ipsec.secrets.5
+-	@sh ${OPENSWANSRCDIR}/packaging/utils/manlink ipsec.secrets.5 | \
+-		while read from to; \
+-		do \
+-			echo $(FMANDIR)/$$to; \
+-		done
+ 
+ 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)