From: Justin Lecher Date: Wed, 23 Sep 2015 12:59:52 +0000 (+0200) Subject: net-misc/vpnc: Drop old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ae6a66dbaf6fc2440beefff98bc7f30a14128be;p=gentoo.git net-misc/vpnc: Drop old obsoletes: Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=380399 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=518254 Package-Manager: portage-2.2.21 Signed-off-by: Justin Lecher --- diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest index abd3719c28a6..36e1f433dacd 100644 --- a/net-misc/vpnc/Manifest +++ b/net-misc/vpnc/Manifest @@ -1,2 +1 @@ -DIST vpnc-0.5.3_p527.tar.xz 98740 SHA256 4076e40b3be37ba95c393cc5e21cccf87540e994275bd336a4ec0c6b4c3d54de SHA512 6c657039c4f914b03214912ef3471fae755b4dcbf771c3653ed00d90bb044fa83dbca7a5cda9ac0c9389baae96c658566c8b3f3a4b94c078dda8387935532c9f WHIRLPOOL 61aaf00f63e531eebf3583492f288ee339c446b0a273f1ff5c008dc37ab9f74749ee3c74ea0f110018ef764448c838064de6140743941ff17039e4288cfe66e8 DIST vpnc-0.5.3_p550.tar.xz 101860 SHA256 5d7582eb3d7ead3cb0732a404ce10f471a65c48d0bb4cb2dd5c525273bf0f4b5 SHA512 95150c743c61a962c36591bb874c77f2c28f341c0a1290dba4e878a460d22d762dd88f7cfc0aa9d17ace71a8b826d9fd13554c23b5123dee6009e9fffcd2de55 WHIRLPOOL 8194e0dcf2c0bd1910b4b110dd475024d5cc351d86dec58b33811c37f9bcbc2702c4fede861a6318c54dfb7d19ff2d2265da86d573181a02f433e131184b9bd3 diff --git a/net-misc/vpnc/files/vpnc-0.5.3_p514-as-needed.patch b/net-misc/vpnc/files/vpnc-0.5.3_p514-as-needed.patch deleted file mode 100644 index 18bc90a99587..000000000000 --- a/net-misc/vpnc/files/vpnc-0.5.3_p514-as-needed.patch +++ /dev/null @@ -1,47 +0,0 @@ - Makefile | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index 270d7e1..578884e 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,16 +60,16 @@ BINSRCS = $(addsuffix .c,$(BINS)) - VERSION := $(shell sh mk-version) - RELEASE_VERSION := $(shell cat VERSION) - --CC=gcc -+CC?=gcc - CFLAGS ?= -O3 -g - CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings - CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) - CPPFLAGS += -DVERSION=\"$(VERSION)\" - LDFLAGS ?= -g --LDFLAGS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) -+LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) - - ifeq ($(shell uname -s), SunOS) --LDFLAGS += -lnsl -lresolv -lsocket -+LIBS += -lnsl -lresolv -lsocket - endif - ifneq (,$(findstring Apple,$(shell $(CC) --version))) - # enabled in FSF GCC, disabled by default in Apple GCC -@@ -79,16 +79,16 @@ endif - all : $(BINS) vpnc.8 - - vpnc : $(OBJS) vpnc.o -- $(CC) -o $@ $^ $(LDFLAGS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - vpnc.8 : vpnc.8.template makeman.pl vpnc - ./makeman.pl - - cisco-decrypt : cisco-decrypt.o decrypt-utils.o -- $(CC) -o $@ $^ $(LDFLAGS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - test-crypto : sysdep.o test-crypto.o crypto.o $(CRYPTO_OBJS) -- $(CC) -o $@ $^ $(LDFLAGS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - .depend: $(SRCS) $(BINSRCS) - $(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@ diff --git a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild deleted file mode 100644 index a18a11fdefd3..000000000000 --- a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils linux-info systemd toolchain-funcs - -DESCRIPTION="Free client for Cisco VPN routing software" -HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/" -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sparc x86" -IUSE="resolvconf +gnutls selinux" - -DEPEND=" - dev-lang/perl - dev-libs/libgcrypt:0= - >=sys-apps/iproute2-2.6.19.20061214[-minimal] - gnutls? ( net-libs/gnutls ) - !gnutls? ( dev-libs/openssl:0= )" -RDEPEND="${DEPEND} - resolvconf? ( net-dns/openresolv ) - selinux? ( sec-policy/selinux-vpn ) -" - -RESTRICT="!gnutls? ( bindist )" - -CONFIG_CHECK="~TUN" - -src_prepare() { - if use gnutls; then - elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries." - elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" - else - sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile || die - ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that" - ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL," - ewarn "see the vpnc Makefile and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318" - fi - - epatch "${FILESDIR}"/${PN}-0.5.3_p514-as-needed.patch - - sed -e 's:test/cert0.pem::g' -i Makefile || die - - tc-export CC - - sed \ - -e 's:/var/run:/run:g' \ - -i ChangeLog config.c TODO || die -} - -src_install() { - emake PREFIX="/usr" DESTDIR="${D}" install - dodoc README TODO VERSION - keepdir /etc/vpnc/scripts.d - newinitd "${FILESDIR}/vpnc-3.init" vpnc - newconfd "${FILESDIR}/vpnc.confd" vpnc - sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die - - systemd_dotmpfilesd "${FILESDIR}"/vpnc-tmpfiles.conf - systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service - - # COPYING file resides here, should not be installed - rm -rf "${ED}"/usr/share/doc/vpnc/ || die -} - -pkg_postinst() { - elog "You can generate a configuration file from the original Cisco profiles of your" - elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file" - elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc" -}