mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-06 11:41:52 +00:00
Update to 1.2.29.
Submitted by: lwhsu PR: 243717
This commit is contained in:
Hiroki Sato
parent
7c084c2ddf
commit
2718818c95
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=526438
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= xmlsec1
|
||||
PORTVERSION= 1.2.25
|
||||
PORTVERSION= 1.2.29
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \
|
||||
ftp://ftp.aleksey.com/pub/xmlsec/releases/ \
|
||||
@ -30,6 +30,7 @@ CONFIGURE_ARGS= --with-openssl="${OPENSSLBASE}" \
|
||||
MAKE_ENV= ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC}
|
||||
INSTALL_TARGET= install-strip
|
||||
PORTDOCS= *
|
||||
PLIST_SUB= PORTVERSION=${PORTVERSION}
|
||||
|
||||
OPTIONS_DEFINE= DOCS GNUTLS NSS
|
||||
OPTIONS_DEFAULT= NSS
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1513083917
|
||||
SHA256 (xmlsec1-1.2.25.tar.gz) = 967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
|
||||
SIZE (xmlsec1-1.2.25.tar.gz) = 1839160
|
||||
TIMESTAMP = 1581996323
|
||||
SHA256 (xmlsec1-1.2.29.tar.gz) = b1d1deba966019930f608d1f2b95c40ca3450f1393bcd3a3c001a8ba1d2839ab
|
||||
SIZE (xmlsec1-1.2.29.tar.gz) = 1989360
|
||||
|
||||
@ -1,135 +0,0 @@
|
||||
--- configure.orig 2017-09-12 13:21:59 UTC
|
||||
+++ configure
|
||||
@@ -12661,7 +12649,7 @@ CC=$lt_save_CC
|
||||
|
||||
|
||||
|
||||
-if test "z$RM" == "z" ; then
|
||||
+if test "z$RM" = "z" ; then
|
||||
# Extract the first word of "rm", so it can be a program name with args.
|
||||
set dummy rm; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
@@ -13648,7 +13636,7 @@ case "${host}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
-if test "z$shrext" == "z" ; then
|
||||
+if test "z$shrext" = "z" ; then
|
||||
shrext=$shrext_cmds
|
||||
fi
|
||||
|
||||
@@ -14384,6 +14372,7 @@ elif test "z$with_openssl" != "z" ; then
|
||||
*-*-osf5*) openssl_exlibs=;;
|
||||
*-*-openbsd*) openssl_exlibs=;;
|
||||
*-*-netbsd*) openssl_exlibs=;;
|
||||
+ *-*-freebsd*) openssl_exlibs=;;
|
||||
#FIXME: check if lib "dl" is required
|
||||
*) openssl_exlibs=-ldl;;
|
||||
esac
|
||||
@@ -14641,9 +14630,9 @@ if test "z$OPENSSL_FOUND" = "zno" ; then
|
||||
for dir in $ac_openssl_lib_dir ; do
|
||||
if test -f $dir/libcrypto.a ; then
|
||||
if test "z$dir" = "z/usr/lib" ; then
|
||||
- OPENSSL_LIBS="-lcrypto -ldl"
|
||||
+ OPENSSL_LIBS="-lcrypto"
|
||||
else
|
||||
- OPENSSL_LIBS="-L$dir -lcrypto -ldl"
|
||||
+ OPENSSL_LIBS="-L$dir -lcrypto "
|
||||
fi
|
||||
OPENSSL_LIBS_FOUND="yes"
|
||||
ac_found_openssl_lib_dir=$dir
|
||||
@@ -14668,7 +14669,7 @@ $as_echo_n "checking for openssl librari
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <openssl/opensslv.h>
|
||||
- #if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER)
|
||||
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L
|
||||
yes
|
||||
#endif
|
||||
|
||||
@@ -14676,7 +14665,7 @@ _ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "yes" >/dev/null 2>&1; then :
|
||||
|
||||
- OPENSSL_VERSION="1.0.0 (libressl)"
|
||||
+ OPENSSL_VERSION="1.0.0 (LibreSSL < 2.7)"
|
||||
|
||||
else
|
||||
|
||||
@@ -14692,7 +14681,31 @@ rm -f conftest*
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <openssl/opensslv.h>
|
||||
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
|
||||
+ yes
|
||||
+ #endif
|
||||
+
|
||||
+_ACEOF
|
||||
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
+ $EGREP "yes" >/dev/null 2>&1; then :
|
||||
+
|
||||
+ OPENSSL_VERSION="1.1.0 (LibreSSL >= 2.7)"
|
||||
+
|
||||
+else
|
||||
+
|
||||
+ OPENSSL_VERSION=""
|
||||
+
|
||||
+fi
|
||||
+rm -f conftest*
|
||||
+
|
||||
+ fi
|
||||
+
|
||||
+ if test "z$OPENSSL_VERSION" = "z" ; then
|
||||
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
+/* end confdefs.h. */
|
||||
+
|
||||
+ #include <openssl/opensslv.h>
|
||||
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
yes
|
||||
#endif
|
||||
|
||||
@@ -14749,12 +14762,12 @@ fi
|
||||
if test "z$OPENSSL_FOUND" = "zyes" ; then
|
||||
XMLSEC_NO_OPENSSL="0"
|
||||
OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_CRYPTO_OPENSSL=1"
|
||||
- XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST openssl"
|
||||
+ XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST openssl"; CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS"
|
||||
else
|
||||
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
|
||||
fi
|
||||
|
||||
- if test "z$XMLSEC_NO_OPENSSL" == "z1"; then
|
||||
+ if test "z$XMLSEC_NO_OPENSSL" = "z1"; then
|
||||
XMLSEC_NO_OPENSSL_TRUE=
|
||||
XMLSEC_NO_OPENSSL_FALSE='#'
|
||||
else
|
||||
@@ -14776,7 +14789,7 @@ NSPR_MIN_VERSION="4.4.1"
|
||||
NSS_CFLAGS=""
|
||||
NSS_LIBS=""
|
||||
NSS_LIBS_LIST="-lnss3 -lsmime3"
|
||||
-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
|
||||
+NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4 -lpthread"
|
||||
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
|
||||
NSS_FOUND="no"
|
||||
NSPR_PACKAGE=mozilla-nspr
|
||||
@@ -15211,15 +15224,15 @@ $as_echo_n "checking for nss libraries >
|
||||
NSS_NSS_H=""
|
||||
|
||||
if test "z$with_nss" != "z" ; then
|
||||
- NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
|
||||
+ NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include/nss/nss -I$with_nss/include/nss"
|
||||
if test "z$with_gnu_ld" = "zyes" ; then
|
||||
- NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
|
||||
+ NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib/nss -L$with_nss/lib/nss $NSS_LIBS_LIST"
|
||||
else
|
||||
- NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST"
|
||||
+ NSS_LIBS="$NSS_LIBS -L$with_nss/lib/nss $NSS_LIBS_LIST"
|
||||
fi
|
||||
NSS_INCLUDES_FOUND="yes"
|
||||
NSS_LIBS_FOUND="yes"
|
||||
- NSS_NSS_H="$with_nss/include/nss.h"
|
||||
+ NSS_NSS_H="$with_nss/include/nss/nss/nss.h"
|
||||
else
|
||||
for dir in $ac_nss_inc_dir ; do
|
||||
if test -f $dir/nss/nss.h ; then
|
||||
@ -1,33 +0,0 @@
|
||||
--- configure.ac.orig 2017-09-12 13:21:09 UTC
|
||||
+++ configure.ac
|
||||
@@ -493,7 +493,7 @@ if test "z$OPENSSL_FOUND" = "zyes" -a "z
|
||||
yes
|
||||
#endif
|
||||
],[
|
||||
- OPENSSL_VERSION="1.0.0 (libressl)"
|
||||
+ OPENSSL_VERSION="1.0.0 (libressl < 2.7)"
|
||||
],[
|
||||
OPENSSL_VERSION=""
|
||||
])
|
||||
@@ -502,7 +502,20 @@ 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 defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
|
||||
+ yes
|
||||
+ #endif
|
||||
+ ],[
|
||||
+ OPENSSL_VERSION="1.1.0 (libressl >= 2.7)"
|
||||
+ ],[
|
||||
+ OPENSSL_VERSION=""
|
||||
+ ])
|
||||
+ fi
|
||||
+
|
||||
+ if test "z$OPENSSL_VERSION" = "z" ; then
|
||||
+ AC_EGREP_CPP(yes,[
|
||||
+ #include <openssl/opensslv.h>
|
||||
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
yes
|
||||
#endif
|
||||
],[
|
||||
@ -1,19 +0,0 @@
|
||||
--- include/xmlsec/openssl/crypto.h.orig 2017-09-12 13:21:09 UTC
|
||||
+++ include/xmlsec/openssl/crypto.h
|
||||
@@ -43,11 +43,14 @@ XMLSEC_CRYPTO_EXPORT const xmlChar*
|
||||
* What version of the openssl API do we have? (also see configure.ac)
|
||||
*
|
||||
*******************************************************************/
|
||||
-#if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER)
|
||||
-/* Libressl decided to take over OpenSSL version 2.0.0, likely will create
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L
|
||||
+/* LibreSSL decided to take over OpenSSL version 2.0.0, likely will create
|
||||
* issues down the road...
|
||||
*/
|
||||
#define XMLSEC_OPENSSL_API_100 1
|
||||
+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
|
||||
+/* LibreSSL 2.7 implements OpenSSL 1.1 API */
|
||||
+#define XMLSEC_OPENSSL_API_110 1
|
||||
#elif OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
#define XMLSEC_OPENSSL_API_110 1
|
||||
#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||
@ -39,7 +39,6 @@ include/xmlsec1/xmlsec/openssl/symbols.h
|
||||
include/xmlsec1/xmlsec/openssl/x509.h
|
||||
include/xmlsec1/xmlsec/parser.h
|
||||
include/xmlsec1/xmlsec/private.h
|
||||
include/xmlsec1/xmlsec/private/xslt.h
|
||||
include/xmlsec1/xmlsec/soap.h
|
||||
include/xmlsec1/xmlsec/strings.h
|
||||
include/xmlsec1/xmlsec/templates.h
|
||||
@ -56,20 +55,20 @@ lib/libxmlsec1-gcrypt.so.1
|
||||
%%GNUTLS%%lib/libxmlsec1-gnutls.a
|
||||
%%GNUTLS%%lib/libxmlsec1-gnutls.so
|
||||
%%GNUTLS%%lib/libxmlsec1-gnutls.so.1
|
||||
%%GNUTLS%%lib/libxmlsec1-gnutls.so.1.2.25
|
||||
%%GNUTLS%%lib/libxmlsec1-gnutls.so.%%PORTVERSION%%
|
||||
%%NSS%%lib/libxmlsec1-nss.a
|
||||
%%NSS%%lib/libxmlsec1-nss.so
|
||||
%%NSS%%lib/libxmlsec1-nss.so.1
|
||||
%%NSS%%lib/libxmlsec1-nss.so.1.2.25
|
||||
lib/libxmlsec1-gcrypt.so.1.2.25
|
||||
%%NSS%%lib/libxmlsec1-nss.so.%%PORTVERSION%%
|
||||
lib/libxmlsec1-gcrypt.so.%%PORTVERSION%%
|
||||
lib/libxmlsec1-openssl.a
|
||||
lib/libxmlsec1-openssl.so
|
||||
lib/libxmlsec1-openssl.so.1
|
||||
lib/libxmlsec1-openssl.so.1.2.25
|
||||
lib/libxmlsec1-openssl.so.%%PORTVERSION%%
|
||||
lib/libxmlsec1.a
|
||||
lib/libxmlsec1.so
|
||||
lib/libxmlsec1.so.1
|
||||
lib/libxmlsec1.so.1.2.25
|
||||
lib/libxmlsec1.so.%%PORTVERSION%%
|
||||
libdata/pkgconfig/xmlsec1-gcrypt.pc
|
||||
%%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc
|
||||
%%NSS%%libdata/pkgconfig/xmlsec1-nss.pc
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user