From c0723c146d5cff1f5b2523812f0f462f744a2093 Mon Sep 17 00:00:00 2001 From: rui Date: Thu, 31 May 2007 04:28:33 +0000 Subject: [PATCH] update dnsmasq to 2.39 ok maintainer, "looks good" aanriot@ --- net/dnsmasq/Makefile | 6 +++--- net/dnsmasq/distinfo | 10 +++++----- net/dnsmasq/patches/patch-man_dnsmasq_8 | 14 +++++++------- net/dnsmasq/patches/patch-src_config_h | 8 ++++---- net/dnsmasq/patches/patch-src_dnsmasq_h | 8 ++++---- net/dnsmasq/patches/patch-src_tftp_c | 12 ++++++------ 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile index f509f74c9b9..588be2e1ec9 100644 --- a/net/dnsmasq/Makefile +++ b/net/dnsmasq/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.5 2007/03/17 21:55:54 jolan Exp $ +# $OpenBSD: Makefile,v 1.6 2007/05/31 04:28:33 rui Exp $ COMMENT= "caching DNS forwarder and DHCP server" -DISTNAME= dnsmasq-2.38 +DISTNAME= dnsmasq-2.39 CATEGORIES= net MAINTAINER= Jonathan Weiss HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo index 07d16c9a43f..c5cc029f060 100644 --- a/net/dnsmasq/distinfo +++ b/net/dnsmasq/distinfo @@ -1,5 +1,5 @@ -MD5 (dnsmasq-2.38.tar.gz) = qwZql8ImBmSFrSDlrVzkJA== -RMD160 (dnsmasq-2.38.tar.gz) = v6fKSl7e2irt1wiZG4F3J0sduLc= -SHA1 (dnsmasq-2.38.tar.gz) = JnrHt46fSLDY1l8w/A+qKmVSrow= -SHA256 (dnsmasq-2.38.tar.gz) = VPPprCvZ9iKyirDVFJ6bwT1i2IJr4IXDKrySm8MN2mo= -SIZE (dnsmasq-2.38.tar.gz) = 272953 +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 diff --git a/net/dnsmasq/patches/patch-man_dnsmasq_8 b/net/dnsmasq/patches/patch-man_dnsmasq_8 index a6081e92f66..600c2b6b6e4 100644 --- a/net/dnsmasq/patches/patch-man_dnsmasq_8 +++ b/net/dnsmasq/patches/patch-man_dnsmasq_8 @@ -1,8 +1,8 @@ -$OpenBSD: patch-man_dnsmasq_8,v 1.1 2006/07/19 09:15:48 alek Exp $ ---- man/dnsmasq.8.orig Wed Jun 7 07:37:25 2006 -+++ man/dnsmasq.8 Wed Jun 7 07:38:22 2006 -@@ -584,7 +584,7 @@ configuration files, to include multiple - level of nesting is allowed. +$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 + line or in a configuration file. .SH CONFIG FILE At startup, dnsmasq reads -.I /etc/dnsmasq.conf, @@ -10,8 +10,8 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.1 2006/07/19 09:15:48 alek Exp $ if it exists. (On FreeBSD, the file is .I /usr/local/etc/dnsmasq.conf -@@ -723,7 +723,7 @@ configurations, allowing some control ov - different classes of hosts. +@@ -948,7 +948,7 @@ dnsmasq has been tested successfully with one million + file needs a 1GHz processor and about 60Mb of RAM. .SH FILES -.IR /etc/dnsmasq.conf diff --git a/net/dnsmasq/patches/patch-src_config_h b/net/dnsmasq/patches/patch-src_config_h index b3d86d07305..624e148e256 100644 --- a/net/dnsmasq/patches/patch-src_config_h +++ b/net/dnsmasq/patches/patch-src_config_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_config_h,v 1.1.1.1 2005/05/23 18:46:58 alek Exp $ ---- src/config.h.orig Thu Mar 31 17:08:43 2005 -+++ src/config.h Sun May 22 11:05:28 2005 -@@ -40,7 +40,7 @@ +$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 +@@ -41,7 +41,7 @@ #if defined(__FreeBSD__) # define CONFFILE "/usr/local/etc/dnsmasq.conf" #else diff --git a/net/dnsmasq/patches/patch-src_dnsmasq_h b/net/dnsmasq/patches/patch-src_dnsmasq_h index 0719a9a175e..fef79841d22 100644 --- a/net/dnsmasq/patches/patch-src_dnsmasq_h +++ b/net/dnsmasq/patches/patch-src_dnsmasq_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_dnsmasq_h,v 1.1 2007/03/17 21:55:54 jolan Exp $ ---- src/dnsmasq.h.orig Sun Mar 4 15:11:27 2007 -+++ src/dnsmasq.h Sun Mar 4 15:11:47 2007 -@@ -437,7 +437,7 @@ struct ping_result { +$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; off_t size; diff --git a/net/dnsmasq/patches/patch-src_tftp_c b/net/dnsmasq/patches/patch-src_tftp_c index 95fef1d54fe..f4ac80733ee 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.1 2007/03/17 21:55:54 jolan Exp $ ---- src/tftp.c.orig Sun Mar 4 15:26:58 2007 -+++ src/tftp.c Sun Mar 4 15:27:38 2007 -@@ -432,7 +432,7 @@ static ssize_t tftp_err(int err, char *p +$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 { struct errmess { unsigned short op, err; @@ -10,7 +10,7 @@ $OpenBSD: patch-src_tftp_c,v 1.1 2007/03/17 21:55:54 jolan Exp $ } *mess = (struct errmess *)packet; ssize_t ret = 4; char *errstr = strerror(errno); -@@ -460,7 +460,7 @@ static ssize_t get_block(char *packet, s +@@ -469,7 +469,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.1 2007/03/17 21:55:54 jolan Exp $ } *mess = (struct oackmess *)packet; p = mess->data; -@@ -483,7 +483,7 @@ static ssize_t get_block(char *packet, s +@@ -492,7 +492,7 @@ static ssize_t get_block(char *packet, struct tftp_tra /* send data packet */ struct datamess { unsigned short op, block;