Index: head/mail/qpopper/files/patch-popper.c
===================================================================
--- head/mail/qpopper/files/patch-popper.c	(nonexistent)
+++ head/mail/qpopper/files/patch-popper.c	(revision 545511)
@@ -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;
+ 
+ 
+ /*

Property changes on: head/mail/qpopper/files/patch-popper.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/qpopper/files/patch-popper__pop_tls_openssl.c
===================================================================
--- head/mail/qpopper/files/patch-popper__pop_tls_openssl.c	(revision 545510)
+++ head/mail/qpopper/files/patch-popper__pop_tls_openssl.c	(revision 545511)
@@ -1,44 +1,53 @@
 --- 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. 
       */
      switch ( pPOP->tls_version ) {
 +#ifdef OPENSSL_NO_SSL2
 +        case QPOP_SSLv2:
 +#endif
 +#ifdef OPENSSL_NO_SSL3_METHOD
 +        case QPOP_SSLv3:
 +#endif
          case QPOP_TLSvDEFAULT:  /* unspecified */
          case QPOP_SSLv23:
              DEBUG_LOG0 ( pPOP, "...setting method to SSLv23_server_method" );
              pTLS->m_OpenSSLmeth = SSLv23_server_method();
              break;
  
 +#ifndef OPENSSL_NO_SSL2
          case QPOP_SSLv2:       /* SSL version 2 only */
              DEBUG_LOG0 ( pPOP, "...setting method to SSLv2_server_method" );
              pTLS->m_OpenSSLmeth = SSLv2_server_method();
              break;
 +#endif
  
 +#ifndef OPENSSL_NO_SSL3_METHOD
          case QPOP_SSLv3:       /* SSL version 3 only */
              DEBUG_LOG0 ( pPOP, "...setting method to SSLv3_server_method" );
              pTLS->m_OpenSSLmeth = SSLv3_server_method();
              break;
 +#endif
  
          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,
 -                          ( pTLS->m_OpenSSLconn->hit ? "reused" : "new" ),
 +                          ( SSL_session_reused(pTLS->m_OpenSSLconn) ?
 +                            "reused" : "new" ),
                            ( ciph_name != NULL ? ciph_name : "(none)" ),
                            get_cipher_description ( ciph, buf, sizeof(buf) ),
                            SSL_CIPHER_get_bits    ( ciph, &al_bits ) );