net-misc/stunnel: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/20259
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

3 files changed, 0 insertions, 321 deletions

diff --git a/net-misc/stunnel/files/stunnel b/net-misc/stunnel/files/stunnel
deleted file mode 100644
index 13887f911332..000000000000
--- a/net-misc/stunnel/files/stunnel
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# 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 4481220c268d..000000000000
--- 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 11530eabe720..000000000000
--- a/net-misc/stunnel/files/stunnel-r1
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 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 $?
-}