Thu Jun 20 02:09:25 2019 UTC ()
Switch from NaCl to libsodium for portability. Ride previous bump.


(schmonz)
diff -r1.4 -r1.5 pkgsrc/net/djbdnscurve6/Makefile
diff -r1.3 -r1.4 pkgsrc/net/djbdnscurve6/distinfo
diff -r1.1 -r1.2 pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile
cvs diff -r1.4 -r1.5 pkgsrc/net/djbdnscurve6/Makefile (expand / switch to unified diff)

--- pkgsrc/net/djbdnscurve6/Makefile 2019/06/20 01:27:59 1.4
+++ pkgsrc/net/djbdnscurve6/Makefile 2019/06/20 02:09:25 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2019/06/20 01:27:59 schmonz Exp $ 1# $NetBSD: Makefile,v 1.5 2019/06/20 02:09:25 schmonz Exp $
2 2
3DISTNAME= djbdnscurve6-35 3DISTNAME= djbdnscurve6-35
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= https://www.fehcom.de/ipnet/djbdnscurve6/ 5MASTER_SITES= https://www.fehcom.de/ipnet/djbdnscurve6/
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= https://www.fehcom.de/ipnet/djbdnscurve6.html 9HOMEPAGE= https://www.fehcom.de/ipnet/djbdnscurve6.html
10COMMENT= Fork of djbdns with IPv6 and DNSCurve support 10COMMENT= Fork of djbdns with IPv6 and DNSCurve support
11#LICENSE= # TODO: (see mk/license.mk) 11#LICENSE= # TODO: (see mk/license.mk)
12 12
13CONFLICTS+= djbdns-[0-9]* 13CONFLICTS+= djbdns-[0-9]*
14 14
@@ -30,26 +30,27 @@ SUBST_FILES.sysconfdir= src/dnscache-con @@ -30,26 +30,27 @@ SUBST_FILES.sysconfdir= src/dnscache-con
30SUBST_VARS.sysconfdir= PKG_SYSCONFDIR 30SUBST_VARS.sysconfdir= PKG_SYSCONFDIR
31SUBST_MESSAGE.sysconfdir=Fixing sysconfdir. 31SUBST_MESSAGE.sysconfdir=Fixing sysconfdir.
32 32
33EGDIR= ${PREFIX}/share/examples/${PKGBASE} 33EGDIR= ${PREFIX}/share/examples/${PKGBASE}
34CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global 34CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
35BUILD_DEFS+= PKG_SYSCONFBASE 35BUILD_DEFS+= PKG_SYSCONFBASE
36 36
37INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \ 37INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
38 share/examples/${PKGBASE} 38 share/examples/${PKGBASE}
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42CFLAGS+= -I${PREFIX}/include/qlibs 42CFLAGS+= -I${PREFIX}/include/qlibs
 43CFLAGS+= -I${PREFIX}/include/sodium
43LDFLAGS+= -L${PREFIX}/lib/qlibs 44LDFLAGS+= -L${PREFIX}/lib/qlibs
44 45
45do-install: 46do-install:
46 cd ${WRKSRC}/compile && ./install && ./instcheck 47 cd ${WRKSRC}/compile && ./install && ./instcheck
47 cd ${WRKSRC}/man; for i in 1 5 8; do \ 48 cd ${WRKSRC}/man; for i in 1 5 8; do \
48 for j in *.$$i; do ${INSTALL_MAN} $$j \ 49 for j in *.$$i; do ${INSTALL_MAN} $$j \
49 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \ 50 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \
50 done 51 done
51 52
52.include "../../net/fehqlibs/buildlink3.mk" 53.include "../../net/fehqlibs/buildlink3.mk"
53.include "../../security/nacl/buildlink3.mk" 54.include "../../security/libsodium/buildlink3.mk"
54.include "../../mk/djbware.mk" 55.include "../../mk/djbware.mk"
55.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/djbdnscurve6/distinfo (expand / switch to unified diff)

--- pkgsrc/net/djbdnscurve6/distinfo 2019/06/20 01:27:59 1.3
+++ pkgsrc/net/djbdnscurve6/distinfo 2019/06/20 02:09:25 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.3 2019/06/20 01:27:59 schmonz Exp $ 1$NetBSD: distinfo,v 1.4 2019/06/20 02:09:25 schmonz Exp $
2 2
3SHA1 (djbdnscurve6-35.tgz) = b23cb04c2640b5fcf6e74ecddce3fae74b122789 3SHA1 (djbdnscurve6-35.tgz) = b23cb04c2640b5fcf6e74ecddce3fae74b122789
4RMD160 (djbdnscurve6-35.tgz) = 5fc456a232c079fcc09a72f84ccd13c328b07ece 4RMD160 (djbdnscurve6-35.tgz) = 5fc456a232c079fcc09a72f84ccd13c328b07ece
5SHA512 (djbdnscurve6-35.tgz) = 5f6f10f8113c92e42ca9ec6de1c4481966f525e27c8d62546b8cb534a086b0db6784075404ef0c87e54edc3da59e87b7e3b33e465668ba5a10e143df9015875a 5SHA512 (djbdnscurve6-35.tgz) = 5f6f10f8113c92e42ca9ec6de1c4481966f525e27c8d62546b8cb534a086b0db6784075404ef0c87e54edc3da59e87b7e3b33e465668ba5a10e143df9015875a
6Size (djbdnscurve6-35.tgz) = 112640 bytes 6Size (djbdnscurve6-35.tgz) = 112640 bytes
7SHA1 (patch-src_Makefile) = 92e5e5503db30f63a30a9903cdc8cb6f9f9fab2c 7SHA1 (patch-src_Makefile) = ecc0360808f7fb2c73705eb9f3b98dd7ffdbc1f0
8SHA1 (patch-src_dnscache-conf.c) = 890bbdf7f803bd0bb0a9371d0a82298b091117eb 8SHA1 (patch-src_dnscache-conf.c) = 890bbdf7f803bd0bb0a9371d0a82298b091117eb
9SHA1 (patch-src_hier.c) = 3aa4172b384b4b3e5ad5621ec790d64892fe71b6 9SHA1 (patch-src_hier.c) = 3aa4172b384b4b3e5ad5621ec790d64892fe71b6
cvs diff -r1.1 -r1.2 pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile (expand / switch to unified diff)

--- pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile 2019/01/05 06:20:19 1.1
+++ pkgsrc/net/djbdnscurve6/patches/patch-src_Makefile 2019/06/20 02:09:25 1.2
@@ -1,42 +1,51 @@ @@ -1,42 +1,51 @@
1$NetBSD: patch-src_Makefile,v 1.1 2019/01/05 06:20:19 schmonz Exp $ 1$NetBSD: patch-src_Makefile,v 1.2 2019/06/20 02:09:25 schmonz Exp $
2 2
3DESTDIR support. 3DESTDIR and libsodium support.
4 4
5--- src/Makefile.orig 2018-08-10 07:57:14.000000000 +0000 5--- src/Makefile.orig 2019-06-09 10:27:03.000000000 +0000
6+++ src/Makefile 6+++ src/Makefile
7@@ -12,6 +12,14 @@ auto-str.o: \ 7@@ -12,6 +12,14 @@ auto-str.o: \
8 compile auto-str.c  8 compile auto-str.c
9 ./compile auto-str.c 9 ./compile auto-str.c
10  10
11+auto_destdir.c: \ 11+auto_destdir.c: \
12+auto-str ../conf-destdir 12+auto-str ../conf-destdir
13+ ./auto-str auto_home `head -1 ../conf-destdir` > auto_destdir.c 13+ ./auto-str auto_home `head -1 ../conf-destdir` > auto_destdir.c
14+ 14+
15+auto_destdir.o: \ 15+auto_destdir.o: \
16+compile auto_destdir.c 16+compile auto_destdir.c
17+ ./compile auto_destdir.c 17+ ./compile auto_destdir.c
18+ 18+
19 auto_home.c: \ 19 auto_home.c: \
20 auto-str ../conf-home 20 auto-str ../conf-home
21 ./auto-str auto_home `head -1 ../conf-home` > auto_home.c 21 ./auto-str auto_home `head -1 ../conf-home` > auto_home.c
22@@ -259,16 +267,16 @@ compile hier.c auto_home.h 22@@ -260,16 +268,16 @@ compile hier.c auto_home.h
23 ./compile hier.c 23 ./compile hier.c
24  24
25 install: \ 25 install: \
26-load install.o hier.o auto_home.o  26-load install.o hier.o auto_home.o
27- ./load install hier.o auto_home.o  27- ./load install hier.o auto_home.o
28+load install.o hier.o auto_destdir.o  28+load install.o hier.o auto_destdir.o
29+ ./load install hier.o auto_destdir.o  29+ ./load install hier.o auto_destdir.o
30  30
31 install.o: \ 31 install.o: \
32 compile install.c 32 compile install.c
33 ./compile install.c 33 ./compile install.c
34  34
35 instcheck: \ 35 instcheck: \
36-load instcheck.o hier.o auto_home.o  36-load instcheck.o hier.o auto_home.o
37- ./load instcheck hier.o auto_home.o 37- ./load instcheck hier.o auto_home.o
38+load instcheck.o hier.o auto_destdir.o  38+load instcheck.o hier.o auto_destdir.o
39+ ./load instcheck hier.o auto_destdir.o 39+ ./load instcheck hier.o auto_destdir.o
40  40
41 instcheck.o: \ 41 instcheck.o: \
42 compile instcheck.c  42 compile instcheck.c
 43@@ -297,7 +305,7 @@ warn-auto.sh ../conf-ld
 44 ( cat warn-auto.sh; \
 45 echo 'main="$$1"; shift'; \
 46 echo exec "`head -1 ../conf-ld`" \
 47- '-o "$$main" "$$main".o $${1+"$$@"} -lqlibs -lnacl' \
 48+ '-o "$$main" "$$main".o $${1+"$$@"} -lqlibs -lsodium' \
 49 ) > load
 50 chmod 755 load
 51