Received: by mail.netbsd.org (Postfix, from userid 605) id A698284D63; Tue, 16 Jan 2018 09:48:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 31A1484D55 for ; Tue, 16 Jan 2018 09:48:49 +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 3Jws8LdR3NbG for ; Tue, 16 Jan 2018 09:48:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3FFC784D3A for ; Tue, 16 Jan 2018 09:48:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D48C9FBDE; Tue, 16 Jan 2018 09:48:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1516096126208040" MIME-Version: 1.0 Date: Tue, 16 Jan 2018 09:48:46 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/security/openssl To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180116094846.D48C9FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1516096126208040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Jan 16 09:48:46 UTC 2018 Modified Files: pkgsrc/security/openssl: distinfo pkgsrc/security/openssl/patches: patch-Makefile.shared Log Message: openssl: Don't set LD_LIBRARY_PATH during build. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 pkgsrc/security/openssl/distinfo cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/security/openssl/patches/patch-Makefile.shared Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1516096126208040 Content-Disposition: inline Content-Length: 4600 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/openssl/distinfo diff -u pkgsrc/security/openssl/distinfo:1.130 pkgsrc/security/openssl/distinfo:1.131 --- pkgsrc/security/openssl/distinfo:1.130 Sat Dec 9 18:02:02 2017 +++ pkgsrc/security/openssl/distinfo Tue Jan 16 09:48:46 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.130 2017/12/09 18:02:02 fhajny Exp $ +$NetBSD: distinfo,v 1.131 2018/01/16 09:48:46 jperkin Exp $ SHA1 (openssl-1.0.2n.tar.gz) = 0ca2957869206de193603eca6d89f532f61680b1 RMD160 (openssl-1.0.2n.tar.gz) = 90fbf1df8986e04921e14e4c6e408458b5b31f6c @@ -6,7 +6,7 @@ SHA512 (openssl-1.0.2n.tar.gz) = 144bf0d Size (openssl-1.0.2n.tar.gz) = 5375802 bytes SHA1 (patch-Configure) = 2d963d781314276a0ee1bc531df6bc50f0f6b32b SHA1 (patch-Makefile.org) = d2a9295003a8b88718a328b01ff6bcbbc102ec0b -SHA1 (patch-Makefile.shared) = d317004d6ade167fc3b6e533bb8a1e93657188b2 +SHA1 (patch-Makefile.shared) = 273154600c6cf0cf4de4ae16d56c5555bca5f9ad SHA1 (patch-apps_Makefile) = 60113291f2a25f5f1c1dba35e8173087bcd4cc30 SHA1 (patch-config) = 345cadece3bdf0ef0a273a6c9ba6d0cbb1026a31 SHA1 (patch-crypto_bn_bn__prime.pl) = a516f3709a862d85e659d466e895419b1e0a94c8 Index: pkgsrc/security/openssl/patches/patch-Makefile.shared diff -u pkgsrc/security/openssl/patches/patch-Makefile.shared:1.5 pkgsrc/security/openssl/patches/patch-Makefile.shared:1.6 --- pkgsrc/security/openssl/patches/patch-Makefile.shared:1.5 Thu Jan 28 16:30:43 2016 +++ pkgsrc/security/openssl/patches/patch-Makefile.shared Tue Jan 16 09:48:46 2018 @@ -1,11 +1,27 @@ -$NetBSD: patch-Makefile.shared,v 1.5 2016/01/28 16:30:43 jperkin Exp $ +$NetBSD: patch-Makefile.shared,v 1.6 2018/01/16 09:48:46 jperkin Exp $ Adjust build procedure. Fix SunOS -h linker argument. ---- Makefile.shared.orig 2016-01-28 13:38:30.000000000 +0000 +--- Makefile.shared.orig 2017-12-07 13:16:38.000000000 +0000 +++ Makefile.shared -@@ -315,6 +315,11 @@ link_o.alpha-osf1: +@@ -95,7 +95,6 @@ LINK_APP= \ + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) + + LINK_SO= \ +@@ -105,7 +104,6 @@ LINK_SO= \ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ +@@ -315,6 +313,11 @@ link_o.alpha-osf1: @ if $(DETECT_GNU_LD); then \ $(DO_GNU_SO); \ else \ @@ -17,7 +33,7 @@ Fix SunOS -h linker argument. SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ -@@ -324,11 +329,11 @@ link_o.alpha-osf1: +@@ -324,11 +327,11 @@ link_o.alpha-osf1: SHLIB_HIST="$(LIBVERSION)"; \ fi; \ SHLIB_SOVER=; \ @@ -32,7 +48,7 @@ Fix SunOS -h linker argument. fi; \ fi; \ $(LINK_SO_O) -@@ -336,6 +341,11 @@ link_a.alpha-osf1: +@@ -336,6 +339,11 @@ link_a.alpha-osf1: @ if $(DETECT_GNU_LD); then \ $(DO_GNU_SO); \ else \ @@ -44,7 +60,7 @@ Fix SunOS -h linker argument. SHLIB=lib$(LIBNAME).so; \ SHLIB_SUFFIX=; \ SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \ -@@ -345,11 +355,11 @@ link_a.alpha-osf1: +@@ -345,11 +353,11 @@ link_a.alpha-osf1: SHLIB_HIST="$(LIBVERSION)"; \ fi; \ SHLIB_SOVER=; \ @@ -59,7 +75,7 @@ Fix SunOS -h linker argument. fi; \ fi; \ $(LINK_SO_A) -@@ -372,7 +382,7 @@ link_o.solaris: +@@ -372,7 +380,7 @@ link_o.solaris: SHLIB_SUFFIX=; \ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ @@ -68,7 +84,7 @@ Fix SunOS -h linker argument. fi; \ $(LINK_SO_O) link_a.solaris: -@@ -386,7 +396,7 @@ link_a.solaris: +@@ -386,7 +394,7 @@ link_a.solaris: SHLIB_SUFFIX=;\ ALLSYMSFLAGS="$${MINUSZ}allextract"; \ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \ @@ -77,7 +93,7 @@ Fix SunOS -h linker argument. fi; \ $(LINK_SO_A) link_app.solaris: -@@ -484,7 +494,7 @@ link_a.irix: +@@ -484,7 +492,7 @@ link_a.irix: ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \ ALLSYMSFLAGS="$${MINUSWL}-all"; \ NOALLSYMSFLAGS="$${MINUSWL}-none"; \ --_----------=_1516096126208040--