1 diff -Nru dnsmasq-2.41.orig/Makefile dnsmasq-2.41/Makefile
2 --- dnsmasq-2.41.orig/Makefile 2008-02-13 12:24:03.000000000 +0100
3 +++ dnsmasq-2.41/Makefile 2008-02-13 12:24:16.000000000 +0100
4 @@ -15,7 +15,7 @@
5
6 PREFIX = /usr/local
7 BINDIR = ${PREFIX}/sbin
8 -MANDIR = ${PREFIX}/share/man
9 +MANDIR = ${PREFIX}/man
10 LOCALEDIR = ${PREFIX}/share/locale
11
12 SRC = src
13 diff -Nru dnsmasq-2.41.orig/bld/Makefile dnsmasq-2.41/bld/Makefile
14 --- dnsmasq-2.41.orig/bld/Makefile 2008-02-13 12:24:03.000000000 +0100
15 +++ dnsmasq-2.41/bld/Makefile 2008-02-13 12:25:45.000000000 +0100
16 @@ -1,4 +1,4 @@
17 -CFLAGS = -Wall -W -O2
18 +CFLAGS += -Wall -W
19
20 OBJS = cache.o rfc1035.o util.o option.o forward.o isc.o network.o \
21 dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
22 diff -Nru dnsmasq-2.41.orig/dnsmasq.conf.example dnsmasq-2.41/dnsmasq.conf.example
23 --- dnsmasq-2.41.orig/dnsmasq.conf.example 2008-02-13 12:24:03.000000000 +0100
24 +++ dnsmasq-2.41/dnsmasq.conf.example 2008-02-13 12:24:16.000000000 +0100
25 @@ -75,8 +75,8 @@
26
27 # If you want dnsmasq to change uid and gid to something other
28 # than the default, edit the following lines.
29 -#user=
30 -#group=
31 +user=nobody
32 +group=nobody
33
34 # If you want dnsmasq to listen for DHCP and DNS requests only on
35 # specified interfaces (and the loopback) give the name of the
36 @@ -351,7 +351,7 @@
37 # The DHCP server needs somewhere on disk to keep its lease database.
38 # This defaults to a sane location, but if you want to change it, use
39 # the line below.
40 -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
41 +# dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases
42
43 # Set the DHCP server to authoritative mode. In this mode it will barge in
44 # and take over the lease for any client which broadcasts on the network,
45 diff -Nru dnsmasq-2.41.orig/src/config.h dnsmasq-2.41/src/config.h
46 --- dnsmasq-2.41.orig/src/config.h 2008-02-13 12:24:03.000000000 +0100
47 +++ dnsmasq-2.41/src/config.h 2008-02-13 12:24:16.000000000 +0100
48 @@ -42,7 +42,7 @@
49 #elif defined(__sun__)
50 # define LEASEFILE "/var/cache/dnsmasq.leases"
51 #else
52 -# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
53 +# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases"
54 #endif
55 #if defined(__FreeBSD__)
56 # define CONFFILE "/usr/local/etc/dnsmasq.conf"
57 @@ -51,7 +51,7 @@
58 #endif
59 #define DEFLEASE 3600 /* default lease time, 1 hour */
60 #define CHUSER "nobody"
61 -#define CHGRP "dip"
62 +#define CHGRP "nobody"
63 #define DHCP_SERVER_PORT 67
64 #define DHCP_CLIENT_PORT 68
65 #define TFTP_PORT 69
|
