Hello community,
here is the log from the commit of package dnsmasq for openSUSE:Factory checked
in at 2012-06-28 15:26:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old)
and /work/SRC/openSUSE:Factory/.dnsmasq.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq", Maintainer is "u...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2012-05-07
22:46:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2012-06-28
15:26:28.000000000 +0200
@@ -1,0 +2,16 @@
+Sun Jun 24 03:51:58 UTC 2012 - crrodrig...@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 - crrodrig...@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
+
+-------------------------------------------------------------------
Old:
----
dnsmasq-2.61.tar.gz
New:
----
dnsmasq-2.62.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dnsmasq.spec ++++++
--- /var/tmp/diff_new_pack.OR0Vkw/_old 2012-06-28 15:26:30.000000000 +0200
+++ /var/tmp/diff_new_pack.OR0Vkw/_new 2012-06-28 15:26:30.000000000 +0200
@@ -20,7 +20,7 @@
Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server
License: GPL-2.0+
Group: Productivity/Networking/DNS/Servers
-Version: 2.61
+Version: 2.62
Release: 0
Provides: dns_daemon
PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq /bin/mkdir
@@ -35,6 +35,8 @@
BuildRequires: libidn-devel
BuildRequires: pkg-config
BuildRequires: systemd
+BuildRequires: pkgconfig(libnetfilter_conntrack)
+
%{?systemd_requires}
%description
@@ -48,14 +50,16 @@
booting of diskless machines.
%prep
-%setup -n dnsmasq-%{version}
-%setup -T -D -a1 -n dnsmasq-%{version}
+%setup -q -n dnsmasq-%{version}
+%setup -q -T -D -a1 -n dnsmasq-%{version}
%patch1 -p0
-echo "#define HAVE_DBUS" >> src/config.h
%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
-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"
make %{?_smp_mflags} AWK=gawk all-i18n
@@ -101,12 +105,12 @@
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 0750 ${RPM_BUILD_ROOT}/srv/tftpboot
-%find_lang %{name}
+%find_lang %{name} --with-man
%files -f %{name}.lang
%defattr(-,root,root)
%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
%{_sbindir}/rcdnsmasq
%{_sbindir}/dnsmasq
@@ -115,8 +119,6 @@
%dir %{_sysconfdir}/slp.reg.d/
%config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
%{_mandir}/man8/dnsmasq.8.gz
-%{_mandir}/fr/man8/dnsmasq.8.gz
-%{_mandir}/es/man8/dnsmasq.8.gz
/etc/dbus-1/system.d/dnsmasq.conf
/lib/systemd/system/dnsmasq.service
%dir %attr(0750,root,tftp) /srv/tftpboot
++++++ dnsmasq-2.61.tar.gz -> dnsmasq-2.62.tar.gz ++++++
++++ 18936 lines of diff (skipped)
++++++ dnsmasq.service ++++++
--- /var/tmp/diff_new_pack.OR0Vkw/_old 2012-06-28 15:26:30.000000000 +0200
+++ /var/tmp/diff_new_pack.OR0Vkw/_new 2012-06-28 15:26:30.000000000 +0200
@@ -6,7 +6,7 @@
Type=dbus
BusName=uk.org.thekelleys.dnsmasq
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
[Install]
++++++ group_and_isc.diff ++++++
--- /var/tmp/diff_new_pack.OR0Vkw/_old 2012-06-28 15:26:30.000000000 +0200
+++ /var/tmp/diff_new_pack.OR0Vkw/_new 2012-06-28 15:26:30.000000000 +0200
@@ -1,6 +1,6 @@
---- man/dnsmasq.8
-+++ man/dnsmasq.8 2012/03/06 09:46:44
-@@ -118,8 +118,7 @@
+--- 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
@@ -10,9 +10,18 @@
.TP
.B \-v, --version
Print the version number.
---- src/config.h
-+++ src/config.h 2012/03/06 09:46:26
-@@ -34,8 +34,8 @@
+--- 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 */
@@ -23,3 +32,32 @@
#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)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
