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

Update to version 2.49.

Browse Source 
Unbreak tftp, since converting the struct members from arrays to
pointers badly broke the code,

ok rui@ (maintainer).
This commit is contained in:
kili 2009-06-14 17:07:25 +00:00
parent a7b1d60056
commit 428fdf942e
9 changed files with 82 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/dnsmasq/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2009/03/08 21:04:16 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2009/06/14 17:07:25 kili Exp $
COMMENT= caching DNS forwarder and DHCP server
DISTNAME= dnsmasq-2.45
PKGNAME= ${DISTNAME}p0
DISTNAME= dnsmasq-2.49
CATEGORIES= net
MAINTAINER= Rui Reis <rui@openbsd.org>
@ -24,7 +23,9 @@ MAKE_ENV= CC="${CC}"
NO_REGRESS= Yes
pre-build:
${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 ${WRKSRC}/src/config.h
${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 \
${WRKSRC}/src/config.h \
${WRKSRC}/dnsmasq.conf.example
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin

10
net/dnsmasq/distinfo
View File

@ -1,5 +1,5 @@
MD5 (dnsmasq-2.45.tar.gz) = t5VuFcl2bgWz7KPOiP22Fg==
RMD160 (dnsmasq-2.45.tar.gz) = uOv53+/ybBhmSpF80yy5tqU4Uss=
SHA1 (dnsmasq-2.45.tar.gz) = EvjP/WV/Z0+/S/T2cKDctl6kpa4=
SHA256 (dnsmasq-2.45.tar.gz) = e1tFbmzLOjbMlrhLeboUiFCrWaxFMWt1mgkKESH5PhM=
SIZE (dnsmasq-2.45.tar.gz) = 380877
MD5 (dnsmasq-2.49.tar.gz) = fMyGHYpzNHT5wKChJwBu6Q==
RMD160 (dnsmasq-2.49.tar.gz) = FP9lLiR8ovmKCThHMOALGpfkLZU=
SHA1 (dnsmasq-2.49.tar.gz) = ySAN5sAHNr0DhQYdhNiAKgfyHdI=
SHA256 (dnsmasq-2.49.tar.gz) = Qc8y/ElqIW0z11sA/DvwOG9Ms7iZlqhT3Du3jAnzCzE=
SIZE (dnsmasq-2.49.tar.gz) = 407342

8
net/dnsmasq/patches/patch-bld_Makefile
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-bld_Makefile,v 1.1 2009/03/08 21:04:16 naddy Exp $
--- bld/Makefile.orig Fri Mar 6 17:21:42 2009
+++ bld/Makefile Fri Mar 6 17:21:47 2009
$OpenBSD: patch-bld_Makefile,v 1.2 2009/06/14 17:07:25 kili Exp $
--- bld/Makefile.orig Mon Jun 8 23:05:30 2009
+++ bld/Makefile Sat Jun 13 12:05:54 2009
@@ -1,4 +1,4 @@
-CFLAGS = -Wall -W -O2
+#CFLAGS = -Wall -W -O2
OBJS = cache.o rfc1035.o util.o option.o forward.o isc.o network.o \
OBJS = cache.o rfc1035.o util.o option.o forward.o network.o \
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \

12
net/dnsmasq/patches/patch-dnsmasq_conf_example Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-dnsmasq_conf_example,v 1.1 2009/06/14 17:07:25 kili Exp $
--- dnsmasq.conf.example.orig Mon Jun 8 23:05:30 2009
+++ dnsmasq.conf.example Sat Jun 13 12:34:06 2009
@@ -2,7 +2,7 @@
#
# Format is one option per line, legal options are the same
# as the long options legal on the command line. See
-# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details.
+# "${LOCALBASE}/sbin/dnsmasq --help" or "man 8 dnsmasq" for details.
# The following two options make you a better netizen, since they
# tell dnsmasq to filter out queries which the public DNS cannot

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

@ -1,7 +1,23 @@
$OpenBSD: patch-man_dnsmasq_8,v 1.5 2008/08/06 03:11:38 pvalchev Exp $
--- man/dnsmasq.8.orig Sun Jul 20 19:26:07 2008
+++ man/dnsmasq.8 Tue Aug 5 11:00:00 2008
@@ -872,7 +872,7 @@ with # are skipped. This flag may be given on the comm
$OpenBSD: patch-man_dnsmasq_8,v 1.6 2009/06/14 17:07:25 kili Exp $
--- man/dnsmasq.8.orig Mon Jun 8 23:05:30 2009
+++ man/dnsmasq.8 Sun Jun 14 17:04:47 2009
@@ -105,13 +105,12 @@ Specify an alternate path for dnsmasq to record its pr
.TP
.B \-u, --user=<username>
Specify the userid to which dnsmasq will change after startup. Dnsmasq must normally be started as root, but it will drop root
-privileges after startup by changing id to another user. Normally this user is "nobody" but that
+privileges after startup by changing id to another user. Normally this user is "_dnsmasq" but that
can be over-ridden with this switch.
.TP
.B \-g, --group=<groupname>
Specify the group which dnsmasq will run
-as. The defaults to "dip", if available, to facilitate access to
-/etc/ppp/resolv.conf which is not normally world readable.
+as. This defaults to "_dnsmasq".
.TP
.B \-v, --version
Print the version number.
@@ -1002,7 +1001,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 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.5 2008/08/06 03:11:38 pvalchev Exp $
if it exists. (On
FreeBSD, the file is
.I /usr/local/etc/dnsmasq.conf
@@ -1106,7 +1106,7 @@ dnsmasq has been tested successfully with one million
@@ -1239,7 +1238,7 @@ dnsmasq has been tested successfully with one million
file needs a 1GHz processor and about 60Mb of RAM.
.SH FILES

28
net/dnsmasq/patches/patch-src_config_h
View File

@ -1,12 +1,20 @@
$OpenBSD: patch-src_config_h,v 1.5 2008/08/06 03:11:38 pvalchev Exp $
--- src/config.h.orig Sun Jul 20 19:26:32 2008
+++ src/config.h Tue Aug 5 11:00:00 2008
@@ -48,7 +48,7 @@
#if defined(__FreeBSD__)
# define CONFFILE "/usr/local/etc/dnsmasq.conf"
#else
-# define CONFFILE "/etc/dnsmasq.conf"
+# define CONFFILE "${SYSCONFDIR}/dnsmasq.conf"
$OpenBSD: patch-src_config_h,v 1.6 2009/06/14 17:07:25 kili Exp $
--- src/config.h.orig Wed Jun 10 15:03:45 2009
+++ src/config.h Sun Jun 14 17:03:14 2009
@@ -53,13 +53,13 @@
# if defined(__FreeBSD__)
# define CONFFILE "/usr/local/etc/dnsmasq.conf"
# else
-# define CONFFILE "/etc/dnsmasq.conf"
+# define CONFFILE "${SYSCONFDIR}/dnsmasq.conf"
# endif
#endif
#define DEFLEASE 3600 /* default lease time, 1 hour */
#define CHUSER "nobody"
-#define CHUSER "nobody"
-#define CHGRP "dip"
+#define CHUSER "_dnsmasq"
+#define CHGRP "_dnsmasq"
#define DHCP_SERVER_PORT 67
#define DHCP_CLIENT_PORT 68
#define DHCP_SERVER_ALTPORT 1067

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

@ -1,12 +1,12 @@
$OpenBSD: patch-src_dnsmasq_h,v 1.5 2008/08/06 03:11:38 pvalchev Exp $
--- src/dnsmasq.h.orig Sun Jul 20 19:26:07 2008
+++ src/dnsmasq.h Tue Aug 5 11:00:00 2008
@@ -543,7 +543,7 @@ struct tftp_file {
$OpenBSD: patch-src_dnsmasq_h,v 1.6 2009/06/14 17:07:25 kili Exp $
--- src/dnsmasq.h.orig Mon Jun 8 23:05:30 2009
+++ src/dnsmasq.h Sat Jun 13 12:05:54 2009
@@ -572,7 +572,7 @@ struct tftp_file {
off_t size;
dev_t dev;
ino_t inode;
- char filename[];
+ char *filename;
+ char filename[0];
};
struct tftp_transfer {

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

@ -1,30 +1,30 @@
$OpenBSD: patch-src_tftp_c,v 1.4 2008/06/05 19:38:39 rui Exp $
--- src/tftp.c.orig Sat May 24 10:32:02 2008
+++ src/tftp.c Wed Jun 4 09:32:56 2008
@@ -484,7 +484,7 @@ static ssize_t tftp_err(int err, char *packet, char *m
$OpenBSD: patch-src_tftp_c,v 1.5 2009/06/14 17:07:25 kili Exp $
--- src/tftp.c.orig Mon Jun 8 23:12:43 2009
+++ src/tftp.c Sat Jun 13 12:05:54 2009
@@ -481,7 +481,7 @@ static ssize_t tftp_err(int err, char *packet, char *m
{
struct errmess {
unsigned short op, err;
- char message[];
+ char *message;
+ char message[0];
} *mess = (struct errmess *)packet;
ssize_t ret = 4;
char *errstr = strerror(errno);
@@ -512,7 +512,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
@@ -508,7 +508,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
char *p;
struct oackmess {
unsigned short op;
- char data[];
+ char *data;
+ char data[0];
} *mess = (struct oackmess *)packet;
p = mess->data;
@@ -535,7 +535,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
@@ -531,7 +531,7 @@ static ssize_t get_block(char *packet, struct tftp_tra
/* send data packet */
struct datamess {
unsigned short op, block;
- unsigned char data[];
+ unsigned char *data;
+ unsigned char data[0];
} *mess = (struct datamess *)packet;
size_t size = transfer->file->size - transfer->offset;

4
net/dnsmasq/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2008/08/06 03:11:38 pvalchev Exp $
@comment $OpenBSD: PLIST,v 1.4 2009/06/14 17:07:25 kili Exp $
@newgroup _dnsmasq:631
@newuser _dnsmasq:631:_dnsmasq:daemon:dnsmasq Account:/nonexistent:/sbin/nologin
@man man/man8/dnsmasq.8
@bin sbin/dnsmasq
share/examples/dnsmasq/