summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2017-02-07 01:19:15 +0000
committerjoerg <joerg@pkgsrc.org>2017-02-07 01:19:15 +0000
commit086409b95e1defa908ef4790b2da725a332734a0 (patch)
tree011e4a211c7fe1034c208b6a945165c88eed0340
parentdb067924e993060e98f83179696271209934a74d (diff)
downloadpkgsrc-086409b95e1defa908ef4790b2da725a332734a0.tar.gz
Never try to force static libssl.
-rw-r--r--security/xmlsec1/distinfo4
-rw-r--r--security/xmlsec1/patches/patch-ab24
2 files changed, 19 insertions, 9 deletions
diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index b9d6c05db1d..b798f8e10d7 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2015/11/04 01:18:12 agc Exp $
+$NetBSD: distinfo,v 1.17 2017/02/07 01:19:15 joerg Exp $
SHA1 (xmlsec1-1.2.19.tar.gz) = 9f24f84bf6f4a61fc55637f016b56c0f44c048ba
RMD160 (xmlsec1-1.2.19.tar.gz) = 55a16d4ffec20d375cc72ed13c228fcecedd5c29
SHA512 (xmlsec1-1.2.19.tar.gz) = 9d391658902e163261a61474fc0415ee0f25732dc4a98d2012459294674f7984212607febc10cdf5f5b6255932c4ad51a23d0a7b868990439812f5e276fd1a89
Size (xmlsec1-1.2.19.tar.gz) = 1766298 bytes
-SHA1 (patch-ab) = 83c3d98e65e33e7b42191d30e69ab9078f36be52
+SHA1 (patch-ab) = 4c2673375fc5e97c5da47b498507f7e939532a83
SHA1 (patch-ac) = eac6b9be709e316ea635109a0c366546a83cb1f6
diff --git a/security/xmlsec1/patches/patch-ab b/security/xmlsec1/patches/patch-ab
index fa9f32d4476..4ed20091b24 100644
--- a/security/xmlsec1/patches/patch-ab
+++ b/security/xmlsec1/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.6 2014/03/26 06:23:12 asau Exp $
+$NetBSD: patch-ab,v 1.7 2017/02/07 01:19:15 joerg Exp $
* portability fix
* DragonFly also not require extra libs for OpenSSL.
---- configure.orig 2011-05-11 23:02:14.000000000 +0000
+--- configure.orig 2013-03-24 21:36:30.000000000 +0000
+++ configure
-@@ -9818,7 +9818,7 @@ darwin* | rhapsody*)
+@@ -10688,7 +10688,7 @@ darwin* | rhapsody*)
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.6 2014/03/26 06:23:12 asau Exp $
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-@@ -11005,7 +11005,7 @@ CC="$lt_save_CC"
+@@ -11923,7 +11923,7 @@ CC="$lt_save_CC"
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.6 2014/03/26 06:23:12 asau Exp $
# 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
-@@ -11718,7 +11718,7 @@ else
+@@ -12597,7 +12597,7 @@ else
fi
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.6 2014/03/26 06:23:12 asau Exp $
shrext=$shrext_cmds
fi
-@@ -12465,6 +12465,8 @@ elif test "z$with_openssl" != "z" ; then
+@@ -13349,15 +13349,13 @@ elif test "z$with_openssl" != "z" ; then
*-*-osf5*) openssl_exlibs=;;
*-*-openbsd*) openssl_exlibs=;;
*-*-netbsd*) openssl_exlibs=;;
@@ -41,7 +41,17 @@ $NetBSD: patch-ab,v 1.6 2014/03/26 06:23:12 asau Exp $
#FIXME: check if lib "dl" is required
*) openssl_exlibs=-ldl;;
esac
-@@ -12864,7 +12866,7 @@ else
+ OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
+- if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then
+- OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
+- else
+- OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs"
+- fi
++ OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
+ OPENSSL_FOUND="yes"
+ elif test "z$PKGCONFIG_FOUND" = "zyes" ; then
+ if test "z$OPENSSL_VERSION" = "z" ; then
+@@ -13828,7 +13826,7 @@ else
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
fi