Date: Wed, 14 Nov 2018 18:14:53 +0000 (UTC) From: Eugene Grosbein <eugen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484938 - in head/mail/qpopper: . files Message-ID: <201811141814.wAEIErQB059700@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eugen Date: Wed Nov 14 18:14:53 2018 New Revision: 484938 URL: https://svnweb.freebsd.org/changeset/ports/484938 Log: Fix mail/qpopper: - remove MASTER_SITE ftp.qualcomm.com that is no more and add a couple of living distfile sources; - describe custom BSD-style Quallcom license for the distfile; - fix building with openssl-1.1.1 that no longer has SSLv2 support plus made struct ssl_st (SSL) completely opaque, so better use public interface SSL_session_reused() instead of direct access to now hidden "hit" part of struct; this works for previous openssl versions too. No PORTREVISION bump as this fixed package building for FreeBSD 12+ and has no visible package changes for other supported branches. PR: 232383 Reported by: sbruno Approved by: bc979@lafn.org (maintainer timeout, 4 weeks) Modified: head/mail/qpopper/Makefile head/mail/qpopper/files/patch-popper__pop_tls_openssl.c Modified: head/mail/qpopper/Makefile ============================================================================== --- head/mail/qpopper/Makefile Wed Nov 14 18:12:23 2018 (r484937) +++ head/mail/qpopper/Makefile Wed Nov 14 18:14:53 2018 (r484938) @@ -5,14 +5,22 @@ PORTNAME= qpopper PORTVERSION= 4.1.0 PORTREVISION= 6 CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \ - http://core.ring.gr.jp/archives/net/mail/qpopper/ +MASTER_SITES= http://core.ring.gr.jp/archives/net/mail/qpopper/ \ + http://ftp.osuosl.org/.1/blfs/7.7/q/ \ + LOCAL/eugen DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= bc979@lafn.org COMMENT= Berkeley POP 3 server (now maintained by Qualcomm) +# BSD-style license +LICENSE= QUALCOMM +LICENSE_NAME= Qualcomm BSD-style lisense +LICENSE_FILE= ${WRKSRC}/License.txt +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + USES= compiler:features + GNU_CONFIGURE= yes CONFIGURE_ENV= OS_DEFS="-DSETPROCTITLE ${OS_DEFS}" CONFIGURE_ARGS= --enable-nonauth-file=${POPUSERS_FILE} \ @@ -114,12 +122,18 @@ CONFIGURE_ARGS+= --enable-shy # without inetd. .if ${PORT_OPTIONS:MSTANDALONE_MODE} CONFIGURE_ARGS+= --enable-standalone -USE_RC_SUBR= ${PORTNAME} +USE_RC_SUBR= ${PORTNAME} .endif # The default is to build without SSL/TLS support. .if ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +.endif + +# openssl-1.1.1 no longer has SSLv2 support +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 +CFLAGS+= -DOPENSSL_NO_SSL2 +CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" .endif post-patch: Modified: head/mail/qpopper/files/patch-popper__pop_tls_openssl.c ============================================================================== --- head/mail/qpopper/files/patch-popper__pop_tls_openssl.c Wed Nov 14 18:12:23 2018 (r484937) +++ head/mail/qpopper/files/patch-popper__pop_tls_openssl.c Wed Nov 14 18:14:53 2018 (r484938) @@ -32,3 +32,13 @@ 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 ) + "%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 ) );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811141814.wAEIErQB059700>