From 6e2e94f8f2f3ceb4056284e43a419833812994429dbd198e83d8109a1a7bdb9d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 23 Jun 2008 19:00:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dnsmasq?expand=0&rev=8 --- chuser.diff | 11 +++++++++++ dnsmasq-2.41.tar.bz2 | 3 --- dnsmasq-2.42.tar.bz2 | 3 +++ dnsmasq.changes | 28 ++++++++++++++++++++++++++++ dnsmasq.spec | 33 +++++++++++++++++++++++++++++++-- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 chuser.diff delete mode 100644 dnsmasq-2.41.tar.bz2 create mode 100644 dnsmasq-2.42.tar.bz2 diff --git a/chuser.diff b/chuser.diff new file mode 100644 index 0000000..612a5d4 --- /dev/null +++ b/chuser.diff @@ -0,0 +1,11 @@ +--- src/config.h ++++ src/config.h 2008/06/19 13:36:10 +@@ -50,7 +50,7 @@ + # define CONFFILE "/etc/dnsmasq.conf" + #endif + #define DEFLEASE 3600 /* default lease time, 1 hour */ +-#define CHUSER "nobody" ++#define CHUSER "dnsmasq" + #define CHGRP "dialout" + #define DHCP_SERVER_PORT 67 + #define DHCP_CLIENT_PORT 68 diff --git a/dnsmasq-2.41.tar.bz2 b/dnsmasq-2.41.tar.bz2 deleted file mode 100644 index 6b5dff3..0000000 --- a/dnsmasq-2.41.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a077fa94debae1005950dc712b172ac0be44efb964711a7adbc7ba8099902acb -size 284597 diff --git a/dnsmasq-2.42.tar.bz2 b/dnsmasq-2.42.tar.bz2 new file mode 100644 index 0000000..ef34931 --- /dev/null +++ b/dnsmasq-2.42.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3724129df1bb5e6df302f0c96b2594d71ef1841be7156e6891374968790ed6c +size 285589 diff --git a/dnsmasq.changes b/dnsmasq.changes index f76b8f9..1d5f830 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Jun 19 16:42:54 CEST 2008 - ug@suse.de + +- running as user dnsmasq now (bnc#401643) + +------------------------------------------------------------------- +Thu Jun 5 15:33:40 CEST 2008 - ug@suse.de + +* Add --dhcp-alternate-port option. Thanks to Jan Psota for + the suggestion. +* Updated Polish translations - thank to Jan Psota. +* Provide --dhcp-bridge on all BSD variants. +* Define _LARGEFILE_SOURCE which removes an arbitrary 2GB + limit on logfiles. Thanks to Paul Chambers for spotting + the problem. +* Fix RFC3046 agent-id echo code, broken for many + releases. Thanks to Jeremy Laine for spotting the problem + and providing a patch. +* Add --dhcp-scriptuser option. +* Support new capability interface on suitable Linux + kernels, removes "legacy support in use" messages. Thanks + to Jorge Bastos for pointing this out. +* Fix subtle bug in cache code which could cause dnsmasq to + lock spinning CPU in rare circumstances. Thanks to Alex + Chekholko for bug reports and help debugging. +* Support netascii transfer mode for TFTP. +- 2.42 + ------------------------------------------------------------------- Wed Feb 13 09:54:14 CET 2008 - ug@suse.de diff --git a/dnsmasq.spec b/dnsmasq.spec index 1c3ef62..b52ccd7 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,5 +1,5 @@ # -# spec file for package dnsmasq (Version 2.41) +# spec file for package dnsmasq (Version 2.42) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server -Version: 2.41 +Version: 2.42 Release: 1 License: GPL v2 or later Group: Productivity/Networking/DNS/Servers @@ -24,6 +24,7 @@ Url: http://www.thekelleys.org.uk/dnsmasq/ Source: %{name}-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 Patch1: group_and_isc.diff +Patch2: chuser.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,12 +47,18 @@ Authors: %setup -n dnsmasq-%{version} %setup -T -D -a1 -n dnsmasq-%{version} %patch1 -p0 +%patch2 -p0 %build mv po/no.po po/nb.po export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{__make} %{?jobs:-j%jobs} +%pre +if ! /usr/bin/getent passwd dnsmasq >/dev/null; then + /usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "dnsmasq" -g nogroup dnsmasq || : +fi + %post %{fillup_and_insserv dnsmasq} @@ -94,6 +101,28 @@ install -m 644 SuSEFirewall.dnsmasq-dhcp ${RPM_BUILD_ROOT}/%{_sysconfdir}/syscon %{_mandir}/es/man8/dnsmasq.8.gz %changelog +* Thu Jun 19 2008 ug@suse.de +- running as user dnsmasq now (bnc#401643) +* Thu Jun 05 2008 ug@suse.de + * Add --dhcp-alternate-port option. Thanks to Jan Psota for + the suggestion. + * Updated Polish translations - thank to Jan Psota. + * Provide --dhcp-bridge on all BSD variants. + * Define _LARGEFILE_SOURCE which removes an arbitrary 2GB + limit on logfiles. Thanks to Paul Chambers for spotting + the problem. + * Fix RFC3046 agent-id echo code, broken for many + releases. Thanks to Jeremy Laine for spotting the problem + and providing a patch. + * Add --dhcp-scriptuser option. + * Support new capability interface on suitable Linux + kernels, removes "legacy support in use" messages. Thanks + to Jorge Bastos for pointing this out. + * Fix subtle bug in cache code which could cause dnsmasq to + lock spinning CPU in rare circumstances. Thanks to Alex + Chekholko for bug reports and help debugging. + * Support netascii transfer mode for TFTP. +- 2.42 * Wed Feb 13 2008 ug@suse.de - Allow the DNS function to be completely disabled, by setting the port to zero "--port=0" diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index efb6c89..d62810c 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76b3976765743ac6559a3fb6e9a888678c17ab15b23ea2345473d5f95d78c7cc -size 1492 +oid sha256:7ef3d0c4fdc5b4d8ef1ccfeee9ba48aa6735b735afa43d49b281c4ac6ad01306 +size 1451