upgrading package: nsd 3.2.16 -> 4.0.0

nsd/nsd.patch

@@ -1,13 +1,14 @@
 Index: Makefile.in
---- Makefile.in.orig	2010-04-01 11:46:31.000000000 +0200
-+++ Makefile.in	2010-08-02 19:01:41.000000000 +0200
-@@ -316,13 +316,13 @@
- 	$(EDIT) $(srcdir)/nsd.conf.sample.in > nsd.conf.sample
+--- Makefile.in.orig	2013-10-04 15:16:42.000000000 +0200
++++ Makefile.in	2013-10-30 19:57:30.567828457 +0100
+@@ -109,14 +109,14 @@
+ 	$(EDIT) $(srcdir)/nsd-control.8.in > nsd-control.8
  
  install: all
 -	$(INSTALL) -d $(DESTDIR)$(sbindir)
 -	$(INSTALL) -d $(DESTDIR)$(configdir)
 -	$(INSTALL) -d $(DESTDIR)$(piddir)
+-	$(INSTALL) -d $(DESTDIR)$(xfrdir)
 -	$(INSTALL) -d $(DESTDIR)$(dbdir)
 -	$(INSTALL) -d $(DESTDIR)$(mandir)
 -	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
@@ -15,17 +16,18 @@ Index: Makefile.in
 +	-$(INSTALL) -d $(DESTDIR)$(sbindir)
 +	-$(INSTALL) -d $(DESTDIR)$(configdir)
 +	-$(INSTALL) -d $(DESTDIR)$(piddir)
++	-$(INSTALL) -d $(DESTDIR)$(xfrdir)
 +	-$(INSTALL) -d $(DESTDIR)$(dbdir)
 +	-$(INSTALL) -d $(DESTDIR)$(mandir)
 +	-$(INSTALL) -d $(DESTDIR)$(mandir)/man8
 +	-$(INSTALL) -d $(DESTDIR)$(mandir)/man5
  	$(INSTALL) nsd $(DESTDIR)$(sbindir)/nsd
- 	$(INSTALL) zonec $(DESTDIR)$(sbindir)/zonec
- 	$(INSTALL) nsdc.sh $(DESTDIR)$(sbindir)/nsdc
+ 	$(INSTALL) nsd-control-setup.sh $(DESTDIR)$(sbindir)/nsd-control-setup
+ 	$(INSTALL) nsd-checkconf $(DESTDIR)$(sbindir)/nsd-checkconf
 Index: tsig.c
---- tsig.c.orig	2010-06-17 12:38:03.000000000 +0200
-+++ tsig.c	2010-08-02 19:01:41.000000000 +0200
-@@ -340,11 +340,19 @@
+--- tsig.c.orig	2013-01-09 13:45:06.000000000 +0100
++++ tsig.c	2013-10-30 19:49:50.407807072 +0100
+@@ -342,11 +342,19 @@
  		time_t clock;
  
  		clock = (time_t) current_time;
@@ -46,9 +48,9 @@ Index: tsig.c
  
  		log_msg(LOG_ERR,
 Index: util.c
---- util.c.orig	2010-06-07 12:52:30.000000000 +0200
-+++ util.c	2010-08-02 19:03:57.000000000 +0200
-@@ -742,7 +742,7 @@
+--- util.c.orig	2013-10-02 11:51:54.000000000 +0200
++++ util.c	2013-10-30 19:49:50.407807072 +0100
+@@ -760,7 +760,7 @@
     http://www.tsfr.org/~orc/Code/bsd/bsd-current/cksum/crc.c.
     or http://gobsd.com/code/freebsd/usr.bin/cksum/crc.c
     The polynomial is 0x04c11db7L. */
@@ -58,8 +60,8 @@ Index: util.c
  	0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
  	0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
 Index: xfrd-tcp.c
---- xfrd-tcp.c.orig	2010-06-17 12:38:03.000000000 +0200
-+++ xfrd-tcp.c	2010-08-02 19:22:50.000000000 +0200
+--- xfrd-tcp.c.orig	2013-07-10 15:16:04.000000000 +0200
++++ xfrd-tcp.c	2013-10-30 19:49:50.407807072 +0100
 @@ -13,6 +13,8 @@
  #include <fcntl.h>
  #include <unistd.h>
@@ -69,9 +71,9 @@ Index: xfrd-tcp.c
  #include "xfrd-tcp.h"
  #include "buffer.h"
  #include "packet.h"
-@@ -22,6 +24,13 @@
- #include "xfrd.h"
- #include "util.h"
+@@ -43,6 +45,13 @@
+ 	return (int)(a - b);
+ }
  
 +#ifndef PF_INET
 +#define PF_INET AF_INET
@@ -84,11 +86,11 @@ Index: xfrd-tcp.c
  {
  	int i;
 Index: xfrd.c
---- xfrd.c.orig	2010-07-06 16:37:45.000000000 +0200
-+++ xfrd.c	2010-08-02 19:23:01.000000000 +0200
-@@ -26,6 +26,13 @@
- #include "difffile.h"
+--- xfrd.c.orig	2013-08-20 15:36:08.000000000 +0200
++++ xfrd.c	2013-10-30 19:49:50.407807072 +0100
+@@ -30,6 +30,13 @@
  #include "ipc.h"
+ #include "remote.h"
  
 +#ifndef PF_INET
 +#define PF_INET AF_INET

nsd/nsd.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        DNS
 License:      GPL
-Version:      3.2.16
-Release:      20130724
+Version:      4.0.0
+Release:      20131030
 
 #   package option
 %option       with_fsl  yes
@@ -49,8 +49,8 @@ Patch0:       nsd.patch
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc
 PreReq:       OpenPKG, openpkg >= 20100101
-BuildPreReq:  openssl
-PreReq:       openssl
+BuildPreReq:  openssl, libevent
+PreReq:       openssl, libevent
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl
 PreReq:       fsl
@@ -91,6 +91,7 @@ PreReq:       fsl
         --with-zonesfile=%{l_prefix}/etc/nsd/nsd.zones \
         --with-dbfile=%{l_prefix}/var/nsd/nsd.db \
         --with-user="%{l_ruid}.%{l_rgid}" \
+        --with-libevent="%{l_prefix}" \
         --enable-bind8-stats \
         --enable-dnssec \
         --with-ssl=%{l_prefix} \