From: Alin Năstac Date: Mon, 7 Nov 2011 21:56:58 +0000 (+0000) Subject: Version bump (#368903); install cotrib files (#350083); use LDFLAGS (#351019). X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=89da33dbbf970b92920e14c4900b369e631fb3bd;p=gentoo.git Version bump (#368903); install cotrib files (#350083); use LDFLAGS (#351019). Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index 01322feae6b2..c0053e76939d 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/openswan # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.76 2011/06/06 06:18:52 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.77 2011/11/07 21:56:58 mrness Exp $ + +*openswan-2.6.37 (07 Nov 2011) + + 07 Nov 2011; Alin Năstac -openswan-2.6.29.ebuild, + -files/openswan-2.6.29-gentoo.patch, +openswan-2.6.37.ebuild, + +files/openswan-2.6.37-gentoo.patch: + Version bump (#368903); install cotrib files (#350083); use LDFLAGS + (#351019). 06 Jun 2011; Robin H. Johnson openswan-2.4.15-r2.ebuild, openswan-2.6.29.ebuild, openswan-2.6.31.ebuild: diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest index 48e03b7d8f12..f25bb1a74649 100644 --- a/net-misc/openswan/Manifest +++ b/net-misc/openswan/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a613a025d34ea3b68e95c2b13e62c SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21 AUX ipsec-initd 487 RMD160 23d9d7be6000fb95fdb142bc948964d6050b7864 SHA1 55a4c3ab2523f265e314c9048c0552699564fc4d SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb773f9f60347 @@ -7,22 +7,20 @@ AUX openswan-2.4-allow-ms-bad-proposal.patch 481 RMD160 7ad11a9fa18a633554fc52d8 AUX openswan-2.4.15-deprecated-ldap.patch 372 RMD160 434d98f24c6b0066be3ce6d50e679b67edc22791 SHA1 95b8aec3807d953d9af3ca7ddc67b6aa08d340db SHA256 e891c8daa25dd8a06b6cc070cdc9913f260c375cf7a794b496a430e029e660bc AUX openswan-2.4.15-gentoo.patch 7744 RMD160 fb3d0f745ddf93f11fbeeee98d709c46455c248d SHA1 14dc6577ddb6e52a7356407512725a23865d02b8 SHA256 792055fe57e1a7756d5e804bdbbdf76e009b9b4e60141125bd92c464ec46d946 AUX openswan-2.6-allow-ms-bad-proposal.patch 551 RMD160 3fda2ba360cb5d3427af56c12f32526c78465c7e SHA1 6649779a6ae76773c78db5d646927a7e698ce825 SHA256 3c84444f6181c0b7f7749c828db790e20f637d93d9dacec8e120709cce8adcc0 -AUX openswan-2.6.29-gentoo.patch 9948 RMD160 64739ea37c197ddd073ff4269d1e3e3a889d0b7f SHA1 c16a8855065ace7ae372c5278144a4e484616a56 SHA256 d2b7bece815701d0e04c80a2f6d3f583e8eb28a1ccd27bb2033326ec5de2d791 AUX openswan-2.6.31-gentoo.patch 9990 RMD160 49b3643ecf5b7a7e47499e1a694c269f20440a01 SHA1 940407b1ba81764a121823dcca96ca29f863483d SHA256 2784539e8cefe8a0938f5d37703c44f7279ad45fa9fb39c5dcd8b51b4b8ae690 +AUX openswan-2.6.37-gentoo.patch 10062 RMD160 4c4a87cc967b2715675f5e5c87577cba9cce5da2 SHA1 f912d096fcfadf1994e1e303699b6d9768966148 SHA256 8e467b283aa44739be50b2804c84b5c8bd1742bdba36d5c84db983491a8f8ddb DIST openswan-2.4.15.tar.gz 3938290 RMD160 be0c9bec423f5df5815d6a773ed79c4d832b94a9 SHA1 b9b76c81fae2ff1f202c362fc67518a7acd1e99e SHA256 cf85bf896dd2b0b0818d2851f4d8ec61f816f777d47cbfed7065a682ffd47293 -DIST openswan-2.6.29.tar.gz 11663568 RMD160 aeb2463dfd07b68678ca94a1f48878b4eb005937 SHA1 bb9c3ece6c6cf9a7902b82b16e1d7d73bf11ba08 SHA256 03345e7090d0e1d4b844b1205c1444db067c6e2f7c423342e052f44cf6fa12e4 DIST openswan-2.6.31.tar.gz 11677821 RMD160 bd04ffcf3432887a93d2f97257dbb0ee40ea7bb1 SHA1 9877a130b9cd8cbea24a72fe9fba2635fe1b2fec SHA256 bddd2ca79fec2326a69904b59df15753e59b1bf02882416b19507516e9cfcc21 +DIST openswan-2.6.37.tar.gz 11238286 RMD160 5ae2ba1e998d0e8a78097ec6d1fe062a1ccfb44f SHA1 a0da03e113f1a54c60513f7e8f9908e198c5cd15 SHA256 235a8e0207db661d533368037b2d6d3e9a300cca37e0ed0e906d96fee3a8cc62 EBUILD openswan-2.4.15-r2.ebuild 3950 RMD160 69b877cca4604ebb777d649e730f96c26d832226 SHA1 0d32a4ef5d427e1cca3d4556b38bd654afbcb10d SHA256 5c00e82e2da652bfd6426ee2102f74fa9323a18248cdd55904675507a65ca6d6 -EBUILD openswan-2.6.29.ebuild 5252 RMD160 4b759863a76bb55d9d27316a93c9365485a9eaf5 SHA1 494ac2c6306f8fa32e33b3ed008a791c4fdd2d95 SHA256 4966a32de92364ca4c4965af02694b0ab54ff772ee55586a95ed4575ac1dfe5f EBUILD openswan-2.6.31.ebuild 5292 RMD160 c19a17d74030330bc7f46385e25e3aa6f4d89b0d SHA1 cc31f59e5f7f617b3c341895cb3e75a66f4ad0f7 SHA256 6a426c2b72b918620e611a3ff6185ad604ebb96bbb91c4ac1fc18d8874ca5548 -MISC ChangeLog 15431 RMD160 bedd1ed97442b894bf16803e574b6c434e66e050 SHA1 7ce160abe3be2059a07989bfc9e5f436c8618b20 SHA256 2770cd4d144c7e91fa047a06ccd32581b0f2935c5588dda440e88527e4664220 +EBUILD openswan-2.6.37.ebuild 5367 RMD160 cfa6b8bac52178368f6dd386f93f65fe051dfa74 SHA1 12a67dee7c4b8b498bb40e83738d6dd7ca6f2d2b SHA256 f17fe7efbee7eabdc37a5b4abe88a42d877143519f74564366498517ee04425d +MISC ChangeLog 15722 RMD160 eb008bb08e38a75d59ea1fd388911324725a8704 SHA1 411078bb898b8e2956202b034da74088f30c1abd SHA256 ddde10e9f5a5668c1d7500a1d0af869e704a0f9cbd574f107dc5405b8fc10245 MISC metadata.xml 1314 RMD160 019be7cd2bd127e6a5bad6d35a35976e55ea7a87 SHA1 89038b19f7d141e24472c1a1afc4d6f0dbb8f102 SHA256 f4f37122d69a0f0dfe862f18fd49d6be83bad404ecfbccbf9ce383708541a84a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59rQ0ACgkQfXuS5UK5QB2D3wP/VcP186f19x1iaFPzXi5RwQSO -ONxLBWOk+UL7CeDkxAGvERRFEjR5HJEfgQ7feNrPc98bwyIFww5BF5HCBhW+YPni -tvk9oOiH9U9fjZrOQCAdbnhAEnSC+4Y/qz8yUp4UTfBZaOmvfADMkJt9nB9GxjwL -YM0T6mD6sIWqV5xwDUs= -=SQ4j +iEYEARECAAYFAk64VDUACgkQ1564UogppBIfFgCgkw1YHmr2k0KXlbkXotaqwCCJ +/SAAoLN6hl61CX/HAxb89XAukmsNtZal +=qFMW -----END PGP SIGNATURE----- diff --git a/net-misc/openswan/files/openswan-2.6.29-gentoo.patch b/net-misc/openswan/files/openswan-2.6.29-gentoo.patch deleted file mode 100644 index e6074a45924b..000000000000 --- a/net-misc/openswan/files/openswan-2.6.29-gentoo.patch +++ /dev/null @@ -1,254 +0,0 @@ -diff -Nru openswan-2.6.29.orig/lib/libcrypto/libmd5/Makefile openswan-2.6.29/lib/libcrypto/libmd5/Makefile ---- openswan-2.6.29.orig/lib/libcrypto/libmd5/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/libcrypto/libmd5/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -12,7 +12,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - include ${srcdir}../../Makefile.library -diff -Nru openswan-2.6.29.orig/lib/libcrypto/libsha1/Makefile openswan-2.6.29/lib/libcrypto/libsha1/Makefile ---- openswan-2.6.29.orig/lib/libcrypto/libsha1/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/libcrypto/libsha1/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -12,7 +12,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - -diff -Nru openswan-2.6.29.orig/lib/libcrypto/libsha2/Makefile openswan-2.6.29/lib/libcrypto/libsha2/Makefile ---- openswan-2.6.29.orig/lib/libcrypto/libsha2/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/libcrypto/libsha2/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -15,5 +15,5 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif -diff -Nru openswan-2.6.29.orig/lib/libdns/Makefile openswan-2.6.29/lib/libdns/Makefile ---- openswan-2.6.29.orig/lib/libdns/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/libdns/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -30,8 +30,8 @@ - -I${srcdir}../libisc/nothreads/include \ - -I. -I./include -I${srcdir}include \ - -I${srcdir}../libisc/include --CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE} --CWARNINGS = -Werror -+CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.29.orig/lib/libipsecconf/Makefile openswan-2.6.29/lib/libipsecconf/Makefile ---- openswan-2.6.29.orig/lib/libipsecconf/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/libipsecconf/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -33,7 +33,7 @@ - #CFLAGS+=-DFIPS_CHECK - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - ifeq ($(USE_NM),true) -diff -Nru openswan-2.6.29.orig/lib/libisc/Makefile openswan-2.6.29/lib/libisc/Makefile ---- openswan-2.6.29.orig/lib/libisc/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/libisc/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -22,8 +22,8 @@ - -I${srcdir}nothreads/include \ - -I. -I./include -I${srcdir}include \ - $(PORTINCLUDE) -I${OPENSWANSRCDIR}/include --CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} --# CWARNINGS = -Werror -+CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} -+# CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.29.orig/lib/liblwres/Makefile openswan-2.6.29/lib/liblwres/Makefile ---- openswan-2.6.29.orig/lib/liblwres/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/liblwres/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -22,8 +22,8 @@ - -I${srcdir}../libisc/${ISCARCH}/include \ - -I${srcdir}../libisc/include \ - -I. -I./include -I${srcdir}include --CDEFINES = -g --CWARNINGS = -Werror -+CDEFINES = -+CWARNINGS = - - CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.29.orig/lib/libopenswan/Makefile openswan-2.6.29/lib/libopenswan/Makefile ---- openswan-2.6.29.orig/lib/libopenswan/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/lib/libopenswan/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -100,7 +100,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - ifeq ($(USE_MODP_RFC5114),true) -diff -Nru openswan-2.6.29.orig/Makefile.inc openswan-2.6.29/Makefile.inc ---- openswan-2.6.29.orig/Makefile.inc 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/Makefile.inc 2010-09-30 00:31:01.000000000 +0200 -@@ -49,7 +49,7 @@ - DESTDIR?= - - # "local" part of tree, used in building other pathnames --INC_USRLOCAL=/usr/local -+INC_USRLOCAL?=/usr - - # PUBDIR is where the "ipsec" command goes; beware, many things define PATH - # settings which are assumed to include it (or at least, to include *some* -@@ -94,7 +94,7 @@ - - # sample configuration files go into - INC_DOCDIR?=share/doc --FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan -+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan - EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} - - FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan -diff -Nru openswan-2.6.29.orig/programs/Makefile.program openswan-2.6.29/programs/Makefile.program ---- openswan-2.6.29.orig/programs/Makefile.program 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/programs/Makefile.program 2010-09-30 00:31:01.000000000 +0200 -@@ -53,7 +53,6 @@ - WERROR:= -Werror - endif - --CFLAGS+= ${WERROR} - - ifneq ($(LD_LIBRARY_PATH),) - LDFLAGS=-L$(LD_LIBRARY_PATH) -@@ -104,8 +103,6 @@ - ifneq ($(NOINSTALL),true) - - doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) -- # remove any old vendor file installed previously -- @rm -f $(FINALLIBEXECDIR)/vendor - @mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) - @if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi - @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ -@@ -180,6 +177,7 @@ - LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp - else - LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - endif - - -diff -Nru openswan-2.6.29.orig/programs/pluto/Makefile.options openswan-2.6.29/programs/pluto/Makefile.options ---- openswan-2.6.29.orig/programs/pluto/Makefile.options 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/programs/pluto/Makefile.options 2010-09-30 00:31:01.000000000 +0200 -@@ -54,7 +54,7 @@ - - # Use LIBNSS - ifeq ($(USE_LIBNSS),true) --HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3 -+HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss - endif - - # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN -@@ -309,6 +309,7 @@ - DEFINES+=-DHAVE_LIBNSS - LIBSPLUTO+= -lnspr4 - LIBSPLUTO+= -lnss3 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - # For avoiding implicit DSO linking - LIBSPLUTO+= -lpthread - ifeq ($(USE_FIPSCHECK),true) -diff -Nru openswan-2.6.29.orig/programs/rsasigkey/Makefile openswan-2.6.29/programs/rsasigkey/Makefile ---- openswan-2.6.29.orig/programs/rsasigkey/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/programs/rsasigkey/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -21,13 +21,14 @@ - FIPS_CHECK=1 - CFLAGS+=-DFIPS_CHECK - endif --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif - - PROGRAM=rsasigkey - LIBS=${OPENSWANLIB} -lgmp - ifeq ($(USE_LIBNSS),true) - LIBS+= -lnspr4 -lnss3 -lplc4 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - ifeq ($(USE_FIPSCHECK),true) - LIBS+= -lfipscheck - endif -diff -Nru openswan-2.6.29.orig/programs/setup/Makefile openswan-2.6.29/programs/setup/Makefile ---- openswan-2.6.29.orig/programs/setup/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/programs/setup/Makefile 2010-09-30 00:31:49.000000000 +0200 -@@ -18,7 +18,6 @@ - - # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec - # not as /etc/rc.d/init.d/setup. --PROGRAMDIR=$(RCDIR) - PROGRAM=setup - EXTRA8MAN=setup.8 - -@@ -29,30 +28,4 @@ - # into the $BINDIR. - # - # the priorities match those in setup's chkconfig line --doinstall:: setup -- @rm -f $(BINDIR)/setup -- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec -- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup -- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done -- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec -- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec -- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec -- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec -- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec -- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec -- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec -- --install_file_list:: -- @echo $(RCDIR)/ipsec -- @echo $(BINDIR)/setup -- @echo $(RCDIR)/../rc0.d/K76ipsec -- @echo $(RCDIR)/../rc1.d/K76ipsec -- @echo $(RCDIR)/../rc2.d/S47ipsec -- @echo $(RCDIR)/../rc3.d/S47ipsec -- @echo $(RCDIR)/../rc4.d/S47ipsec -- @echo $(RCDIR)/../rc5.d/S47ipsec -- @echo $(RCDIR)/../rc6.d/K76ipsec -- --cleanall:: -- @rm -f setup - -diff -Nru openswan-2.6.29.orig/programs/showhostkey/Makefile openswan-2.6.29/programs/showhostkey/Makefile ---- openswan-2.6.29.orig/programs/showhostkey/Makefile 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/programs/showhostkey/Makefile 2010-09-30 00:31:01.000000000 +0200 -@@ -16,7 +16,7 @@ - include ${OPENSWANSRCDIR}/Makefile.inc - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif - - PROGRAM=showhostkey -diff -Nru openswan-2.6.29.orig/testing/utils/make-uml.sh openswan-2.6.29/testing/utils/make-uml.sh ---- openswan-2.6.29.orig/testing/utils/make-uml.sh 2010-09-27 18:40:32.000000000 +0200 -+++ openswan-2.6.29/testing/utils/make-uml.sh 2010-09-30 00:31:01.000000000 +0200 -@@ -262,7 +262,7 @@ - - cd $OPENSWANSRCDIR || exit 1 - --make WERROR=-Werror USE_OBJDIR=true programs -+make USE_OBJDIR=true programs - - # now, execute the Makefile that we have created! - cd $POOLSPACE && make $OPENSWANHOSTS diff --git a/net-misc/openswan/files/openswan-2.6.37-gentoo.patch b/net-misc/openswan/files/openswan-2.6.37-gentoo.patch new file mode 100644 index 000000000000..1ff87c35d12a --- /dev/null +++ b/net-misc/openswan/files/openswan-2.6.37-gentoo.patch @@ -0,0 +1,253 @@ +diff -Nru openswan-2.6.37.old//lib/libcrypto/libmd5/Makefile openswan-2.6.37/lib/libcrypto/libmd5/Makefile +--- openswan-2.6.37.old//lib/libcrypto/libmd5/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/libcrypto/libmd5/Makefile 2011-11-07 21:36:27.000000000 +0100 +@@ -12,7 +12,7 @@ + + ifeq ($(USE_LIBNSS),true) + CFLAGS+=-DHAVE_LIBNSS +-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 ++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss + endif + + include ${srcdir}../../Makefile.library +diff -Nru openswan-2.6.37.old//lib/libcrypto/libsha1/Makefile openswan-2.6.37/lib/libcrypto/libsha1/Makefile +--- openswan-2.6.37.old//lib/libcrypto/libsha1/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/libcrypto/libsha1/Makefile 2011-11-07 21:36:29.000000000 +0100 +@@ -12,7 +12,7 @@ + + ifeq ($(USE_LIBNSS),true) + CFLAGS+=-DHAVE_LIBNSS +-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 ++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss + endif + + +diff -Nru openswan-2.6.37.old//lib/libcrypto/libsha2/Makefile openswan-2.6.37/lib/libcrypto/libsha2/Makefile +--- openswan-2.6.37.old//lib/libcrypto/libsha2/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/libcrypto/libsha2/Makefile 2011-11-07 21:36:30.000000000 +0100 +@@ -15,5 +15,5 @@ + + ifeq ($(USE_LIBNSS),true) + CFLAGS+=-DHAVE_LIBNSS +-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 ++INCLUDES+=-I/usr/include/nspr -I/usr/include/nss + endif +diff -Nru openswan-2.6.37.old//lib/libdns/Makefile openswan-2.6.37/lib/libdns/Makefile +--- openswan-2.6.37.old//lib/libdns/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/libdns/Makefile 2011-11-07 21:36:30.000000000 +0100 +@@ -31,7 +31,7 @@ + -I. -I./include -I${srcdir}include \ + -I${srcdir}../libisc/include + CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} +-CWARNINGS = -Werror ++CWARNINGS = + + CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} + +diff -Nru openswan-2.6.37.old//lib/libipsecconf/Makefile openswan-2.6.37/lib/libipsecconf/Makefile +--- openswan-2.6.37.old//lib/libipsecconf/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/libipsecconf/Makefile 2011-11-07 21:36:32.000000000 +0100 +@@ -33,7 +33,7 @@ + #CFLAGS+=-DFIPS_CHECK + ifeq ($(USE_LIBNSS),true) + CFLAGS+=-DHAVE_LIBNSS +-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 ++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss + endif + + ifeq ($(USE_NM),true) +diff -Nru openswan-2.6.37.old//lib/libisc/Makefile openswan-2.6.37/lib/libisc/Makefile +--- openswan-2.6.37.old//lib/libisc/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/libisc/Makefile 2011-11-07 21:36:32.000000000 +0100 +@@ -23,7 +23,7 @@ + -I. -I./include -I${srcdir}include \ + $(PORTINCLUDE) -I${OPENSWANSRCDIR}/include + CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} +-# CWARNINGS = -Werror ++CWARNINGS = + + CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} + +diff -Nru openswan-2.6.37.old//lib/liblwres/Makefile openswan-2.6.37/lib/liblwres/Makefile +--- openswan-2.6.37.old//lib/liblwres/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/liblwres/Makefile 2011-11-07 21:36:32.000000000 +0100 +@@ -23,7 +23,7 @@ + -I${srcdir}../libisc/include \ + -I. -I./include -I${srcdir}include + CDEFINES = +-CWARNINGS = -Werror ++CWARNINGS = + + CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} + +diff -Nru openswan-2.6.37.old//lib/libopenswan/Makefile openswan-2.6.37/lib/libopenswan/Makefile +--- openswan-2.6.37.old//lib/libopenswan/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/lib/libopenswan/Makefile 2011-11-07 21:36:32.000000000 +0100 +@@ -105,7 +105,7 @@ + + ifeq ($(USE_LIBNSS),true) + CFLAGS+=-DHAVE_LIBNSS +-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 ++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss + endif + + ifeq ($(USE_MODP_RFC5114),true) +diff -Nru openswan-2.6.37.old//Makefile.inc openswan-2.6.37/Makefile.inc +--- openswan-2.6.37.old//Makefile.inc 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/Makefile.inc 2011-11-07 21:36:32.000000000 +0100 +@@ -55,7 +55,7 @@ + DESTDIR?= + + # "local" part of tree, used in building other pathnames +-INC_USRLOCAL=/usr/local ++INC_USRLOCAL?=/usr + + # PUBDIR is where the "ipsec" command goes; beware, many things define PATH + # settings which are assumed to include it (or at least, to include *some* +diff -Nru openswan-2.6.37.old//packaging/makefiles/module.make openswan-2.6.37/packaging/makefiles/module.make +--- openswan-2.6.37.old//packaging/makefiles/module.make 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/packaging/makefiles/module.make 2011-11-07 21:36:35.000000000 +0100 +@@ -25,7 +25,6 @@ + + EXTRA_CFLAGS += $(KLIPSCOMPILE) + EXTRA_CFLAGS += -Wall -DIPCOMP_PREFIX +-#EXTRA_CFLAGS += -Werror + #EXTRA_CFLAGS += -Wconversion + #EXTRA_CFLAGS += -Wmissing-prototypes + # 'override CFLAGS' should really be 'EXTRA_CFLAGS' +diff -Nru openswan-2.6.37.old//programs/Makefile.program openswan-2.6.37/programs/Makefile.program +--- openswan-2.6.37.old//programs/Makefile.program 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/programs/Makefile.program 2011-11-07 21:36:36.000000000 +0100 +@@ -48,12 +48,7 @@ + CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\" + CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" + +-# die if there are any warnings +-ifndef WERROR +-WERROR:= -Werror +-endif + +-CFLAGS+= ${WERROR} + + ifneq ($(LD_LIBRARY_PATH),) + LDFLAGS=-L$(LD_LIBRARY_PATH) +@@ -104,8 +99,6 @@ + ifneq ($(NOINSTALL),true) + + doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) +- # remove any old vendor file installed previously +- @rm -f $(FINALLIBEXECDIR)/vendor + @mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) + @if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi + @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ +@@ -180,6 +173,7 @@ + LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp + else + LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3 ++LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss + endif + + +diff -Nru openswan-2.6.37.old//programs/pluto/Makefile.options openswan-2.6.37/programs/pluto/Makefile.options +--- openswan-2.6.37.old//programs/pluto/Makefile.options 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/programs/pluto/Makefile.options 2011-11-07 21:36:36.000000000 +0100 +@@ -44,7 +44,7 @@ + + # -O on Linux makes gcc coredump when compiling sha1.c + # -Wundef is nice but RHL5.2 compiler doesn't support it +-CFLAGS +=-g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ ++CFLAGS +=-Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ + -Wcast-qual -Wmissing-declarations -Wwrite-strings \ + -Wstrict-prototypes # -Wundef + +@@ -58,7 +58,7 @@ + + # Use LIBNSS + ifeq ($(USE_LIBNSS),true) +-HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3 ++HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss + endif + + # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN +@@ -315,6 +315,7 @@ + DEFINES+=-DHAVE_LIBNSS + LIBSPLUTO+= -lnspr4 + LIBSPLUTO+= -lnss3 ++LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss + # For avoiding implicit DSO linking + LIBSPLUTO+= -lpthread + ifeq ($(USE_FIPSCHECK),true) +diff -Nru openswan-2.6.37.old//programs/rsasigkey/Makefile openswan-2.6.37/programs/rsasigkey/Makefile +--- openswan-2.6.37.old//programs/rsasigkey/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/programs/rsasigkey/Makefile 2011-11-07 21:36:36.000000000 +0100 +@@ -21,13 +21,14 @@ + FIPS_CHECK=1 + CFLAGS+=-DFIPS_CHECK + endif +-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 ++INCLUDES+=-I/usr/include/nspr -I/usr/include/nss + endif + + PROGRAM=rsasigkey + LIBS=${OPENSWANLIB} -lgmp + ifeq ($(USE_LIBNSS),true) + LIBS+= -lnspr4 -lnss3 -lplc4 ++LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss + ifeq ($(USE_FIPSCHECK),true) + LIBS+= -lfipscheck + endif +diff -Nru openswan-2.6.37.old//programs/setup/Makefile openswan-2.6.37/programs/setup/Makefile +--- openswan-2.6.37.old//programs/setup/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/programs/setup/Makefile 2011-11-07 21:36:36.000000000 +0100 +@@ -16,11 +16,7 @@ + OPENSWANSRCDIR?=$(shell cd ../..; pwd) + include ${OPENSWANSRCDIR}/Makefile.inc + +-# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec +-# not as /etc/rc.d/init.d/setup. +-PROGRAMDIR=$(RCDIR) + PROGRAM=setup +-NOINSTALL=true + EXTRA8MAN=setup.8 + + include ${srcdir}../Makefile.program +@@ -34,13 +30,11 @@ + # remove any old vendor file installed previously + @rm -f $(BINDIR)/setup + # check the directories we need exist (ie., make install DESTDIR=/tmp/IPsec) +- @mkdir -p $(RCDIR) $(BINDIR) ++ @mkdir -p $(BINDIR) + # install and link everything +- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec +- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup ++ @$(INSTALL) $(INSTBINFLAGS) setup $(BINDIR)/setup + + install_file_list:: +- @echo $(RCDIR)/ipsec + @echo $(BINDIR)/setup + + cleanall:: +diff -Nru openswan-2.6.37.old//programs/showhostkey/Makefile openswan-2.6.37/programs/showhostkey/Makefile +--- openswan-2.6.37.old//programs/showhostkey/Makefile 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/programs/showhostkey/Makefile 2011-11-07 21:36:36.000000000 +0100 +@@ -16,7 +16,7 @@ + include ${OPENSWANSRCDIR}/Makefile.inc + ifeq ($(USE_LIBNSS),true) + CFLAGS+=-DHAVE_LIBNSS +-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 ++INCLUDES+=-I/usr/include/nspr -I/usr/include/nss + endif + + PROGRAM=showhostkey +diff -Nru openswan-2.6.37.old//testing/utils/make-uml.sh openswan-2.6.37/testing/utils/make-uml.sh +--- openswan-2.6.37.old//testing/utils/make-uml.sh 2011-10-28 23:11:53.000000000 +0200 ++++ openswan-2.6.37/testing/utils/make-uml.sh 2011-11-07 21:39:58.000000000 +0100 +@@ -264,7 +264,7 @@ + + cd $OPENSWANSRCDIR || exit 1 + +-make ${WERROR:-WERROR=-Werror} USE_OBJDIR=true USE_IPSECPOLICY=true programs ++make ${WERROR:-WERROR=} USE_OBJDIR=true USE_IPSECPOLICY=true programs + + # now, execute the Makefile that we have created! + cd $POOLSPACE && make $OPENSWANHOSTS diff --git a/net-misc/openswan/openswan-2.6.29.ebuild b/net-misc/openswan/openswan-2.6.37.ebuild similarity index 93% rename from net-misc/openswan/openswan-2.6.29.ebuild rename to net-misc/openswan/openswan-2.6.37.ebuild index d844f102f67c..c60e004824cf 100644 --- a/net-misc/openswan/openswan-2.6.29.ebuild +++ b/net-misc/openswan/openswan-2.6.37.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.29.ebuild,v 1.2 2011/06/06 06:18:52 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.37.ebuild,v 1.1 2011/11/07 21:56:58 mrness Exp $ EAPI="2" @@ -15,6 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss" +RESTRICT="test" # requires user mode linux setup + COMMON_DEPEND="!net-misc/strongswan dev-libs/gmp dev-lang/perl @@ -40,8 +42,7 @@ pkg_setup() { linux-info_pkg_setup if kernel_is -ge 2 6; then - einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)." - einfo "KLIPS will not be compiled/installed." + einfo "This ebuild will set ${P} to use kernel native IPsec (KAME)." MYMAKE="programs" elif kernel_is 2 4; then @@ -79,8 +80,10 @@ get_make_options() { INC_USRLOCAL=/usr\ INC_MANDIR=share/man\ FINALDOCDIR=/usr/share/doc/${PF}/html\ + FINALLIBDIR=/usr/$(get_libdir)/ipsec\ DESTDIR=\"${D}\"\ USERCOMPILE=\"${CFLAGS}\"\ + USERLINK=\"-Wl,-z,relro ${LDFLAGS}\"\ CC=\"$(tc-getCC)\" use caps\ @@ -138,9 +141,11 @@ src_install() { emake "$@" install || die "emake install failed" dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*} - dohtml doc/*.html docinto quickstarts - dodoc doc/quickstarts/* + dodoc docs/quickstarts/* + + insinto /usr/share/doc/${PF} + doins -r contrib newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"