Accepting request 126390 from network
- 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/126390 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dnsmasq?expand=0&rev=40
This commit is contained in:
commit
3361436322
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:74dfed010805bf4663f7952507b48e31788ca69e20e1c7a2af146ee42974949f
|
|
||||||
size 534596
|
|
3
dnsmasq-2.62.tar.gz
Normal file
3
dnsmasq-2.62.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2f2b4e4062f3bec35a9fd6636295f22fe042b2438b2305e1a570314f243ff210
|
||||||
|
size 531616
|
@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jun 24 03:51:58 UTC 2012 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- 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.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jun 23 03:53:32 UTC 2012 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- 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
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 29 19:16:43 UTC 2012 - pascal.bleser@opensuse.org
|
Sun Apr 29 19:16:43 UTC 2012 - pascal.bleser@opensuse.org
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ After=syslog.target network.target
|
|||||||
Type=dbus
|
Type=dbus
|
||||||
BusName=uk.org.thekelleys.dnsmasq
|
BusName=uk.org.thekelleys.dnsmasq
|
||||||
ExecStartPre=/usr/sbin/dnsmasq --test
|
ExecStartPre=/usr/sbin/dnsmasq --test
|
||||||
ExecStart=/usr/sbin/dnsmasq --enable-dbus --keep-in-foreground
|
ExecStart=/usr/sbin/dnsmasq --log-async --enable-dbus --keep-in-foreground
|
||||||
ExecReload=/bin/kill -HUP $MAINPID
|
ExecReload=/bin/kill -HUP $MAINPID
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
20
dnsmasq.spec
20
dnsmasq.spec
@ -20,7 +20,7 @@ Name: dnsmasq
|
|||||||
Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
|
Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: Productivity/Networking/DNS/Servers
|
Group: Productivity/Networking/DNS/Servers
|
||||||
Version: 2.61
|
Version: 2.62
|
||||||
Release: 0
|
Release: 0
|
||||||
Provides: dns_daemon
|
Provides: dns_daemon
|
||||||
PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
|
PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
|
||||||
@ -35,6 +35,8 @@ BuildRequires: libidn
|
|||||||
BuildRequires: libidn-devel
|
BuildRequires: libidn-devel
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
|
BuildRequires: pkgconfig(libnetfilter_conntrack)
|
||||||
|
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -48,14 +50,16 @@ Dnsmasq supports static and dynamic DHCP leases and BOOTP for network
|
|||||||
booting of diskless machines.
|
booting of diskless machines.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n dnsmasq-%{version}
|
%setup -q -n dnsmasq-%{version}
|
||||||
%setup -T -D -a1 -n dnsmasq-%{version}
|
%setup -q -T -D -a1 -n dnsmasq-%{version}
|
||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
echo "#define HAVE_DBUS" >> src/config.h
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
echo "#define HAVE_DBUS" >> src/config.h
|
||||||
|
echo "#define HAVE_CONNTRACK" >> src/config.h
|
||||||
|
echo "#define HAVE_IDN" >> src/config.h
|
||||||
mv po/no.po po/nb.po
|
mv po/no.po po/nb.po
|
||||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -fpie -fno-strict-aliasing"
|
export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie"
|
||||||
export LDFLAGS="-Wl,-z,relro,-z,now -pie"
|
export LDFLAGS="-Wl,-z,relro,-z,now -pie"
|
||||||
make %{?_smp_mflags} AWK=gawk all-i18n
|
make %{?_smp_mflags} AWK=gawk all-i18n
|
||||||
|
|
||||||
@ -101,12 +105,12 @@ install -d 755 ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/
|
|||||||
install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
|
install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.conf
|
||||||
install -D -m 0644 %SOURCE2 %{buildroot}/lib/systemd/system/dnsmasq.service
|
install -D -m 0644 %SOURCE2 %{buildroot}/lib/systemd/system/dnsmasq.service
|
||||||
install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
|
install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
|
||||||
%find_lang %{name}
|
%find_lang %{name} --with-man
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib README.SUSE dbus
|
%doc CHANGELOG COPYING FAQ doc.html setup.html dnsmasq.conf.example contrib README.SUSE dbus
|
||||||
%config(noreplace) /%{_sysconfdir}/dnsmasq.conf
|
%config(noreplace) %{_sysconfdir}/dnsmasq.conf
|
||||||
%{_sysconfdir}/init.d/dnsmasq
|
%{_sysconfdir}/init.d/dnsmasq
|
||||||
%{_sbindir}/rcdnsmasq
|
%{_sbindir}/rcdnsmasq
|
||||||
%{_sbindir}/dnsmasq
|
%{_sbindir}/dnsmasq
|
||||||
@ -115,8 +119,6 @@ install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
|
|||||||
%dir %{_sysconfdir}/slp.reg.d/
|
%dir %{_sysconfdir}/slp.reg.d/
|
||||||
%config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
|
%config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
|
||||||
%{_mandir}/man8/dnsmasq.8.gz
|
%{_mandir}/man8/dnsmasq.8.gz
|
||||||
%{_mandir}/fr/man8/dnsmasq.8.gz
|
|
||||||
%{_mandir}/es/man8/dnsmasq.8.gz
|
|
||||||
/etc/dbus-1/system.d/dnsmasq.conf
|
/etc/dbus-1/system.d/dnsmasq.conf
|
||||||
/lib/systemd/system/dnsmasq.service
|
/lib/systemd/system/dnsmasq.service
|
||||||
%dir %attr(0750,root,tftp) /srv/tftpboot
|
%dir %attr(0750,root,tftp) /srv/tftpboot
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- man/dnsmasq.8
|
--- man/dnsmasq.8.orig
|
||||||
+++ man/dnsmasq.8 2012/03/06 09:46:44
|
+++ man/dnsmasq.8
|
||||||
@@ -118,8 +118,7 @@
|
@@ -118,8 +118,7 @@ can be over-ridden with this switch.
|
||||||
.TP
|
.TP
|
||||||
.B \-g, --group=<groupname>
|
.B \-g, --group=<groupname>
|
||||||
Specify the group which dnsmasq will run
|
Specify the group which dnsmasq will run
|
||||||
@ -10,9 +10,18 @@
|
|||||||
.TP
|
.TP
|
||||||
.B \-v, --version
|
.B \-v, --version
|
||||||
Print the version number.
|
Print the version number.
|
||||||
--- src/config.h
|
--- src/config.h.orig
|
||||||
+++ src/config.h 2012/03/06 09:46:26
|
+++ src/config.h
|
||||||
@@ -34,8 +34,8 @@
|
@@ -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 ETHERSFILE "/etc/ethers"
|
||||||
#define RUNFILE "/var/run/dnsmasq.pid"
|
#define RUNFILE "/var/run/dnsmasq.pid"
|
||||||
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
||||||
@ -23,3 +32,32 @@
|
|||||||
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
||||||
#define LOG_MAX 5 /* log-queue length */
|
#define LOG_MAX 5 /* log-queue length */
|
||||||
#define RANDFILE "/dev/urandom"
|
#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)
|
||||||
|
Loading…
Reference in New Issue
Block a user