Index: Makefile =================================================================== RCS file: /cvs/ports/net/pdnsd/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 17 Dec 2011 22:01:13 -0000 1.22 +++ Makefile 14 Mar 2012 16:19:09 -0000 @@ -2,13 +2,14 @@ COMMENT= threaded DNS daemon, optimized for caching -DISTNAME= pdnsd-1.2.8-par +DISTNAME= pdnsd-1.2.9-par PKGNAME= ${DISTNAME:S/-par//} -REVISION= 3 CATEGORIES= net MASTER_SITES= ${HOMEPAGE}/releases/ -HOMEPAGE= http://www.phys.uu.nl/~rombouts/pdnsd/ +HOMEPAGE= http://members.home.nl/p.a.rombouts/pdnsd/ + +MAINTAINER= Gonzalo L. R. WRKDIST= ${WRKDIR}/${DISTNAME:S/-par//} Index: distinfo =================================================================== RCS file: /cvs/ports/net/pdnsd/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 2 Mar 2011 23:30:20 -0000 1.8 +++ distinfo 14 Mar 2012 16:19:09 -0000 @@ -1,5 +1,5 @@ -MD5 (pdnsd-1.2.8-par.tar.gz) = d5xdGVduVh+/JFXeQ15Vlw== -RMD160 (pdnsd-1.2.8-par.tar.gz) = InpVC6IQwkVLPMOejY0FaWDUm58= -SHA1 (pdnsd-1.2.8-par.tar.gz) = U4hJl18pxZsefw3QdWQ1zG8PKzA= -SHA256 (pdnsd-1.2.8-par.tar.gz) = Xzyt4J5EXwNEMIY7plBHpKsvWBuG8+qw0JgWRufsJE4= -SIZE (pdnsd-1.2.8-par.tar.gz) = 471303 +MD5 (pdnsd-1.2.9-par.tar.gz) = A3950ZG5iXT/wslklye/Zg== +RMD160 (pdnsd-1.2.9-par.tar.gz) = ClhOA/bbgDf/bvconief9exxw04= +SHA1 (pdnsd-1.2.9-par.tar.gz) = X6jNh/6fj6GpW4I3kllFKyl05+g= +SHA256 (pdnsd-1.2.9-par.tar.gz) = dy1Q6KtF4RpUGiY/CG6tGKeVoPl3RcIhWl2OfAxPkto= +SIZE (pdnsd-1.2.9-par.tar.gz) = 515141 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/pdnsd/patches/patch-Makefile_in,v retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile_in --- patches/patch-Makefile_in 2 Jan 2009 22:28:21 -0000 1.5 +++ patches/patch-Makefile_in 14 Mar 2012 16:19:09 -0000 @@ -1,21 +1,13 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/01/02 22:28:21 sthen Exp $ ---- Makefile.in.orig Thu Sep 4 12:20:38 2008 -+++ Makefile.in Fri Sep 12 04:41:24 2008 -@@ -546,7 +546,7 @@ info-am: +--- Makefile.in.orig Wed Mar 14 09:47:18 2012 ++++ Makefile.in Wed Mar 14 10:10:36 2012 +@@ -626,7 +626,8 @@ info-am: install-data-am: @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook + $(MAKE) $(AM_MAKEFLAGS) ++ + install-dvi: install-dvi-recursive - install-exec-am: - -@@ -599,7 +599,7 @@ install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(cachedir) - test -f $(DESTDIR)$(cachedir)/pdnsd.cache || \ - touch $(DESTDIR)$(cachedir)/pdnsd.cache -- if test `whoami` = "root"; then \ -+ if test `userinfo -e _pdnsd`; then \ - chown $(def_id) $(DESTDIR)$(cachedir)/pdnsd.cache; \ - chown $(def_id) $(DESTDIR)$(cachedir); \ - fi + install-dvi-am: Index: patches/patch-doc_pdnsd_8_in =================================================================== RCS file: /cvs/ports/net/pdnsd/patches/patch-doc_pdnsd_8_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-doc_pdnsd_8_in --- patches/patch-doc_pdnsd_8_in 23 Mar 2009 09:54:36 -0000 1.2 +++ patches/patch-doc_pdnsd_8_in 14 Mar 2012 16:19:09 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_pdnsd_8_in,v 1.2 2009/03/23 09:54:36 ajacoutot Exp $ ---- doc/pdnsd.8.in.orig Mon Aug 20 14:24:51 2007 -+++ doc/pdnsd.8.in Sun Mar 22 20:14:48 2009 +--- doc/pdnsd.8.in.orig Mon Jan 30 07:11:50 2012 ++++ doc/pdnsd.8.in Wed Mar 14 09:39:41 2012 @@ -11,7 +11,7 @@ This man page is an extract of the documentation of \f For complete, current documentation, refer to the HTML (or plain text) documentation (which you can find in the \fBdoc/\fP subdirectory of the @@ -37,7 +37,7 @@ $OpenBSD: patch-doc_pdnsd_8_in,v 1.2 200 .SH AUTHORS -@@ -301,7 +301,7 @@ and was extensively revised by Paul Rombouts +@@ -301,7 +301,7 @@ and was extensively revised by Paul A. Rombouts (for versions 1.1.8b1\-par and later). .PP Several others have contributed to \fBpdnsd\fP; see files in the Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/net/pdnsd/patches/patch-src_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_Makefile_in --- patches/patch-src_Makefile_in 2 Jan 2009 22:28:21 -0000 1.1 +++ patches/patch-src_Makefile_in 14 Mar 2012 16:19:09 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2009/01/02 22:28:21 sthen Exp $ ---- src/Makefile.in.orig Sat Sep 13 04:15:02 2008 -+++ src/Makefile.in Sat Sep 13 04:20:10 2008 -@@ -60,7 +60,7 @@ am_pdnsd_OBJECTS = pdnsd-conf-parser.$(OBJEXT) pdnsd-c +--- src/Makefile.in.orig Wed Mar 14 10:13:13 2012 ++++ src/Makefile.in Wed Mar 14 10:13:39 2012 +@@ -56,7 +56,7 @@ am_pdnsd_OBJECTS = pdnsd-conf-parser.$(OBJEXT) pdnsd-c pdnsd-thread.$(OBJEXT) pdnsd-cache.$(OBJEXT) \ pdnsd-hash.$(OBJEXT) pdnsd_OBJECTS = $(am_pdnsd_OBJECTS) -pdnsd_LDADD = $(LDADD) +pdnsd_LDADD = $(LDADD) @thread_CFLAGS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles + pdnsd_LINK = $(CCLD) $(pdnsd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) Index: patches/patch-src_cache_c =================================================================== RCS file: patches/patch-src_cache_c diff -N patches/patch-src_cache_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_cache_c 14 Mar 2012 16:19:09 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/cache.c.orig Mon Jan 30 06:57:56 2012 ++++ src/cache.c Wed Mar 14 09:30:00 2012 +@@ -715,6 +715,8 @@ static int add_cent_rr_int(dns_cent_t *cent, unsigned + /* Add an rr to a cache entry, giving the ttl, the data length, the rr type (tp) + * and a pointer to the data. A record is allocated, and the data is copied into + * it. Do this for all rrs in a cache entry. ++ * The return value will be 1 in case of success, or 0 in case of a memory allocation ++ * problem. + */ + int add_cent_rr(dns_cent_t *cent, int type , time_t ttl, time_t ts, unsigned flags, + unsigned dlen, void *data DBGPARAM) Index: patches/patch-src_dns_query_c =================================================================== RCS file: patches/patch-src_dns_query_c diff -N patches/patch-src_dns_query_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_dns_query_c 14 Mar 2012 16:19:09 -0000 @@ -0,0 +1,334 @@ +$OpenBSD$ +--- src/dns_query.c.orig Mon Feb 20 16:33:20 2012 ++++ src/dns_query.c Wed Mar 14 09:30:05 2012 +@@ -176,6 +176,9 @@ typedef DYNAMIC_ARRAY(dns_cent_t) *dns_cent_array; + + /* + * Take the data from an RR and add it to an array of cache entries. ++ * The return value will be RC_OK in case of success, ++ * RC_SERVFAIL in case the RR was rejected because of incorrect timestamp settings ++ * or RC_FATALERR in case of a memory allocation failure. + */ + static int rr_to_cache(dns_cent_array *centa, unsigned char *oname, int tp, time_t ttl, + unsigned dlen, void *data, unsigned flags, time_t queryts) +@@ -187,26 +190,26 @@ static int rr_to_cache(dns_cent_array *centa, unsigned + for(i=0;iqname,oname)) { +- /* We already have an entry in the array for this name. add_cent_rr is sufficient. ++ /* We already have an entry in the array for this name. add_cent_rr is sufficient. + However, make sure there are no double records. This is done by add_cent_rr */ + #ifdef RFC2181_ME_HARDER +- rr_set_t rrset= getrrset(cent,tp); ++ rr_set_t *rrset= getrrset(cent,tp); + if (rrset && rrset->ttl!=ttl) +- return 0; ++ return RC_SERVFAIL; + #endif +- return add_cent_rr(cent,tp,ttl,queryts,flags,dlen,data DBG1); ++ return add_cent_rr(cent,tp,ttl,queryts,flags,dlen,data DBG1)? RC_OK: RC_FATALERR; + } + } + + /* Add a new entry to the array for this name. */ + if (!(*centa=DA_GROW1_F(*centa,free_cent0))) +- return 0; ++ return RC_FATALERR; + cent=&DA_LAST(*centa); + if (!init_cent(cent,oname, 0, 0, 0 DBG1)) { + *centa=DA_RESIZE(*centa,n); +- return 0; ++ return RC_FATALERR; + } +- return add_cent_rr(cent,tp,ttl,queryts,flags,dlen,data DBG1); ++ return add_cent_rr(cent,tp,ttl,queryts,flags,dlen,data DBG1)? RC_OK: RC_FATALERR; + } + + /* +@@ -217,8 +220,12 @@ static int rr_to_cache(dns_cent_array *centa, unsigned + * *numopt is incremented with the number of OPT pseudo RRs found (should be at most one). + * The structure pointed to by ep is filled with the information of the first OPT pseudo RR found, + * but only if *numopt was set to zero before the call. ++ * ++ * The return value will be either RC_OK (which indicates success), ++ * or one of the failure codes RC_FORMAT, RC_TRUNC, RC_SERVFAIL or RC_FATALERR ++ * (the latter indicates a memory allocation failure). + */ +-static int rrs2cent(unsigned char *msg, size_t msgsz, unsigned char **ptr, size_t *lcnt, int recnum, ++static int rrs2cent(unsigned char *msg, size_t msgsz, unsigned char **ptr, size_t *lcnt, int recnum, + unsigned flags, time_t queryts, dns_cent_array *centa, int *numopt, edns_info_t *ep) + { + int rc; +@@ -304,8 +311,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + return rc==RC_TRUNC?RC_FORMAT:rc; + if (blcnt!=0) + goto trailing_junk; +- if (!rr_to_cache(centa, oname, type, ttl, len, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, len, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + +@@ -330,8 +337,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + slen+=len; + if (blcnt!=0) + goto trailing_junk; +- if (!rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + #endif +@@ -360,8 +367,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + slen+=len; + if (blcnt!=0) + goto trailing_junk; +- if (!rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + +@@ -386,8 +393,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + slen+=20; + if (blcnt!=0) + goto trailing_junk; +- if (!rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + #if IS_CACHED_AAAA +@@ -418,8 +425,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + slen+=len; + if (blcnt!=0) + goto trailing_junk; +- if (!rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + #endif +@@ -440,8 +447,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + slen+=len; + if (blcnt!=0) + goto trailing_junk; +- if (!rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + #endif +@@ -457,8 +464,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + if (slen > sizeof(db)) + goto buffer_overflow; + memcpy(nptr,bptr,blcnt); +- if (!rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + #endif +@@ -497,8 +504,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + slen+=len; + if (blcnt!=0) + goto trailing_junk; +- if (!rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, slen, db, flags,queryts))!=RC_OK) ++ return rc; + } + break; + #endif +@@ -536,8 +543,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + memcpy(nptr,bptr,blcnt); + rc=rr_to_cache(centa, oname, type, ttl, slen, rbuf, flags,queryts); + free(rbuf); +- if(!rc) +- return RC_FATALERR; ++ if(rc!=RC_OK) ++ return rc; + } + break; + default: +@@ -569,8 +576,8 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + memcpy(nptr,bptr,blcnt); + rc=rr_to_cache(centa, oname, type, ttl, slen, rbuf, flags,queryts); + free(rbuf); +- if(!rc) +- return RC_FATALERR; ++ if(rc!=RC_OK) ++ return rc; + } + break; + #endif +@@ -592,15 +599,15 @@ static int rrs2cent(unsigned char *msg, size_t msgsz, + memcpy(nptr,bptr,blcnt); + rc=rr_to_cache(centa, oname, type, ttl, slen, rbuf, flags,queryts); + free(rbuf); +- if(!rc) +- return RC_FATALERR; ++ if(rc!=RC_OK) ++ return rc; + } + break; + #endif + default: + default_case: +- if (!rr_to_cache(centa, oname, type, ttl, rdlength, *ptr, flags,queryts)) +- return RC_FATALERR; ++ if ((rc=rr_to_cache(centa, oname, type, ttl, rdlength, *ptr, flags,queryts))!=RC_OK) ++ return rc; + } + } + else { +@@ -665,7 +672,7 @@ static int bind_socket(int s) + for(m=1; m= range. */ +@@ -791,12 +798,12 @@ inline static void switch_to_tcp(query_stat_t *st) + */ + + /* The query state machine that is called from p_exec_query. This is called once for initialization (state +- * QS_TCPINITIAL or QS_UDPINITIAL is preset), and the state that it gives back may either be state QS_DONE, +- * in which case it must return a return code other than -1 and is called no more for this server ++ * QS_TCPINITIAL or QS_UDPINITIAL is preset), and the state that it gives back may either be state QS_DONE, ++ * in which case it must return a return code other than -1 and is called no more for this server + * (except perhaps in UDP mode if TCP failed). If p_query_sm returns -1, then the state machine is in a read +- * or write state, and a function higher up the calling chain can setup a poll() or select() together with st->sock. +- * If that poll/select is succesful for that socket, p_exec_query is called again and will hand over to p_query_sm. +- * So, you can assume that read(), write() and recvfrom() will not block at the start of a state handling when you ++ * or write state, and a function higher up the calling chain can setup a poll() or select() together with st->sock. ++ * If that poll/select is succesful for that socket, p_exec_query is called again and will hand over to p_query_sm. ++ * So, you can assume that read(), write() and recvfrom() will not block at the start of a state handling when you + * have returned -1 (which means "call again") as last step of the last state handling. */ + static int p_query_sm(query_stat_t *st) + { +@@ -1072,7 +1079,7 @@ static time_t soa_minimum(rr_bucket_t *rrs) + + /* + * The function that will actually execute a query. It takes a state structure in st. +- * st->state must be set to QS_INITIAL before calling. ++ * st->state must be set to QS_INITIAL before calling. + * This may return one of the RC_* codes, where RC_OK indicates success, the other + * RC codes indicate the appropriate errors. -1 is the return value that indicates that + * you should call p_exec_query again with the same state for the result until you get +@@ -1282,7 +1289,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + } + } + } +- ++ + discard_reply: + /* report failure */ + pdnsd_free(st->msg); +@@ -1389,7 +1396,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + storing the results in the arrays ans_sec,auth_sec and add_sec. + */ + numoptrr=0; +- rv=rrs2cent((unsigned char *)st->recvbuf, st->recvl, &rrp, &lcnt, ntohs(st->recvbuf->ancount), ++ rv=rrs2cent((unsigned char *)st->recvbuf, st->recvl, &rrp, &lcnt, ntohs(st->recvbuf->ancount), + flags, queryts, &ans_sec, &numoptrr, &ednsinfo); + #if DEBUG>0 + if(numoptrr!=0) { +@@ -1400,7 +1407,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + if(rv==RC_OK) { + uint16_t nscount=ntohs(st->recvbuf->nscount); + if (nscount) { +- rv=rrs2cent((unsigned char *)st->recvbuf, st->recvl, &rrp, &lcnt, nscount, ++ rv=rrs2cent((unsigned char *)st->recvbuf, st->recvl, &rrp, &lcnt, nscount, + flags|CF_ADDITIONAL, queryts, &auth_sec, &numoptrr, &ednsinfo); + #if DEBUG>0 + if(numoptrr!=0) { +@@ -1414,7 +1421,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + if(rv==RC_OK) { + uint16_t arcount=ntohs(st->recvbuf->arcount); + if (arcount) { +- rv=rrs2cent((unsigned char *)st->recvbuf, st->recvl, &rrp, &lcnt, arcount, ++ rv=rrs2cent((unsigned char *)st->recvbuf, st->recvl, &rrp, &lcnt, arcount, + flags|CF_ADDITIONAL, queryts, &add_sec, &numoptrr, &ednsinfo); + if(numoptrr!=0) { + #if DEBUG>0 +@@ -1438,6 +1445,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + if(!(rv==RC_OK || (rv==RC_TRUNC && st->recvbuf->tc))) { + DEBUG_PDNSDA_MSG(rv==RC_FORMAT?"Format error in reply from %s.\n": + rv==RC_TRUNC?"Format error in reply from %s (message unexpectedly truncated).\n": ++ rv==RC_SERVFAIL?"Inconsistent timestamps in reply from %s.\n": + "Out of memory while processing reply from %s.\n", + PDNSDA2STR(PDNSD_A(st))); + if(rv!=RC_FATALERR) rv=RC_SERVFAIL; +@@ -1456,7 +1464,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + cent->c_ns=scnt; + if(getrrset_SOA(cent)) + cent->c_soa=scnt; +- ++ + if((qtype>=QT_MIN && qtype<=QT_MAX) || + (/* (qtype>=T_MIN && qtype<=T_MAX) && */ getrrset(cent,qtype)) || + (n==1 && cent->num_rrs==0)) +@@ -1639,7 +1647,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + } + goto delegation_OK; + } +- try_next_auth:; ++ try_next_auth:; + } + } + #if DEBUG>0 +@@ -1696,7 +1704,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + ((cent=lookup_cent_array(auth_sec, + (ent->c_soa!=cundef && ent->c_soa<(scnt=rhnsegcnt(name)))? + skipsegs(name,scnt-ent->c_soa): +- name)) && ++ name)) && + (rrset=getrrset_SOA(cent)) && rrset->rrs)) + { + time_t min=soa_minimum(rrset->rrs); +@@ -1862,7 +1870,7 @@ static int p_exec_query(dns_cent_t **entp, const unsig + + /* + * Cancel a query, freeing all resources. Any query state is valid as input (this may even be called +- * if a call to p_exec_query already returned error or success) ++ * if a call to p_exec_query already returned error or success) + */ + static void p_cancel_query(query_stat_t *st) + { +@@ -2126,7 +2134,7 @@ static int p_recursive_query(query_stat_array q, const + * the returned times are not always to be trusted upon */ + ts=time(NULL); + do { +- /* build poll/select sets, maintain time. ++ /* build poll/select sets, maintain time. + * If you do parallel queries, the highest timeout will be honored + * also for the other servers when their timeout is exceeded and + * the highest is not. +@@ -2267,7 +2275,7 @@ static int p_recursive_query(query_stat_array q, const + */ + if(nevents && (time(NULL)-ts0)0 + if(!retval) {