unbound 1.0.1; bugfix release

2008-07-16 20:34:10 +00:00 · 2008-07-16 20:34:10 +00:00 · 2d9513a060
commit 2d9513a060
parent a68e45a846
8 changed files with 67 additions and 59 deletions
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2008/06/03 15:09:59 jakob Exp $
+# $OpenBSD: Makefile,v 1.3 2008/07/16 20:34:10 jakob Exp $

 COMMENT=	validating DNS resolver

-DISTNAME=	unbound-1.0.0
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	unbound-1.0.1
+PKGNAME=	${DISTNAME}

 CATEGORIES=	net

@ -27,13 +27,14 @@ NO_REGRESS=		Yes
 SHARED_LIBS+=		unbound 0.0

 WANTLIB=		c crypto event
-BUILD_DEPENDS+=		::devel/doxygen
 LIB_DEPENDS+=		ldns.>=1.0::net/ldns/libldns

 CONFIGURE_ARGS+=	--with-ssl=/usr \
 			--with-libevent=/usr \
 			--with-ldns=${LOCALBASE} \
 			--without-pthreads \
+			--with-chroot-dir=/var/unbound \
+			--with-pidfile=/var/unbound/var/run/unbound.pid \
 			--with-conf-file=/var/unbound/etc/unbound.conf

 post-install:
--- a/net/unbound/distinfo
+++ b/net/unbound/distinfo
@ -1,5 +1,5 @@
-MD5 (unbound-1.0.0.tar.gz) = BbdTLCbmAF91ddBPxE+4kw==
-RMD160 (unbound-1.0.0.tar.gz) = oIr/eTwRXy/ihcbRVXvMqY4MTbo=
-SHA1 (unbound-1.0.0.tar.gz) = qDdAfYZvCRhUfGEi+PZUwhm0tR8=
-SHA256 (unbound-1.0.0.tar.gz) = SOJ5BcssveYEJS+90Z3NkVo7lwxV8roqAz2sAgSN4f4=
-SIZE (unbound-1.0.0.tar.gz) = 3554571
+MD5 (unbound-1.0.1.tar.gz) = 5gyCIXaMx57Kh4PwHoz5aQ==
+RMD160 (unbound-1.0.1.tar.gz) = 874phyU8mMMl8T3HFMoMHPNCQGM=
+SHA1 (unbound-1.0.1.tar.gz) = OoYzdsii6AWQOqTZoyZIufTIDvE=
+SHA256 (unbound-1.0.1.tar.gz) = ldMSS14qNXhIuEQToveOWJbUFjYnjtSQ3PE7+JaD85U=
+SIZE (unbound-1.0.1.tar.gz) = 3592490
--- a/net/unbound/patches/patch-Makefile_in
+++ b/net/unbound/patches/patch-Makefile_in
@ -1,8 +1,21 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2008/07/02 19:01:41 naddy Exp $
--- Makefile.in.orig	Wed Jul  2 14:23:10 2008
-+++ Makefile.in	Wed Jul  2 14:23:29 2008
-@@ -277,7 +277,7 @@ install:
- 	if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(DESTDIR)$(configfile); fi
+$OpenBSD: patch-Makefile_in,v 1.2 2008/07/16 20:34:10 jakob Exp $
+--- Makefile.in.orig	Tue Jul 15 17:05:12 2008
+++ Makefile.in	Wed Jul 16 21:13:36 2008
+@@ -270,15 +270,15 @@ install:
+ 	$(LIBTOOL) --mode=install cp unbound $(DESTDIR)$(sbindir)/unbound
+ 	$(LIBTOOL) --mode=install cp unbound-checkconf $(DESTDIR)$(sbindir)/unbound-checkconf
+ 	$(LIBTOOL) --mode=install cp unbound-host $(DESTDIR)$(sbindir)/unbound-host
+-	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound.8 $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-checkconf.8 $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
+	$(INSTALL) -c -m 644 doc/unbound.8 $(DESTDIR)$(mandir)/man8
+	$(INSTALL) -c -m 644 doc/unbound-checkconf.8 $(DESTDIR)$(mandir)/man8
+	$(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
+ 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
+-	$(INSTALL) -c -m 644 $(srcdir)/doc/libunbound.3 $(DESTDIR)$(mandir)/man3
+-	if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(DESTDIR)$(configfile); fi
+	$(INSTALL) -c -m 644 doc/libunbound.3 $(DESTDIR)$(mandir)/man3
+	if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi
 	$(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound.h $(DESTDIR)$(includedir)/unbound.h
 	$(LIBTOOL) --mode=install cp libunbound.la $(DESTDIR)$(libdir)
 -	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
--- a/net/unbound/patches/patch-daemon_unbound_c
+++ b/net/unbound/patches/patch-daemon_unbound_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-daemon_unbound_c,v 1.1.1.1 2008/05/23 06:52:21 jakob Exp $
--- daemon/unbound.c.orig	Thu May 22 10:41:08 2008
-+++ daemon/unbound.c	Thu May 22 10:42:40 2008
-@@ -376,6 +376,8 @@ run_daemon(char* cfgfile, int cmdline_verbose, int deb
- 	struct daemon* daemon = NULL;
- 	int done_chroot = 0;
- 
-+	tzset();
-+
- 	if(!(daemon = daemon_init()))
- 		fatal_exit("alloc failure");
- 	while(!daemon->need_to_exit) {
--- a/net/unbound/patches/patch-doc_example_conf
+++ b/net/unbound/patches/patch-doc_example_conf
@ -1,33 +0,0 @@
-$OpenBSD: patch-doc_example_conf,v 1.1.1.1 2008/05/23 06:52:21 jakob Exp $
--- doc/example.conf.orig	Thu Apr 24 15:29:34 2008
-+++ doc/example.conf	Tue May 20 21:58:39 2008
-@@ -162,17 +162,17 @@ server:
- 	# How to do this is specific to your OS.
- 	#
- 	# If you give "" no chroot is performed. The path must not end in a /.
-	# chroot: "/usr/local/etc/unbound"
-+	chroot: "/var/unbound"
- 
- 	# if given, user privileges are dropped (after binding port),
- 	# and the given username is assumed. Default is user "unbound".
- 	# If you give "" no privileges are dropped.
-	# username: "unbound"
-+	username: "_unbound"
- 
- 	# the working directory. The relative files in this config are 
- 	# relative to this directory. If you give "" the working directory
- 	# is not changed.
-	# directory: "/usr/local/etc/unbound"
-+	directory: "/var/unbound/etc"
- 
- 	# the log file, "" means log to stderr. 
- 	# Use of this option sets use-syslog to "no".
-@@ -183,7 +183,7 @@ server:
- 	# use-syslog: yes 
- 
- 	# the pid file.
-	# pidfile: "/usr/local/etc/unbound/unbound.pid"
-+	pidfile: "/var/unbound/var/run/unbound.pid"
- 	
- 	# file to read root hints from.
- 	# get one from ftp://FTP.INTERNIC.NET/domain/named.cache
--- a/net/unbound/patches/patch-doc_example_conf_in
+++ b/net/unbound/patches/patch-doc_example_conf_in
@ -0,0 +1,15 @@
+$OpenBSD: patch-doc_example_conf_in,v 1.1 2008/07/16 20:34:10 jakob Exp $
+--- doc/example.conf.in.orig	Mon Jun  9 16:59:29 2008
+++ doc/example.conf.in	Wed Jul 16 20:36:51 2008
+@@ -165,9 +165,9 @@ server:
+ 	# chroot: "@UNBOUND_CHROOT_DIR@"
+ 
+ 	# if given, user privileges are dropped (after binding port),
+-	# and the given username is assumed. Default is user "unbound".
+	# and the given username is assumed. Default is user "_unbound".
+ 	# If you give "" no privileges are dropped.
+-	# username: "unbound"
+	# username: "_unbound"
+ 
+ 	# the working directory. The relative files in this config are 
+ 	# relative to this directory. If you give "" the working directory
--- a/net/unbound/patches/patch-doc_unbound_conf_5_in
+++ b/net/unbound/patches/patch-doc_unbound_conf_5_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_unbound_conf_5_in,v 1.1 2008/07/16 20:34:10 jakob Exp $
+--- doc/unbound.conf.5.in.orig	Wed Jul 16 20:33:05 2008
+++ doc/unbound.conf.5.in	Wed Jul 16 20:36:59 2008
+@@ -258,7 +258,7 @@ If given a chroot is done to the given directory. The 
+ .TP
+ .B username: \fI<name>
+ If given, after binding the port the user privileges are dropped. Default is
+-"unbound". If you give username: "" no user change is performed. 
+"_unbound". If you give username: "" no user change is performed. 
+ .IP
+ If this user is not capable of binding the
+ port, reloads (by signal HUP) will still retain the opened ports.
--- a/net/unbound/patches/patch-util_config_file_c
+++ b/net/unbound/patches/patch-util_config_file_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-util_config_file_c,v 1.1 2008/07/16 20:34:10 jakob Exp $
+--- util/config_file.c.orig	Wed Jun 25 16:36:10 2008
+++ util/config_file.c	Wed Jul 16 21:47:00 2008
+@@ -105,7 +105,7 @@ config_create()
+ 	if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int))))
+ 		goto error_exit;
+ 	init_outgoing_availports(cfg->outgoing_avail_ports, 65536);
+-	if(!(cfg->username = strdup("unbound"))) goto error_exit;
+	if(!(cfg->username = strdup("_unbound"))) goto error_exit;
+ #ifdef HAVE_CHROOT
+ 	if(!(cfg->chrootdir = strdup(CHROOT_DIR))) goto error_exit;
+ #endif