Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openswan/files: openswan-2.4.13-gentoo-fixed.patch openswan-2.6.18-gentoo.patch
Date: Sun, 12 Oct 2008 16:39:22
Message-Id: E1Kp3yM-00009S-5l@stork.gentoo.org
1 mrness 08/10/12 16:39:14
2
3 Modified: openswan-2.4.13-gentoo-fixed.patch
4 Added: openswan-2.6.18-gentoo.patch
5 Log:
6 Remove livetest script wrt security bug #238574.
7 Skip xml validation (#237132).
8 (Portage version: 2.1.4.4, RepoMan options: --force)
9
10 Revision Changes Path
11 1.2 net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch?r1=1.1&r2=1.2
16
17 Index: openswan-2.4.13-gentoo-fixed.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/openswan/files/openswan-2.4.13-gentoo-fixed.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- openswan-2.4.13-gentoo-fixed.patch 16 Aug 2008 10:19:36 -0000 1.1
24 +++ openswan-2.4.13-gentoo-fixed.patch 12 Oct 2008 16:39:14 -0000 1.2
25 @@ -19,6 +19,18 @@
26 EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
27
28 FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
29 +diff -Nru openswan-2.4.13.orig/programs/Makefile openswan-2.4.13/programs/Makefile
30 +--- openswan-2.4.13.orig/programs/Makefile 2006-10-27 14:47:07.000000000 +0000
31 ++++ openswan-2.4.13/programs/Makefile 2008-10-12 16:12:31.000000000 +0000
32 +@@ -24,7 +24,7 @@
33 + SUBDIRS+=_realsetup _secretcensor _startklips _updown _updown_x509
34 + SUBDIRS+=auto barf verify ipsec look manual newhostkey ranbits secrets
35 + SUBDIRS+=rsasigkey setup showdefaults showhostkey calcgoo mailkey
36 +-SUBDIRS+=ikeping examples livetest
37 ++SUBDIRS+=ikeping examples
38 +
39 + ifeq ($(USE_LWRES),true)
40 + SUBDIRS+=lwdnsq
41 diff -ur openswan-2.4.13.orig/programs/_confread/_confread.in openswan-2.4.13/programs/_confread/_confread.in
42 --- openswan-2.4.13.orig/programs/_confread/_confread.in 2006-04-12 19:55:42.000000000 +0000
43 +++ openswan-2.4.13/programs/_confread/_confread.in 2008-08-16 09:56:57.000000000 +0000
44
45
46
47 1.1 net-misc/openswan/files/openswan-2.6.18-gentoo.patch
48
49 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.18-gentoo.patch?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.18-gentoo.patch?rev=1.1&content-type=text/plain
51
52 Index: openswan-2.6.18-gentoo.patch
53 ===================================================================
54 diff -Nru openswan-2.6.18.orig/Makefile.inc openswan-2.6.18/Makefile.inc
55 --- openswan-2.6.18.orig/Makefile.inc 2008-10-12 16:30:24.000000000 +0000
56 +++ openswan-2.6.18/Makefile.inc 2008-10-12 16:27:49.000000000 +0000
57 @@ -49,7 +49,7 @@
58 DESTDIR?=
59
60 # "local" part of tree, used in building other pathnames
61 -INC_USRLOCAL=/usr/local
62 +INC_USRLOCAL?=/usr
63
64 # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
65 # settings which are assumed to include it (or at least, to include *some*
66 @@ -94,7 +94,7 @@
67
68 # sample configuration files go into
69 INC_DOCDIR?=share/doc
70 -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
71 +FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
72 EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
73
74 FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
75 diff -Nru openswan-2.6.18.orig/programs/Makefile openswan-2.6.18/programs/Makefile
76 --- openswan-2.6.18.orig/programs/Makefile 2008-10-12 16:30:24.000000000 +0000
77 +++ openswan-2.6.18/programs/Makefile 2008-10-12 16:27:49.000000000 +0000
78 @@ -42,7 +42,7 @@
79 SUBDIRS+=_realsetup _secretcensor _startklips _updown _updown.klips _updown.mast
80 SUBDIRS+=auto barf verify ipsec look newhostkey ranbits secrets
81 SUBDIRS+=rsasigkey setup showdefaults showhostkey
82 -SUBDIRS+=ikeping examples livetest
83 +SUBDIRS+=ikeping examples
84 ifeq ($(USE_KLIPS),true)
85 SUBDIRS+= _startklips _updown.klips
86 endif
87 diff -Nru openswan-2.6.18.orig/programs/Makefile.manpages openswan-2.6.18/programs/Makefile.manpages
88 --- openswan-2.6.18.orig/programs/Makefile.manpages 2008-10-06 16:52:49.000000000 +0000
89 +++ openswan-2.6.18/programs/Makefile.manpages 2008-10-12 16:30:42.000000000 +0000
90 @@ -1,15 +1,15 @@
91 # xmlto is from http://cyberelk.net/tim/xmlto/
92 ifneq ($(strip $(XMLTO)),)
93 %.8: %.8.xml
94 - ${XMLTO} man $<
95 + ${XMLTO} --skip-validation man $<
96 @for m in ipsec_*.8; do if [ -f $$m ]; then mv $$m $@; fi; done
97
98 %.5: %.5.xml
99 - ${XMLTO} man $<
100 + ${XMLTO} --skip-validation man $<
101 @for m in ipsec_*.5; do if [ -f $$m ]; then mv $$m $@; fi; done
102
103 %.1: %.1.xml
104 - ${XMLTO} man $<
105 + ${XMLTO} --skip-validation man $<
106 @for m in ipsec_*.1; do if [ -f $$m ]; then mv $$m $@; fi; done
107 endif
108
109 diff -Nru openswan-2.6.18.orig/programs/setup/Makefile openswan-2.6.18/programs/setup/Makefile
110 --- openswan-2.6.18.orig/programs/setup/Makefile 2008-10-12 16:30:24.000000000 +0000
111 +++ openswan-2.6.18/programs/setup/Makefile 2008-10-12 16:27:49.000000000 +0000
112 @@ -18,7 +18,6 @@
113
114 # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
115 # not as /etc/rc.d/init.d/setup.
116 -PROGRAMDIR=$(RCDIR)
117 PROGRAM=setup
118 EXTRA8MAN=setup.8
119
120 @@ -29,32 +28,6 @@
121 # into the $BINDIR.
122 #
123 # the priorities match those in setup's chkconfig line
124 -doinstall:: setup
125 - @rm -f $(BINDIR)/setup
126 - @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
127 - @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
128 - -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
129 - -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
130 - -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
131 - -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
132 - -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
133 - -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
134 - -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
135 - -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
136 -
137 -install_file_list::
138 - @echo $(RCDIR)/ipsec
139 - @echo $(BINDIR)/setup
140 - @echo $(RCDIR)/../rc0.d/K76ipsec
141 - @echo $(RCDIR)/../rc1.d/K76ipsec
142 - @echo $(RCDIR)/../rc2.d/S47ipsec
143 - @echo $(RCDIR)/../rc3.d/S47ipsec
144 - @echo $(RCDIR)/../rc4.d/S47ipsec
145 - @echo $(RCDIR)/../rc5.d/S47ipsec
146 - @echo $(RCDIR)/../rc6.d/K76ipsec
147 -
148 -cleanall::
149 - @rm -f setup
150
151 #
152 # $Log: openswan-2.6.18-gentoo.patch,v $
153 # Revision 1.1 2008/10/12 16:39:14 mrness
154 # Remove livetest script wrt security bug #238574.
155 # Skip xml validation (#237132).
156 # (Portage version: 2.1.4.4, RepoMan options: --force)
157 #
Report Message
Find on MARC Find on Google Groups