blob: 0eb8be768aa6772cd09d42b78e58ee7f56cef950 (
plain)
1 diff -Nru dnsmasq-2.60.orig/Makefile dnsmasq-2.60/Makefile
2 --- dnsmasq-2.60.orig/Makefile 2012-03-06 09:13:14.574103519 +0100
3 +++ dnsmasq-2.60/Makefile 2012-03-06 09:11:44.000000000 +0100
4 @@ -20,11 +20,11 @@
5
6 PREFIX = /usr/local
7 BINDIR = $(PREFIX)/sbin
8 -MANDIR = $(PREFIX)/share/man
9 +MANDIR = $(PREFIX)/man
10 LOCALEDIR = $(PREFIX)/share/locale
11 BUILDDIR = $(SRC)
12 DESTDIR =
13 -CFLAGS = -Wall -W -O2
14 +CFLAGS += -Wall -W
15 LDFLAGS =
16 COPTS =
17 RPM_OPT_FLAGS =
18 diff -Nru dnsmasq-2.60.orig/dnsmasq.conf.example dnsmasq-2.60/dnsmasq.conf.example
19 --- dnsmasq-2.60.orig/dnsmasq.conf.example 2012-03-06 09:13:14.574103519 +0100
20 +++ dnsmasq-2.60/dnsmasq.conf.example 2012-03-06 09:07:32.000000000 +0100
21 @@ -75,8 +75,8 @@
22
23 # If you want dnsmasq to change uid and gid to something other
24 # than the default, edit the following lines.
25 -#user=
26 -#group=
27 +#user=nobody
28 +#group=nobody
29
30 # If you want dnsmasq to listen for DHCP and DNS requests only on
31 # specified interfaces (and the loopback) give the name of the
32 @@ -466,7 +466,7 @@
33 # The DHCP server needs somewhere on disk to keep its lease database.
34 # This defaults to a sane location, but if you want to change it, use
35 # the line below.
36 -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
37 +# dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases
38
39 # Set the DHCP server to authoritative mode. In this mode it will barge in
40 # and take over the lease for any client which broadcasts on the network,
41 diff -Nru dnsmasq-2.60.orig/src/config.h dnsmasq-2.60/src/config.h
42 --- dnsmasq-2.60.orig/src/config.h 2012-03-06 09:13:14.574103519 +0100
43 +++ dnsmasq-2.60/src/config.h 2012-03-06 09:12:38.000000000 +0100
44 @@ -35,7 +35,7 @@
45 #define RUNFILE "/var/run/dnsmasq.pid"
46 #define DEFLEASE 3600 /* default lease time, 1 hour */
47 #define CHUSER "nobody"
48 -#define CHGRP "dip"
49 +#define CHGRP "nobody"
50 #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
51 #define LOG_MAX 5 /* log-queue length */
52 #define RANDFILE "/dev/urandom"
53 @@ -137,7 +137,7 @@
54 # elif defined(__ANDROID__)
55 # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
56 # else
57 -# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
58 +# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases"
59 # endif
60 #endif
61
|
