Revert to test23 version of fefe's patch, as test25 causes repeated segfaults. Bump revision and epoch.

3 files changed, 14 insertions, 34 deletions

diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index f860e4ddbefe..455612b55d5b 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME?=	djbdns
 PORTVERSION?=	${DJBDNS_VER}
-PORTREVISION?=	16
+PORTREVISION?=	17
+PORTEPOCH?=	1
 CATEGORIES?=	dns
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
@@ -114,7 +115,7 @@ BUILD_DEPENDS+=	nacl-sha256:${PORTSDIR}/security/nacl
 .endif
 
 DJBDNS_VER=	1.05
-DJBDNS_V6_VER=	test25
+DJBDNS_V6_VER=	test23
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
diff --git a/dns/djbdns/distinfo b/dns/djbdns/distinfo
index 86f147f9d63d..d9d5e760280a 100644
--- a/dns/djbdns/distinfo
+++ b/dns/djbdns/distinfo
@@ -2,17 +2,5 @@ SHA256 (djbdns-1.05.tar.gz) = 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc9
 SIZE (djbdns-1.05.tar.gz) = 85648
 SHA256 (djbdns-1.05-man-20031023.tar.gz) = ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569
 SIZE (djbdns-1.05-man-20031023.tar.gz) = 17170
-SHA256 (jumbo-p13.patch.gz) = 04397e9a5b35546ae4b5dc134142ad6cc47014791cad2284e5465f6a35a69304
-SIZE (jumbo-p13.patch.gz) = 11779
-SHA256 (patch-dnscache-dumpcache-v4.txt) = c2fbc21035fccbb3564226fc40edaa44643119b7b103483825f82786c89009f0
-SIZE (patch-dnscache-dumpcache-v4.txt) = 16065
-SHA256 (djbdns-1.05-test25.diff.bz2) = 28c88de08822894cf252e54ed3be9abfdf4f492644ff74a7c479340bdce051ea
-SIZE (djbdns-1.05-test25.diff.bz2) = 20376
-SHA256 (djbdns-1.05-ignoreip2.patch) = ca5d759380c316132be6680e77c37d24a5d715cd6e1c325a75c8450e01133be0
-SIZE (djbdns-1.05-ignoreip2.patch) = 3890
-SHA256 (tinydns-persistmmap-20040418.patch) = 9c8e685ed628ef80b92611023c098066633f7bf63be434f373edfba0a465ebb6
-SIZE (tinydns-persistmmap-20040418.patch) = 920
-SHA256 (srv-patch) = 779546218b09544493c6ba5e23bc29c33c5d284cfc78ac6fa74fa8e050bb3779
-SIZE (srv-patch) = 4508
-SHA256 (djbdns-dnscurve-20090602.patch) = 7efc54bd1981d0eb920de02b97f9b152c57e6add8023c9b82566358dc9525bba
-SIZE (djbdns-dnscurve-20090602.patch) = 26674
+SHA256 (djbdns-1.05-test23.diff.bz2) = e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
+SIZE (djbdns-1.05-test23.diff.bz2) = 18480
diff --git a/dns/djbdns/files/uint32.patch b/dns/djbdns/files/uint32.patch
index 075e696ef182..b677eb10628c 100644
--- a/dns/djbdns/files/uint32.patch
+++ b/dns/djbdns/files/uint32.patch
@@ -1,15 +1,6 @@
---- Makefile.orig	2013-12-17 14:29:31.000000000 -0700
-+++ Makefile	2013-12-17 14:30:30.000000000 -0700
-@@ -212,7 +212,7 @@
- 	chmod 755 choose
- 
- clientloc.o: \
--compile clientloc.c open.h byte.h cdb.h ip6.h
-+compile clientloc.c open.h byte.h cdb.h ip6.h uint32.h
- 	./compile clientloc.c
- 
- compile: \
-@@ -337,7 +337,7 @@
+--- Makefile.orig	Wed Dec 29 09:37:36 2004
++++ Makefile	Wed Dec 29 09:52:11 2004
+@@ -333,7 +333,7 @@
  dns_transmit.o: \
  compile dns_transmit.c socket.h uint16.h alloc.h error.h byte.h \
  uint16.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h \
@@ -18,7 +9,7 @@
  	./compile dns_transmit.c
  
  dns_txt.o: \
-@@ -859,15 +859,15 @@
+@@ -855,15 +855,15 @@
  	rm -f trylsock.o trylsock
  
  socket_accept.o: \
@@ -37,7 +28,7 @@
  	./compile socket_bind.c
  
  socket_bind6.o: \
-@@ -875,7 +875,7 @@
+@@ -871,7 +871,7 @@
  	./compile socket_bind6.c
  
  socket_conn.o: \
@@ -46,7 +37,7 @@
  	./compile socket_conn.c
  
  socket_connect6.o: \
-@@ -883,11 +883,11 @@
+@@ -879,11 +879,11 @@
  	./compile socket_connect6.c
  
  socket_listen.o: \
@@ -60,7 +51,7 @@
  	./compile socket_recv.c
  
  socket_recv6.o: \
-@@ -895,7 +895,7 @@
+@@ -891,7 +891,7 @@
  	./compile socket_recv6.c
  
  socket_send.o: \
@@ -69,7 +60,7 @@
  	./compile socket_send.c
  
  socket_send6.o: \
-@@ -903,7 +903,7 @@
+@@ -899,7 +899,7 @@
  	./compile socket_send6.c
  
  socket_tcp.o: \
@@ -78,7 +69,7 @@
  	./compile socket_tcp.c
  
  socket_tcp6.o: \
-@@ -911,7 +911,7 @@
+@@ -907,7 +907,7 @@
  	./compile socket_tcp6.c
  
  socket_udp.o: \