From owner-svn-ports-all@freebsd.org Wed Oct 31 05:10:46 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 00ACD1079319; Wed, 31 Oct 2018 05:10:46 +0000 (UTC) (envelope-from cy@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 9A0218BC33; Wed, 31 Oct 2018 05:10:45 +0000 (UTC) (envelope-from cy@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 4861227BB4; Wed, 31 Oct 2018 05:10:45 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9V5Aj3t040511; Wed, 31 Oct 2018 05:10:45 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9V5AimG040509; Wed, 31 Oct 2018 05:10:44 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201810310510.w9V5AimG040509@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 31 Oct 2018 05:10:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483548 - in head/sysutils: syslog-ng36 syslog-ng37 X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/sysutils: syslog-ng36 syslog-ng37 X-SVN-Commit-Revision: 483548 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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, 31 Oct 2018 05:10:46 -0000 Author: cy Date: Wed Oct 31 05:10:44 2018 New Revision: 483548 URL: https://svnweb.freebsd.org/changeset/ports/483548 Log: Rather than flag syslog-ng ports that do not support openssl111 unconditionally BROKEN under FreeBSD 12 & 13, only flag BROKEN when security/openssl is not installed on systems after openssl111 was committed to 12-CURRENT. PR: 232710 Reported by: linimon Modified: head/sysutils/syslog-ng36/Makefile (contents, props changed) head/sysutils/syslog-ng37/Makefile (contents, props changed) Modified: head/sysutils/syslog-ng36/Makefile ============================================================================== --- head/sysutils/syslog-ng36/Makefile Wed Oct 31 05:10:40 2018 (r483547) +++ head/sysutils/syslog-ng36/Makefile Wed Oct 31 05:10:44 2018 (r483548) @@ -55,8 +55,12 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --locals .include .if ${PORT_OPTIONS:MOPENSSL} -BROKEN_FreeBSD_12= Fails to build with openssl111 -BROKEN_FreeBSD_13= Fails to build with openssl111 +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif USES+= ssl CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ Modified: head/sysutils/syslog-ng37/Makefile ============================================================================== --- head/sysutils/syslog-ng37/Makefile Wed Oct 31 05:10:40 2018 (r483547) +++ head/sysutils/syslog-ng37/Makefile Wed Oct 31 05:10:44 2018 (r483548) @@ -23,8 +23,6 @@ BUILD_DEPENDS= xsltproc:textproc/libxslt DEPRECATED= No longer officially supported by Balabit, does not support openssl111 EXPIRATION_DATE= 2018-12-31 -BROKEN_FreeBSD_12= fails to build with openssl111 -BROKEN_FreeBSD_13= fails to build with openssl111 BROKEN_powerpc64= fails to link: Internal error: Segmentation fault (program ld) BROKEN_sparc64= fails to link: Internal error: Segmentation fault (program ld) @@ -123,6 +121,13 @@ PYTHON_USES= python:2.7 PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so .include + +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085 +.if ${SSL_DEFAULT} != "openssl" +BROKEN_FreeBSD_12= fails to build with openssl111, install security/openssl +BROKEN_FreeBSD_13= fails to build with openssl111, install security/openssl +.endif +.endif post-patch: @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist