From c1eac792362e605a7a36bb834625b03396ebe2cc Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sat, 4 Apr 2015 06:54:48 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- net-misc/openswan/ChangeLog | 8 +- net-misc/openswan/Manifest | 15 +- .../files/openswan-2.6.38-gentoo.patch | 296 ------------------ net-misc/openswan/openswan-2.6.38.ebuild | 178 ----------- 4 files changed, 7 insertions(+), 490 deletions(-) delete mode 100644 net-misc/openswan/files/openswan-2.6.38-gentoo.patch delete mode 100644 net-misc/openswan/openswan-2.6.38.ebuild diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index 5066a3466ee3..2fda1fa4516b 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openswan -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.97 2014/08/10 20:46:00 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.98 2015/04/04 06:54:40 mr_bones_ Exp $ + + 04 Apr 2015; Michael Sterrett + -files/openswan-2.6.38-gentoo.patch, -openswan-2.6.38.ebuild: + old 10 Aug 2014; Sergei Trofimovich openswan-2.6.38.ebuild, openswan-2.6.39-r1.ebuild: diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest index 23cffd4e0feb..20ea70867cf2 100644 --- a/net-misc/openswan/Manifest +++ b/net-misc/openswan/Manifest @@ -1,21 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX ipsec-initd 487 SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb773f9f60347 SHA512 5ee9163625b32efbe6a1210bd9a8e91f7216ef20dd9dd4c8f32370a8945a949e200b7786c5947c35822389f6fa41890be4641c58bb9d1ce271e631d7a0f0c7d0 WHIRLPOOL 51900362cfa07db14c31e3015855690d0cf1b37668b603f72348b351fc69f9ae7122d0af257ea5250fb5b45a71e816c849577b20be1860f8f764bfebd988dac3 AUX ipsec.service 170 SHA256 dda3c88413f2a4f558f562e2f571d73c184e6cfb8b84a1bdddf4f6fbbebd0dff SHA512 72c8d73ec089bd521a35425eb44891c4b3161468c35b424f0a77c620119237a1eb9f48f74cd8f213eb5907fd745ec1230e55b54f066fb1c2d6c29505de824cb8 WHIRLPOOL af853e11c0fad946a53e5cb3fed4e1ab7be4e1c60ac214661626559147a56b7382c2e2baaaeeeb2fea86b51f7386027e4cc15f546bb914e2e4ffbefd534a01b5 AUX openswan-2.6-allow-ms-bad-proposal.patch 551 SHA256 3c84444f6181c0b7f7749c828db790e20f637d93d9dacec8e120709cce8adcc0 SHA512 9a41f6d8e7cce99d96ff11ea5a50288831a3e30c5cb0b5be5f21dcd3d09f7c0968f78235693408f18b80a651e9d86955446106bc775213ad159ae6b6a830b407 WHIRLPOOL dbc025dd6bd4249e99f18bb0d6ae52e14ac5a6bd7de7de81147acd4d65985ee24eb18e4fdf4f9e2ae4e54af817940a940b5561a65a65c28dc1ecb2ef759f4005 -AUX openswan-2.6.38-gentoo.patch 9913 SHA256 b1f12f7cb0da2db047e7a21b2895d9a7b1562f426af111853e1c13141e7c874b SHA512 829668e4693fd822097c549b0d1829c6b92ae4ec0ad1a04944fa34d79eec03168560166df8272930c397517a68aa350f42dc3d2c74982e0c17338f2a23d6e218 WHIRLPOOL 5af74c3e1c2fb05b14b3e046fab8245bfe5ba5be8eae28d52482fbd86556b2612e8cb0371822d207b3e2f08e0223675e212092dc7690920b5a9f16fa8eaf057e AUX openswan-2.6.39-gentoo.patch 9107 SHA256 4ccedaf74b7bb9f152888c32ce33b1a2de75b7ff27b4f64aa325e2e35879bbf8 SHA512 ab69882e65014d0db490a25ab41c907a23105e6a45ec3b5a65cb878974946163362275e84dd918a14d197bab7170deb25605f176a65eee0558d2510ae3005b9e WHIRLPOOL 873ded45e4bdbf6172f06ca4ce7452b6e60b2be90af538f3213005c216181f2ff13a1e425560956d5e2efaaa8b77ee39594e1edbb822c23d085133373d280dd5 -DIST openswan-2.6.38.tar.gz 10861574 SHA256 bdd3ccf31df1f3e8530887986ea8b6702a3db139486738213f5de8d8690b3723 SHA512 0963a9df548c901eb562185f97d844f57539668f11fbe2a43712223773053895c761b1d5d0be4fffa64014baf58ff2d7cf23676a3da51c5a5134b0639796ad10 WHIRLPOOL e270de7eceee7964148910ed4ec35a39df002ebca3ca892d9f13a2a06eaf1476019c5ac8830eb24c9389afb8256d43ea580d7a3d29dc828be88608a9535d9668 DIST openswan-2.6.39.tar.gz 10872761 SHA256 95c52552465ca3a8a57452ea425bd03347fc17d9f4a14b0b9fbe06dbd5cb013e SHA512 a87a724a6e75ed053af7621e5b5fa1d835063b55ed2a9852d4bd04aee91d4e68a44fe6da888baaf5c3b5031c53c8b9869ba9f29839027090eb0d66821cd35de7 WHIRLPOOL ef44f91f34a2397a8e020c96221bc7e5cfbebedfb64282c922a6ff136cc6c8d4a373e4860e310c643bde9b37dff7e3fedff58a64f4c00f2f8e8cf2da00669fbb -EBUILD openswan-2.6.38.ebuild 5227 SHA256 1c5a0c60d9a6673f4e17a0881e3886eddcac8092f679a727235b346b710d8db7 SHA512 f67a87ed5e192012f8842172f03c902c573e97634d2e5c7c91ed119d41161c62167322f61318d7b79366f9d685809150e6b26dc3211936b85e5c574649d62fe3 WHIRLPOOL be3563a9b37d7682dbfe147a67ecde63566703b1a7b8b5e51e62c81c6c107c0609d4b4f1ca729ac4ff46097e3fd1a38ac3af78a0097288d435115c0f5b47f713 EBUILD openswan-2.6.39-r1.ebuild 5280 SHA256 68e15d5b8d978263dfce5874cf926eef0fd72fa33ef35c0d9ebca7f0feea0693 SHA512 b555feeb14d67f796e1b778324d124622eac1e7409261753e1ddb8965ea5372016b12ff15d9c4b367d6db636731b0be63474a822c742391eb490d531cc15299b WHIRLPOOL cdfdc944612de1974bca2ffb240563e48a262e4d1b09b4d9f07a326d5b7eb4b1598ad4fdc5c51d3c3e5dbba990e7321291d957242c7d6f804026ab68ae9181c8 -MISC ChangeLog 18818 SHA256 7d2044bc3f6731892b26b9bbaf7ea753c7388116c34b6fed3248127022d32ac5 SHA512 23e16f961c41319c19932c6f83e95950b6de4dfe0a6a01eeec457b9e7f2e9e93f1451a6eae85db4858251afd573826db9661cef34d52f19546bcdc756247b336 WHIRLPOOL c16b95aff9ad39aa16050d754e7212cd59dc830da5add7da946469bc4b29b5468d54dd8e01eeb0a2ec10f08d7cd40c27b6fdf686ed5b6f1d063c4b7e16d90f07 +MISC ChangeLog 18947 SHA256 695e1b0edfb0632417cae80702b7b525a1ea1e1072b8593238a0a23612c36ad2 SHA512 a2b36614aab71fc32bb9e1e52bcb81455c509a821f1305e88020820ec795aea5a53f9ff31aeeb591a4cfae5c29484a84b637fd80a85b40529631b04bde4b2423 WHIRLPOOL 4b45ccbd472383ce5318473fc1ca2efd1b427ff4992617f28c9ce8243231e455b96e0b38ac003e85aaa2ae3060a424f25a1916ae0a563a046802b52f28c45b32 MISC metadata.xml 1245 SHA256 b61d911293bd12ca87c2a05e7434c4d768a378d656fcc11d5a19fe18ea04dd5d SHA512 cfd4e52362e566d31b8540282d6fc14a9bb14f29a018bd282d195549d76d162e65a40482e04246eff34684a3ab90780266c07b7dc96215581c21378915c35f12 WHIRLPOOL c8b62a1a22617964f95e38bef4d3c76466eb37a03829b21ead082ac393b79a1c42f7d15b6a087bb0b88b65a871864e56e39fc2c89ea5d7a46faf19acec5d2040 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREIAAYFAlPn2gkACgkQcaHudmEf86rBRACfS+pronAR+MdFxuQeVy6Ij6QL -mGEAn301DpkSJqoiQjkb6wFRh67qcSr+ -=m6wK ------END PGP SIGNATURE----- diff --git a/net-misc/openswan/files/openswan-2.6.38-gentoo.patch b/net-misc/openswan/files/openswan-2.6.38-gentoo.patch deleted file mode 100644 index 6149e6dd2558..000000000000 --- a/net-misc/openswan/files/openswan-2.6.38-gentoo.patch +++ /dev/null @@ -1,296 +0,0 @@ -From 40f1f558b5b0ccd9d60e34178fbebf376ed48b5f Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 6 Apr 2012 21:20:23 -0400 -Subject: [PATCH] Gentoo changes - ---- - Makefile.inc | 2 +- - lib/libcrypto/libmd5/Makefile | 2 +- - lib/libcrypto/libsha1/Makefile | 2 +- - lib/libcrypto/libsha2/Makefile | 2 +- - lib/libdns/Makefile | 2 +- - lib/libipsecconf/Makefile | 2 +- - lib/libisc/Makefile | 2 +- - lib/liblwres/Makefile | 2 +- - lib/libopenswan/Makefile | 2 +- - packaging/makefiles/module.make | 1 - - programs/Makefile.program | 8 +------- - programs/pluto/Makefile.options | 5 +++-- - programs/rsasigkey/Makefile | 3 ++- - programs/setup/Makefile | 10 ++-------- - programs/showhostkey/Makefile | 2 +- - testing/utils/make-uml.sh | 2 +- - 16 files changed, 19 insertions(+), 30 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index c827328..f63e660 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -55,7 +55,7 @@ export SHELL - 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 --git a/lib/libcrypto/libmd5/Makefile b/lib/libcrypto/libmd5/Makefile -index 2d6c566..948ba38 100644 ---- a/lib/libcrypto/libmd5/Makefile -+++ b/lib/libcrypto/libmd5/Makefile -@@ -12,7 +12,7 @@ LIB=libmd5.a - - 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 --git a/lib/libcrypto/libsha1/Makefile b/lib/libcrypto/libsha1/Makefile -index a2c006c..1f7bc3e 100644 ---- a/lib/libcrypto/libsha1/Makefile -+++ b/lib/libcrypto/libsha1/Makefile -@@ -12,7 +12,7 @@ LIB=libsha1.a - - 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 --git a/lib/libcrypto/libsha2/Makefile b/lib/libcrypto/libsha2/Makefile -index 7db2862..7f1517f 100644 ---- a/lib/libcrypto/libsha2/Makefile -+++ b/lib/libcrypto/libsha2/Makefile -@@ -15,5 +15,5 @@ include ${srcdir}../../Makefile.library - - 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 --git a/lib/libdns/Makefile b/lib/libdns/Makefile -index 9b1993f..be3f896 100644 ---- a/lib/libdns/Makefile -+++ b/lib/libdns/Makefile -@@ -31,7 +31,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/include \ - -I. -I./include -I${srcdir}include \ - -I${srcdir}../libisc/include - CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} --CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff --git a/lib/libipsecconf/Makefile b/lib/libipsecconf/Makefile -index 02422fb..b4ccc10 100644 ---- a/lib/libipsecconf/Makefile -+++ b/lib/libipsecconf/Makefile -@@ -33,7 +33,7 @@ SRCS+=interfaces.c - #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 --git a/lib/libisc/Makefile b/lib/libisc/Makefile -index 777b4b2..dcb082a 100644 ---- a/lib/libisc/Makefile -+++ b/lib/libisc/Makefile -@@ -23,7 +23,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/include \ - -I. -I./include -I${srcdir}include \ - $(PORTINCLUDE) -I${OPENSWANSRCDIR}/include - CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} --# CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff --git a/lib/liblwres/Makefile b/lib/liblwres/Makefile -index 4b045cc..c6d18a4 100644 ---- a/lib/liblwres/Makefile -+++ b/lib/liblwres/Makefile -@@ -23,7 +23,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/include \ - -I${srcdir}../libisc/include \ - -I. -I./include -I${srcdir}include - CDEFINES = --CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff --git a/lib/libopenswan/Makefile b/lib/libopenswan/Makefile -index 1661522..033ef86 100644 ---- a/lib/libopenswan/Makefile -+++ b/lib/libopenswan/Makefile -@@ -103,7 +103,7 @@ endif - - 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 --git a/packaging/makefiles/module.make b/packaging/makefiles/module.make -index 74a9f09..6f21471 100644 ---- a/packaging/makefiles/module.make -+++ b/packaging/makefiles/module.make -@@ -25,7 +25,6 @@ EXTRA_CFLAGS += -DDISABLE_UDP_CHECKSUM - - 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 --git a/programs/Makefile.program b/programs/Makefile.program -index 342f6c4..276777f 100644 ---- a/programs/Makefile.program -+++ b/programs/Makefile.program -@@ -48,12 +48,7 @@ CFLAGS+=-DFINALCONFDDIR=\"${FINALCONFDDIR}\" - 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 @@ endif - 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 @@ ifeq ($(USE_LIBNSS),false) - 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 --git a/programs/pluto/Makefile.options b/programs/pluto/Makefile.options -index bf09b32..a7bcd12 100644 ---- a/programs/pluto/Makefile.options -+++ b/programs/pluto/Makefile.options -@@ -44,7 +44,7 @@ endif - - # -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 @@ HDRDIRS = -I${OPENSWANSRCDIR}/programs/pluto/linux26 -I${OPENSWANSRCDIR}/include - - # 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 -@@ -318,6 +318,7 @@ HAVE_LIBNSS=1 - 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 --git a/programs/rsasigkey/Makefile b/programs/rsasigkey/Makefile -index 6c87280..ac117d5 100644 ---- a/programs/rsasigkey/Makefile -+++ b/programs/rsasigkey/Makefile -@@ -21,13 +21,14 @@ ifeq ($(USE_FIPSCHECK),true) - 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 --git a/programs/setup/Makefile b/programs/setup/Makefile -index 7ac3dbe..ce0ba07 100644 ---- a/programs/setup/Makefile -+++ b/programs/setup/Makefile -@@ -14,11 +14,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 -@@ -32,13 +28,11 @@ doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LI - # 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 --git a/programs/showhostkey/Makefile b/programs/showhostkey/Makefile -index 3a127fc..decaf1c 100644 ---- a/programs/showhostkey/Makefile -+++ b/programs/showhostkey/Makefile -@@ -16,7 +16,7 @@ OPENSWANSRCDIR?=$(shell cd ../..; pwd) - 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 --git a/testing/utils/make-uml.sh b/testing/utils/make-uml.sh -index b8ee039..cb8a232 100755 ---- a/testing/utils/make-uml.sh -+++ b/testing/utils/make-uml.sh -@@ -264,7 +264,7 @@ fi - - 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 --- -1.7.9.4 - diff --git a/net-misc/openswan/openswan-2.6.38.ebuild b/net-misc/openswan/openswan-2.6.38.ebuild deleted file mode 100644 index 6a1de10deec2..000000000000 --- a/net-misc/openswan/openswan-2.6.38.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.9 2014/08/10 20:46:00 slyfox Exp $ - -EAPI="4" - -inherit eutils linux-info toolchain-funcs flag-o-matic - -DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)" -HOMEPAGE="http://www.openswan.org/" -SRC_URI="http://download.openswan.org/openswan/${P}.tar.gz" - -LICENSE="GPL-2 BSD-4 DES RSA" -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 - caps? ( sys-libs/libcap-ng ) - curl? ( net-misc/curl ) - ldap? ( net-nds/openldap ) - nss? ( dev-libs/nss ) - ssl? ( dev-libs/openssl )" -DEPEND="${COMMON_DEPEND} - virtual/linux-sources - app-text/xmlto - app-text/docbook-xml-dtd:4.1.2" # see bug 237132 -RDEPEND="${COMMON_DEPEND} - virtual/logger - sys-apps/iproute2 - !net-misc/libreswan" - -pkg_setup() { - if use nocrypto-algorithms && ! use weak-algorithms; then - ewarn "Enabling nocrypto-algorithms USE flag has no effect when" - ewarn "weak-algorithms USE flag is disabled" - fi - - linux-info_pkg_setup - - if kernel_is -ge 2 6; then - einfo "This ebuild will set ${P} to use kernel native IPsec (KAME)." - MYMAKE="programs" - - elif kernel_is 2 4; then - if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then - eerror "You need to have an IPsec enabled 2.4.x kernel." - eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" - die - fi - - einfo "Using patched-in IPsec code for kernel 2.4" - einfo "Your kernel only supports KLIPS for kernel level IPsec." - MYMAKE="confcheck programs" - - else - die "Unsupported kernel version" - fi - - # most code is OK, but programs/pluto code breaks strict aliasing - append-cflags -fno-strict-aliasing -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch - - find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \ - -e s:/usr/local:/usr:g '{}' \; || - die "failed to replace text in docs" -} - -usetf() { usex $1 true false ; } -get_make_options() { - make_options=( - KERNELSRC="${KERNEL_DIR}" - FINALEXAMPLECONFDIR=/usr/share/doc/${PF} - INC_RCDEFAULT=/etc/init.d - 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_LIBCAP_NG=$(usetf caps) - USE_LIBCURL=$(usetf curl) - USE_LDAP=$(usetf ldap) - USE_XAUTH=true - USE_XAUTHPAM=$(usetf pam) - USE_LIBNSS=$(usetf nss) - HAVE_OPENSSL=$(usetf ssl) - USE_EXTRACRYPTO=$(usetf extra-algorithms) - USE_WEAKSTUFF=$(usetf weak-algorithms) - ) - - if use weak-algorithms && use nocrypto-algorithms ; then - make_options+=( USE_NOCRYPTO=true ) - fi - - make_options+=( USE_LWRES=false ) # needs bind9 with lwres support - if use curl || use ldap || use pam; then - make_options+=( HAVE_THREADS=true ) - else - make_options+=( HAVE_THREADS=false ) - fi -} - -src_compile() { - local make_options; get_make_options - emake "${make_options[@]}" ${MYMAKE} -} - -src_install() { - local make_options; get_make_options - emake "${make_options[@]}" install - - dodoc CHANGES README - dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*} - docinto quickstarts - dodoc docs/quickstarts/* - - insinto /usr/share/doc/${PF} - doins -r contrib - docompress -x /usr/share/doc/${PF}/contrib - - newinitd "${FILESDIR}"/ipsec-initd ipsec - - # We don't need to install /var/run/pluto. - rm -rf "${D}var" || die -} - -pkg_preinst() { - if has_version "