1 |
floppym 13/09/01 06:05:42 |
2 |
|
3 |
Added: openswan-2.6.39-gentoo.patch |
4 |
Log: |
5 |
Version bump. |
6 |
|
7 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-misc/openswan/files/openswan-2.6.39-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openswan/files/openswan-2.6.39-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openswan/files/openswan-2.6.39-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: openswan-2.6.39-gentoo.patch |
16 |
=================================================================== |
17 |
commit 9d3ad7f0e84c7cff17d07d2d9d660f88c7a6e4e0 |
18 |
Author: Mike Gilbert <floppym@g.o> |
19 |
Date: Fri Apr 6 21:20:23 2012 -0400 |
20 |
|
21 |
Gentoo changes |
22 |
|
23 |
diff --git a/Makefile.inc b/Makefile.inc |
24 |
index e50285e..1a6caa4 100644 |
25 |
--- a/Makefile.inc |
26 |
+++ b/Makefile.inc |
27 |
@@ -55,7 +55,7 @@ export SHELL |
28 |
DESTDIR?= |
29 |
|
30 |
# "local" part of tree, used in building other pathnames |
31 |
-INC_USRLOCAL=/usr/local |
32 |
+INC_USRLOCAL?=/usr |
33 |
|
34 |
# PUBDIR is where the "ipsec" command goes; beware, many things define PATH |
35 |
# settings which are assumed to include it (or at least, to include *some* |
36 |
diff --git a/lib/libcrypto/libmd5/Makefile b/lib/libcrypto/libmd5/Makefile |
37 |
index 2d6c566..948ba38 100644 |
38 |
--- a/lib/libcrypto/libmd5/Makefile |
39 |
+++ b/lib/libcrypto/libmd5/Makefile |
40 |
@@ -12,7 +12,7 @@ LIB=libmd5.a |
41 |
|
42 |
ifeq ($(USE_LIBNSS),true) |
43 |
CFLAGS+=-DHAVE_LIBNSS |
44 |
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 |
45 |
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss |
46 |
endif |
47 |
|
48 |
include ${srcdir}../../Makefile.library |
49 |
diff --git a/lib/libcrypto/libsha1/Makefile b/lib/libcrypto/libsha1/Makefile |
50 |
index a2c006c..1f7bc3e 100644 |
51 |
--- a/lib/libcrypto/libsha1/Makefile |
52 |
+++ b/lib/libcrypto/libsha1/Makefile |
53 |
@@ -12,7 +12,7 @@ LIB=libsha1.a |
54 |
|
55 |
ifeq ($(USE_LIBNSS),true) |
56 |
CFLAGS+=-DHAVE_LIBNSS |
57 |
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 |
58 |
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss |
59 |
endif |
60 |
|
61 |
|
62 |
diff --git a/lib/libcrypto/libsha2/Makefile b/lib/libcrypto/libsha2/Makefile |
63 |
index 7db2862..7f1517f 100644 |
64 |
--- a/lib/libcrypto/libsha2/Makefile |
65 |
+++ b/lib/libcrypto/libsha2/Makefile |
66 |
@@ -15,5 +15,5 @@ include ${srcdir}../../Makefile.library |
67 |
|
68 |
ifeq ($(USE_LIBNSS),true) |
69 |
CFLAGS+=-DHAVE_LIBNSS |
70 |
-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 |
71 |
+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss |
72 |
endif |
73 |
diff --git a/lib/libdns/Makefile b/lib/libdns/Makefile |
74 |
index 9b1993f..be3f896 100644 |
75 |
--- a/lib/libdns/Makefile |
76 |
+++ b/lib/libdns/Makefile |
77 |
@@ -31,7 +31,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/include \ |
78 |
-I. -I./include -I${srcdir}include \ |
79 |
-I${srcdir}../libisc/include |
80 |
CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} |
81 |
-CWARNINGS = -Werror |
82 |
+CWARNINGS = |
83 |
|
84 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
85 |
|
86 |
diff --git a/lib/libipsecconf/Makefile b/lib/libipsecconf/Makefile |
87 |
index 02422fb..b4ccc10 100644 |
88 |
--- a/lib/libipsecconf/Makefile |
89 |
+++ b/lib/libipsecconf/Makefile |
90 |
@@ -33,7 +33,7 @@ SRCS+=interfaces.c |
91 |
#CFLAGS+=-DFIPS_CHECK |
92 |
ifeq ($(USE_LIBNSS),true) |
93 |
CFLAGS+=-DHAVE_LIBNSS |
94 |
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 |
95 |
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss |
96 |
endif |
97 |
|
98 |
ifeq ($(USE_NM),true) |
99 |
diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile |
100 |
index 777b4b2..dcb082a 100644 |
101 |
--- a/lib/libisc/Makefile |
102 |
+++ b/lib/libisc/Makefile |
103 |
@@ -23,7 +23,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/include \ |
104 |
-I. -I./include -I${srcdir}include \ |
105 |
$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include |
106 |
CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} |
107 |
-# CWARNINGS = -Werror |
108 |
+CWARNINGS = |
109 |
|
110 |
CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
111 |
|
112 |
diff --git a/lib/liblwres/Makefile b/lib/liblwres/Makefile |
113 |
index 4b045cc..c6d18a4 100644 |
114 |
--- a/lib/liblwres/Makefile |
115 |
+++ b/lib/liblwres/Makefile |
116 |
@@ -23,7 +23,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/include \ |
117 |
-I${srcdir}../libisc/include \ |
118 |
-I. -I./include -I${srcdir}include |
119 |
CDEFINES = |
120 |
-CWARNINGS = -Werror |
121 |
+CWARNINGS = |
122 |
|
123 |
CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} |
124 |
|
125 |
diff --git a/lib/libopenswan/Makefile b/lib/libopenswan/Makefile |
126 |
index 1f36354..04caf1c 100644 |
127 |
--- a/lib/libopenswan/Makefile |
128 |
+++ b/lib/libopenswan/Makefile |
129 |
@@ -109,7 +109,7 @@ endif |
130 |
|
131 |
ifeq ($(USE_LIBNSS),true) |
132 |
CFLAGS+=-DHAVE_LIBNSS |
133 |
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 |
134 |
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss |
135 |
endif |
136 |
|
137 |
ifeq ($(USE_MODP_RFC5114),true) |
138 |
diff --git a/packaging/makefiles/module.make b/packaging/makefiles/module.make |
139 |
index 74a9f09..6f21471 100644 |
140 |
--- a/packaging/makefiles/module.make |
141 |
+++ b/packaging/makefiles/module.make |
142 |
@@ -25,7 +25,6 @@ EXTRA_CFLAGS += -DDISABLE_UDP_CHECKSUM |
143 |
|
144 |
EXTRA_CFLAGS += $(KLIPSCOMPILE) |
145 |
EXTRA_CFLAGS += -Wall -DIPCOMP_PREFIX |
146 |
-#EXTRA_CFLAGS += -Werror |
147 |
#EXTRA_CFLAGS += -Wconversion |
148 |
#EXTRA_CFLAGS += -Wmissing-prototypes |
149 |
# 'override CFLAGS' should really be 'EXTRA_CFLAGS' |
150 |
diff --git a/programs/Makefile.program b/programs/Makefile.program |
151 |
index 342f6c4..276777f 100644 |
152 |
--- a/programs/Makefile.program |
153 |
+++ b/programs/Makefile.program |
154 |
@@ -48,12 +48,7 @@ CFLAGS+=-DFINALCONFDDIR=\"${FINALCONFDDIR}\" |
155 |
CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\" |
156 |
CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" |
157 |
|
158 |
-# die if there are any warnings |
159 |
-ifndef WERROR |
160 |
-WERROR:= -Werror |
161 |
-endif |
162 |
|
163 |
-CFLAGS+= ${WERROR} |
164 |
|
165 |
ifneq ($(LD_LIBRARY_PATH),) |
166 |
LDFLAGS=-L$(LD_LIBRARY_PATH) |
167 |
@@ -104,8 +99,6 @@ endif |
168 |
ifneq ($(NOINSTALL),true) |
169 |
|
170 |
doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) |
171 |
- # remove any old vendor file installed previously |
172 |
- @rm -f $(FINALLIBEXECDIR)/vendor |
173 |
@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) |
174 |
@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi |
175 |
@$(foreach f, $(addsuffix .8, $(PROGRAM)), \ |
176 |
@@ -180,6 +173,7 @@ ifeq ($(USE_LIBNSS),false) |
177 |
LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp |
178 |
else |
179 |
LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3 |
180 |
+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss |
181 |
endif |
182 |
|
183 |
|
184 |
diff --git a/programs/pluto/Makefile.options b/programs/pluto/Makefile.options |
185 |
index bf09b32..a7bcd12 100644 |
186 |
--- a/programs/pluto/Makefile.options |
187 |
+++ b/programs/pluto/Makefile.options |
188 |
@@ -44,7 +44,7 @@ endif |
189 |
|
190 |
# -O on Linux makes gcc coredump when compiling sha1.c |
191 |
# -Wundef is nice but RHL5.2 compiler doesn't support it |
192 |
-CFLAGS +=-g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ |
193 |
+CFLAGS +=-Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ |
194 |
-Wcast-qual -Wmissing-declarations -Wwrite-strings \ |
195 |
-Wstrict-prototypes # -Wundef |
196 |
|
197 |
@@ -58,7 +58,7 @@ HDRDIRS = -I${OPENSWANSRCDIR}/programs/pluto/linux26 -I${OPENSWANSRCDIR}/include |
198 |
|
199 |
# Use LIBNSS |
200 |
ifeq ($(USE_LIBNSS),true) |
201 |
-HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3 |
202 |
+HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss |
203 |
endif |
204 |
|
205 |
# BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN |
206 |
@@ -318,6 +318,7 @@ HAVE_LIBNSS=1 |
207 |
DEFINES+=-DHAVE_LIBNSS |
208 |
LIBSPLUTO+= -lnspr4 |
209 |
LIBSPLUTO+= -lnss3 |
210 |
+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss |
211 |
# For avoiding implicit DSO linking |
212 |
LIBSPLUTO+= -lpthread |
213 |
ifeq ($(USE_FIPSCHECK),true) |
214 |
diff --git a/programs/rsasigkey/Makefile b/programs/rsasigkey/Makefile |
215 |
index 6c87280..ac117d5 100644 |
216 |
--- a/programs/rsasigkey/Makefile |
217 |
+++ b/programs/rsasigkey/Makefile |
218 |
@@ -21,13 +21,14 @@ ifeq ($(USE_FIPSCHECK),true) |
219 |
FIPS_CHECK=1 |
220 |
CFLAGS+=-DFIPS_CHECK |
221 |
endif |
222 |
-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 |
223 |
+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss |
224 |
endif |
225 |
|
226 |
PROGRAM=rsasigkey |
227 |
LIBS=${OPENSWANLIB} -lgmp |
228 |
ifeq ($(USE_LIBNSS),true) |
229 |
LIBS+= -lnspr4 -lnss3 -lplc4 |
230 |
+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss |
231 |
ifeq ($(USE_FIPSCHECK),true) |
232 |
LIBS+= -lfipscheck |
233 |
endif |
234 |
diff --git a/programs/setup/Makefile b/programs/setup/Makefile |
235 |
index 872cea3..ce0ba07 100644 |
236 |
--- a/programs/setup/Makefile |
237 |
+++ b/programs/setup/Makefile |
238 |
@@ -14,11 +14,7 @@ |
239 |
OPENSWANSRCDIR?=$(shell cd ../..; pwd) |
240 |
include ${OPENSWANSRCDIR}/Makefile.inc |
241 |
|
242 |
-# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec |
243 |
-# not as /etc/rc.d/init.d/setup. |
244 |
-PROGRAMDIR=$(RCDIR) |
245 |
PROGRAM=setup |
246 |
-NOINSTALL=true |
247 |
EXTRA8MAN=setup.8 |
248 |
|
249 |
include ${srcdir}../Makefile.program |
250 |
@@ -32,13 +28,11 @@ doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LI |
251 |
# remove any old vendor file installed previously |
252 |
@rm -f $(BINDIR)/setup |
253 |
# check the directories we need exist (ie., make install DESTDIR=/tmp/IPsec) |
254 |
- @mkdir -p $(RCDIR) $(BINDIR) |
255 |
+ @mkdir -p $(BINDIR) |
256 |
# install and link everything |
257 |
- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec |
258 |
- @ln -s $(RELFINALRCDIR)/ipsec $(BINDIR)/setup |
259 |
+ @$(INSTALL) $(INSTBINFLAGS) setup $(BINDIR)/setup |
260 |
|
261 |
install_file_list:: |
262 |
- @echo $(RCDIR)/ipsec |
263 |
@echo $(BINDIR)/setup |
264 |
|
265 |
cleanall:: |
266 |
diff --git a/programs/showhostkey/Makefile b/programs/showhostkey/Makefile |
267 |
index 3a127fc..decaf1c 100644 |
268 |
--- a/programs/showhostkey/Makefile |
269 |
+++ b/programs/showhostkey/Makefile |
270 |
@@ -16,7 +16,7 @@ OPENSWANSRCDIR?=$(shell cd ../..; pwd) |
271 |
include ${OPENSWANSRCDIR}/Makefile.inc |
272 |
ifeq ($(USE_LIBNSS),true) |
273 |
CFLAGS+=-DHAVE_LIBNSS |
274 |
-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 |
275 |
+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss |
276 |
endif |
277 |
|
278 |
PROGRAM=showhostkey |
279 |
diff --git a/testing/utils/make-uml.sh b/testing/utils/make-uml.sh |
280 |
index bd47a99..8901fe3 100755 |
281 |
--- a/testing/utils/make-uml.sh |
282 |
+++ b/testing/utils/make-uml.sh |
283 |
@@ -267,7 +267,7 @@ fi |
284 |
|
285 |
cd $OPENSWANSRCDIR || exit 1 |
286 |
|
287 |
-make ${WERROR:-WERROR=-Werror} USE_OBJDIR=true USE_IPSECPOLICY=true programs |
288 |
+make ${WERROR:-WERROR=} USE_OBJDIR=true USE_IPSECPOLICY=true programs |
289 |
|
290 |
# now, execute the Makefile that we have created! |
291 |
cd $POOLSPACE && make $OPENSWANHOSTS |