Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Oct 2016 11:21:02 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423502 - in head/security/xmlsec1: . files
Message-ID:  <201610081121.u98BL2Wq037820@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <grembo@freebsd.org>
+
+--- 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 <openssl/opensslv.h>
+-        #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 <openssl/opensslv.h>
+-        #if OPENSSL_VERSION_NUMBER >= 0x10100000L
++        #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         yes
+         #endif
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610081121.u98BL2Wq037820>