here's an update to net/dnsmasq. Also take over maintainership because
Jonathan Weiss (maintainer) doesn't run OpenBSD anymore and I've been updating
this port since 2006.

works for me on i386, amd64, macppc and sparc64.

ok?

cheers,
rui


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile    15 Sep 2007 22:36:53 -0000      1.7
+++ Makefile    25 Sep 2007 08:26:08 -0000
@@ -2,10 +2,10 @@
 
 COMMENT=       caching DNS forwarder and DHCP server
 
-DISTNAME=      dnsmasq-2.39
+DISTNAME=      dnsmasq-2.40
 CATEGORIES=    net
 
-MAINTAINER=    Jonathan Weiss <[EMAIL PROTECTED]>
+MAINTAINER=    Rui Reis <[EMAIL PROTECTED]>
 
 HOMEPAGE=      http://www.thekelleys.org.uk/dnsmasq/doc.html
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo    31 May 2007 04:28:33 -0000      1.6
+++ distinfo    25 Sep 2007 08:26:08 -0000
@@ -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
Index: patches/patch-man_dnsmasq_8
===================================================================
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.2
diff -u -r1.2 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 31 May 2007 04:28:33 -0000      1.2
+++ patches/patch-man_dnsmasq_8 25 Sep 2007 08:26:08 -0000
@@ -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$
+--- 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 @@
  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
Index: patches/patch-src_config_h
===================================================================
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
retrieving revision 1.2
diff -u -r1.2 patch-src_config_h
--- patches/patch-src_config_h  31 May 2007 04:28:33 -0000      1.2
+++ patches/patch-src_config_h  25 Sep 2007 08:26:08 -0000
@@ -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$
+--- 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"
Index: patches/patch-src_dnsmasq_h
===================================================================
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_dnsmasq_h,v
retrieving revision 1.2
diff -u -r1.2 patch-src_dnsmasq_h
--- patches/patch-src_dnsmasq_h 31 May 2007 04:28:33 -0000      1.2
+++ patches/patch-src_dnsmasq_h 25 Sep 2007 08:26:09 -0000
@@ -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$
+--- 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;
  };
Index: patches/patch-src_tftp_c
===================================================================
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_tftp_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_tftp_c
--- patches/patch-src_tftp_c    31 May 2007 04:28:33 -0000      1.2
+++ patches/patch-src_tftp_c    25 Sep 2007 08:26:09 -0000
@@ -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$
+--- 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 @@
    } *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 @@
        } *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;

Reply via email to