From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB3421395E2 for ; Sun, 20 Nov 2016 13:15:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 615E8E0BD7; Sun, 20 Nov 2016 13:15:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35C71E0BD7 for ; Sun, 20 Nov 2016 13:15:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C869333BE32 for ; Sun, 20 Nov 2016 13:15:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4137D492 for ; Sun, 20 Nov 2016 13:15:46 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1479647729.5006a37f801240bbe31ace460e3ab3cdfebe3891.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/stunnel/Manifest net-misc/stunnel/stunnel-5.24.ebuild net-misc/stunnel/stunnel-5.30.ebuild X-VCS-Directories: net-misc/stunnel/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 5006a37f801240bbe31ace460e3ab3cdfebe3891 X-VCS-Branch: master Date: Sun, 20 Nov 2016 13:15:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6c7c9548-0261-451d-8796-d523c008744e X-Archives-Hash: 6ba69f2503fe0437308f775e7cd16223 commit: 5006a37f801240bbe31ace460e3ab3cdfebe3891 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Nov 20 13:15:29 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Nov 20 13:15:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5006a37f net-misc/stunnel: remove "${T}"/20stunnel -} - -src_configure() { - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable ipv6) \ - $(use_enable tcpd libwrap) \ - --with-ssl="${EPREFIX}"/usr \ - --disable-fips -} - -src_install() { - emake DESTDIR="${D}" install - rm -rf "${ED}"/usr/share/doc/${PN} - rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ - "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 - use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - - dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog - dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ - tools/importCA.html - - insinto /etc/stunnel - doins "${FILESDIR}"/stunnel.conf - doinitd "${FILESDIR}"/stunnel - - doenvd "${T}"/20stunnel - - systemd_dounit "${S}/tools/stunnel.service" - systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf -} - -pkg_postinst() { - if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then - install_cert /etc/stunnel/stunnel - chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - fi - - einfo "If you want to run multiple instances of stunnel, create a new config" - einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " - einfo "\'pid= \' with a unique filename." -} diff --git a/net-misc/stunnel/stunnel-5.30.ebuild b/net-misc/stunnel/stunnel-5.30.ebuild deleted file mode 100644 index 39898a5..00000000 --- a/net-misc/stunnel/stunnel-5.30.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit ssl-cert eutils multilib systemd user - -DESCRIPTION="TLS/SSL - Port Wrapper" -HOMEPAGE="http://www.stunnel.org/index.html" -SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz - http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz - ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="ipv6 libressl selinux stunnel3 tcpd" - -DEPEND="tcpd? ( sys-apps/tcp-wrappers ) - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl )" -RDEPEND="${DEPEND} - stunnel3? ( dev-lang/perl ) - selinux? ( sec-policy/selinux-stunnel )" - -RESTRICT="test" - -pkg_setup() { - enewgroup stunnel - enewuser stunnel -1 -1 -1 stunnel -} - -src_prepare() { - # Hack away generation of certificate - sed -i -e "s/^install-data-local:/do-not-run-this:/" \ - tools/Makefile.in || die "sed failed" - - # libressl compat - epatch "${FILESDIR}"/stunnel-compat-libressl.patch - - echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel -} - -src_configure() { - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable ipv6) \ - $(use_enable tcpd libwrap) \ - --with-ssl="${EPREFIX}"/usr \ - --disable-fips -} - -src_install() { - emake DESTDIR="${D}" install - rm -rf "${ED}"/usr/share/doc/${PN} - rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ - "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 - use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - - dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog - dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ - tools/importCA.html - - insinto /etc/stunnel - doins "${FILESDIR}"/stunnel.conf - doinitd "${FILESDIR}"/stunnel - - doenvd "${T}"/20stunnel - - systemd_dounit "${S}/tools/stunnel.service" - systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf -} - -pkg_postinst() { - if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then - install_cert /etc/stunnel/stunnel - chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} - fi - - einfo "If you want to run multiple instances of stunnel, create a new config" - einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " - einfo "\'pid= \' with a unique filename." -}