Date: Tue, 17 Dec 2013 15:16:58 -0700 (MST) From: Brad Davis <brd@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/184949: [patch] Update dns/djbdns with stage support and updated IPv6 patch Message-ID: <20131217221658.1F1D18FF9E@valentine.liquidneon.com> Resent-Message-ID: <201312172220.rBHMK0dL021463@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184949
>Category: ports
>Synopsis: [patch] Update dns/djbdns with stage support and updated IPv6 patch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 17 22:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Brad Davis
>Release: FreeBSD 9.1-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
This adds stage support and updates to the latest version of Fefe's IPv6 patch.
>How-To-Repeat:
>Fix:
--- djbdns.diff begins here ---
Index: dns/djbdns/Makefile
===================================================================
--- dns/djbdns/Makefile (revision 336781)
+++ dns/djbdns/Makefile (working copy)
@@ -30,7 +30,6 @@
DNSCURVE_DESC= DNSCurve support by Matthew Dempsky
ADD_USERS_DESC= Add dnscache, tinydns and dnslog users/groups
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MADD_USERS}
@@ -57,15 +56,10 @@
MANDATE= -20031023
MASTER_SITES+= http://smarden.org/pape/djb/manpages/:manpages
DISTFILES+= ${DISTNAME}-man${MANDATE}.tar.gz:manpages
-
-MAN1= dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \
- dnsq.1 dnsqr.1 dnstrace.1 dnstracesort.1 dnstxt.1 \
- tinydns-get.1
-MAN8= axfr-get.8 axfrdns.8 axfrdns-conf.8 dnscache-conf.8 \
- dnscache.8 rbldns-conf.8 \
- rbldns-data.8 rbldns.8 tinydns-conf.8 tinydns-data.8 \
- tinydns-edit.8 tinydns.8 walldns-conf.8 walldns.8
-MANCOMPRESSED= no
+PLIST_SUB+= WITH_MAN=""
+#MANCOMPRESSED= no
+.else
+PLIST_SUB+= WITH_MAN="@comment "
.endif
.if ${PORT_OPTIONS:MIP6}
@@ -121,7 +115,7 @@
.endif
DJBDNS_VER= 1.05
-DJBDNS_V6_VER= test23
+DJBDNS_V6_VER= test25
ALL_TARGET= it
INSTALL_TARGET= setup check
@@ -135,12 +129,12 @@
post-patch:
@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
@echo "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
- @echo "${PREFIX}" > ${WRKSRC}/conf-home
+ @echo "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home
.if ${PORT_OPTIONS:MMAN}
post-install:
- @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${PREFIX}/man/man1/
- @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${PREFIX}/man/man8/
+ @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${STAGEDIR}${PREFIX}/man/man1/
+ @${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${STAGEDIR}${PREFIX}/man/man8/
.endif
.include <bsd.port.mk>
Index: dns/djbdns/distinfo
===================================================================
--- dns/djbdns/distinfo (revision 336781)
+++ dns/djbdns/distinfo (working copy)
@@ -6,8 +6,8 @@
SIZE (jumbo-p13.patch.gz) = 11779
SHA256 (patch-dnscache-dumpcache-v4.txt) = c2fbc21035fccbb3564226fc40edaa44643119b7b103483825f82786c89009f0
SIZE (patch-dnscache-dumpcache-v4.txt) = 16065
-SHA256 (djbdns-1.05-test23.diff.bz2) = e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33
-SIZE (djbdns-1.05-test23.diff.bz2) = 18480
+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
Index: dns/djbdns/files/uint32.patch
===================================================================
--- dns/djbdns/files/uint32.patch (revision 336781)
+++ dns/djbdns/files/uint32.patch (working copy)
@@ -1,6 +1,15 @@
---- Makefile.orig Wed Dec 29 09:37:36 2004
-+++ Makefile Wed Dec 29 09:52:11 2004
-@@ -333,7 +333,7 @@
+--- 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 @@
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 \
@@ -9,7 +18,7 @@
./compile dns_transmit.c
dns_txt.o: \
-@@ -855,15 +855,15 @@
+@@ -859,15 +859,15 @@
rm -f trylsock.o trylsock
socket_accept.o: \
@@ -28,7 +37,7 @@
./compile socket_bind.c
socket_bind6.o: \
-@@ -871,7 +871,7 @@
+@@ -875,7 +875,7 @@
./compile socket_bind6.c
socket_conn.o: \
@@ -37,7 +46,7 @@
./compile socket_conn.c
socket_connect6.o: \
-@@ -879,11 +879,11 @@
+@@ -883,11 +883,11 @@
./compile socket_connect6.c
socket_listen.o: \
@@ -51,7 +60,7 @@
./compile socket_recv.c
socket_recv6.o: \
-@@ -891,7 +891,7 @@
+@@ -895,7 +895,7 @@
./compile socket_recv6.c
socket_send.o: \
@@ -60,7 +69,7 @@
./compile socket_send.c
socket_send6.o: \
-@@ -899,7 +899,7 @@
+@@ -903,7 +903,7 @@
./compile socket_send6.c
socket_tcp.o: \
@@ -69,7 +78,7 @@
./compile socket_tcp.c
socket_tcp6.o: \
-@@ -907,7 +907,7 @@
+@@ -911,7 +911,7 @@
./compile socket_tcp6.c
socket_udp.o: \
Index: dns/djbdns/pkg-plist
===================================================================
--- dns/djbdns/pkg-plist (revision 336781)
+++ dns/djbdns/pkg-plist (working copy)
@@ -30,3 +30,28 @@
bin/walldns
bin/walldns-conf
etc/dnsroots.global
+%%WITH_MAN%%man/man1/dnsfilter.1.gz
+%%WITH_MAN%%man/man1/dnsip.1.gz
+%%WITH_MAN%%man/man1/dnsipq.1.gz
+%%WITH_MAN%%man/man1/dnsmx.1.gz
+%%WITH_MAN%%man/man1/dnsname.1.gz
+%%WITH_MAN%%man/man1/dnsq.1.gz
+%%WITH_MAN%%man/man1/dnsqr.1.gz
+%%WITH_MAN%%man/man1/dnstrace.1.gz
+%%WITH_MAN%%man/man1/dnstracesort.1.gz
+%%WITH_MAN%%man/man1/dnstxt.1.gz
+%%WITH_MAN%%man/man1/tinydns-get.1.gz
+%%WITH_MAN%%man/man8/axfr-get.8.gz
+%%WITH_MAN%%man/man8/axfrdns-conf.8.gz
+%%WITH_MAN%%man/man8/axfrdns.8.gz
+%%WITH_MAN%%man/man8/dnscache-conf.8.gz
+%%WITH_MAN%%man/man8/dnscache.8.gz
+%%WITH_MAN%%man/man8/rbldns-conf.8.gz
+%%WITH_MAN%%man/man8/rbldns-data.8.gz
+%%WITH_MAN%%man/man8/rbldns.8.gz
+%%WITH_MAN%%man/man8/tinydns-conf.8.gz
+%%WITH_MAN%%man/man8/tinydns-data.8.gz
+%%WITH_MAN%%man/man8/tinydns-edit.8.gz
+%%WITH_MAN%%man/man8/tinydns.8.gz
+%%WITH_MAN%%man/man8/walldns-conf.8.gz
+%%WITH_MAN%%man/man8/walldns.8.gz
--- djbdns.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217221658.1F1D18FF9E>