1 |
mrness 09/06/28 09:45:58 |
2 |
|
3 |
Added: openswan-2.4.15-gentoo.patch |
4 |
openswan-2.4.15-deprecated-ldap.patch |
5 |
Log: |
6 |
Version bump wrt security bug #275233. Fix sed error (#275448). |
7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-misc/openswan/files/openswan-2.4.15-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.15-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.15-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: openswan-2.4.15-gentoo.patch |
16 |
=================================================================== |
17 |
diff -Nru openswan-2.4.15.orig/lib/liblwres/Makefile openswan-2.4.15/lib/liblwres/Makefile |
18 |
--- openswan-2.4.15.orig/lib/liblwres/Makefile 2007-10-22 16:33:11.000000000 +0200 |
19 |
+++ openswan-2.4.15/lib/liblwres/Makefile 2009-06-28 11:21:35.000000000 +0200 |
20 |
@@ -17,8 +17,8 @@ |
21 |
|
22 |
CINCLUDES = -I${srcdir}/unix/include \ |
23 |
-I. -I./include -I${srcdir}/include |
24 |
-CDEFINES = -g |
25 |
-CWARNINGS = -Werror |
26 |
+CDEFINES = |
27 |
+CWARNINGS = |
28 |
|
29 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
30 |
|
31 |
diff -Nru openswan-2.4.15.orig/Makefile.inc openswan-2.4.15/Makefile.inc |
32 |
--- openswan-2.4.15.orig/Makefile.inc 2009-06-25 06:01:16.000000000 +0200 |
33 |
+++ openswan-2.4.15/Makefile.inc 2009-06-28 11:21:35.000000000 +0200 |
34 |
@@ -46,7 +46,7 @@ |
35 |
DESTDIR?= |
36 |
|
37 |
# "local" part of tree, used in building other pathnames |
38 |
-INC_USRLOCAL=/usr/local |
39 |
+INC_USRLOCAL?=/usr |
40 |
|
41 |
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH |
42 |
# settings which are assumed to include it (or at least, to include *some* |
43 |
@@ -91,7 +91,7 @@ |
44 |
|
45 |
# sample configuration files go into |
46 |
INC_DOCDIR?=share/doc |
47 |
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
48 |
+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
49 |
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} |
50 |
|
51 |
FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
52 |
diff -Nru openswan-2.4.15.orig/programs/_confread/_confread.in openswan-2.4.15/programs/_confread/_confread.in |
53 |
--- openswan-2.4.15.orig/programs/_confread/_confread.in 2006-04-12 21:55:42.000000000 +0200 |
54 |
+++ openswan-2.4.15/programs/_confread/_confread.in 2009-06-28 11:21:35.000000000 +0200 |
55 |
@@ -14,7 +14,7 @@ |
56 |
# |
57 |
# RCSID $Id: _confread.in,v 1.81.2.5 2006/04/12 19:55:42 mcr Exp $ |
58 |
# |
59 |
-# Extract configuration info from /etc/ipsec.conf, repackage as assignments |
60 |
+# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments |
61 |
# to shell variables or tab-delimited fields. Success or failure is reported |
62 |
# inline, as extra data, due to the vagaries of shell backquote handling. |
63 |
# In the absence of --varprefix, output is tab-separated fields, like: |
64 |
diff -Nru openswan-2.4.15.orig/programs/_confread/ipsec.conf.in openswan-2.4.15/programs/_confread/ipsec.conf.in |
65 |
--- openswan-2.4.15.orig/programs/_confread/ipsec.conf.in 2006-10-19 05:49:46.000000000 +0200 |
66 |
+++ openswan-2.4.15/programs/_confread/ipsec.conf.in 2009-06-28 11:22:29.000000000 +0200 |
67 |
@@ -1,4 +1,4 @@ |
68 |
-# /etc/ipsec.conf - Openswan IPsec configuration file |
69 |
+# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file |
70 |
# RCSID $Id: ipsec.conf.in,v 1.15.2.6 2006/10/19 03:49:46 paul Exp $ |
71 |
|
72 |
# This file: @FINALEXAMPLECONFDIR@/ipsec.conf-sample |
73 |
diff -Nru openswan-2.4.15.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.15/programs/examples/l2tp-psk.conf.in |
74 |
--- openswan-2.4.15.orig/programs/examples/l2tp-psk.conf.in 2007-11-02 02:49:40.000000000 +0100 |
75 |
+++ openswan-2.4.15/programs/examples/l2tp-psk.conf.in 2009-06-28 11:21:35.000000000 +0200 |
76 |
@@ -11,7 +11,7 @@ |
77 |
# |
78 |
# Use a Preshared Key. Disable Perfect Forward Secrecy. |
79 |
# |
80 |
- # PreSharedSecret needs to be specified in /etc/ipsec.secrets as |
81 |
+ # PreSharedSecret needs to be specified in /etc/ipsec/ipsec.secrets as |
82 |
# YourIPAddress %any: "sharedsecret" |
83 |
authby=secret |
84 |
pfs=no |
85 |
diff -Nru openswan-2.4.15.orig/programs/_include/_include.in openswan-2.4.15/programs/_include/_include.in |
86 |
--- openswan-2.4.15.orig/programs/_include/_include.in 2003-01-06 22:44:04.000000000 +0100 |
87 |
+++ openswan-2.4.15/programs/_include/_include.in 2009-06-28 11:21:35.000000000 +0200 |
88 |
@@ -47,10 +47,10 @@ |
89 |
do |
90 |
if test ! -r "$f" |
91 |
then |
92 |
- if test ! "$f" = "/etc/ipsec.conf" |
93 |
+ if test ! "$f" = "/etc/ipsec/ipsec.conf" |
94 |
then |
95 |
echo "#:cannot open configuration file \'$f\'" |
96 |
- if test "$f" = "/etc/ipsec.secrets" |
97 |
+ if test "$f" = "/etc/ipsec/ipsec.secrets" |
98 |
then |
99 |
echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." |
100 |
fi |
101 |
diff -Nru openswan-2.4.15.orig/programs/mailkey/mailkey.in openswan-2.4.15/programs/mailkey/mailkey.in |
102 |
--- openswan-2.4.15.orig/programs/mailkey/mailkey.in 2006-10-29 01:49:23.000000000 +0200 |
103 |
+++ openswan-2.4.15/programs/mailkey/mailkey.in 2009-06-28 11:21:35.000000000 +0200 |
104 |
@@ -60,7 +60,7 @@ |
105 |
|
106 |
"$test1st" |
107 |
|
108 |
-Common concerns: This account must be able to read /etc/ipsec.secrets. |
109 |
+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. |
110 |
If you haven't generated your key yet, please run 'ipsec newhostkey'." |
111 |
exit 0 |
112 |
} |
113 |
diff -Nru openswan-2.4.15.orig/programs/Makefile.program openswan-2.4.15/programs/Makefile.program |
114 |
--- openswan-2.4.15.orig/programs/Makefile.program 2007-06-19 16:49:19.000000000 +0200 |
115 |
+++ openswan-2.4.15/programs/Makefile.program 2009-06-28 11:21:35.000000000 +0200 |
116 |
@@ -34,7 +34,6 @@ |
117 |
WERROR:= -Werror |
118 |
endif |
119 |
|
120 |
-CFLAGS+= ${WERROR} |
121 |
|
122 |
ifneq ($(LD_LIBRARY_PATH),) |
123 |
LDFLAGS=-L$(LD_LIBRARY_PATH) |
124 |
diff -Nru openswan-2.4.15.orig/programs/pluto/Makefile openswan-2.4.15/programs/pluto/Makefile |
125 |
--- openswan-2.4.15.orig/programs/pluto/Makefile 2007-11-06 19:56:26.000000000 +0100 |
126 |
+++ openswan-2.4.15/programs/pluto/Makefile 2009-06-28 11:21:35.000000000 +0200 |
127 |
@@ -210,7 +210,7 @@ |
128 |
endif |
129 |
|
130 |
ifeq ($(USE_WEAKSTUFF),true) |
131 |
-WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES |
132 |
+WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES |
133 |
endif |
134 |
|
135 |
ifeq ($(USE_EXTRACRYPTO),true) |
136 |
diff -Nru openswan-2.4.15.orig/programs/setup/Makefile openswan-2.4.15/programs/setup/Makefile |
137 |
--- openswan-2.4.15.orig/programs/setup/Makefile 2004-12-18 19:13:43.000000000 +0100 |
138 |
+++ openswan-2.4.15/programs/setup/Makefile 2009-06-28 11:21:35.000000000 +0200 |
139 |
@@ -33,25 +33,10 @@ |
140 |
@rm -f $(BINDIR)/setup |
141 |
@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec |
142 |
@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup |
143 |
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done |
144 |
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec |
145 |
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec |
146 |
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec |
147 |
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec |
148 |
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec |
149 |
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec |
150 |
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec |
151 |
|
152 |
install_file_list:: |
153 |
@echo $(RCDIR)/ipsec |
154 |
@echo $(BINDIR)/setup |
155 |
- @echo $(RCDIR)/../rc0.d/K76ipsec |
156 |
- @echo $(RCDIR)/../rc1.d/K76ipsec |
157 |
- @echo $(RCDIR)/../rc2.d/S47ipsec |
158 |
- @echo $(RCDIR)/../rc3.d/S47ipsec |
159 |
- @echo $(RCDIR)/../rc4.d/S47ipsec |
160 |
- @echo $(RCDIR)/../rc5.d/S47ipsec |
161 |
- @echo $(RCDIR)/../rc6.d/K76ipsec |
162 |
|
163 |
clean:: |
164 |
@rm -f setup |
165 |
diff -Nru openswan-2.4.15.orig/programs/showhostkey/showhostkey.in openswan-2.4.15/programs/showhostkey/showhostkey.in |
166 |
--- openswan-2.4.15.orig/programs/showhostkey/showhostkey.in 2007-06-19 17:27:27.000000000 +0200 |
167 |
+++ openswan-2.4.15/programs/showhostkey/showhostkey.in 2009-06-28 11:21:35.000000000 +0200 |
168 |
@@ -18,7 +18,7 @@ |
169 |
usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] |
170 |
[--dhclient] [--ipseckey]" |
171 |
|
172 |
-file=/etc/ipsec.secrets |
173 |
+file=/etc/ipsec/ipsec.secrets |
174 |
fmt="" |
175 |
gw= |
176 |
id= |
177 |
diff -Nru openswan-2.4.15.orig/testing/utils/ikeping/Makefile openswan-2.4.15/testing/utils/ikeping/Makefile |
178 |
--- openswan-2.4.15.orig/testing/utils/ikeping/Makefile 2004-04-03 21:44:52.000000000 +0200 |
179 |
+++ openswan-2.4.15/testing/utils/ikeping/Makefile 2009-06-28 11:21:35.000000000 +0200 |
180 |
@@ -27,10 +27,9 @@ |
181 |
FREESWANINCLS= -I$(FREESWANLIBDIR) -I${OPENSWANSRCDIR} |
182 |
FREESWANLIB=$(FREESWANLIBDIR)/libfreeswan.a |
183 |
|
184 |
-CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ |
185 |
+CFLAGS = -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ |
186 |
-Wcast-qual -Wmissing-declarations -Wwrite-strings |
187 |
CFLAGS+= -Wstrict-prototypes |
188 |
-CFLAGS+= -Werror |
189 |
#CFLAGS+= -Wundef |
190 |
|
191 |
HDRDIRS = $(FREESWANINCLS) |
192 |
|
193 |
|
194 |
|
195 |
1.1 net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch |
196 |
|
197 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch?rev=1.1&view=markup |
198 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch?rev=1.1&content-type=text/plain |
199 |
|
200 |
Index: openswan-2.4.15-deprecated-ldap.patch |
201 |
=================================================================== |
202 |
diff -Nru openswan-2.4.15.orig/programs/pluto/fetch.c openswan-2.4.15/programs/pluto/fetch.c |
203 |
--- openswan-2.4.15.orig/programs/pluto/fetch.c 2004-06-14 04:01:32.000000000 +0200 |
204 |
+++ openswan-2.4.15/programs/pluto/fetch.c 2009-06-28 11:24:17.000000000 +0200 |
205 |
@@ -28,6 +28,7 @@ |
206 |
#include <openswan.h> |
207 |
|
208 |
#ifdef LDAP_VER |
209 |
+#define LDAP_DEPRECATED 1 |
210 |
#include <ldap.h> |
211 |
#endif |