update to LDNS 1.6.11, from brad

This commit is contained in:
jakob 2011-10-17 19:41:23 +00:00
parent e310870aa6
commit 4c659ddc93
12 changed files with 48 additions and 84 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.18 2011/05/31 17:40:49 jakob Exp $
# $OpenBSD: Makefile.inc,v 1.19 2011/10/17 19:41:23 jakob Exp $
VERSION= 1.6.10
VERSION= 1.6.11
DISTNAME= ldns-${VERSION}

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.20 2011/05/31 17:40:49 jakob Exp $
# $OpenBSD: Makefile,v 1.21 2011/10/17 19:41:23 jakob Exp $
COMMENT= DNS debugger
PKGNAME= drill-${VERSION}
WANTLIB= c crypto ldns>=4.8
LIB_DEPENDS+= net/ldns/libldns>=1.6.10
WANTLIB= c crypto ldns>=4.9
LIB_DEPENDS+= net/ldns/libldns>=1.6.11
WRKSRC= ${WRKDIST}/drill
CONFIGURE_ARGS+= --with-ldns=${LOCALBASE}
USE_GROFF = Yes
USE_GROFF= Yes
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (ldns-1.6.10.tar.gz) = +t+OOPvS00NKLEYJfZky1Q==
RMD160 (ldns-1.6.10.tar.gz) = BAE2jJbFsa6aeB7kyUQWUqXoavU=
SHA1 (ldns-1.6.10.tar.gz) = d5ijLG9QpPt9Vt33chY9wct5waQ=
SHA256 (ldns-1.6.10.tar.gz) = pCGqcSMAReDSKpfbjE/7wEnuBrBk3hQZEtonDbcheo8=
SIZE (ldns-1.6.10.tar.gz) = 999717
MD5 (ldns-1.6.11.tar.gz) = xVtZKmeWcigXEsRX+7QetQ==
RMD160 (ldns-1.6.11.tar.gz) = dYCGnkuL3S0xywjLaQwuPQZj84E=
SHA1 (ldns-1.6.11.tar.gz) = LEU37uOaGvY+jd5PNUmM54yWjB8=
SHA256 (ldns-1.6.11.tar.gz) = aJG46o6d7T59LKqvSUqMJFm6tynN0XFvbbK6N19iiIg=
SIZE (ldns-1.6.11.tar.gz) = 1018369

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.20 2011/09/17 19:00:22 jakob Exp $
# $OpenBSD: Makefile,v 1.21 2011/10/17 19:41:23 jakob Exp $
COMMENT= DNS library modelled after Net::DNS
PKGNAME= libldns-${VERSION}
REVISION= 1
SHARED_LIBS += ldns 4.8
SHARED_LIBS += ldns 4.9
WANTLIB= crypto
USE_GROFF= Yes
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (ldns-1.6.10.tar.gz) = +t+OOPvS00NKLEYJfZky1Q==
RMD160 (ldns-1.6.10.tar.gz) = BAE2jJbFsa6aeB7kyUQWUqXoavU=
SHA1 (ldns-1.6.10.tar.gz) = d5ijLG9QpPt9Vt33chY9wct5waQ=
SHA256 (ldns-1.6.10.tar.gz) = pCGqcSMAReDSKpfbjE/7wEnuBrBk3hQZEtonDbcheo8=
SIZE (ldns-1.6.10.tar.gz) = 999717
MD5 (ldns-1.6.11.tar.gz) = xVtZKmeWcigXEsRX+7QetQ==
RMD160 (ldns-1.6.11.tar.gz) = dYCGnkuL3S0xywjLaQwuPQZj84E=
SHA1 (ldns-1.6.11.tar.gz) = LEU37uOaGvY+jd5PNUmM54yWjB8=
SHA256 (ldns-1.6.11.tar.gz) = aJG46o6d7T59LKqvSUqMJFm6tynN0XFvbbK6N19iiIg=
SIZE (ldns-1.6.11.tar.gz) = 1018369

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.10 2011/05/31 17:40:50 jakob Exp $
--- Makefile.in.orig Mon May 30 13:56:41 2011
+++ Makefile.in Tue May 31 19:39:46 2011
$OpenBSD: patch-Makefile_in,v 1.11 2011/10/17 19:41:24 jakob Exp $
--- Makefile.in.orig Thu Sep 22 15:55:11 2011
+++ Makefile.in Fri Oct 14 22:04:28 2011
@@ -13,7 +13,7 @@ datarootdir = @datarootdir@
datadir = @datadir@
libdir = @libdir@
@ -8,9 +8,18 @@ $OpenBSD: patch-Makefile_in,v 1.10 2011/05/31 17:40:50 jakob Exp $
-doxygen = @doxygen@
+#doxygen = @doxygen@
pywrapdir = ${srcdir}/contrib/python
swig = @swig@
python_site =@PYTHON_SITE_PKG@
@@ -229,7 +229,6 @@ uninstall-h:
pyldnsxwrapdir = ${srcdir}/contrib/ldnsx
swig = @swig@
@@ -216,7 +216,7 @@ install-manpages: manpages
done
if [ $(INSTALL_LDNS_CONFIG) = "yes" ] ; then \
${INSTALL} -d $(DESTDIR)$(mandir)/man1; \
- ${INSTALL} -c -m 444 packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/; \
+ ${INSTALL} -c -m 444 $(srcdir)/packaging/ldns-config.1 $(DESTDIR)$(mandir)/man1/; \
fi
uninstall-manpages:
@@ -248,7 +248,6 @@ uninstall-h:
install-lib: lib
$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir)

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-net_c,v 1.1 2011/09/17 19:00:22 jakob Exp $
Fix socket leak on errors.
--- net.c.orig Thu Jul 14 16:11:57 2011
+++ net.c Thu Jul 14 16:15:24 2011
@@ -341,6 +341,11 @@ ldns_udp_bgsend(ldns_buffer *qbin, const struct sockad
}
if (ldns_udp_send_query(qbin, sockfd, to, tolen) == 0) {
+#ifndef USE_WINSOCK
+ close(sockfd);
+#else
+ closesocket(sockfd);
+#endif
return 0;
}
return sockfd;
@@ -678,6 +683,11 @@ ldns_tcp_bgsend(ldns_buffer *qbin, const struct sockad
}
if (ldns_tcp_send_query(qbin, sockfd, to, tolen) == 0) {
+#ifndef USE_WINSOCK
+ close(sockfd);
+#else
+ closesocket(sockfd);
+#endif
return 0;
}

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-util_c,v 1.7 2011/05/31 17:40:50 jakob Exp $
--- util.c.orig Wed May 18 16:15:05 2011
+++ util.c Tue May 31 19:39:46 2011
@@ -369,10 +369,10 @@ ldns_init_random(FILE *fd, unsigned int size)
}
if (!fd) {
- if ((rand_f = fopen("/dev/urandom", "r")) == NULL) {
- /* no readable /dev/urandom, try /dev/random */
- if ((rand_f = fopen("/dev/random", "r")) == NULL) {
- /* no readable /dev/random either, and no entropy
+ if ((rand_f = fopen("/dev/arandom", "r")) == NULL) {
+ /* no readable /dev/arandom, try /dev/urandom */
+ if ((rand_f = fopen("/dev/urandom", "r")) == NULL) {
+ /* no readable /dev/urandom either, and no entropy
source given. we'll have to improvise */
for (read = 0; read < size; read++) {
gettimeofday(&tv, NULL);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2010/03/21 13:50:27 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2011/10/17 19:41:24 jakob Exp $
@conflict ldns-*
%%SHARED%%
bin/ldns-config
@ -34,6 +34,7 @@ include/ldns/wire2host.h
include/ldns/zone.h
lib/libldns.a
lib/libldns.la
@man man/man1/ldns-config.1
@man man/man3/ldns_bget_token.3
@man man/man3/ldns_bgetc.3
@man man/man3/ldns_bskipcs.3

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.22 2011/05/31 17:40:50 jakob Exp $
# $OpenBSD: Makefile,v 1.23 2011/10/17 19:41:24 jakob Exp $
COMMENT= LDNS utilities
PKGNAME= ldns-utils-${VERSION}
WANTLIB= c crypto ldns>=4.8 pcap
LIB_DEPENDS+= net/ldns/libldns>=1.6.10
WANTLIB= c crypto ldns>=4.9 pcap
LIB_DEPENDS+= net/ldns/libldns>=1.6.11
WRKSRC= ${WRKDIST}/examples
CONFIGURE_ARGS+= --with-ldns=${LOCALBASE}
CONFIGURE_ENV+= libtool=${LIBTOOL}
USE_GROFF = Yes
USE_GROFF= Yes
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (ldns-1.6.10.tar.gz) = +t+OOPvS00NKLEYJfZky1Q==
RMD160 (ldns-1.6.10.tar.gz) = BAE2jJbFsa6aeB7kyUQWUqXoavU=
SHA1 (ldns-1.6.10.tar.gz) = d5ijLG9QpPt9Vt33chY9wct5waQ=
SHA256 (ldns-1.6.10.tar.gz) = pCGqcSMAReDSKpfbjE/7wEnuBrBk3hQZEtonDbcheo8=
SIZE (ldns-1.6.10.tar.gz) = 999717
MD5 (ldns-1.6.11.tar.gz) = xVtZKmeWcigXEsRX+7QetQ==
RMD160 (ldns-1.6.11.tar.gz) = dYCGnkuL3S0xywjLaQwuPQZj84E=
SHA1 (ldns-1.6.11.tar.gz) = LEU37uOaGvY+jd5PNUmM54yWjB8=
SHA256 (ldns-1.6.11.tar.gz) = aJG46o6d7T59LKqvSUqMJFm6tynN0XFvbbK6N19iiIg=
SIZE (ldns-1.6.11.tar.gz) = 1018369

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2011/03/06 09:16:37 jakob Exp $
@comment $OpenBSD: PLIST,v 1.6 2011/10/17 19:41:24 jakob Exp $
@bin bin/ldns-chaos
@bin bin/ldns-compare-zones
@bin bin/ldns-dpa
@bin bin/ldns-gen-zone
@bin bin/ldns-key2ds
@bin bin/ldns-keyfetcher
@bin bin/ldns-keygen
@ -25,6 +26,7 @@
@man man/man1/ldns-chaos.1
@man man/man1/ldns-compare-zones.1
@man man/man1/ldns-dpa.1
@man man/man1/ldns-gen-zone.1
@man man/man1/ldns-key2ds.1
@man man/man1/ldns-keyfetcher.1
@man man/man1/ldns-keygen.1