diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile index 85f2ff79de4..1ed57b50301 100644 --- a/net/dnsmasq/Makefile +++ b/net/dnsmasq/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 22:36:53 merdely Exp $ +# $OpenBSD: Makefile,v 1.8 2007/09/26 19:51:33 rui Exp $ COMMENT= caching DNS forwarder and DHCP server -DISTNAME= dnsmasq-2.39 +DISTNAME= dnsmasq-2.40 CATEGORIES= net -MAINTAINER= Jonathan Weiss +MAINTAINER= Rui Reis HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html @@ -27,7 +27,8 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/share/examples + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq + ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/share/examples/dnsmasq ${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8 .include diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo index c5cc029f060..1d19fab331b 100644 --- a/net/dnsmasq/distinfo +++ b/net/dnsmasq/distinfo @@ -1,5 +1,5 @@ -MD5 (dnsmasq-2.39.tar.gz) = H/zMHw2bigjyuZ4DupzAiw== -RMD160 (dnsmasq-2.39.tar.gz) = e9fmC4JdBw61iDGb2w8vmm3JXSM= -SHA1 (dnsmasq-2.39.tar.gz) = nG47Bznns+VaqxSssr7YHG+0fbk= -SHA256 (dnsmasq-2.39.tar.gz) = wpD2r1UI7O/oO1CloGOGewWrAk3S9exe5NBWslCRkME= -SIZE (dnsmasq-2.39.tar.gz) = 288990 +MD5 (dnsmasq-2.40.tar.gz) = kbYGOugRRrnXC0OBsvPkTw== +RMD160 (dnsmasq-2.40.tar.gz) = +G7jxeOYs6jqwQPGWY+PPbYNaVU= +SHA1 (dnsmasq-2.40.tar.gz) = Svk7GMJiuD5fa9JABEg6ouxvPSA= +SHA256 (dnsmasq-2.40.tar.gz) = FlF4VpMAdPpLunOfQMod1KEbgKBiOhLyrnvnAQg1ZOA= +SIZE (dnsmasq-2.40.tar.gz) = 307051 diff --git a/net/dnsmasq/patches/patch-man_dnsmasq_8 b/net/dnsmasq/patches/patch-man_dnsmasq_8 index 600c2b6b6e4..0cd45a984e1 100644 --- a/net/dnsmasq/patches/patch-man_dnsmasq_8 +++ b/net/dnsmasq/patches/patch-man_dnsmasq_8 @@ -1,7 +1,7 @@ -$OpenBSD: patch-man_dnsmasq_8,v 1.2 2007/05/31 04:28:33 rui Exp $ ---- man/dnsmasq.8.orig Fri Apr 20 14:35:26 2007 -+++ man/dnsmasq.8 Sat May 26 18:26:21 2007 -@@ -763,7 +763,7 @@ with # are skipped. This flag may be given on the comm +$OpenBSD: patch-man_dnsmasq_8,v 1.3 2007/09/26 19:51:33 rui Exp $ +--- man/dnsmasq.8.orig Sat Aug 11 20:53:44 2007 ++++ man/dnsmasq.8 Tue Sep 25 09:28:25 2007 +@@ -786,7 +786,7 @@ with # are skipped. This flag may be given on the comm line or in a configuration file. .SH CONFIG FILE At startup, dnsmasq reads @@ -10,7 +10,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.2 2007/05/31 04:28:33 rui Exp $ if it exists. (On FreeBSD, the file is .I /usr/local/etc/dnsmasq.conf -@@ -948,7 +948,7 @@ dnsmasq has been tested successfully with one million +@@ -1018,7 +1018,7 @@ dnsmasq has been tested successfully with one million file needs a 1GHz processor and about 60Mb of RAM. .SH FILES diff --git a/net/dnsmasq/patches/patch-src_config_h b/net/dnsmasq/patches/patch-src_config_h index 624e148e256..aa4d62c2b28 100644 --- a/net/dnsmasq/patches/patch-src_config_h +++ b/net/dnsmasq/patches/patch-src_config_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_config_h,v 1.2 2007/05/31 04:28:33 rui Exp $ ---- src/config.h.orig Sat Apr 28 15:14:44 2007 -+++ src/config.h Sat May 26 18:26:21 2007 +$OpenBSD: patch-src_config_h,v 1.3 2007/09/26 19:51:33 rui Exp $ +--- src/config.h.orig Tue Aug 28 15:01:17 2007 ++++ src/config.h Tue Sep 25 09:28:25 2007 @@ -41,7 +41,7 @@ #if defined(__FreeBSD__) # define CONFFILE "/usr/local/etc/dnsmasq.conf" diff --git a/net/dnsmasq/patches/patch-src_dnsmasq_h b/net/dnsmasq/patches/patch-src_dnsmasq_h index fef79841d22..6b9568f0a7f 100644 --- a/net/dnsmasq/patches/patch-src_dnsmasq_h +++ b/net/dnsmasq/patches/patch-src_dnsmasq_h @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_dnsmasq_h,v 1.2 2007/05/31 04:28:33 rui Exp $ ---- src/dnsmasq.h.orig Fri Apr 20 11:53:38 2007 -+++ src/dnsmasq.h Sat May 26 18:26:21 2007 -@@ -452,7 +452,7 @@ struct ping_result { - struct tftp_file { - int refcount, fd; +$OpenBSD: patch-src_dnsmasq_h,v 1.3 2007/09/26 19:51:33 rui Exp $ +--- src/dnsmasq.h.orig Tue Sep 25 09:29:15 2007 ++++ src/dnsmasq.h Tue Sep 25 09:29:33 2007 +@@ -483,7 +483,7 @@ struct tftp_file { off_t size; + dev_t dev; + ino_t inode; - char filename[]; + char *filename; }; diff --git a/net/dnsmasq/patches/patch-src_tftp_c b/net/dnsmasq/patches/patch-src_tftp_c index f4ac80733ee..9503bf8d2a9 100644 --- a/net/dnsmasq/patches/patch-src_tftp_c +++ b/net/dnsmasq/patches/patch-src_tftp_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_tftp_c,v 1.2 2007/05/31 04:28:33 rui Exp $ ---- src/tftp.c.orig Wed Mar 21 19:28:47 2007 -+++ src/tftp.c Sat May 26 18:26:21 2007 -@@ -441,7 +441,7 @@ static ssize_t tftp_err(int err, char *packet, char *m +$OpenBSD: patch-src_tftp_c,v 1.3 2007/09/26 19:51:33 rui Exp $ +--- src/tftp.c.orig Mon Jul 23 19:33:37 2007 ++++ src/tftp.c Tue Sep 25 09:28:25 2007 +@@ -448,7 +448,7 @@ static ssize_t tftp_err(int err, char *packet, char *m { struct errmess { unsigned short op, err; @@ -10,7 +10,7 @@ $OpenBSD: patch-src_tftp_c,v 1.2 2007/05/31 04:28:33 rui Exp $ } *mess = (struct errmess *)packet; ssize_t ret = 4; char *errstr = strerror(errno); -@@ -469,7 +469,7 @@ static ssize_t get_block(char *packet, struct tftp_tra +@@ -476,7 +476,7 @@ static ssize_t get_block(char *packet, struct tftp_tra char *p; struct oackmess { unsigned short op; @@ -19,7 +19,7 @@ $OpenBSD: patch-src_tftp_c,v 1.2 2007/05/31 04:28:33 rui Exp $ } *mess = (struct oackmess *)packet; p = mess->data; -@@ -492,7 +492,7 @@ static ssize_t get_block(char *packet, struct tftp_tra +@@ -499,7 +499,7 @@ static ssize_t get_block(char *packet, struct tftp_tra /* send data packet */ struct datamess { unsigned short op, block; diff --git a/net/dnsmasq/pkg/PLIST b/net/dnsmasq/pkg/PLIST index 57ea1dcadb6..abfebcf1a6b 100644 --- a/net/dnsmasq/pkg/PLIST +++ b/net/dnsmasq/pkg/PLIST @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/23 18:46:58 alek Exp $ +@comment $OpenBSD: PLIST,v 1.2 2007/09/26 19:51:33 rui Exp $ @man man/man8/dnsmasq.8 sbin/dnsmasq -share/examples/dnsmasq.conf.example +share/examples/dnsmasq/ +share/examples/dnsmasq/dnsmasq.conf.example @sample ${SYSCONFDIR}/dnsmasq.conf