Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 816117A1FF for ; Tue, 7 Feb 2017 01:19:17 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E99CD855E9; Tue, 7 Feb 2017 01:19:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7954B855D9 for ; Tue, 7 Feb 2017 01:19:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id GSrsG5j3PwOh for ; Tue, 7 Feb 2017 01:19:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EEA7585577 for ; Tue, 7 Feb 2017 01:19:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E9308FBE4; Tue, 7 Feb 2017 01:19:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1486430355271790" MIME-Version: 1.0 Date: Tue, 7 Feb 2017 01:19:15 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/security/xmlsec1 To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170207011915.E9308FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1486430355271790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Feb 7 01:19:15 UTC 2017 Modified Files: pkgsrc/security/xmlsec1: distinfo pkgsrc/security/xmlsec1/patches: patch-ab Log Message: Never try to force static libssl. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/xmlsec1/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/xmlsec1/patches/patch-ab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1486430355271790 Content-Disposition: inline Content-Length: 3468 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/xmlsec1/distinfo diff -u pkgsrc/security/xmlsec1/distinfo:1.16 pkgsrc/security/xmlsec1/distinfo:1.17 --- pkgsrc/security/xmlsec1/distinfo:1.16 Wed Nov 4 01:18:12 2015 +++ pkgsrc/security/xmlsec1/distinfo Tue Feb 7 01:19:15 2017 @@ -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 Index: pkgsrc/security/xmlsec1/patches/patch-ab diff -u pkgsrc/security/xmlsec1/patches/patch-ab:1.6 pkgsrc/security/xmlsec1/patches/patch-ab:1.7 --- pkgsrc/security/xmlsec1/patches/patch-ab:1.6 Wed Mar 26 06:23:12 2014 +++ pkgsrc/security/xmlsec1/patches/patch-ab Tue Feb 7 01:19:15 2017 @@ -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 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 # 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 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 #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 --_----------=_1486430355271790--