aboutsummaryrefslogtreecommitdiff
path: root/mail/qpopper
diff options
context:
space:
mode:
authorEugene Grosbein <eugen@FreeBSD.org>2020-08-20 09:31:20 +0000
committerEugene Grosbein <eugen@FreeBSD.org>2020-08-20 09:31:20 +0000
commitee6a3e31b31b907c171814618e8203971c329922 (patch)
tree83002ec82efefeea7d8f9845643dd82ff21f48ef /mail/qpopper
parent3b42f93d560c2984f283f1bf9fc734cee2e18654 (diff)
downloadports-ee6a3e31b31b907c171814618e8203971c329922.tar.gz
ports-ee6a3e31b31b907c171814618e8203971c329922.zip
mail/qpopper: fix build with -fno-common (clang 11 and gcc 10)
PORTREVISION not bumped as it fixes build for FreeBSD 13. Reported by: pkg-fallout
Notes
Notes: svn path=/head/; revision=545511
Diffstat (limited to 'mail/qpopper')
-rw-r--r--mail/qpopper/files/patch-popper.c11
-rw-r--r--mail/qpopper/files/patch-popper__pop_tls_openssl.c11
2 files changed, 21 insertions, 1 deletions
diff --git a/mail/qpopper/files/patch-popper.c b/mail/qpopper/files/patch-popper.c
new file mode 100644
index 000000000000..e80befbc79d7
--- /dev/null
+++ b/mail/qpopper/files/patch-popper.c
@@ -0,0 +1,11 @@
+--- popper/popper.c.orig 2011-05-31 02:13:40.000000000 +0700
++++ popper/popper.c 2020-08-20 16:22:31.645139000 +0700
+@@ -430,7 +430,7 @@ DEBUG_LOG1 ( &p,"(v%s) Intro", VERSION )
+ }
+
+
+-jmp_buf env;
++static jmp_buf env;
+
+
+ /*
diff --git a/mail/qpopper/files/patch-popper__pop_tls_openssl.c b/mail/qpopper/files/patch-popper__pop_tls_openssl.c
index 364a66225313..90a78a32443c 100644
--- a/mail/qpopper/files/patch-popper__pop_tls_openssl.c
+++ b/mail/qpopper/files/patch-popper__pop_tls_openssl.c
@@ -1,5 +1,14 @@
--- popper/pop_tls_openssl.c.orig 2011-05-30 19:13:40 UTC
+++ popper/pop_tls_openssl.c
+@@ -89,7 +89,7 @@
+ /* ---- Globals ---- */
+ extern volatile BOOL poptimeout;
+ extern int pop_timeout;
+-jmp_buf env;
++static jmp_buf env;
+
+
+
@@ -312,21 +312,31 @@ openssl_init ( pop_tls *pTLS, POP *pPOP
* concern.
*/
@@ -32,7 +41,7 @@
case QPOP_TLSv1: /* TLS version 1 only */
DEBUG_LOG0 ( pPOP, "...setting method to TLSv1_server_method" );
-@@ -547,7 +547,8 @@ openssl_handshake ( pop_tls *pTLS )
+@@ -537,7 +547,8 @@ openssl_handshake ( pop_tls *pTLS )
"%s session-id; cipher: %s (%s), %d bits",
VERSION, SSL_CIPHER_get_version(ciph),
pTLS->m_pPOP->client, pTLS->m_pPOP->ipaddr,