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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D8A3158094 for ; Sun, 10 Jul 2022 22:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86444E0D66; Sun, 10 Jul 2022 22:52:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6140EE0D62 for ; Sun, 10 Jul 2022 22:52:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53445341097 for ; Sun, 10 Jul 2022 22:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C53DD53D for ; Sun, 10 Jul 2022 22:52:06 +0000 (UTC) From: "Quentin Retornaz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Quentin Retornaz" Message-ID: <1657493419.d18a63c82d7541b55c18eb1e30e65ad9df512c0a.quentin@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-misc/stunnel/files/, net-misc/stunnel/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: net-misc/stunnel/Manifest net-misc/stunnel/files/stunnel net-misc/stunnel/files/stunnel-5.50-libressl.patch net-misc/stunnel/files/stunnel-r1 net-misc/stunnel/stunnel-5.50-r1.ebuild X-VCS-Directories: net-misc/stunnel/files/ net-misc/stunnel/ X-VCS-Committer: quentin X-VCS-Committer-Name: Quentin Retornaz X-VCS-Revision: d18a63c82d7541b55c18eb1e30e65ad9df512c0a X-VCS-Branch: master Date: Sun, 10 Jul 2022 22:52:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee161474-d592-45be-b949-30f05b2b96f4 X-Archives-Hash: 35f4cad95c9730083a783a92b9ff6f19 commit: d18a63c82d7541b55c18eb1e30e65ad9df512c0a Author: orbea riseup net> AuthorDate: Thu Jul 7 21:46:19 2022 +0000 Commit: Quentin Retornaz retornaz com> CommitDate: Sun Jul 10 22:50:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d18a63c8 net-misc/stunnel: Remove old version Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/442 Signed-off-by: Quentin Retornaz retornaz.com> net-misc/stunnel/Manifest | 1 - net-misc/stunnel/files/stunnel | 42 ---- net-misc/stunnel/files/stunnel-5.50-libressl.patch | 228 --------------------- net-misc/stunnel/files/stunnel-r1 | 51 ----- net-misc/stunnel/stunnel-5.50-r1.ebuild | 94 --------- 5 files changed, 416 deletions(-) diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 5811970..d381987 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,3 +1,2 @@ -DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7 DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23 SHA512 85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa diff --git a/net-misc/stunnel/files/stunnel b/net-misc/stunnel/files/stunnel deleted file mode 100644 index 42087c6..0000000 --- a/net-misc/stunnel/files/stunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -SERVICENAME=${SVCNAME#*.} -SERVICENAME=${SERVICENAME:-stunnel} -STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf} - -depend() { - need net - before logger -} - -get_config() { - if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then - eerror "You need to create ${STUNNEL_CONFIGFILE} first." - return 1 - fi - CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}" - PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid} -} - -start() { - get_config || return 1 - checkpath -d -m 0775 -o root:stunnel /run/stunnel - if [ "$(dirname ${PIDFILE})" != "/run" ]; then - checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE}) - fi - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \ - --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS} - eend $? "Failed to start ${SVCNAME}" -} - -stop() { - get_config || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - eend $? "Failed to stop ${SVCNAME}" -} diff --git a/net-misc/stunnel/files/stunnel-5.50-libressl.patch b/net-misc/stunnel/files/stunnel-5.50-libressl.patch deleted file mode 100644 index 4481220..0000000 --- a/net-misc/stunnel/files/stunnel-5.50-libressl.patch +++ /dev/null @@ -1,228 +0,0 @@ -diff --git a/src/ctx.c b/src/ctx.c -index cd59f4e..b41be1b 100644 ---- a/src/ctx.c -+++ b/src/ctx.c -@@ -118,7 +118,7 @@ NOEXPORT void sslerror_log(unsigned long, char *); - - /**************************************** initialize section->ctx */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - typedef long unsigned SSL_OPTIONS_TYPE; - #else - typedef long SSL_OPTIONS_TYPE; -@@ -126,7 +126,7 @@ typedef long SSL_OPTIONS_TYPE; - - int context_init(SERVICE_OPTIONS *section) { /* init TLS context */ - /* create TLS context */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - if(section->option.client) - section->ctx=SSL_CTX_new(TLS_client_method()); - else /* server mode */ -@@ -437,7 +437,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) { - /**************************************** initialize OpenSSL CONF */ - - NOEXPORT int conf_init(SERVICE_OPTIONS *section) { --#if OPENSSL_VERSION_NUMBER>=0x10002000L -+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CONF_CTX *cctx; - NAME_LIST *curr; - char *cmd, *param; -@@ -1247,7 +1247,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { - - c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli); - if(c) { --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl); - #else - int state=SSL_get_state((SSL *)ssl); -diff --git a/src/options.c b/src/options.c -index 103ea6c..756e48c 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -75,7 +75,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *); - NOEXPORT void sni_free(SERVICE_OPTIONS *); - #endif /* !defined(OPENSSL_NO_TLSEXT) */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int str_to_proto_version(const char *); - #else /* OPENSSL_VERSION_NUMBER<0x10100000L */ - NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *); -@@ -3048,7 +3048,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr, - break; - } - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - - /* sslVersion */ - switch(cmd) { -@@ -3621,7 +3621,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) { - - /**************************************** modern TLS version handling */ - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - - NOEXPORT int str_to_proto_version(const char *name) { - if(!strcasecmp(name, "all")) -diff --git a/src/prototypes.h b/src/prototypes.h -index aaf50fc..01343bf 100644 ---- a/src/prototypes.h -+++ b/src/prototypes.h -@@ -223,7 +223,7 @@ typedef struct service_options_struct { - #if OPENSSL_VERSION_NUMBER>=0x009080dfL - long unsigned ssl_options_clear; - #endif /* OpenSSL 0.9.8m or later */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - int min_proto_version, max_proto_version; - #else /* OPENSSL_VERSION_NUMBER<0x10100000L */ - SSL_METHOD *client_method, *server_method; -@@ -663,7 +663,7 @@ int getnameinfo(const struct sockaddr *, socklen_t, - #define USE_OS_THREADS - #endif - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - - #ifdef USE_OS_THREADS - -@@ -711,7 +711,7 @@ typedef enum { - - extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS]; - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */ - CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void); - int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *); -diff --git a/src/ssl.c b/src/ssl.c -index ad06cb5..0b45769 100644 ---- a/src/ssl.c -+++ b/src/ssl.c -@@ -39,7 +39,7 @@ - #include "prototypes.h" - - /* global OpenSSL initialization: compression, engine, entropy */ --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, - void *from_d, int idx, long argl, void *argp); - #else -@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { - #endif - #endif - --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, - void *from_d, int idx, long argl, void *argp) { - #else -@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */ - - #ifndef OPENSSL_NO_COMP - --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - NOEXPORT int COMP_get_type(const COMP_METHOD *meth) { - return meth->type; -diff --git a/src/sthreads.c b/src/sthreads.c -index 412a31a..e12a330 100644 ---- a/src/sthreads.c -+++ b/src/sthreads.c -@@ -97,14 +97,16 @@ unsigned long stunnel_thread_id(void) { - - #endif /* USE_WIN32 */ - --#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L -+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \ -+ defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void threadid_func(CRYPTO_THREADID *tid) { - CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id()); - } - #endif - - void thread_id_init(void) { --#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L -+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \ -+ defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_THREADID_set_callback(threadid_func); - #endif - #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED) -@@ -115,7 +117,7 @@ void thread_id_init(void) { - /**************************************** locking */ - - /* we only need to initialize locking with OpenSSL older than 1.1.0 */ --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - - #ifdef USE_PTHREAD - -@@ -224,7 +226,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) { - - CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS]; - --#if OPENSSL_VERSION_NUMBER<0x10100004L -+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - - #ifdef USE_OS_THREADS - -@@ -334,7 +336,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) { - - void locking_init(void) { - size_t i; --#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L -+#if defined(USE_OS_THREADS) && \ -+ (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)) - size_t num; - - /* initialize the OpenSSL static locking */ -diff --git a/src/tls.c b/src/tls.c -index 9616df3..b89c61e 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -41,7 +41,7 @@ - volatile int tls_initialized=0; - - NOEXPORT void tls_platform_init(); --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void free_function(void *); - #endif - -@@ -52,7 +52,7 @@ void tls_init() { - tls_platform_init(); - tls_initialized=1; - ui_tls=tls_alloc(NULL, NULL, "ui"); --#if OPENSSL_VERSION_NUMBER>=0x10100000L -+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_set_mem_functions(str_alloc_detached_debug, - str_realloc_detached_debug, str_free_debug); - #else -@@ -184,7 +184,7 @@ TLS_DATA *tls_get() { - - /**************************************** OpenSSL allocator hook */ - --#if OPENSSL_VERSION_NUMBER<0x10100000L -+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - NOEXPORT void free_function(void *ptr) { - /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */ - /* unfortunately, OpenSSL provides no file:line information here */ -diff --git a/src/verify.c b/src/verify.c -index b4b5115..0457ce0 100644 ---- a/src/verify.c -+++ b/src/verify.c -@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) { - cert=X509_STORE_CTX_get_current_cert(callback_ctx); - subject=X509_get_subject_name(cert); - --#if OPENSSL_VERSION_NUMBER<0x10100006L -+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER) - #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs - #endif - /* modern API allows retrieving multiple matching certificates */ diff --git a/net-misc/stunnel/files/stunnel-r1 b/net-misc/stunnel/files/stunnel-r1 deleted file mode 100644 index 2beb683..0000000 --- a/net-misc/stunnel/files/stunnel-r1 +++ /dev/null @@ -1,51 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" -SERVICENAME=${SVCNAME#*.} -SERVICENAME=${SERVICENAME:-stunnel} -STUNNEL_CONFIGFILE=${STUNNEL_CONFIGFILE:-/etc/stunnel/${SERVICENAME}.conf} - -depend() { - need net - before logger -} - -get_config() { - if [ ! -e ${STUNNEL_CONFIGFILE} ] ; then - eerror "You need to create ${STUNNEL_CONFIGFILE} first." - return 1 - fi - CHROOT=$(grep "^chroot" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - [ -n "${CHROOT}" ] && CHROOT="--chroot ${CHROOT}" - PIDFILE=$(grep "^pid" ${STUNNEL_CONFIGFILE} | sed "s;.*= *;;") - PIDFILE=${PIDFILE:-/run/stunnel/${SERVICENAME}.pid} -} - -start() { - get_config || return 1 - checkpath -d -m 0775 -o root:stunnel /run/stunnel - if [ "$(dirname ${PIDFILE})" != "/run" ]; then - checkpath -d -m 0755 -o stunnel:stunnel -q $(dirname ${PIDFILE}) - fi - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --pidfile "${PIDFILE}" ${CHROOT} \ - --exec /usr/bin/stunnel -- ${STUNNEL_CONFIGFILE} ${STUNNEL_OPTIONS} - eend $? "Failed to start ${SVCNAME}" -} - -stop() { - get_config || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \ - --pidfile ${PIDFILE} - eend $? "Failed to stop ${SVCNAME}" -} - -reload() { - get_config || return 1 - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile ${PIDFILE} --name stunnel - eend $? -} diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild deleted file mode 100644 index 322899f..0000000 --- a/net-misc/stunnel/stunnel-5.50-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit ssl-cert multilib systemd user - -DESCRIPTION="TLS/SSL - Port Wrapper" -HOMEPAGE="https://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" -IUSE="ipv6 selinux stunnel3 tcpd" - -DEPEND="tcpd? ( sys-apps/tcp-wrappers ) - dev-libs/openssl:0=" -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" - - # bug 656420 - eapply "${FILESDIR}"/${P}-libressl.patch - - echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel - - eapply_user -} - -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 - docinto html - dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ - tools/importCA.html - - insinto /etc/stunnel - doins "${FILESDIR}"/stunnel.conf - newinitd "${FILESDIR}"/stunnel-r1 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." -}