On Sun, Aug 23, 2009 at 06:23:55PM -0400, Brad wrote: > > Not sure if you mean that we should remove -Werror instead of patching > > ne_mesg.c? > > I mean just remove the compiler flag.
Ok, I guess less patches is good. Stefan Index: Makefile =================================================================== RCS file: /cvs/ports/net/totd/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 15 Sep 2007 22:36:59 -0000 1.19 +++ Makefile 23 Aug 2009 20:56:30 -0000 @@ -3,13 +3,13 @@ COMMENT= DNS proxy that supports IPv6 <==> IPv4 record translation -DISTNAME= totd-1.3 +DISTNAME= totd-1.5.1 CATEGORIES= net MASTER_SITES= ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/ -MAINTAINER= Jun-ichiro itojun Hagino <ito...@itojun.org> -HOMEPAGE= http://www.vermicelli.pasta.cs.uit.no/ipv6/software.html +HOMEPAGE= http://www.vermicelli.pasta.cs.uit.no/software/totd.html +# BSD/ISC (built-in webserver is LGPL but we don't use it) PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -17,6 +17,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c CONFIGURE_STYLE= gnu +CONFIGURE_ARGS += --enable-stf NO_REGRESS= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/net/totd/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 5 Apr 2007 16:20:16 -0000 1.4 +++ distinfo 23 Aug 2009 19:30:02 -0000 @@ -1,5 +1,5 @@ -MD5 (totd-1.3.tar.gz) = vGuFpb3bcvw/sg+p/lDToA== -RMD160 (totd-1.3.tar.gz) = 6E0Kc/auRu1l/2D1AaxXtGma7bM= -SHA1 (totd-1.3.tar.gz) = vXeXlxaIgMmoJYLbnFmY5DJZaDs= -SHA256 (totd-1.3.tar.gz) = 4c7SfDLmlJcC5zD3rG8JwT2DvJ8fzWk5qG4OkJW0dSs= -SIZE (totd-1.3.tar.gz) = 82133 +MD5 (totd-1.5.1.tar.gz) = ftrtrp9qylkS3WwSNYLPCA== +RMD160 (totd-1.5.1.tar.gz) = O4CTGDfu0b2eXN+oo+1wjW7UBCk= +SHA1 (totd-1.5.1.tar.gz) = z51Is4ay8hgDK4mX4otG5kkh1Z4= +SHA256 (totd-1.5.1.tar.gz) = Ggnvbc84K+6jVG7sMTjq37ruwZim+SHJbok36RoeBvo= +SIZE (totd-1.5.1.tar.gz) = 235809 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/totd/patches/patch-Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile_in --- patches/patch-Makefile_in 15 Mar 2002 03:35:45 -0000 1.2 +++ patches/patch-Makefile_in 23 Aug 2009 20:57:36 -0000 @@ -1,7 +1,16 @@ ---- Makefile.in.orig Thu Feb 28 20:59:47 2002 -+++ Makefile.in Fri Mar 15 13:14:18 2002 -@@ -58,8 +58,8 @@ - ${CC} ${LDFLAGS} -o ${PROG} ${OBJS} ${LDADD} +--- Makefile.in.orig Mon Jan 31 11:55:14 2005 ++++ Makefile.in Sun Aug 23 21:57:32 2009 +@@ -19,7 +19,7 @@ tot_config_fi...@sysconfdir@/totd.conf + + INSTALL = /usr/bin/install + +-CFLAGS = @CFLAGS@ @DEFS@ -Werror -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) ++CFLAGS = @CFLAGS@ @DEFS@ -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) + + # When debugging is enabled by --enable-malloc-debug flag to the configure + # script, the @DBMALLOC@ substitution will contain the empty string, thus +@@ -66,8 +66,8 @@ libswill.a: + -ranlib libswill.a install: $(PROG) - $(INSTALL) -c -s -m 0555 -o bin -g bin $(PROG) $(INSTALLDIR) Index: patches/patch-totd_8 =================================================================== RCS file: patches/patch-totd_8 diff -N patches/patch-totd_8 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-totd_8 23 Aug 2009 19:53:05 -0000 @@ -0,0 +1,29 @@ +$OpenBSD$ + +formatting error; s/I N-ADDR/IN-ADDR/g; s/IP 6.ARPA/IP6.ARPA/g + +--- totd.8.orig Wed Feb 2 11:10:31 2005 ++++ totd.8 Sun Aug 23 20:50:31 2009 +@@ -47,6 +47,7 @@ By default totd listens on wildcard sockets. This opti + \fBpidfile\fR <filename> + .br + Changes the default filename for totd to write its process id into. ++.TP + \fBstf\fR + .br + Enable 6to4 PTR rewriting. +@@ -142,11 +143,11 @@ If multiple prefixed are configured, totd will cycle t + .LP + To enable 6to4 PTR query translation trick, add the `stf' keyword to your totd config file. 6to4 reverse lookup is based on draft\-moore\-6to4\-dns\-00.txt, section 3.3: + .IP +- When such a resolver received a PTR or NS query for a label that had a [x2002].IP 6.ARPA suffix, it would first attempt to satisfy that query from its cache, or failing that, by forwarding the query to an upstream server. If that query failed due to a "no such domain" error,the resolver would then attempt to find the server for the {something}.[x2002].IP 6.ARPA label by issuing an NS query for {something}.I N\-ADDR.ARPA. ++ When such a resolver received a PTR or NS query for a label that had a [x2002].IP6.ARPA suffix, it would first attempt to satisfy that query from its cache, or failing that, by forwarding the query to an upstream server. If that query failed due to a "no such domain" error,the resolver would then attempt to find the server for the {something}.[x2002].IP6.ARPA label by issuing an NS query for {something}.IN\-ADDR.ARPA. + .IP +- If the original query was for PTR records, and one or more NS records were found for {something}.I N\-ADDR.ARPA, the resolver would then forward the original query for {something}.[x2002].IP 6.ARPA to one or more of those servers, and return the results from one of the forwarded queries if any were successful. ++ If the original query was for PTR records, and one or more NS records were found for {something}.IN\-ADDR.ARPA, the resolver would then forward the original query for {something}.[x2002].IP6.ARPA to one or more of those servers, and return the results from one of the forwarded queries if any were successful. + .IP +- If the original query was for NS records, and one or more NS records were found for {something}.I N\-ADDR.ARPA, the resolver would then return the pseudo\-records corresponding to the IN\-ADDR.ARPA domains. Those pseudo\-records would NOT be marked as authoritative, and the resolver would NOT cache those records. ++ If the original query was for NS records, and one or more NS records were found for {something}.IN\-ADDR.ARPA, the resolver would then return the pseudo\-records corresponding to the IN\-ADDR.ARPA domains. Those pseudo\-records would NOT be marked as authoritative, and the resolver would NOT cache those records. + .SH "SCOPED ADDRESSES" + .LP + Totd supports re\-writing of scoped addresses in DNS responses. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/totd/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 15 Sep 2004 18:17:47 -0000 1.5 +++ pkg/PLIST 23 Aug 2009 20:55:41 -0000 @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:17:47 espie Exp $ @man man/man8/totd.8 -sbin/totd +...@bin sbin/totd share/totd/ share/totd/totd.conf.sample @sample ${SYSCONFDIR}/totd.conf
