cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to unbound v1.2.0; from brad

Browse Source
This commit is contained in:
jakob 2009-01-14 17:44:51 +00:00
parent a604f81e7c
commit 9590ff9609
6 changed files with 17 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/unbound/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2008/12/30 10:40:13 jakob Exp $
# $OpenBSD: Makefile,v 1.8 2009/01/14 17:44:51 jakob Exp $
COMMENT= validating DNS resolver
DISTNAME= unbound-1.1.1
PKGNAME= ${DISTNAME}p1
DISTNAME= unbound-1.2.0
CATEGORIES= net
@ -24,7 +23,7 @@ USE_LIBTOOL= Yes
USE_GMAKE= Yes
NO_REGRESS= Yes
SHARED_LIBS+= unbound 0.0
SHARED_LIBS+= unbound 0.1
WANTLIB= c crypto event ssl
LIB_DEPENDS+= ldns.>=2.0::net/ldns/libldns

10
net/unbound/distinfo
View File

@ -1,5 +1,5 @@
MD5 (unbound-1.1.1.tar.gz) = Q1hvGLTZF4h8kqNf9GDJIw==
RMD160 (unbound-1.1.1.tar.gz) = CCmaLzGioBwtWBn2OrwjEBUHSvM=
SHA1 (unbound-1.1.1.tar.gz) = jIDokiMqBUWZI4JvJmr7dw0/fXM=
SHA256 (unbound-1.1.1.tar.gz) = q2xwH0Su7xGhqDcElXSbm2MABFl6843AQJStVofnOYE=
SIZE (unbound-1.1.1.tar.gz) = 3754958
MD5 (unbound-1.2.0.tar.gz) = JRf4EexJOcDqYCyZpv3qIw==
RMD160 (unbound-1.2.0.tar.gz) = QNdDLCEDCM9weY97vuOY9SXbPfI=
SHA1 (unbound-1.2.0.tar.gz) = LBzvcGadz6E/TbQwbNe47spokqo=
SHA256 (unbound-1.2.0.tar.gz) = iOSAvfsjhVZWpwy4ebIxQU0jIvtsC33VlGKMdII1h4Q=
SIZE (unbound-1.2.0.tar.gz) = 3789663

10
net/unbound/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$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:
$OpenBSD: patch-Makefile_in,v 1.4 2009/01/14 17:44:51 jakob Exp $
--- Makefile.in.orig Thu Dec 18 05:56:18 2008
+++ Makefile.in Wed Jan 14 03:23:54 2009
@@ -296,7 +296,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)
@ -9,4 +9,4 @@ $OpenBSD: patch-Makefile_in,v 1.3 2008/08/20 08:25:41 jakob Exp $
+# $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
uninstall:
rm -f -- $(DESTDIR)$(sbindir)/unbound $(DESTDIR)$(sbindir)/unbound-checkconf $(DESTDIR)$(sbindir)/unbound-host
rm -f -- $(DESTDIR)$(sbindir)/unbound $(DESTDIR)$(sbindir)/unbound-checkconf $(DESTDIR)$(sbindir)/unbound-host $(DESTDIR)$(sbindir)/unbound-control $(DESTDIR)$(sbindir)/unbound-control-setup

25
net/unbound/patches/patch-daemon_unbound_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-daemon_unbound_c,v 1.3 2008/12/30 10:40:13 jakob Exp $
--- daemon/unbound.c.orig Thu Dec 18 22:53:27 2008
+++ daemon/unbound.c Thu Dec 18 22:54:57 2008
@@ -345,8 +345,6 @@ perform_setup(struct daemon* daemon, struct config_fil
* a fork error could not be printed since daemonize closed stderr.*/
if(cfg->use_syslog) {
log_init(cfg->logfile, cfg->use_syslog, cfg->chrootdir);
- /* but syslog is not really opened by glibc until first msg */
- log_info("open syslog, startup in progress");
}
/* if using a logfile, we cannot open it because the logfile would
* be created with the wrong permissions, we cannot chown it because
@@ -516,7 +514,11 @@ run_daemon(const char* cfgfile, int cmdline_verbose, i
if(!done_setup) {
perform_setup(daemon, cfg, debug_mode, &cfgfile);
done_setup = 1;
- } else log_init(cfg->logfile, cfg->use_syslog, cfg->chrootdir);
+ } else {
+ /* reopen log after HUP to facilitate log rotation */
+ if(!cfg->use_syslog)
+ log_init(cfg->logfile, 0, cfg->chrootdir);
+ }
/* work */
daemon_fork(daemon);

8
net/unbound/patches/patch-doc_example_conf_in
View File

@ -1,7 +1,7 @@
$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:
$OpenBSD: patch-doc_example_conf_in,v 1.3 2009/01/14 17:44:51 jakob Exp $
--- doc/example.conf.in.orig Tue Jan 6 08:51:12 2009
+++ doc/example.conf.in Wed Jan 14 03:23:54 2009
@@ -175,7 +175,7 @@ server:
# chroot: "@UNBOUND_CHROOT_DIR@"
# if given, user privileges are dropped (after binding port),

24
net/unbound/patches/patch-services_cache_infra_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-services_cache_infra_c,v 1.1 2008/12/30 10:40:13 jakob Exp $
--- services/cache/infra.c.orig Thu Dec 18 22:42:50 2008
+++ services/cache/infra.c Thu Dec 18 22:44:44 2008
@@ -136,8 +136,18 @@ static hashvalue_t
hash_addr(struct sockaddr_storage* addr, socklen_t addrlen)
{
hashvalue_t h = 0xab;
- h = hashlittle(&addrlen, sizeof(addrlen), h);
- h = hashlittle(addr, addrlen, h);
+ /* select the pieces to hash, some OS have changing data inside */
+ if(addr_is_ip6(addr, addrlen)) {
+ struct sockaddr_in6* in6 = (struct sockaddr_in6*)addr;
+ h = hashlittle(&in6->sin6_family, sizeof(in6->sin6_family), h);
+ h = hashlittle(&in6->sin6_port, sizeof(in6->sin6_port), h);
+ h = hashlittle(&in6->sin6_addr, INET6_SIZE, h);
+ } else {
+ struct sockaddr_in* in = (struct sockaddr_in*)addr;
+ h = hashlittle(&in->sin_family, sizeof(in->sin_family), h);
+ h = hashlittle(&in->sin_port, sizeof(in->sin_port), h);
+ h = hashlittle(&in->sin_addr, INET_SIZE, h);
+ }
return h;
}