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 B46B07A272 for ; Mon, 1 May 2017 08:52:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 623C184E0A; Mon, 1 May 2017 08:52:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E5B5684E0A for ; Mon, 1 May 2017 08:52:47 +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 iGo_K78NHh56 for ; Mon, 1 May 2017 08:52:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 64C9C84DC7 for ; Mon, 1 May 2017 08:52:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5EE75FBE4; Mon, 1 May 2017 08:52:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1493628767299140" MIME-Version: 1.0 Date: Mon, 1 May 2017 08:52:47 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2017Q1] pkgsrc/security/zebedee To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20170501085247.5EE75FBE4@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. --_----------=_1493628767299140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon May 1 08:52:47 UTC 2017 Modified Files: pkgsrc/security/zebedee [pkgsrc-2017Q1]: distinfo pkgsrc/security/zebedee/patches [pkgsrc-2017Q1]: patch-aa Log Message: Pullup ticket #5343 - requested by sevan security/zebedee: build fix Revisions pulled up: - security/zebedee/distinfo 1.14-1.15 - security/zebedee/patches/patch-aa 1.11-1.12 --- Module Name: pkgsrc Committed By: jperkin Date: Fri Apr 21 13:22:00 UTC 2017 Modified Files: pkgsrc/security/zebedee: distinfo pkgsrc/security/zebedee/patches: patch-aa Log Message: Honour existing LDFLAGS. --- Module Name: pkgsrc Committed By: jperkin Date: Fri Apr 21 13:33:32 UTC 2017 Modified Files: pkgsrc/security/zebedee: distinfo pkgsrc/security/zebedee/patches: patch-aa Log Message: Use BSD_INSTALL. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.10.1 pkgsrc/security/zebedee/distinfo cvs rdiff -u -r1.10 -r1.10.10.1 pkgsrc/security/zebedee/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1493628767299140 Content-Disposition: inline Content-Length: 2787 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/zebedee/distinfo diff -u pkgsrc/security/zebedee/distinfo:1.13 pkgsrc/security/zebedee/distinfo:1.13.10.1 --- pkgsrc/security/zebedee/distinfo:1.13 Fri Apr 1 17:11:36 2016 +++ pkgsrc/security/zebedee/distinfo Mon May 1 08:52:47 2017 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.13 2016/04/01 17:11:36 jperkin Exp $ +$NetBSD: distinfo,v 1.13.10.1 2017/05/01 08:52:47 bsiegert Exp $ SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986 RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30 SHA512 (zebedee-2.5.3.tar.gz) = 05ce8f7bd57fbb07b746c0754f0cb34b7d76270b9d5430fed7108f2025bff5dae87961d4645415700da4438a1fbfdcd538c84763fcbc77593767466d63f3e5c6 Size (zebedee-2.5.3.tar.gz) = 176088 bytes -SHA1 (patch-aa) = 33386527015bd1dcba0729a33ee241199aa69b76 +SHA1 (patch-aa) = 0f94fa69d77e13038f96875fede97a6984cdc9c2 SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b SHA1 (patch-doc__jp_ftpgw.tcl.pod) = d5dd66ba31df3c61bba2c0b983ca1f1106bd9f2a SHA1 (patch-doc__jp_zebedee.pod) = d78e9f2ebb13d8ad7256cde8921f3bab3296e9db Index: pkgsrc/security/zebedee/patches/patch-aa diff -u pkgsrc/security/zebedee/patches/patch-aa:1.10 pkgsrc/security/zebedee/patches/patch-aa:1.10.10.1 --- pkgsrc/security/zebedee/patches/patch-aa:1.10 Fri Apr 1 17:11:36 2016 +++ pkgsrc/security/zebedee/patches/patch-aa Mon May 1 08:52:47 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.10 2016/04/01 17:11:36 jperkin Exp $ +$NetBSD: patch-aa,v 1.10.10.1 2017/05/01 08:52:47 bsiegert Exp $ --- Makefile.orig 2005-09-06 05:59:53.000000000 +0000 +++ Makefile @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 17:1 # This is a BSD-style install -@@ -87,6 +89,7 @@ INSTALL_linux = install -c +@@ -87,12 +89,13 @@ INSTALL_linux = install -c INSTALL_linux64 = $(INSTALL_linux) INSTALL_solaris = /usr/ucb/install -c INSTALL_freebsd = install -c @@ -69,6 +69,13 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 17:1 INSTALL_tru64 = installbsd -c INSTALL_irix = install -c INSTALL_hpux = install -c + INSTALL_macosx = install + INSTALL_bsdi = install -c +-INSTALL = $(INSTALL_$(OS)) ++INSTALL = $(BSD_INSTALL) + + # InnoSetup compiler for Win32 (see http://www.jordanr.dhs.org/) + @@ -148,12 +151,14 @@ DEFINES_linux = -DHAVE_PTHREADS DEFINES_linux64 = $(DEFINES_linux) DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS @@ -116,7 +123,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 17:1 +CFLAGS += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) -LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) -+LDFLAGS= $(PTHREAD_LDFLAGS) ++LDFLAGS += $(PTHREAD_LDFLAGS) +LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) $(PTHREAD_LIBS) OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ) --_----------=_1493628767299140--