From 83c667e3552e4af9f6899fe417813e47890f974c2d12a9f8ff835cc9beff5bf8 Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Wed, 4 Nov 2009 09:16:02 +0000 Subject: [PATCH 1/5] Accepting request 23679 from home:coolo:branches:openSUSE:Factory:branched Copy from home:coolo:branches:openSUSE:Factory:branched/dnsmasq via accept of submit request 23679 revision 2. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/23679 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=4 --- dnsmasq.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnsmasq.spec b/dnsmasq.spec index 53bc1de..6722dcd 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -21,7 +21,7 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server Version: 2.50 -Release: 2 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/DNS/Servers Provides: dns_daemon From 94ba2923767ee61adb1bc0f7d70d40f1c5d2fe09f08c50b229ce6834c95f0017 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 11:55:18 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=5 --- chuser.diff | 10 ++++------ dnsmasq.changes | 5 ----- group_and_isc.diff | 20 ++++++++------------ 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/chuser.diff b/chuser.diff index 2c72cc5..9edbaab 100644 --- a/chuser.diff +++ b/chuser.diff @@ -1,10 +1,8 @@ -Index: src/config.h -=================================================================== ---- src/config.h.orig -+++ src/config.h -@@ -58,7 +58,7 @@ +--- 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" diff --git a/dnsmasq.changes b/dnsmasq.changes index be98fa9..65e355d 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 3 19:09:13 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - ------------------------------------------------------------------- Tue Sep 1 10:30:14 CEST 2009 - ug@suse.de diff --git a/group_and_isc.diff b/group_and_isc.diff index c2f7fe3..49613de 100644 --- a/group_and_isc.diff +++ b/group_and_isc.diff @@ -1,8 +1,6 @@ -Index: man/dnsmasq.8 -=================================================================== ---- man/dnsmasq.8.orig -+++ man/dnsmasq.8 -@@ -110,7 +110,7 @@ can be over-ridden with this switch. +--- man/dnsmasq.8 ++++ man/dnsmasq.8 2005/11/28 10:33:09 +@@ -70,7 +70,7 @@ .TP .B \-g, --group= Specify the group which dnsmasq will run @@ -11,16 +9,14 @@ Index: man/dnsmasq.8 /etc/ppp/resolv.conf which is not normally world readable. .TP .B \-v, --version -Index: src/config.h -=================================================================== ---- src/config.h.orig -+++ src/config.h -@@ -59,7 +59,7 @@ - +--- src/config.h ++++ src/config.h 2006/05/09 14:27:47 +@@ -45,7 +45,7 @@ + #endif #define DEFLEASE 3600 /* default lease time, 1 hour */ #define CHUSER "nobody" -#define CHGRP "dip" +#define CHGRP "nogroup" #define DHCP_SERVER_PORT 67 #define DHCP_CLIENT_PORT 68 - #define DHCP_SERVER_ALTPORT 1067 + From a30edcad0b85023bb9a217a80996104ea8e2751480cd455d98fb43c4bb8b7b18 Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Fri, 20 Nov 2009 15:21:33 +0000 Subject: [PATCH 3/5] 2.51 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=6 --- chuser.diff | 10 ++++---- dnsmasq-2.50.tar.bz2 | 3 --- dnsmasq-2.51.tar.bz2 | 3 +++ dnsmasq.changes | 55 ++++++++++++++++++++++++++++++++++++++++++++ dnsmasq.spec | 8 +++---- group_and_isc.diff | 20 +++++++++------- 6 files changed, 80 insertions(+), 19 deletions(-) delete mode 100644 dnsmasq-2.50.tar.bz2 create mode 100644 dnsmasq-2.51.tar.bz2 diff --git a/chuser.diff b/chuser.diff index 9edbaab..2c72cc5 100644 --- a/chuser.diff +++ b/chuser.diff @@ -1,8 +1,10 @@ ---- src/config.h -+++ src/config.h 2008/06/19 13:36:10 -@@ -50,7 +50,7 @@ - # define CONFFILE "/etc/dnsmasq.conf" +Index: src/config.h +=================================================================== +--- src/config.h.orig ++++ src/config.h +@@ -58,7 +58,7 @@ #endif + #define DEFLEASE 3600 /* default lease time, 1 hour */ -#define CHUSER "nobody" +#define CHUSER "dnsmasq" diff --git a/dnsmasq-2.50.tar.bz2 b/dnsmasq-2.50.tar.bz2 deleted file mode 100644 index 2330609..0000000 --- a/dnsmasq-2.50.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4032ceb033190c80b26e52679c37742734a840bdd311f392c737d20cc7b1d582 -size 313044 diff --git a/dnsmasq-2.51.tar.bz2 b/dnsmasq-2.51.tar.bz2 new file mode 100644 index 0000000..c54ff15 --- /dev/null +++ b/dnsmasq-2.51.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a02b9ccd585e7b0a728f1ca06f54d121765fa640fec1cecd1cb261b73432410d +size 319925 diff --git a/dnsmasq.changes b/dnsmasq.changes index 65e355d..d76ce63 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Fri Nov 20 16:07:32 CET 2009 - ug@suse.de + +* Add support for internationalised DNS. + +* Add two more environment variables for lease-change scripts: + First, DNSMASQ_SUPPLIED_HOSTNAME; this is set to the hostname + supplied by a client, even if the actual hostname used is + over-ridden by dhcp-host or dhcp-ignore-names directives. + Also DNSMASQ_RELAY_ADDRESS which gives the address of + a DHCP relay, if used. + +* Fix regression which broke echo of relay-agent + options. Thanks to Michael Rack for spotting this. + +* Don't treat option 67 as being interchangeable with + dhcp-boot parameters if it's specified as + dhcp-option-force. + +* Make the code to call scripts on lease-change compile-time + optional. It can be switched off by editing src/config.h + or building with "make COPTS=-DNO_SCRIPT". + +* Make the TFTP server cope with filenames from Windows/DOS + which use '\' as pathname separator. Thanks to Ralf for + the patch. + +* Warn if an IP address is duplicated in /etc/ethers. + +* Teach --conf-dir to take an option list of file suffices + which will be ignored when scanning the directory. Useful + for backup files etc. Thanks to Helmut Hullen for the + suggestion. + +* Add new DHCP option named tftpserver-address + +* Don't do any PXE processing, even for clients with the + correct vendorclass, unless at least one pxe-prompt or + pxe-service option is given. + +* Limit the blocksize used for TFTP transfers to a value + which avoids packet fragmentation, based on the MTU of the + local interface. Many netboot ROMs can't cope with + fragmented packets. + +* Honour dhcp-ignore configuration for PXE and proxy-PXE + requests. + +* 2.51 + +------------------------------------------------------------------- +Tue Nov 3 19:09:13 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Sep 1 10:30:14 CEST 2009 - ug@suse.de diff --git a/dnsmasq.spec b/dnsmasq.spec index 6722dcd..5bd0a62 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -20,8 +20,8 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server -Version: 2.50 -Release: 1 +Version: 2.51 +Release: 2 License: GPL v2 or later Group: Productivity/Networking/DNS/Servers Provides: dns_daemon @@ -34,7 +34,7 @@ Patch1: group_and_isc.diff Patch2: chuser.diff Patch3: manpage.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-devel pkg-config +BuildRequires: dbus-1-devel pkg-config libidn libidn-devel %description Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP @@ -63,7 +63,7 @@ echo "#define HAVE_DBUS" >> src/config.h %build mv po/no.po po/nb.po export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{__make} %{?jobs:-j%jobs} AWK=gawk +%{__make} %{?jobs:-j%jobs} AWK=gawk all-i18n %pre if ! /usr/bin/getent passwd dnsmasq >/dev/null; then diff --git a/group_and_isc.diff b/group_and_isc.diff index 49613de..c2f7fe3 100644 --- a/group_and_isc.diff +++ b/group_and_isc.diff @@ -1,6 +1,8 @@ ---- man/dnsmasq.8 -+++ man/dnsmasq.8 2005/11/28 10:33:09 -@@ -70,7 +70,7 @@ +Index: man/dnsmasq.8 +=================================================================== +--- man/dnsmasq.8.orig ++++ man/dnsmasq.8 +@@ -110,7 +110,7 @@ can be over-ridden with this switch. .TP .B \-g, --group= Specify the group which dnsmasq will run @@ -9,14 +11,16 @@ /etc/ppp/resolv.conf which is not normally world readable. .TP .B \-v, --version ---- src/config.h -+++ src/config.h 2006/05/09 14:27:47 -@@ -45,7 +45,7 @@ - #endif +Index: src/config.h +=================================================================== +--- src/config.h.orig ++++ src/config.h +@@ -59,7 +59,7 @@ + #define DEFLEASE 3600 /* default lease time, 1 hour */ #define CHUSER "nobody" -#define CHGRP "dip" +#define CHGRP "nogroup" #define DHCP_SERVER_PORT 67 #define DHCP_CLIENT_PORT 68 - + #define DHCP_SERVER_ALTPORT 1067 From 20f81eec5ce1f6a1c3bb3b338f4ebe03c38949af208613e768289ad693f3ab38 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 23 Nov 2009 11:03:10 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=7 --- dnsmasq-2.50.tar.bz2 | 3 +++ dnsmasq-2.51.tar.bz2 | 3 --- dnsmasq.changes | 50 -------------------------------------------- dnsmasq.spec | 6 +++--- 4 files changed, 6 insertions(+), 56 deletions(-) create mode 100644 dnsmasq-2.50.tar.bz2 delete mode 100644 dnsmasq-2.51.tar.bz2 diff --git a/dnsmasq-2.50.tar.bz2 b/dnsmasq-2.50.tar.bz2 new file mode 100644 index 0000000..2330609 --- /dev/null +++ b/dnsmasq-2.50.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4032ceb033190c80b26e52679c37742734a840bdd311f392c737d20cc7b1d582 +size 313044 diff --git a/dnsmasq-2.51.tar.bz2 b/dnsmasq-2.51.tar.bz2 deleted file mode 100644 index c54ff15..0000000 --- a/dnsmasq-2.51.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a02b9ccd585e7b0a728f1ca06f54d121765fa640fec1cecd1cb261b73432410d -size 319925 diff --git a/dnsmasq.changes b/dnsmasq.changes index d76ce63..be98fa9 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,53 +1,3 @@ -------------------------------------------------------------------- -Fri Nov 20 16:07:32 CET 2009 - ug@suse.de - -* Add support for internationalised DNS. - -* Add two more environment variables for lease-change scripts: - First, DNSMASQ_SUPPLIED_HOSTNAME; this is set to the hostname - supplied by a client, even if the actual hostname used is - over-ridden by dhcp-host or dhcp-ignore-names directives. - Also DNSMASQ_RELAY_ADDRESS which gives the address of - a DHCP relay, if used. - -* Fix regression which broke echo of relay-agent - options. Thanks to Michael Rack for spotting this. - -* Don't treat option 67 as being interchangeable with - dhcp-boot parameters if it's specified as - dhcp-option-force. - -* Make the code to call scripts on lease-change compile-time - optional. It can be switched off by editing src/config.h - or building with "make COPTS=-DNO_SCRIPT". - -* Make the TFTP server cope with filenames from Windows/DOS - which use '\' as pathname separator. Thanks to Ralf for - the patch. - -* Warn if an IP address is duplicated in /etc/ethers. - -* Teach --conf-dir to take an option list of file suffices - which will be ignored when scanning the directory. Useful - for backup files etc. Thanks to Helmut Hullen for the - suggestion. - -* Add new DHCP option named tftpserver-address - -* Don't do any PXE processing, even for clients with the - correct vendorclass, unless at least one pxe-prompt or - pxe-service option is given. - -* Limit the blocksize used for TFTP transfers to a value - which avoids packet fragmentation, based on the MTU of the - local interface. Many netboot ROMs can't cope with - fragmented packets. - -* Honour dhcp-ignore configuration for PXE and proxy-PXE - requests. - -* 2.51 - ------------------------------------------------------------------- Tue Nov 3 19:09:13 UTC 2009 - coolo@novell.com diff --git a/dnsmasq.spec b/dnsmasq.spec index 5bd0a62..53bc1de 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -20,7 +20,7 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server -Version: 2.51 +Version: 2.50 Release: 2 License: GPL v2 or later Group: Productivity/Networking/DNS/Servers @@ -34,7 +34,7 @@ Patch1: group_and_isc.diff Patch2: chuser.diff Patch3: manpage.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-devel pkg-config libidn libidn-devel +BuildRequires: dbus-1-devel pkg-config %description Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP @@ -63,7 +63,7 @@ echo "#define HAVE_DBUS" >> src/config.h %build mv po/no.po po/nb.po export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{__make} %{?jobs:-j%jobs} AWK=gawk all-i18n +%{__make} %{?jobs:-j%jobs} AWK=gawk %pre if ! /usr/bin/getent passwd dnsmasq >/dev/null; then From 23291d73ba5eb638483320b34877992e38317ad6957f9883f13ec33727ba8bb9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 23 Nov 2009 11:03:11 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/dnsmasq revision 22.0 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=f1d0d51ecc0564e9a5a1bf0a32c0cc84 --- dnsmasq-2.50.tar.bz2 | 3 --- dnsmasq-2.51.tar.bz2 | 3 +++ dnsmasq.changes | 50 ++++++++++++++++++++++++++++++++++++++++++++ dnsmasq.spec | 10 ++++----- 4 files changed, 58 insertions(+), 8 deletions(-) delete mode 100644 dnsmasq-2.50.tar.bz2 create mode 100644 dnsmasq-2.51.tar.bz2 diff --git a/dnsmasq-2.50.tar.bz2 b/dnsmasq-2.50.tar.bz2 deleted file mode 100644 index 2330609..0000000 --- a/dnsmasq-2.50.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4032ceb033190c80b26e52679c37742734a840bdd311f392c737d20cc7b1d582 -size 313044 diff --git a/dnsmasq-2.51.tar.bz2 b/dnsmasq-2.51.tar.bz2 new file mode 100644 index 0000000..c54ff15 --- /dev/null +++ b/dnsmasq-2.51.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a02b9ccd585e7b0a728f1ca06f54d121765fa640fec1cecd1cb261b73432410d +size 319925 diff --git a/dnsmasq.changes b/dnsmasq.changes index be98fa9..d76ce63 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Fri Nov 20 16:07:32 CET 2009 - ug@suse.de + +* Add support for internationalised DNS. + +* Add two more environment variables for lease-change scripts: + First, DNSMASQ_SUPPLIED_HOSTNAME; this is set to the hostname + supplied by a client, even if the actual hostname used is + over-ridden by dhcp-host or dhcp-ignore-names directives. + Also DNSMASQ_RELAY_ADDRESS which gives the address of + a DHCP relay, if used. + +* Fix regression which broke echo of relay-agent + options. Thanks to Michael Rack for spotting this. + +* Don't treat option 67 as being interchangeable with + dhcp-boot parameters if it's specified as + dhcp-option-force. + +* Make the code to call scripts on lease-change compile-time + optional. It can be switched off by editing src/config.h + or building with "make COPTS=-DNO_SCRIPT". + +* Make the TFTP server cope with filenames from Windows/DOS + which use '\' as pathname separator. Thanks to Ralf for + the patch. + +* Warn if an IP address is duplicated in /etc/ethers. + +* Teach --conf-dir to take an option list of file suffices + which will be ignored when scanning the directory. Useful + for backup files etc. Thanks to Helmut Hullen for the + suggestion. + +* Add new DHCP option named tftpserver-address + +* Don't do any PXE processing, even for clients with the + correct vendorclass, unless at least one pxe-prompt or + pxe-service option is given. + +* Limit the blocksize used for TFTP transfers to a value + which avoids packet fragmentation, based on the MTU of the + local interface. Many netboot ROMs can't cope with + fragmented packets. + +* Honour dhcp-ignore configuration for PXE and proxy-PXE + requests. + +* 2.51 + ------------------------------------------------------------------- Tue Nov 3 19:09:13 UTC 2009 - coolo@novell.com diff --git a/dnsmasq.spec b/dnsmasq.spec index 53bc1de..78ce10a 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,5 +1,5 @@ # -# spec file for package dnsmasq (Version 2.50) +# spec file for package dnsmasq (Version 2.51) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: dnsmasq Summary: Lightweight, Easy-to-Configure DNS Forwarder and DHCP Server -Version: 2.50 -Release: 2 +Version: 2.51 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/DNS/Servers Provides: dns_daemon @@ -34,7 +34,7 @@ Patch1: group_and_isc.diff Patch2: chuser.diff Patch3: manpage.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: dbus-1-devel pkg-config +BuildRequires: dbus-1-devel libidn libidn-devel pkg-config %description Dnsmasq is a lightweight, easy-to-configure DNS forwarder and DHCP @@ -63,7 +63,7 @@ echo "#define HAVE_DBUS" >> src/config.h %build mv po/no.po po/nb.po export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{__make} %{?jobs:-j%jobs} AWK=gawk +%{__make} %{?jobs:-j%jobs} AWK=gawk all-i18n %pre if ! /usr/bin/getent passwd dnsmasq >/dev/null; then