commit: e6eaa8e01909348f08f58534daec6af9f0b1e3f6 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Apr 11 23:16:26 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Apr 12 02:06:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e6eaa8e0
net-misc/stunnel: Add 5.64-r2, 5.65-r2, 5.68 Remove stunnel-5.59. Closes: https://github.com/gentoo/libressl/pull/523 Signed-off-by: orbea <orbea <AT> riseup.net> net-misc/stunnel/Manifest | 3 +- net-misc/stunnel/files/stunnel-5.65-libressl.patch | 246 ++++++++++++++++ net-misc/stunnel/files/stunnel-5.68-libressl.patch | 321 +++++++++++++++++++++ net-misc/stunnel/metadata.xml | 5 +- ...unnel-5.64-r1.ebuild => stunnel-5.64-r2.ebuild} | 4 - ...{stunnel-5.59.ebuild => stunnel-5.65-r2.ebuild} | 15 +- ...{stunnel-5.64-r1.ebuild => stunnel-5.68.ebuild} | 11 +- 7 files changed, 579 insertions(+), 26 deletions(-) diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index d381987..1f9de10 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,2 +1,3 @@ -DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7 DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23 SHA512 85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa +DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781 SHA512 96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a +DIST stunnel-5.68.tar.gz 884989 BLAKE2B e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40 SHA512 cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb diff --git a/net-misc/stunnel/files/stunnel-5.65-libressl.patch b/net-misc/stunnel/files/stunnel-5.65-libressl.patch new file mode 100644 index 0000000..ac878f6 --- /dev/null +++ b/net-misc/stunnel/files/stunnel-5.65-libressl.patch @@ -0,0 +1,246 @@ +From OpenBSD. + +diff --git a/src/client.c b/src/client.c +index 6a5aeb3..d416127 100644 +--- a/src/client.c ++++ b/src/client.c +@@ -753,7 +753,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiated cipher */ + NOEXPORT void transfer(CLI *c) { + int timeout; /* s_poll_wait timeout in seconds */ + int pending; /* either processed on unprocessed TLS data */ +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + int has_pending=0, prev_has_pending; + #endif + int watchdog=0; /* a counter to detect an infinite loop */ +@@ -800,7 +800,7 @@ NOEXPORT void transfer(CLI *c) { + + /****************************** wait for an event */ + pending=SSL_pending(c->ssl); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + /* only attempt to process SSL_has_pending() data once */ + prev_has_pending=has_pending; + has_pending=SSL_has_pending(c->ssl); +@@ -1205,7 +1205,7 @@ NOEXPORT void transfer(CLI *c) { + s_log(LOG_ERR, + "please report the problem to [email protected]"); + stunnel_info(LOG_ERR); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + s_log(LOG_ERR, "protocol=%s, SSL_pending=%d, SSL_has_pending=%d", + SSL_get_version(c->ssl), + SSL_pending(c->ssl), SSL_has_pending(c->ssl)); +diff --git a/src/common.h b/src/common.h +index bc37eb5..87bfe54 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -457,7 +457,7 @@ extern char *sys_errlist[]; + #define OPENSSL_NO_TLS1_2 + #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */ + +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + #ifndef OPENSSL_NO_SSL2 + #define OPENSSL_NO_SSL2 + #endif /* !defined(OPENSSL_NO_SSL2) */ +diff --git a/src/ctx.c b/src/ctx.c +index a2202b7..a39ee4c 100644 +--- a/src/ctx.c ++++ b/src/ctx.c +@@ -94,7 +94,7 @@ NOEXPORT void set_prompt(const char *); + NOEXPORT int ui_retry(void); + + /* session tickets */ +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + NOEXPORT int generate_session_ticket_cb(SSL *, void *); + NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *, + const unsigned char *, size_t, SSL_TICKET_STATUS, void *); +@@ -182,7 +182,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */ + } + current_section=section; /* setup current section for callbacks */ + +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + /* set the security level */ + if(section->security_level>=0) { + /* set the user-specified value */ +@@ -270,7 +270,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */ + #endif + + /* setup session tickets */ +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb, + decrypt_session_ticket_cb, NULL); + #endif /* OpenSSL 1.1.1 or later */ +@@ -544,7 +544,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; +@@ -1050,7 +1050,7 @@ NOEXPORT int ui_retry() { + + /**************************************** session tickets */ + +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + + typedef struct { + void *session_authenticated; +@@ -1541,7 +1541,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { + + c=SSL_get_ex_data(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 9ac9c7e..dfcf8b2 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -37,7 +37,7 @@ + + #include "prototypes.h" + +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + #define DEFAULT_CURVES "X25519:P-256:X448:P-521:P-384" + #else /* OpenSSL version < 1.1.1 */ + #define DEFAULT_CURVES "prime256v1" +diff --git a/src/prototypes.h b/src/prototypes.h +index 89d77b8..832942d 100644 +--- a/src/prototypes.h ++++ b/src/prototypes.h +@@ -726,7 +726,7 @@ int getnameinfo(const struct sockaddr *, socklen_t, + extern CLI *thread_head; + #endif + +-#if OPENSSL_VERSION_NUMBER<0x10100004L ++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) + + #ifdef USE_OS_THREADS + +@@ -777,7 +777,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 fd6106b..526da34 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -43,7 +43,7 @@ NOEXPORT void cb_new_auth(void *parent, void *ptr, CRYPTO_EX_DATA *ad, + #if OPENSSL_VERSION_NUMBER>=0x30000000L + NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, + void **from_d, int idx, long argl, void *argp); +-#elif OPENSSL_VERSION_NUMBER>=0x10100000L ++#elif 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 +@@ -102,7 +102,7 @@ int fips_available() { /* either FIPS provider or container is available */ + + /* initialize libcrypto before invoking API functions that require it */ + void crypto_init(char *stunnel_dir) { +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_INIT_SETTINGS *conf=OPENSSL_INIT_new(); + #ifdef USE_WIN32 + char *path; +@@ -200,7 +200,7 @@ NOEXPORT void cb_new_auth(void *parent, void *ptr, CRYPTO_EX_DATA *ad, + #if OPENSSL_VERSION_NUMBER>=0x30000000L + NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, + void **from_d, int idx, long argl, void *argp) { +-#elif OPENSSL_VERSION_NUMBER>=0x10100000L ++#elif 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 +diff --git a/src/sthreads.c b/src/sthreads.c +index e3e442e..9f343e9 100644 +--- a/src/sthreads.c ++++ b/src/sthreads.c +@@ -123,7 +123,7 @@ NOEXPORT void thread_id_init() { + /**************************************** 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 + +@@ -283,7 +283,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 + +@@ -391,7 +391,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) { + + NOEXPORT void locking_init() { + 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 43266d3..5de3435 100644 +--- a/src/tls.c ++++ b/src/tls.c +@@ -40,7 +40,7 @@ + volatile int tls_initialized=0; + + NOEXPORT void tls_platform_init(void); +-#if OPENSSL_VERSION_NUMBER<0x10100000L ++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + NOEXPORT void free_function(void *); + #endif + +@@ -51,7 +51,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 +@@ -183,7 +183,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 4058d6c..dbb4880 100644 +--- a/src/verify.c ++++ b/src/verify.c +@@ -350,7 +350,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-5.68-libressl.patch b/net-misc/stunnel/files/stunnel-5.68-libressl.patch new file mode 100644 index 0000000..7bae42f --- /dev/null +++ b/net-misc/stunnel/files/stunnel-5.68-libressl.patch @@ -0,0 +1,321 @@ +commit deb3cc400a32c21712b6b748da616ef4a1b0d86a +Author: orbea <[email protected]> +Date: Tue Apr 11 15:13:02 2023 -0700 + + libressl (From OpenBSD) + +diff --git a/src/client.c b/src/client.c +index ac4a115..dda42c2 100644 +--- a/src/client.c ++++ b/src/client.c +@@ -773,7 +773,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiated cipher */ + NOEXPORT void transfer(CLI *c) { + int timeout; /* s_poll_wait timeout in seconds */ + int pending; /* either processed on unprocessed TLS data */ +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + int has_pending=0, prev_has_pending; + #endif + int watchdog=0; /* a counter to detect an infinite loop */ +@@ -820,7 +820,7 @@ NOEXPORT void transfer(CLI *c) { + + /****************************** wait for an event */ + pending=SSL_pending(c->ssl); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + /* only attempt to process SSL_has_pending() data once */ + prev_has_pending=has_pending; + has_pending=SSL_has_pending(c->ssl); +@@ -1225,7 +1225,7 @@ NOEXPORT void transfer(CLI *c) { + s_log(LOG_ERR, + "please report the problem to [email protected]"); + stunnel_info(LOG_ERR); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + s_log(LOG_ERR, "protocol=%s, SSL_pending=%d, SSL_has_pending=%d", + SSL_get_version(c->ssl), + SSL_pending(c->ssl), SSL_has_pending(c->ssl)); +diff --git a/src/common.h b/src/common.h +index 8fe50b4..52435d7 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -459,7 +459,7 @@ extern char *sys_errlist[]; + #define OPENSSL_NO_TLS1_2 + #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */ + +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + #ifndef OPENSSL_NO_SSL2 + #define OPENSSL_NO_SSL2 + #endif /* !defined(OPENSSL_NO_SSL2) */ +@@ -505,7 +505,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); + /* not defined in public headers before OpenSSL 0.9.8 */ + STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); + #endif /* !defined(OPENSSL_NO_COMP) */ +-#if OPENSSL_VERSION_NUMBER>=0x10101000L ++#if OPENSSL_VERSION_NUMBER>=0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + #include <openssl/storeerr.h> + #endif /* OPENSSL_VERSION_NUMBER>=0x10101000L */ + #if OPENSSL_VERSION_NUMBER>=0x30000000L +diff --git a/src/ctx.c b/src/ctx.c +index 6a42a6b..90d6273 100644 +--- a/src/ctx.c ++++ b/src/ctx.c +@@ -94,7 +94,7 @@ NOEXPORT void set_prompt(const char *); + NOEXPORT int ui_retry(void); + + /* session tickets */ +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + NOEXPORT int generate_session_ticket_cb(SSL *, void *); + NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *, + const unsigned char *, size_t, SSL_TICKET_STATUS, void *); +@@ -133,7 +133,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, int, const 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; +@@ -184,7 +184,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */ + } + current_section=section; /* setup current section for callbacks */ + +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + /* set the security level */ + if(section->security_level>=0) { + /* set the user-specified value */ +@@ -272,7 +272,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */ + #endif + + /* setup session tickets */ +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb, + decrypt_session_ticket_cb, NULL); + #endif /* OpenSSL 1.1.1 or later */ +@@ -546,7 +546,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; +@@ -1085,7 +1085,7 @@ NOEXPORT int ui_retry() { + + /**************************************** session tickets */ + +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + + typedef struct { + void *session_authenticated; +@@ -1573,7 +1573,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) { + CLI *c; + SSL_CTX *ctx; + const char *state_string; +-#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/prototypes.h b/src/prototypes.h +index 0ecd719..1084ce2 100644 +--- a/src/prototypes.h ++++ b/src/prototypes.h +@@ -733,7 +733,7 @@ int getnameinfo(const struct sockaddr *, socklen_t, + extern CLI *thread_head; + #endif + +-#if OPENSSL_VERSION_NUMBER<0x10100004L ++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER) + + #ifdef USE_OS_THREADS + +@@ -784,7 +784,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 2fd0c77..e465fe1 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -43,7 +43,7 @@ NOEXPORT void cb_new_auth(void *parent, void *ptr, CRYPTO_EX_DATA *ad, + #if OPENSSL_VERSION_NUMBER>=0x30000000L + NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, + void **from_d, int idx, long argl, void *argp); +-#elif OPENSSL_VERSION_NUMBER>=0x10100000L ++#elif 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 +@@ -103,7 +103,7 @@ int fips_available() { /* either FIPS provider or container is available */ + + /* initialize libcrypto before invoking API functions that require it */ + void crypto_init() { +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_INIT_SETTINGS *conf; + #endif /* OPENSSL_VERSION_NUMBER>=0x10100000L */ + #ifdef USE_WIN32 +@@ -146,7 +146,7 @@ void crypto_init() { + #endif /* USE_WIN32 */ + + /* initialize OpenSSL */ +-#if OPENSSL_VERSION_NUMBER>=0x10100000L ++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + conf=OPENSSL_INIT_new(); + #ifdef USE_WIN32 + stunnel_dir=tstr2str(stunnel_exe_path); +@@ -246,7 +246,7 @@ NOEXPORT void cb_new_auth(void *parent, void *ptr, CRYPTO_EX_DATA *ad, + #if OPENSSL_VERSION_NUMBER>=0x30000000L + NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, + void **from_d, int idx, long argl, void *argp) { +-#elif OPENSSL_VERSION_NUMBER>=0x10100000L ++#elif 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 +diff --git a/src/sthreads.c b/src/sthreads.c +index d0104ee..23ca48c 100644 +--- a/src/sthreads.c ++++ b/src/sthreads.c +@@ -123,7 +123,7 @@ NOEXPORT void thread_id_init() { + /**************************************** 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 + +@@ -283,7 +283,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 + +@@ -391,7 +391,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) { + + NOEXPORT void locking_init() { + 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/str.c b/src/str.c +index 5b464a1..9837c49 100644 +--- a/src/str.c ++++ b/src/str.c +@@ -93,7 +93,7 @@ NOEXPORT LEAK_ENTRY leak_hash_table[LEAK_TABLE_SIZE], + *leak_results[LEAK_TABLE_SIZE]; + NOEXPORT int leak_result_num=0; + +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + DEFINE_STACK_OF(LEAK_ENTRY) + #endif /* OpenSSL version >= 1.1.1 */ + +@@ -107,7 +107,9 @@ NOEXPORT ALLOC_LIST *get_alloc_list_ptr(void *, const char *, int); + NOEXPORT void str_leak_debug(const ALLOC_LIST *, int); + + NOEXPORT LEAK_ENTRY *leak_search(const ALLOC_LIST *); ++#if !defined(LIBRESSL_VERSION_NUMBER) + NOEXPORT int leak_cmp(const LEAK_ENTRY *const *, const LEAK_ENTRY *const *); ++#endif /* LIBRESSL_VERSION_NUMBER */ + NOEXPORT void leak_report(void); + NOEXPORT long leak_threshold(void); + +@@ -555,7 +557,7 @@ NOEXPORT LEAK_ENTRY *leak_search(const ALLOC_LIST *alloc_list) { + void leak_table_utilization() { + int i, utilization=0; + int64_t grand_total=0; +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + STACK_OF(LEAK_ENTRY) *stats; + #endif /* OpenSSL version >= 1.1.1 */ + +@@ -572,7 +574,7 @@ void leak_table_utilization() { + s_log(LOG_DEBUG, "Leak detection table utilization: %d/%d (%05.2f%%)", + utilization, LEAK_TABLE_SIZE, 100.0*utilization/LEAK_TABLE_SIZE); + +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) + /* log up to 5 most frequently used heap allocations */ + stats=sk_LEAK_ENTRY_new_reserve(leak_cmp, utilization); + for(i=0; i<LEAK_TABLE_SIZE; ++i) +@@ -589,6 +591,7 @@ void leak_table_utilization() { + #endif /* OpenSSL version >= 1.1.1 */ + } + ++#if !defined(LIBRESSL_VERSION_NUMBER) + NOEXPORT int leak_cmp(const LEAK_ENTRY *const *a, const LEAK_ENTRY *const *b) { + int64_t d = (*a)->total - (*b)->total; + if(d>0) +@@ -597,6 +600,7 @@ NOEXPORT int leak_cmp(const LEAK_ENTRY *const *a, const LEAK_ENTRY *const *b) { + return -1; + return 0; + } ++#endif /* LIBRESSL_VERSION_NUMBER */ + + /* report identified leaks */ + NOEXPORT void leak_report() { +diff --git a/src/tls.c b/src/tls.c +index 691dfa2..bd1b66a 100644 +--- a/src/tls.c ++++ b/src/tls.c +@@ -40,7 +40,7 @@ + volatile int tls_initialized=0; + + NOEXPORT void tls_platform_init(void); +-#if OPENSSL_VERSION_NUMBER<0x10100000L ++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + NOEXPORT void free_function(void *); + #endif + +@@ -51,7 +51,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 4d8c087..9e71e2c 100644 +--- a/src/verify.c ++++ b/src/verify.c +@@ -388,7 +388,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/metadata.xml b/net-misc/stunnel/metadata.xml index 208244b..4d7c40f 100644 --- a/net-misc/stunnel/metadata.xml +++ b/net-misc/stunnel/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="stunnel3">Install the stunnel3 wrapper.</flag> </use> diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild b/net-misc/stunnel/stunnel-5.64-r2.ebuild similarity index 95% copy from net-misc/stunnel/stunnel-5.64-r1.ebuild copy to net-misc/stunnel/stunnel-5.64-r2.ebuild index 339ba22..e95db60 100644 --- a/net-misc/stunnel/stunnel-5.64-r1.ebuild +++ b/net-misc/stunnel/stunnel-5.64-r2.ebuild @@ -70,10 +70,6 @@ src_install() { "${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.md BUGS.md CREDITS.md PORTS.md README.md TODO.md docinto html dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ diff --git a/net-misc/stunnel/stunnel-5.59.ebuild b/net-misc/stunnel/stunnel-5.65-r2.ebuild similarity index 91% rename from net-misc/stunnel/stunnel-5.59.ebuild rename to net-misc/stunnel/stunnel-5.65-r2.ebuild index 7df17fe..91062e9 100644 --- a/net-misc/stunnel/stunnel-5.59.ebuild +++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit ssl-cert systemd tmpfiles @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6 selinux stunnel3 tcpd" +IUSE="selinux stunnel3 tcpd" DEPEND=" dev-libs/openssl:0= @@ -44,7 +44,7 @@ src_prepare() { tools/Makefile.in || die "sed failed" # bug 656420 - eapply "${FILESDIR}"/${P}-libressl.patch + eapply "${FILESDIR}"/${PN}-5.65-libressl.patch echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel @@ -54,7 +54,6 @@ src_prepare() { src_configure() { local myeconfargs=( --libdir="${EPREFIX}/usr/$(get_libdir)" - $(use_enable ipv6) $(use_enable tcpd libwrap) --with-ssl="${EPREFIX}"/usr --disable-fips @@ -70,10 +69,6 @@ src_install() { "${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.md BUGS.md CREDITS.md PORTS.md README.md TODO.md docinto html dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ @@ -87,6 +82,8 @@ src_install() { systemd_dounit "${S}/tools/stunnel.service" newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf + + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/net-misc/stunnel/stunnel-5.64-r1.ebuild b/net-misc/stunnel/stunnel-5.68.ebuild similarity index 91% rename from net-misc/stunnel/stunnel-5.64-r1.ebuild rename to net-misc/stunnel/stunnel-5.68.ebuild index 339ba22..6412689 100644 --- a/net-misc/stunnel/stunnel-5.64-r1.ebuild +++ b/net-misc/stunnel/stunnel-5.68.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6 selinux stunnel3 tcpd" +IUSE="selinux stunnel3 tcpd" DEPEND=" dev-libs/openssl:0= @@ -44,7 +44,7 @@ src_prepare() { tools/Makefile.in || die "sed failed" # bug 656420 - eapply "${FILESDIR}"/${PN}-5.59-libressl.patch + eapply "${FILESDIR}"/${PN}-5.68-libressl.patch echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel @@ -54,7 +54,6 @@ src_prepare() { src_configure() { local myeconfargs=( --libdir="${EPREFIX}/usr/$(get_libdir)" - $(use_enable ipv6) $(use_enable tcpd libwrap) --with-ssl="${EPREFIX}"/usr --disable-fips @@ -70,10 +69,6 @@ src_install() { "${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.md BUGS.md CREDITS.md PORTS.md README.md TODO.md docinto html dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
