From owner-svn-ports-head@freebsd.org Sat Oct 8 11:21:04 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49A2AC06034; Sat, 8 Oct 2016 11:21:04 +0000 (UTC) (envelope-from brnrd@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 mx1.freebsd.org (Postfix) with ESMTPS id F3C7589E; Sat, 8 Oct 2016 11:21:03 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98BL3X4037822; Sat, 8 Oct 2016 11:21:03 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98BL2Wq037820; Sat, 8 Oct 2016 11:21:02 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201610081121.u98BL2Wq037820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 8 Oct 2016 11:21:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423502 - in head/security/xmlsec1: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 11:21:04 -0000 Author: brnrd Date: Sat Oct 8 11:21:02 2016 New Revision: 423502 URL: https://svnweb.freebsd.org/changeset/ports/423502 Log: security/xmlsec1: Fix build with LibreSSL - Fix build with LibreSSL - USE_OPENSSL -> USES= ssl PR: 213301 Submitted by: grembo Reported by: grembo Approved by: ssl blanket Added: head/security/xmlsec1/files/patch-configure (contents, props changed) Modified: head/security/xmlsec1/Makefile Modified: head/security/xmlsec1/Makefile ============================================================================== --- head/security/xmlsec1/Makefile Sat Oct 8 11:18:39 2016 (r423501) +++ head/security/xmlsec1/Makefile Sat Oct 8 11:21:02 2016 (r423502) @@ -25,8 +25,7 @@ NSS_LIB_DEPENDS= libnss3.so:security/nss GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= libtool pathfix pkgconfig -USE_OPENSSL= yes +USES= libtool pathfix pkgconfig ssl USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes Added: head/security/xmlsec1/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/xmlsec1/files/patch-configure Sat Oct 8 11:21:02 2016 (r423502) @@ -0,0 +1,32 @@ +https://github.com/lsh123/xmlsec/pull/45 + + - LibreSSL: + * defines OPENSSL_VERSION_NUMBER as 0x20000000L + * deFines LIBRESS_VERSION_NUMBER in opensslv.h + * was forked from 1.0.1f / 0x1000107fL + +PR: https://bugs.freebsd.org/213301 +Reported by: Michael Gmelin + +--- configure.ac.orig 2016-04-20 16:26:22 UTC ++++ configure.ac +@@ -495,7 +495,7 @@ if test "z$OPENSSL_FOUND" = "zyes" -a "z + if test "z$OPENSSL_VERSION" = "z" ; then + AC_EGREP_CPP(yes,[ + #include +- #if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + yes + #endif + ],[ +--- configure.orig 2016-10-08 10:49:21 UTC ++++ configure +@@ -14258,7 +14258,7 @@ $as_echo_n "checking for openssl librari + /* end confdefs.h. */ + + #include +- #if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + yes + #endif +