1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
diff -Nru openswan-2.6.18.orig/Makefile.inc openswan-2.6.18/Makefile.inc
--- openswan-2.6.18.orig/Makefile.inc 2008-10-12 16:30:24.000000000 +0000
+++ openswan-2.6.18/Makefile.inc 2008-10-12 16:27:49.000000000 +0000
@@ -49,7 +49,7 @@
DESTDIR?=
# "local" part of tree, used in building other pathnames
-INC_USRLOCAL=/usr/local
+INC_USRLOCAL?=/usr
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
# settings which are assumed to include it (or at least, to include *some*
@@ -94,7 +94,7 @@
# sample configuration files go into
INC_DOCDIR?=share/doc
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
diff -Nru openswan-2.6.18.orig/programs/Makefile openswan-2.6.18/programs/Makefile
--- openswan-2.6.18.orig/programs/Makefile 2008-10-12 16:30:24.000000000 +0000
+++ openswan-2.6.18/programs/Makefile 2008-10-12 16:27:49.000000000 +0000
@@ -42,7 +42,7 @@
SUBDIRS+=_realsetup _secretcensor _startklips _updown _updown.klips _updown.mast
SUBDIRS+=auto barf verify ipsec look newhostkey ranbits secrets
SUBDIRS+=rsasigkey setup showdefaults showhostkey
-SUBDIRS+=ikeping examples livetest
+SUBDIRS+=ikeping examples
ifeq ($(USE_KLIPS),true)
SUBDIRS+= _startklips _updown.klips
endif
diff -Nru openswan-2.6.18.orig/programs/Makefile.manpages openswan-2.6.18/programs/Makefile.manpages
--- openswan-2.6.18.orig/programs/Makefile.manpages 2008-10-06 16:52:49.000000000 +0000
+++ openswan-2.6.18/programs/Makefile.manpages 2008-10-12 16:30:42.000000000 +0000
@@ -1,15 +1,15 @@
# xmlto is from http://cyberelk.net/tim/xmlto/
ifneq ($(strip $(XMLTO)),)
%.8: %.8.xml
- ${XMLTO} man $<
+ ${XMLTO} --skip-validation man $<
@for m in ipsec_*.8; do if [ -f $$m ]; then mv $$m $@; fi; done
%.5: %.5.xml
- ${XMLTO} man $<
+ ${XMLTO} --skip-validation man $<
@for m in ipsec_*.5; do if [ -f $$m ]; then mv $$m $@; fi; done
%.1: %.1.xml
- ${XMLTO} man $<
+ ${XMLTO} --skip-validation man $<
@for m in ipsec_*.1; do if [ -f $$m ]; then mv $$m $@; fi; done
endif
diff -Nru openswan-2.6.18.orig/programs/setup/Makefile openswan-2.6.18/programs/setup/Makefile
--- openswan-2.6.18.orig/programs/setup/Makefile 2008-10-12 16:30:24.000000000 +0000
+++ openswan-2.6.18/programs/setup/Makefile 2008-10-12 16:27:49.000000000 +0000
@@ -18,7 +18,6 @@
# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
# not as /etc/rc.d/init.d/setup.
-PROGRAMDIR=$(RCDIR)
PROGRAM=setup
EXTRA8MAN=setup.8
@@ -29,32 +28,6 @@
# into the $BINDIR.
#
# the priorities match those in setup's chkconfig line
-doinstall:: setup
- @rm -f $(BINDIR)/setup
- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
-
-install_file_list::
- @echo $(RCDIR)/ipsec
- @echo $(BINDIR)/setup
- @echo $(RCDIR)/../rc0.d/K76ipsec
- @echo $(RCDIR)/../rc1.d/K76ipsec
- @echo $(RCDIR)/../rc2.d/S47ipsec
- @echo $(RCDIR)/../rc3.d/S47ipsec
- @echo $(RCDIR)/../rc4.d/S47ipsec
- @echo $(RCDIR)/../rc5.d/S47ipsec
- @echo $(RCDIR)/../rc6.d/K76ipsec
-
-cleanall::
- @rm -f setup
#
# $Log: openswan-2.6.18-gentoo.patch,v $
# Revision 1.1 2008/10/12 16:39:14 mrness
# Remove livetest script wrt security bug #238574.
# Skip xml validation (#237132).
# (Portage version: 2.1.4.4, RepoMan options: --force)
#
|
GitWeb