From dc8544a72535f5751dacffd60e32472327ed1b10 Mon Sep 17 00:00:00 2001 From: jakob Date: Wed, 20 Aug 2008 08:25:41 +0000 Subject: [PATCH] upgrade to unbound 1.0.2 --- net/unbound/Makefile | 7 +++--- net/unbound/distinfo | 10 ++++---- net/unbound/patches/patch-Makefile_in | 23 ++++--------------- net/unbound/patches/patch-doc_example_conf_in | 15 +++++------- .../patches/patch-doc_unbound_conf_5_in | 12 ---------- net/unbound/patches/patch-util_config_file_c | 12 ---------- net/unbound/pkg/PLIST | 8 +++---- 7 files changed, 24 insertions(+), 63 deletions(-) delete mode 100644 net/unbound/patches/patch-doc_unbound_conf_5_in delete mode 100644 net/unbound/patches/patch-util_config_file_c diff --git a/net/unbound/Makefile b/net/unbound/Makefile index ec2421f2d9f..068fb894e33 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2008/07/16 20:34:10 jakob Exp $ +# $OpenBSD: Makefile,v 1.4 2008/08/20 08:25:41 jakob Exp $ COMMENT= validating DNS resolver -DISTNAME= unbound-1.0.1 +DISTNAME= unbound-1.0.2 PKGNAME= ${DISTNAME} CATEGORIES= net @@ -35,7 +35,8 @@ CONFIGURE_ARGS+= --with-ssl=/usr \ --without-pthreads \ --with-chroot-dir=/var/unbound \ --with-pidfile=/var/unbound/var/run/unbound.pid \ - --with-conf-file=/var/unbound/etc/unbound.conf + --with-conf-file=/var/unbound/etc/unbound.conf \ + --with-username=_unbound post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/unbound diff --git a/net/unbound/distinfo b/net/unbound/distinfo index bb091136f4c..11981476e25 100644 --- a/net/unbound/distinfo +++ b/net/unbound/distinfo @@ -1,5 +1,5 @@ -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 +MD5 (unbound-1.0.2.tar.gz) = AbCKnA0kvpgd5ktuTiXsvg== +RMD160 (unbound-1.0.2.tar.gz) = HpQlBUaPauQGGyCJFOm3/u1uz/E= +SHA1 (unbound-1.0.2.tar.gz) = k/qnt2z3aBuMewxRh6r4TDa2Zws= +SHA256 (unbound-1.0.2.tar.gz) = 5rvEu4UMIR6X7ntbwYJ/WetSItKVtxW9pFUXdXZiQKw= +SIZE (unbound-1.0.2.tar.gz) = 3597275 diff --git a/net/unbound/patches/patch-Makefile_in b/net/unbound/patches/patch-Makefile_in index bc22c9a53b5..11da0f8b8a5 100644 --- a/net/unbound/patches/patch-Makefile_in +++ b/net/unbound/patches/patch-Makefile_in @@ -1,21 +1,8 @@ -$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 +$OpenBSD: patch-Makefile_in,v 1.3 2008/08/20 08:25:41 jakob Exp $ +--- Makefile.in.orig Thu Jul 17 04:45:12 2008 ++++ Makefile.in Thu Aug 7 22:39:00 2008 +@@ -278,7 +278,7 @@ install: + 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) diff --git a/net/unbound/patches/patch-doc_example_conf_in b/net/unbound/patches/patch-doc_example_conf_in index 343751964dd..540d400bf49 100644 --- a/net/unbound/patches/patch-doc_example_conf_in +++ b/net/unbound/patches/patch-doc_example_conf_in @@ -1,15 +1,12 @@ -$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: +$OpenBSD: patch-doc_example_conf_in,v 1.2 2008/08/20 08:25:41 jakob Exp $ +--- doc/example.conf.in.orig Thu Jul 17 05:00:38 2008 ++++ doc/example.conf.in Thu Aug 7 22:43:01 2008 +@@ -165,7 +165,7 @@ 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". ++ # and the given username is assumed. Default is user "@UNBOUND_USERNAME@". # If you give "" no privileges are dropped. -- # username: "unbound" -+ # username: "_unbound" + # username: "@UNBOUND_USERNAME@" - # the working directory. The relative files in this config are - # relative to this directory. If you give "" the working directory diff --git a/net/unbound/patches/patch-doc_unbound_conf_5_in b/net/unbound/patches/patch-doc_unbound_conf_5_in deleted file mode 100644 index 6362e869228..00000000000 --- a/net/unbound/patches/patch-doc_unbound_conf_5_in +++ /dev/null @@ -1,12 +0,0 @@ -$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 - 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. diff --git a/net/unbound/patches/patch-util_config_file_c b/net/unbound/patches/patch-util_config_file_c deleted file mode 100644 index cfffefc68b1..00000000000 --- a/net/unbound/patches/patch-util_config_file_c +++ /dev/null @@ -1,12 +0,0 @@ -$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 diff --git a/net/unbound/pkg/PLIST b/net/unbound/pkg/PLIST index 07fbd5d725a..5622e825a04 100644 --- a/net/unbound/pkg/PLIST +++ b/net/unbound/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2008/06/03 15:09:59 jakob Exp $ +@comment $OpenBSD: PLIST,v 1.3 2008/08/20 08:25:41 jakob Exp $ @newgroup _unbound:601 @newuser _unbound:601:601:daemon:Unbound Daemon:/var/unbound:/sbin/nologin %%SHARED%% @@ -10,9 +10,9 @@ lib/libunbound.la @man man/man5/unbound.conf.5 @man man/man8/unbound-checkconf.8 @man man/man8/unbound.8 -sbin/unbound -sbin/unbound-checkconf -sbin/unbound-host +@bin sbin/unbound +@bin sbin/unbound-checkconf +@bin sbin/unbound-host share/examples/unbound/ share/examples/unbound/unbound.conf @sample /var/unbound/