- Update to version 2.62, misc bugfixes - Fix CFLAGS/LDFLAGS usage - fix the small cache size problem in a different way by tweaking the build config instead. - The default cache size is way too small (150 entries) use a sane default of 2000 as used in *WRT embeeded routers which is still very conservative for a desktop/server machine. - use async logging OBS-URL: https://build.opensuse.org/request/show/125865 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=40
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
--- man/dnsmasq.8.orig
|
|
+++ man/dnsmasq.8
|
|
@@ -118,8 +118,7 @@ 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. The defaults to "nogroup".
|
|
.TP
|
|
.B \-v, --version
|
|
Print the version number.
|
|
--- src/config.h.orig
|
|
+++ src/config.h
|
|
@@ -24,7 +24,7 @@
|
|
#define FORWARD_TIME 20 /* or 20 seconds */
|
|
#define RANDOM_SOCKS 64 /* max simultaneous random ports */
|
|
#define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY seconds */
|
|
-#define CACHESIZ 150 /* default cache size */
|
|
+#define CACHESIZ 2000 /* default cache size */
|
|
#define MAXLEASES 1000 /* maximum number of DHCP leases */
|
|
#define PING_WAIT 3 /* wait for ping address-in-use test */
|
|
#define PING_CACHE_TIME 30 /* Ping test assumed to be valid this long. */
|
|
@@ -35,8 +35,8 @@
|
|
#define ETHERSFILE "/etc/ethers"
|
|
#define RUNFILE "/var/run/dnsmasq.pid"
|
|
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
|
-#define CHUSER "nobody"
|
|
-#define CHGRP "dip"
|
|
+#define CHUSER "dnsmasq"
|
|
+#define CHGRP "nogroup"
|
|
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
|
#define LOG_MAX 5 /* log-queue length */
|
|
#define RANDFILE "/dev/urandom"
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -18,14 +18,14 @@
|
|
|
|
# Variables you may well want to override.
|
|
|
|
-PREFIX = /usr/local
|
|
+PREFIX = /usr
|
|
BINDIR = $(PREFIX)/sbin
|
|
MANDIR = $(PREFIX)/share/man
|
|
LOCALEDIR = $(PREFIX)/share/locale
|
|
BUILDDIR = $(SRC)
|
|
DESTDIR =
|
|
-CFLAGS = -Wall -W -O2
|
|
-LDFLAGS =
|
|
+CFLAGS += -Wall -W -O2
|
|
+LDFLAGS +=
|
|
COPTS =
|
|
RPM_OPT_FLAGS =
|
|
LIBS =
|
|
@@ -122,7 +122,7 @@ $(objs:.o=.c) $(hdrs):
|
|
$(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $<
|
|
|
|
dnsmasq : $(hdrs) $(objs)
|
|
- $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
|
|
|
|
dnsmasq.pot : $(objs:.o=.c) $(hdrs)
|
|
$(XGETTEXT) -d dnsmasq --foreign-user --omit-header --keyword=_ -o $@ -i $(objs:.o=.c)
|