Skip to content
Permalink
Browse files

Switch from NaCl to libsodium for portability. Ride previous bump.

  • Loading branch information...
schmonz committed Jun 20, 2019
1 parent ba519ba commit 617afc2c819a765f52c212d9a42a153c045bb78a
Showing with 18 additions and 8 deletions.
  1. +3 −2 net/djbdnscurve6/Makefile
  2. +2 −2 net/djbdnscurve6/distinfo
  3. +13 −4 net/djbdnscurve6/patches/patch-src_Makefile
@@ -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 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
.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"
@@ -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
@@ -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

0 comments on commit 617afc2

Please sign in to comment.
You can’t perform that action at this time.