cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 2.58

Browse Source 
from brad
This commit is contained in:
jasper 2011-09-07 10:34:26 +00:00
parent 0986549eb9
commit 4dee02fc1d
7 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/dnsmasq/Makefile
View File

@ -1,25 +1,24 @@
# $OpenBSD: Makefile,v 1.19 2011/03/06 11:19:53 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2011/09/07 10:34:26 jasper Exp $
COMMENT= caching DNS forwarder and DHCP server
DISTNAME= dnsmasq-2.57
DISTNAME= dnsmasq-2.58
CATEGORIES= net
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
MAINTAINER= Rui Reis <rui@openbsd.org>
HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html
# GPLv2/GPLv3
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
WANTLIB= c
MAKE_ENV= CC="${CC}"
MAKE_FLAGS= CFLAGS="${CFLAGS} -Wall -W"
USE_GROFF= Yes
NO_REGRESS= Yes
pre-build:

10
net/dnsmasq/distinfo
View File

@ -1,5 +1,5 @@
MD5 (dnsmasq-2.57.tar.gz) = 0Q+utAlxfq6UcY13FspjpA==
RMD160 (dnsmasq-2.57.tar.gz) = +pRxfU4MfQldc0oYp3uqRt3CzVQ=
SHA1 (dnsmasq-2.57.tar.gz) = N+NlZPis/ZSvBFX6KkPa+fIzi3Y=
SHA256 (dnsmasq-2.57.tar.gz) = wuDHuCEi1jaTOyihwo5rzLbarUkWLnU0tkGzwzQP+K4=
SIZE (dnsmasq-2.57.tar.gz) = 456035
MD5 (dnsmasq-2.58.tar.gz) = FMXIHeuzJK3CYduXFzD0xg==
RMD160 (dnsmasq-2.58.tar.gz) = G2U/EUcvOp4BiEvfIZ6zwlQQXJU=
SHA1 (dnsmasq-2.58.tar.gz) = kVC/EQ7dOddDk5m8TCM4UidceAE=
SHA256 (dnsmasq-2.58.tar.gz) = 1fZO1l8rmk24RtbaXWkD7APoaSTAniMvQse2O8v6O+Y=
SIZE (dnsmasq-2.58.tar.gz) = 473693

12
net/dnsmasq/patches/patch-Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile,v 1.1 2011/01/10 22:08:26 ajacoutot Exp $
--- Makefile.orig Tue Dec 28 18:57:01 2010
+++ Makefile Tue Dec 28 18:57:18 2010
@@ -24,7 +24,7 @@ MSGMERGE = msgmerge
MSGFMT = msgfmt
XGETTEXT = xgettext
-CFLAGS = -Wall -W -O2
+CFLAGS += -Wall -W
#################################################################

10
net/dnsmasq/patches/patch-man_dnsmasq_8
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-man_dnsmasq_8,v 1.9 2011/03/06 11:19:53 sthen Exp $
--- man/dnsmasq.8.orig Sat Feb 12 16:12:13 2011
+++ man/dnsmasq.8 Tue Feb 15 19:11:50 2011
$OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
--- man/dnsmasq.8.orig Tue Aug 9 11:05:38 2011
+++ man/dnsmasq.8 Mon Aug 29 17:35:40 2011
@@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
.TP
.B \-u, --user=<username>
@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.9 2011/03/06 11:19:53 sthen Exp $
.TP
.B \-v, --version
Print the version number.
@@ -1173,7 +1172,7 @@ with # are always skipped. This flag may be given on t
@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
line or in a configuration file.
.SH CONFIG FILE
At startup, dnsmasq reads
@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.9 2011/03/06 11:19:53 sthen Exp $
if it exists. (On
FreeBSD, the file is
.I /usr/local/etc/dnsmasq.conf
@@ -1480,7 +1479,7 @@ dnsmasq has no direct way of determining the charset i
@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
assume that it is the system default.
.SH FILES

17
net/dnsmasq/patches/patch-src_bpf_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_bpf_c,v 1.1 2011/03/06 11:19:53 sthen Exp $
--- src/bpf.c.orig Wed Mar 2 17:42:32 2011
+++ src/bpf.c Wed Mar 2 17:42:43 2011
@@ -35,6 +35,13 @@ static struct iovec ifreq = {
#include <net/if_dl.h>
#include <netinet/if_ether.h>
+#ifndef SA_SIZE
+#define SA_SIZE(sa) \
+ ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \
+ sizeof(long) : \
+ 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) )
+#endif
+
int arp_enumerate(void *parm, int (*callback)())
{
int mib[6];

11
net/dnsmasq/patches/patch-src_dnsmasq_h
View File

@ -1,7 +1,10 @@
$OpenBSD: patch-src_dnsmasq_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
--- src/dnsmasq.h.orig Thu Feb 17 10:30:15 2011
+++ src/dnsmasq.h Fri Feb 18 14:58:43 2011
@@ -593,7 +593,7 @@ struct tftp_file {
$OpenBSD: patch-src_dnsmasq_h,v 1.9 2011/09/07 10:34:26 jasper Exp $
gcc2 fix to struct tftp_file
--- src/dnsmasq.h.orig Tue Jun 28 12:08:53 2011
+++ src/dnsmasq.h Thu Jul 14 17:02:11 2011
@@ -596,7 +596,7 @@ struct tftp_file {
off_t size;
dev_t dev;
ino_t inode;

14
net/dnsmasq/patches/patch-src_tftp_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_tftp_c,v 1.9 2011/03/06 11:19:53 sthen Exp $
$OpenBSD: patch-src_tftp_c,v 1.10 2011/09/07 10:34:26 jasper Exp $
gcc2 fixes to struct errmess, struct oackmess, struct datamess from kili
gcc2 fixes to struct errmess, struct oackmess, struct datamess
--- src/tftp.c.orig Tue Jan 18 17:23:57 2011
+++ src/tftp.c Tue Feb 15 19:11:50 2011
@@ -606,7 +606,7 @@ static ssize_t tftp_err(int err, char *packet, char *m
--- src/tftp.c.orig Tue Aug 9 08:41:48 2011
+++ src/tftp.c Mon Aug 29 17:35:40 2011
@@ -611,7 +611,7 @@ static ssize_t tftp_err(int err, char *packet, char *m
{
struct errmess {
unsigned short op, err;
@ -13,7 +13,7 @@ gcc2 fixes to struct errmess, struct oackmess, struct datamess from kili
} *mess = (struct errmess *)packet;
ssize_t ret = 4;
char *errstr = strerror(errno);
@@ -633,7 +633,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
@@ -638,7 +638,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
char *p;
struct oackmess {
unsigned short op;
@ -22,7 +22,7 @@ gcc2 fixes to struct errmess, struct oackmess, struct datamess from kili
} *mess = (struct oackmess *)packet;
p = mess->data;
@@ -656,7 +656,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
@@ -661,7 +661,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
/* send data packet */
struct datamess {
unsigned short op, block;