Received: by mail.netbsd.org (Postfix, from userid 605) id B2C2684D78; Thu, 20 Jun 2019 02:09:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3AA6B84D32 for ; Thu, 20 Jun 2019 02:09:26 +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 6X8k8wjEDw8Z for ; Thu, 20 Jun 2019 02:09:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A353984CEF for ; Thu, 20 Jun 2019 02:09:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9C507FBF4; Thu, 20 Jun 2019 02:09:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1560996565225690" MIME-Version: 1.0 Date: Thu, 20 Jun 2019 02:09:25 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/net/djbdnscurve6 To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20190620020925.9C507FBF4@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. --_----------=_1560996565225690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Jun 20 02:09:25 UTC 2019 Modified Files: pkgsrc/net/djbdnscurve6: Makefile distinfo pkgsrc/net/djbdnscurve6/patches: patch-src_Makefile Log Message: Switch from NaCl to libsodium for portability. Ride previous bump. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/djbdnscurve6/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/djbdnscurve6/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1560996565225690 Content-Disposition: inline Content-Length: 3321 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/djbdnscurve6/Makefile diff -u pkgsrc/net/djbdnscurve6/Makefile:1.4 pkgsrc/net/djbdnscurve6/Makefile:1.5 --- pkgsrc/net/djbdnscurve6/Makefile:1.4 Thu Jun 20 01:27:59 2019 +++ pkgsrc/net/djbdnscurve6/Makefile Thu Jun 20 02:09:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/06/20 01:27:59 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2019/06/20 02:09:25 schmonz Exp $ DISTNAME= djbdnscurve6-35 CATEGORIES= net @@ -40,6 +40,7 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${P .include "../../mk/bsd.prefs.mk" CFLAGS+= -I${PREFIX}/include/qlibs +CFLAGS+= -I${PREFIX}/include/sodium LDFLAGS+= -L${PREFIX}/lib/qlibs do-install: @@ -50,6 +51,6 @@ do-install: done .include "../../net/fehqlibs/buildlink3.mk" -.include "../../security/nacl/buildlink3.mk" +.include "../../security/libsodium/buildlink3.mk" .include "../../mk/djbware.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/djbdnscurve6/distinfo diff -u pkgsrc/net/djbdnscurve6/distinfo:1.3 pkgsrc/net/djbdnscurve6/distinfo:1.4 --- pkgsrc/net/djbdnscurve6/distinfo:1.3 Thu Jun 20 01:27:59 2019 +++ pkgsrc/net/djbdnscurve6/distinfo Thu Jun 20 02:09:25 2019 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2019/06/20 01:27:59 schmonz Exp $ +$NetBSD: distinfo,v 1.4 2019/06/20 02:09:25 schmonz Exp $ SHA1 (djbdnscurve6-35.tgz) = b23cb04c2640b5fcf6e74ecddce3fae74b122789 RMD160 (djbdnscurve6-35.tgz) = 5fc456a232c079fcc09a72f84ccd13c328b07ece SHA512 (djbdnscurve6-35.tgz) = 5f6f10f8113c92e42ca9ec6de1c4481966f525e27c8d62546b8cb534a086b0db6784075404ef0c87e54edc3da59e87b7e3b33e465668ba5a10e143df9015875a Size (djbdnscurve6-35.tgz) = 112640 bytes -SHA1 (patch-src_Makefile) = 92e5e5503db30f63a30a9903cdc8cb6f9f9fab2c +SHA1 (patch-src_Makefile) = ecc0360808f7fb2c73705eb9f3b98dd7ffdbc1f0 SHA1 (patch-src_dnscache-conf.c) = 890bbdf7f803bd0bb0a9371d0a82298b091117eb SHA1 (patch-src_hier.c) = 3aa4172b384b4b3e5ad5621ec790d64892fe71b6 Index: pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile diff -u pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile:1.1 pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile:1.2 --- pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile:1.1 Sat Jan 5 06:20:19 2019 +++ pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile Thu Jun 20 02:09:25 2019 @@ -1,8 +1,8 @@ -$NetBSD: patch-src_Makefile,v 1.1 2019/01/05 06:20:19 schmonz Exp $ +$NetBSD: patch-src_Makefile,v 1.2 2019/06/20 02:09:25 schmonz Exp $ -DESTDIR support. +DESTDIR and libsodium support. ---- src/Makefile.orig 2018-08-10 07:57:14.000000000 +0000 +--- src/Makefile.orig 2019-06-09 10:27:03.000000000 +0000 +++ src/Makefile @@ -12,6 +12,14 @@ auto-str.o: \ compile auto-str.c @@ -19,7 +19,7 @@ DESTDIR support. auto_home.c: \ auto-str ../conf-home ./auto-str auto_home `head -1 ../conf-home` > auto_home.c -@@ -259,16 +267,16 @@ compile hier.c auto_home.h +@@ -260,16 +268,16 @@ compile hier.c auto_home.h ./compile hier.c install: \ @@ -40,3 +40,12 @@ DESTDIR support. instcheck.o: \ compile instcheck.c +@@ -297,7 +305,7 @@ warn-auto.sh ../conf-ld + ( cat warn-auto.sh; \ + echo 'main="$$1"; shift'; \ + echo exec "`head -1 ../conf-ld`" \ +- '-o "$$main" "$$main".o $${1+"$$@"} -lqlibs -lnacl' \ ++ '-o "$$main" "$$main".o $${1+"$$@"} -lqlibs -lsodium' \ + ) > load + chmod 755 load + --_----------=_1560996565225690--