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