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

update to unbound 1.4.18; includes a crash fix (assertion failure).

Browse Source 
- rc.d script now generates the unbound-control keys if they don't exist
and the sample config file is patched to enable this, various rc.d/unbound
actions depend on this, pointed out/ok aja@
This commit is contained in:
sthen 2012-08-04 20:43:54 +00:00
parent be5406b3fe
commit 73f342959a
6 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/unbound/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.42 2012/06/08 21:58:17 jakob Exp $
# $OpenBSD: Makefile,v 1.43 2012/08/04 20:43:54 sthen Exp $
COMMENT= validating DNS resolver
DISTNAME= unbound-1.4.17
DISTNAME= unbound-1.4.18
CATEGORIES= net
MASTER_SITES= http://www.unbound.net/downloads/
@ -27,6 +27,7 @@ SHARED_LIBS+= unbound 3.3
WANTLIB= c crypto event expat ldns>=4.11 ssl
LIB_DEPENDS+= net/ldns/libldns>=1.6.13
CONFIGURE_ENV= CFLAGS="${CFLAGS}"
CONFIGURE_ARGS+= --enable-allsymbols \
--with-ssl=/usr \
--with-libevent=/usr \

7
net/unbound/distinfo
View File

@ -1,5 +1,2 @@
MD5 (unbound-1.4.17.tar.gz) = gS1JBkp4ySdllwoTZHNtpw==
RMD160 (unbound-1.4.17.tar.gz) = BTDQUb9+ywIzN10GIMoyDAJoM3M=
SHA1 (unbound-1.4.17.tar.gz) = /qTYEsA69HN+9nGsMLe3QA00ZRY=
SHA256 (unbound-1.4.17.tar.gz) = JjfWvaQGXXq/HNEe4lv8jpFiQRU8LTMd6Zq2xj3149M=
SIZE (unbound-1.4.17.tar.gz) = 3585122
SHA256 (unbound-1.4.18.tar.gz) = sg9F/5C5RPMG/Bh1CEr47Lpoyg2xaJUUgojUPOwiW40=
SIZE (unbound-1.4.18.tar.gz) = 3592485

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.15 2012/06/08 21:58:17 jakob Exp $
--- Makefile.in.orig Tue Mar 27 04:49:30 2012
+++ Makefile.in Thu May 17 22:14:40 2012
@@ -468,7 +468,6 @@ install: all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL)
$OpenBSD: patch-Makefile_in,v 1.16 2012/08/04 20:43:54 sthen Exp $
--- Makefile.in.orig Mon Jul 23 13:27:04 2012
+++ Makefile.in Sat Aug 4 09:56:48 2012
@@ -472,7 +472,6 @@ install: all $(PYTHONMOD_INSTALL) $(PYUNBOUND_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)

12
net/unbound/patches/patch-configure_ac
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.4 2012/06/08 21:58:17 jakob Exp $
--- configure.ac.orig Tue May 15 10:50:21 2012
+++ configure.ac Thu May 24 18:13:48 2012
@@ -208,8 +208,6 @@ AC_DEFINE_UNQUOTED(RSRC_PACKAGE_VERSION, [$wnvs], [ver
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_LANG_C
-ACX_CHECK_COMPILER_FLAG(g, [CFLAGS="$CFLAGS -g"])
-ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="$CFLAGS -O2"])
AC_PROG_CC
ACX_DEPFLAG
ACX_DETERMINE_EXT_FLAGS_UNBOUND

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_example_conf_in,v 1.9 2011/12/20 10:49:19 sthen Exp $
--- doc/example.conf.in.orig Tue Dec 13 03:58:23 2011
+++ doc/example.conf.in Tue Dec 13 07:37:15 2011
$OpenBSD: patch-doc_example_conf_in,v 1.10 2012/08/04 20:43:54 sthen Exp $
--- doc/example.conf.in.orig Thu Aug 2 08:26:14 2012
+++ doc/example.conf.in Sat Aug 4 10:19:00 2012
@@ -191,7 +191,7 @@ server:
# chroot: "@UNBOUND_CHROOT_DIR@"
@ -10,3 +10,12 @@ $OpenBSD: patch-doc_example_conf_in,v 1.9 2011/12/20 10:49:19 sthen Exp $
# If you give "" no privileges are dropped.
# username: "@UNBOUND_USERNAME@"
@@ -483,7 +483,7 @@ python:
remote-control:
# Enable remote control with unbound-control(8) here.
# set up the keys and certificates with unbound-control-setup.
- # control-enable: no
+ control-enable: yes
# what interfaces are listened to for remote control.
# give 0.0.0.0 and ::0 to listen to all interfaces.

10
net/unbound/pkg/unbound.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: unbound.rc,v 1.2 2012/01/09 11:55:10 sthen Exp $
# $OpenBSD: unbound.rc,v 1.3 2012/08/04 20:43:54 sthen Exp $
daemon="${TRUEPREFIX}/sbin/unbound-control"
daemon_flags="-c /var/unbound/etc/unbound.conf"
@ -10,6 +10,14 @@ daemon_flags="-c /var/unbound/etc/unbound.conf"
pexp="unbound${daemon_flags:+ ${daemon_flags}}"
rc_reload=NO
rc_pre() {
if ! [[ -f /var/unbound/etc/unbound_server.pem ||
-f /var/unbound/etc/unbound_control.key ||
-f /var/unbound/etc/unbound_control.pem ]]; then
unbound-control-setup >/dev/null 2>&1
fi
}
rc_start() {
${rcexec} "${daemon} ${daemon_flags} start"
}