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