| 1 |
mrness 09/04/08 23:30:45 |
| 2 |
|
| 3 |
Added: openswan-2.4.14-deprecated-ldap.patch |
| 4 |
openswan-2.4.14-gentoo.patch |
| 5 |
openswan-2.6.21-gentoo.patch |
| 6 |
Log: |
| 7 |
Version bumps wrt to security bug #264346. Remove -Werror from compiler options (#260927). |
| 8 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/openswan/files/openswan-2.4.14-deprecated-ldap.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.14-deprecated-ldap.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.14-deprecated-ldap.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: openswan-2.4.14-deprecated-ldap.patch |
| 17 |
=================================================================== |
| 18 |
diff -Nru openswan-2.4.14.orig/programs/pluto/fetch.c openswan-2.4.14/programs/pluto/fetch.c |
| 19 |
--- openswan-2.4.14.orig/programs/pluto/fetch.c 2004-06-14 02:01:32.000000000 +0000 |
| 20 |
+++ openswan-2.4.14/programs/pluto/fetch.c 2009-04-08 23:14:29.000000000 +0000 |
| 21 |
@@ -28,6 +28,7 @@ |
| 22 |
#include <openswan.h> |
| 23 |
|
| 24 |
#ifdef LDAP_VER |
| 25 |
+#define LDAP_DEPRECATED 1 |
| 26 |
#include <ldap.h> |
| 27 |
#endif |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 net-misc/openswan/files/openswan-2.4.14-gentoo.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.14-gentoo.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.4.14-gentoo.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: openswan-2.4.14-gentoo.patch |
| 38 |
=================================================================== |
| 39 |
diff -Nru openswan-2.4.14.orig/lib/liblwres/Makefile openswan-2.4.14/lib/liblwres/Makefile |
| 40 |
--- openswan-2.4.14.orig/lib/liblwres/Makefile 2007-10-22 14:33:11.000000000 +0000 |
| 41 |
+++ openswan-2.4.14/lib/liblwres/Makefile 2009-04-08 23:07:06.000000000 +0000 |
| 42 |
@@ -17,8 +17,8 @@ |
| 43 |
|
| 44 |
CINCLUDES = -I${srcdir}/unix/include \ |
| 45 |
-I. -I./include -I${srcdir}/include |
| 46 |
-CDEFINES = -g |
| 47 |
-CWARNINGS = -Werror |
| 48 |
+CDEFINES = |
| 49 |
+CWARNINGS = |
| 50 |
|
| 51 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
| 52 |
|
| 53 |
diff -Nru openswan-2.4.14.orig/Makefile.inc openswan-2.4.14/Makefile.inc |
| 54 |
--- openswan-2.4.14.orig/Makefile.inc 2009-03-30 13:55:24.000000000 +0000 |
| 55 |
+++ openswan-2.4.14/Makefile.inc 2009-04-08 23:06:04.000000000 +0000 |
| 56 |
@@ -46,7 +46,7 @@ |
| 57 |
DESTDIR?= |
| 58 |
|
| 59 |
# "local" part of tree, used in building other pathnames |
| 60 |
-INC_USRLOCAL=/usr/local |
| 61 |
+INC_USRLOCAL?=/usr |
| 62 |
|
| 63 |
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH |
| 64 |
# settings which are assumed to include it (or at least, to include *some* |
| 65 |
@@ -91,7 +91,7 @@ |
| 66 |
|
| 67 |
# sample configuration files go into |
| 68 |
INC_DOCDIR?=share/doc |
| 69 |
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
| 70 |
+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
| 71 |
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} |
| 72 |
|
| 73 |
FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
| 74 |
diff -Nru openswan-2.4.14.orig/programs/_confread/_confread.in openswan-2.4.14/programs/_confread/_confread.in |
| 75 |
--- openswan-2.4.14.orig/programs/_confread/_confread.in 2006-04-12 19:55:42.000000000 +0000 |
| 76 |
+++ openswan-2.4.14/programs/_confread/_confread.in 2009-04-08 23:06:04.000000000 +0000 |
| 77 |
@@ -14,7 +14,7 @@ |
| 78 |
# |
| 79 |
# RCSID $Id: openswan-2.4.14-gentoo.patch,v 1.1 2009/04/08 23:30:45 mrness Exp $ |
| 80 |
# |
| 81 |
-# Extract configuration info from /etc/ipsec.conf, repackage as assignments |
| 82 |
+# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments |
| 83 |
# to shell variables or tab-delimited fields. Success or failure is reported |
| 84 |
# inline, as extra data, due to the vagaries of shell backquote handling. |
| 85 |
# In the absence of --varprefix, output is tab-separated fields, like: |
| 86 |
diff -Nru openswan-2.4.14.orig/programs/_confread/ipsec.conf.in openswan-2.4.14/programs/_confread/ipsec.conf.in |
| 87 |
--- openswan-2.4.14.orig/programs/_confread/ipsec.conf.in 2006-10-19 03:49:46.000000000 +0000 |
| 88 |
+++ openswan-2.4.14/programs/_confread/ipsec.conf.in 2009-04-08 23:06:04.000000000 +0000 |
| 89 |
@@ -1,4 +1,4 @@ |
| 90 |
-# /etc/ipsec.conf - Openswan IPsec configuration file |
| 91 |
+# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file |
| 92 |
# RCSID $Id: openswan-2.4.14-gentoo.patch,v 1.1 2009/04/08 23:30:45 mrness Exp $ |
| 93 |
|
| 94 |
# This file: @FINALEXAMPLECONFDIR@/ipsec.conf-sample |
| 95 |
diff -Nru openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.14/programs/examples/l2tp-psk.conf.in |
| 96 |
--- openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in 2007-11-02 01:49:40.000000000 +0000 |
| 97 |
+++ openswan-2.4.14/programs/examples/l2tp-psk.conf.in 2009-04-08 23:06:04.000000000 +0000 |
| 98 |
@@ -11,7 +11,7 @@ |
| 99 |
# |
| 100 |
# Use a Preshared Key. Disable Perfect Forward Secrecy. |
| 101 |
# |
| 102 |
- # PreSharedSecret needs to be specified in /etc/ipsec.secrets as |
| 103 |
+ # PreSharedSecret needs to be specified in /etc/ipsec/ipsec.secrets as |
| 104 |
# YourIPAddress %any: "sharedsecret" |
| 105 |
authby=secret |
| 106 |
pfs=no |
| 107 |
diff -Nru openswan-2.4.14.orig/programs/_include/_include.in openswan-2.4.14/programs/_include/_include.in |
| 108 |
--- openswan-2.4.14.orig/programs/_include/_include.in 2003-01-06 21:44:04.000000000 +0000 |
| 109 |
+++ openswan-2.4.14/programs/_include/_include.in 2009-04-08 23:06:04.000000000 +0000 |
| 110 |
@@ -47,10 +47,10 @@ |
| 111 |
do |
| 112 |
if test ! -r "$f" |
| 113 |
then |
| 114 |
- if test ! "$f" = "/etc/ipsec.conf" |
| 115 |
+ if test ! "$f" = "/etc/ipsec/ipsec.conf" |
| 116 |
then |
| 117 |
echo "#:cannot open configuration file \'$f\'" |
| 118 |
- if test "$f" = "/etc/ipsec.secrets" |
| 119 |
+ if test "$f" = "/etc/ipsec/ipsec.secrets" |
| 120 |
then |
| 121 |
echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." |
| 122 |
fi |
| 123 |
diff -Nru openswan-2.4.14.orig/programs/mailkey/mailkey.in openswan-2.4.14/programs/mailkey/mailkey.in |
| 124 |
--- openswan-2.4.14.orig/programs/mailkey/mailkey.in 2006-10-28 23:49:23.000000000 +0000 |
| 125 |
+++ openswan-2.4.14/programs/mailkey/mailkey.in 2009-04-08 23:06:04.000000000 +0000 |
| 126 |
@@ -60,7 +60,7 @@ |
| 127 |
|
| 128 |
"$test1st" |
| 129 |
|
| 130 |
-Common concerns: This account must be able to read /etc/ipsec.secrets. |
| 131 |
+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. |
| 132 |
If you haven't generated your key yet, please run 'ipsec newhostkey'." |
| 133 |
exit 0 |
| 134 |
} |
| 135 |
diff -Nru openswan-2.4.14.orig/programs/Makefile.program openswan-2.4.14/programs/Makefile.program |
| 136 |
--- openswan-2.4.14.orig/programs/Makefile.program 2007-06-19 14:49:19.000000000 +0000 |
| 137 |
+++ openswan-2.4.14/programs/Makefile.program 2009-04-08 23:08:31.000000000 +0000 |
| 138 |
@@ -34,7 +34,6 @@ |
| 139 |
WERROR:= -Werror |
| 140 |
endif |
| 141 |
|
| 142 |
-CFLAGS+= ${WERROR} |
| 143 |
|
| 144 |
ifneq ($(LD_LIBRARY_PATH),) |
| 145 |
LDFLAGS=-L$(LD_LIBRARY_PATH) |
| 146 |
diff -Nru openswan-2.4.14.orig/programs/pluto/Makefile openswan-2.4.14/programs/pluto/Makefile |
| 147 |
--- openswan-2.4.14.orig/programs/pluto/Makefile 2007-11-06 18:56:26.000000000 +0000 |
| 148 |
+++ openswan-2.4.14/programs/pluto/Makefile 2009-04-08 23:06:04.000000000 +0000 |
| 149 |
@@ -210,7 +210,7 @@ |
| 150 |
endif |
| 151 |
|
| 152 |
ifeq ($(USE_WEAKSTUFF),true) |
| 153 |
-WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES |
| 154 |
+WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES |
| 155 |
endif |
| 156 |
|
| 157 |
ifeq ($(USE_EXTRACRYPTO),true) |
| 158 |
diff -Nru openswan-2.4.14.orig/programs/setup/Makefile openswan-2.4.14/programs/setup/Makefile |
| 159 |
--- openswan-2.4.14.orig/programs/setup/Makefile 2004-12-18 18:13:43.000000000 +0000 |
| 160 |
+++ openswan-2.4.14/programs/setup/Makefile 2009-04-08 23:06:04.000000000 +0000 |
| 161 |
@@ -33,25 +33,10 @@ |
| 162 |
@rm -f $(BINDIR)/setup |
| 163 |
@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec |
| 164 |
@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup |
| 165 |
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done |
| 166 |
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec |
| 167 |
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec |
| 168 |
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec |
| 169 |
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec |
| 170 |
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec |
| 171 |
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec |
| 172 |
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec |
| 173 |
|
| 174 |
install_file_list:: |
| 175 |
@echo $(RCDIR)/ipsec |
| 176 |
@echo $(BINDIR)/setup |
| 177 |
- @echo $(RCDIR)/../rc0.d/K76ipsec |
| 178 |
- @echo $(RCDIR)/../rc1.d/K76ipsec |
| 179 |
- @echo $(RCDIR)/../rc2.d/S47ipsec |
| 180 |
- @echo $(RCDIR)/../rc3.d/S47ipsec |
| 181 |
- @echo $(RCDIR)/../rc4.d/S47ipsec |
| 182 |
- @echo $(RCDIR)/../rc5.d/S47ipsec |
| 183 |
- @echo $(RCDIR)/../rc6.d/K76ipsec |
| 184 |
|
| 185 |
clean:: |
| 186 |
@rm -f setup |
| 187 |
diff -Nru openswan-2.4.14.orig/programs/showhostkey/showhostkey.in openswan-2.4.14/programs/showhostkey/showhostkey.in |
| 188 |
--- openswan-2.4.14.orig/programs/showhostkey/showhostkey.in 2007-06-19 15:27:27.000000000 +0000 |
| 189 |
+++ openswan-2.4.14/programs/showhostkey/showhostkey.in 2009-04-08 23:06:04.000000000 +0000 |
| 190 |
@@ -18,7 +18,7 @@ |
| 191 |
usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] |
| 192 |
[--dhclient] [--ipseckey]" |
| 193 |
|
| 194 |
-file=/etc/ipsec.secrets |
| 195 |
+file=/etc/ipsec/ipsec.secrets |
| 196 |
fmt="" |
| 197 |
gw= |
| 198 |
id= |
| 199 |
diff -Nru openswan-2.4.14.orig/testing/utils/ikeping/Makefile openswan-2.4.14/testing/utils/ikeping/Makefile |
| 200 |
--- openswan-2.4.14.orig/testing/utils/ikeping/Makefile 2004-04-03 19:44:52.000000000 +0000 |
| 201 |
+++ openswan-2.4.14/testing/utils/ikeping/Makefile 2009-04-08 23:09:18.000000000 +0000 |
| 202 |
@@ -27,10 +27,9 @@ |
| 203 |
FREESWANINCLS= -I$(FREESWANLIBDIR) -I${OPENSWANSRCDIR} |
| 204 |
FREESWANLIB=$(FREESWANLIBDIR)/libfreeswan.a |
| 205 |
|
| 206 |
-CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ |
| 207 |
+CFLAGS = -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ |
| 208 |
-Wcast-qual -Wmissing-declarations -Wwrite-strings |
| 209 |
CFLAGS+= -Wstrict-prototypes |
| 210 |
-CFLAGS+= -Werror |
| 211 |
#CFLAGS+= -Wundef |
| 212 |
|
| 213 |
HDRDIRS = $(FREESWANINCLS) |
| 214 |
|
| 215 |
|
| 216 |
|
| 217 |
1.1 net-misc/openswan/files/openswan-2.6.21-gentoo.patch |
| 218 |
|
| 219 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.21-gentoo.patch?rev=1.1&view=markup |
| 220 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openswan/files/openswan-2.6.21-gentoo.patch?rev=1.1&content-type=text/plain |
| 221 |
|
| 222 |
Index: openswan-2.6.21-gentoo.patch |
| 223 |
=================================================================== |
| 224 |
diff -Nru openswan-2.6.21.orig/lib/libdns/Makefile openswan-2.6.21/lib/libdns/Makefile |
| 225 |
--- openswan-2.6.21.orig/lib/libdns/Makefile 2009-03-30 13:11:28.000000000 +0000 |
| 226 |
+++ openswan-2.6.21/lib/libdns/Makefile 2009-04-08 23:23:13.000000000 +0000 |
| 227 |
@@ -30,8 +30,8 @@ |
| 228 |
-I${srcdir}../libisc/nothreads/include \ |
| 229 |
-I. -I./include -I${srcdir}include \ |
| 230 |
-I${srcdir}../libisc/include |
| 231 |
-CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE} |
| 232 |
-CWARNINGS = -Werror |
| 233 |
+CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} |
| 234 |
+CWARNINGS = |
| 235 |
|
| 236 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
| 237 |
|
| 238 |
diff -Nru openswan-2.6.21.orig/lib/libisc/Makefile openswan-2.6.21/lib/libisc/Makefile |
| 239 |
--- openswan-2.6.21.orig/lib/libisc/Makefile 2009-03-30 13:11:28.000000000 +0000 |
| 240 |
+++ openswan-2.6.21/lib/libisc/Makefile 2009-04-08 23:23:01.000000000 +0000 |
| 241 |
@@ -22,8 +22,8 @@ |
| 242 |
-I${srcdir}nothreads/include \ |
| 243 |
-I. -I./include -I${srcdir}include \ |
| 244 |
$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include |
| 245 |
-CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} |
| 246 |
-# CWARNINGS = -Werror |
| 247 |
+CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} |
| 248 |
+# CWARNINGS = |
| 249 |
|
| 250 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
| 251 |
|
| 252 |
diff -Nru openswan-2.6.21.orig/lib/liblwres/Makefile openswan-2.6.21/lib/liblwres/Makefile |
| 253 |
--- openswan-2.6.21.orig/lib/liblwres/Makefile 2009-03-30 13:11:28.000000000 +0000 |
| 254 |
+++ openswan-2.6.21/lib/liblwres/Makefile 2009-04-08 23:22:53.000000000 +0000 |
| 255 |
@@ -22,8 +22,8 @@ |
| 256 |
-I${srcdir}../libisc/${ISCARCH}/include \ |
| 257 |
-I${srcdir}../libisc/include \ |
| 258 |
-I. -I./include -I${srcdir}include |
| 259 |
-CDEFINES = -g |
| 260 |
-CWARNINGS = -Werror |
| 261 |
+CDEFINES = |
| 262 |
+CWARNINGS = |
| 263 |
|
| 264 |
CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
| 265 |
|
| 266 |
diff -Nru openswan-2.6.21.orig/Makefile.inc openswan-2.6.21/Makefile.inc |
| 267 |
--- openswan-2.6.21.orig/Makefile.inc 2009-03-30 13:11:28.000000000 +0000 |
| 268 |
+++ openswan-2.6.21/Makefile.inc 2009-04-08 23:21:42.000000000 +0000 |
| 269 |
@@ -49,7 +49,7 @@ |
| 270 |
DESTDIR?= |
| 271 |
|
| 272 |
# "local" part of tree, used in building other pathnames |
| 273 |
-INC_USRLOCAL=/usr/local |
| 274 |
+INC_USRLOCAL?=/usr |
| 275 |
|
| 276 |
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH |
| 277 |
# settings which are assumed to include it (or at least, to include *some* |
| 278 |
@@ -94,7 +94,7 @@ |
| 279 |
|
| 280 |
# sample configuration files go into |
| 281 |
INC_DOCDIR?=share/doc |
| 282 |
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
| 283 |
+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
| 284 |
EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} |
| 285 |
|
| 286 |
FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan |
| 287 |
diff -Nru openswan-2.6.21.orig/programs/Makefile.program openswan-2.6.21/programs/Makefile.program |
| 288 |
--- openswan-2.6.21.orig/programs/Makefile.program 2009-03-30 13:11:28.000000000 +0000 |
| 289 |
+++ openswan-2.6.21/programs/Makefile.program 2009-04-08 23:23:28.000000000 +0000 |
| 290 |
@@ -53,7 +53,6 @@ |
| 291 |
WERROR:= -Werror |
| 292 |
endif |
| 293 |
|
| 294 |
-CFLAGS+= ${WERROR} |
| 295 |
|
| 296 |
ifneq ($(LD_LIBRARY_PATH),) |
| 297 |
LDFLAGS=-L$(LD_LIBRARY_PATH) |
| 298 |
diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/setup/Makefile |
| 299 |
--- openswan-2.6.21.orig/programs/setup/Makefile 2009-03-30 13:11:28.000000000 +0000 |
| 300 |
+++ openswan-2.6.21/programs/setup/Makefile 2009-04-08 23:21:42.000000000 +0000 |
| 301 |
@@ -18,7 +18,6 @@ |
| 302 |
|
| 303 |
# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec |
| 304 |
# not as /etc/rc.d/init.d/setup. |
| 305 |
-PROGRAMDIR=$(RCDIR) |
| 306 |
PROGRAM=setup |
| 307 |
EXTRA8MAN=setup.8 |
| 308 |
|
| 309 |
@@ -29,32 +28,6 @@ |
| 310 |
# into the $BINDIR. |
| 311 |
# |
| 312 |
# the priorities match those in setup's chkconfig line |
| 313 |
-doinstall:: setup |
| 314 |
- @rm -f $(BINDIR)/setup |
| 315 |
- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec |
| 316 |
- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup |
| 317 |
- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done |
| 318 |
- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec |
| 319 |
- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec |
| 320 |
- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec |
| 321 |
- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec |
| 322 |
- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec |
| 323 |
- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec |
| 324 |
- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec |
| 325 |
- |
| 326 |
-install_file_list:: |
| 327 |
- @echo $(RCDIR)/ipsec |
| 328 |
- @echo $(BINDIR)/setup |
| 329 |
- @echo $(RCDIR)/../rc0.d/K76ipsec |
| 330 |
- @echo $(RCDIR)/../rc1.d/K76ipsec |
| 331 |
- @echo $(RCDIR)/../rc2.d/S47ipsec |
| 332 |
- @echo $(RCDIR)/../rc3.d/S47ipsec |
| 333 |
- @echo $(RCDIR)/../rc4.d/S47ipsec |
| 334 |
- @echo $(RCDIR)/../rc5.d/S47ipsec |
| 335 |
- @echo $(RCDIR)/../rc6.d/K76ipsec |
| 336 |
- |
| 337 |
-cleanall:: |
| 338 |
- @rm -f setup |
| 339 |
|
| 340 |
# |
| 341 |
# $Log: openswan-2.6.21-gentoo.patch,v $ |
| 342 |
# Revision 1.1 2009/04/08 23:30:45 mrness |
| 343 |
# Version bumps wrt to security bug #264346. Remove -Werror from compiler options (#260927). |
| 344 |
# (Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 345 |
# |
| 346 |
diff -Nru openswan-2.6.21.orig/testing/utils/make-uml.sh openswan-2.6.21/testing/utils/make-uml.sh |
| 347 |
--- openswan-2.6.21.orig/testing/utils/make-uml.sh 2009-03-30 13:11:28.000000000 +0000 |
| 348 |
+++ openswan-2.6.21/testing/utils/make-uml.sh 2009-04-08 23:23:48.000000000 +0000 |
| 349 |
@@ -262,7 +262,7 @@ |
| 350 |
|
| 351 |
cd $OPENSWANSRCDIR || exit 1 |
| 352 |
|
| 353 |
-make WERROR=-Werror USE_OBJDIR=true programs |
| 354 |
+make USE_OBJDIR=true programs |
| 355 |
|
| 356 |
# now, execute the Makefile that we have created! |
| 357 |
cd $POOLSPACE && make $OPENSWANHOSTS |
Archives