From owner-svn-ports-all@freebsd.org Wed Nov 14 18:14:55 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFE1B11306B4; Wed, 14 Nov 2018 18:14:54 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0696E83923; Wed, 14 Nov 2018 18:14:54 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D7681229BA; Wed, 14 Nov 2018 18:14:53 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAEIEroM059702; Wed, 14 Nov 2018 18:14:53 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAEIErQB059700; Wed, 14 Nov 2018 18:14:53 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811141814.wAEIErQB059700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Wed, 14 Nov 2018 18:14:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484938 - in head/mail/qpopper: . files X-SVN-Group: ports-head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in head/mail/qpopper: . files X-SVN-Commit-Revision: 484938 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0696E83923 X-Spamd-Result: default: False [-102.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; URI_HIDDEN_PATH(1.00)[http://ftp.osuosl.org/.1/blfs/7.7/q/]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2018 18:14:55 -0000 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 ) );