pkg/41871: Updating pkgsrc/net/unbound to version 1.3.3

[sm%resistor.net@localhost]

>Number:         41871
>Category:       pkg
>Synopsis:       Updating pkgsrc/net/unbound to version 1.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 10 18:55:00 +0000 2009
>Originator:     SM
>Release:        
>Organization:
>Environment:
>Description:
The patches below is for updating Unbound in pkgsrc to version 1.3.3

Refer to http://www.unbound.net/download.html for changes




>How-To-Repeat:

>Fix:
--- Makefile.old        2009-08-10 08:49:13.000000000 -0700
+++ Makefile    2009-08-10 11:08:02.000000000 -0700
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2008/12/17 18:14:01 joerg Exp $
 
-DISTNAME=      unbound-1.1.1
+DISTNAME=      unbound-1.3.3
 CATEGORIES=    net
 MASTER_SITES=  http://www.unbound.net/downloads/
 
--- distinfo.old        2009-08-10 08:49:13.000000000 -0700
+++ distinfo    2009-08-10 11:35:48.000000000 -0700
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/12/17 18:14:01 joerg Exp $
+$NetBSD$
 
-SHA1 (unbound-1.1.1.tar.gz) = 8c80e892232a05459923826f266afb770d3f7d73
-RMD160 (unbound-1.1.1.tar.gz) = 08299a2f31a2a01c2d5819f63abc231015074af3
-Size (unbound-1.1.1.tar.gz) = 3754958 bytes
-SHA1 (patch-ac) = 49d727258b41a3f7eafbed70173b24a3fd3a3e5e
+SHA1 (unbound-1.3.3.tar.gz) = 4124d3b70a38d72a1ad47bf2a9e5aee9498ae439
+RMD160 (unbound-1.3.3.tar.gz) = 3d5b3e321c7b5fdb660da94bac1d2f93b16a166c
+Size (unbound-1.3.3.tar.gz) = 4036248 bytes
+SHA1 (patch-ac) = abf56a2663c21d17388e7aad7f6009758818e9f3

--- patches/old.patch-ac        2008-12-20 21:31:51.000000000 -0800
+++ patches/patch-ac    2009-08-10 11:35:26.000000000 -0700
@@ -1,50 +1,66 @@
-$NetBSD: patch-ac,v 1.3 2008/12/17 18:14:01 joerg Exp $
-
---- Makefile.in.orig   2008-11-18 14:30:41.000000000 +0100
-+++ Makefile.in
-@@ -72,12 +72,11 @@ UNITTEST_SRC=$(patsubst $(srcdir)/%,%, \
+--- Makefile.in.orig   2009-07-15 06:08:52.000000000 -0700
++++ Makefile.in        2009-08-10 11:35:07.000000000 -0700
+@@ -91,12 +91,11 @@
        testcode/readhex.c testcode/ldns-testpkts.c smallapp/worker_cb.c \
        $(COMMON_SRC)
  UNITTEST_OBJ=$(addprefix $(BUILD),$(UNITTEST_SRC:.c=.lo)) $(COMPAT_OBJ)
 -DAEMON_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/daemon/*.c)) \
 -      $(COMMON_SRC)
-+DAEMON_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/daemon/*.c))
++DAEMON_SRC=$(patsubst $(srcdir)/%,%, $(wildcard $(srcdir)/daemon/*.c)) 
  DAEMON_OBJ=$(addprefix $(BUILD),$(DAEMON_SRC:.c=.lo)) $(COMPAT_OBJ)
 -CHECKCONF_SRC=smallapp/unbound-checkconf.c smallapp/worker_cb.c $(COMMON_SRC)
-+CHECKCONF_SRC=smallapp/unbound-checkconf.c smallapp/worker_cb.c
++CHECKCONF_SRC=smallapp/unbound-checkconf.c smallapp/worker_cb.c 
  CHECKCONF_OBJ=$(addprefix $(BUILD),$(CHECKCONF_SRC:.c=.lo)) $(COMPAT_OBJ)
 -CONTROL_SRC=smallapp/unbound-control.c smallapp/worker_cb.c $(COMMON_SRC)
-+CONTROL_SRC=smallapp/unbound-control.c smallapp/worker_cb.c
++CONTROL_SRC=smallapp/unbound-control.c smallapp/worker_cb.c 
  CONTROL_OBJ=$(addprefix $(BUILD),$(CONTROL_SRC:.c=.lo)) $(COMPAT_OBJ)
  HOST_SRC=smallapp/unbound-host.c
  HOST_OBJ=$(addprefix $(BUILD),$(HOST_SRC:.c=.lo)) $(COMPAT_OBJ)
-@@ -153,21 +152,21 @@ else
+@@ -202,21 +201,21 @@
  ldnslib=
  endif
  
--unbound:      $(DAEMON_OBJ) $(ldnslib)
-+unbound:      $(DAEMON_OBJ) $(ldnslib) libunbound.la
+-unbound$(EXEEXT):     $(DAEMON_OBJ) $(ldnslib)
++unbound$(EXEEXT):     $(DAEMON_OBJ) $(ldnslib) libunbound.la
        $(INFO) Link $@
 -      $Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) -lssl $(LIBS)
 +      $Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) libunbound.la -lssl $(LIBS)
  
--unbound-checkconf:    $(CHECKCONF_OBJ) $(ldnslib)
-+unbound-checkconf:    $(CHECKCONF_OBJ) $(ldnslib) libunbound.la
+-unbound-checkconf$(EXEEXT):   $(CHECKCONF_OBJ) $(ldnslib)
++unbound-checkconf$(EXEEXT):   $(CHECKCONF_OBJ) $(ldnslib) libunbound.la
        $(INFO) Link $@
 -      $Q$(LINK) -o $@ $(sort $(CHECKCONF_OBJ)) $(LIBS)
 +      $Q$(LINK) -o $@ $(sort $(CHECKCONF_OBJ)) libunbound.la $(LIBS)
  
--unbound-control:      $(CONTROL_OBJ) $(ldnslib)
-+unbound-control:      $(CONTROL_OBJ) $(ldnslib) libunbound.la
+-unbound-control$(EXEEXT):     $(CONTROL_OBJ) $(ldnslib)
++unbound-control$(EXEEXT):     $(CONTROL_OBJ) $(ldnslib) libunbound.la
        $(INFO) Link $@
 -      $Q$(LINK) -o $@ $(sort $(CONTROL_OBJ)) -lssl $(LIBS)
-+      $Q$(LINK) -o $@ $(sort $(CONTROL_OBJ)) libunbound.la -lssl $(LIBS)
++      $Q$(LINK) -o $@ $(sort $(CONTROL_OBJ)) -lssl libunbound.la $(LIBS)
  
--unbound-host: $(HOST_OBJ) libunbound.la $(ldnslib)
-+unbound-host: $(HOST_OBJ) libunbound.la $(ldnslib) libunbound.la
+-unbound-host$(EXEEXT):        $(HOST_OBJ) libunbound.la $(ldnslib)
++unbound-host$(EXEEXT):        $(HOST_OBJ) libunbound.la $(ldnslib) 
libunbound.la
        $(INFO) Link $@
 -      $Q$(LINK) -o $@ $(sort $(HOST_OBJ)) -L. -L.libs -lunbound $(LIBS)
 +      $Q$(LINK) -o $@ $(sort $(HOST_OBJ)) libunbound.la $(LIBS)
  
- unittest:     $(UNITTEST_OBJ) $(ldnslib)
+ unbound-service-install$(EXEEXT):     $(SVCINST_OBJ)
        $(INFO) Link $@
+@@ -256,7 +255,7 @@
+ 
+ asynclook$(EXEEXT):   $(ASYNCLOOK_OBJ) $(ldnslib) libunbound.la
+       $(INFO) Link $@
+-      $Q$(LINK) -o $@ $(sort $(ASYNCLOOK_OBJ)) $(LIBS) -L. -L.libs -lunbound
++      $Q$(LINK) -o $@ $(sort $(ASYNCLOOK_OBJ)) libunbound.la $(LIBS)
+ 
+ streamtcp$(EXEEXT):   $(STREAMTCP_OBJ) $(ldnslib)
+       $(INFO) Link $@
+@@ -272,7 +271,7 @@
+ 
+ harvest$(EXEEXT):     $(HARVEST_OBJ) $(ldnslib) libunbound.la
+       $(INFO) Link $@
+-      $Q$(LINK) -o $@ $(sort $(HARVEST_OBJ)) $(LIBS) -L. -L.libs -lunbound
++      $Q$(LINK) -o $@ $(sort $(HARVEST_OBJ)) libunbound.la $(LIBS) 
+ 
+ unbound-control-setup:        $(srcdir)/smallapp/unbound-control-setup.sh
+       $(INFO) Sed $@