rpms/dnsmasq/FC-4 dnsmasq-2.30-enable-dbus.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.1, 1.2 dnsmasq-2.30-fedora-extras.patch, 1.1, NONE
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-4
Modified Files:
dnsmasq.spec
Added Files:
dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch
Removed Files:
dnsmasq-2.30-fedora-extras.patch
Log Message:
Implementing request from upstream, unified spec/patchset, cleanup
dnsmasq-2.30-enable-dbus.patch:
--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h 2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h 2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
/* platform independent options- uncomment to enable */
/* #define HAVE_BROKEN_RTC */
/* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
#if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
# error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC
dnsmasq-2.30-initscript.patch:
--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
#
# Startup script for the DNS caching server
#
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec 25 Apr 2006 16:51:25 -0000 1.1
+++ dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2
@@ -1,16 +1,19 @@
Name: dnsmasq
Version: 2.30
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
License: GPL
URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
-Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-fedora-ext...
+Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript...
+Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if "%{dist}" != ".fc3"
BuildRequires: dbus-devel
+%endif
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
@@ -31,6 +34,9 @@
%prep
%setup -q
%patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
%build
make %{?_smp_mflags}
@@ -74,10 +80,15 @@
%changelog
-* Mon Apr 24 2006 Patrick Laughton <jima(a)auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-2
- Disabled stripping of binary while installing (oops)
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
- Added BuildReq for dbus-devel
-* Mon Apr 24 2006 Patrick Laughton <jima(a)auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-1
- Initial Fedora Extras RPM
--- dnsmasq-2.30-fedora-extras.patch DELETED ---
18 years
rpms/dnsmasq/FC-5 dnsmasq-2.30-enable-dbus.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.1, 1.2 dnsmasq-2.30-fedora-extras.patch, 1.1, NONE
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-5
Modified Files:
dnsmasq.spec
Added Files:
dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch
Removed Files:
dnsmasq-2.30-fedora-extras.patch
Log Message:
Implementing request from upstream, unified spec/patchset, cleanup
dnsmasq-2.30-enable-dbus.patch:
--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h 2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h 2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
/* platform independent options- uncomment to enable */
/* #define HAVE_BROKEN_RTC */
/* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
#if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
# error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC
dnsmasq-2.30-initscript.patch:
--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
#
# Startup script for the DNS caching server
#
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec 25 Apr 2006 16:51:25 -0000 1.1
+++ dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2
@@ -1,16 +1,19 @@
Name: dnsmasq
Version: 2.30
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
License: GPL
URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
-Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-fedora-ext...
+Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript...
+Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if "%{dist}" != ".fc3"
BuildRequires: dbus-devel
+%endif
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
@@ -31,6 +34,9 @@
%prep
%setup -q
%patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
%build
make %{?_smp_mflags}
@@ -74,10 +80,15 @@
%changelog
-* Mon Apr 24 2006 Patrick Laughton <jima(a)auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-2
- Disabled stripping of binary while installing (oops)
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
- Added BuildReq for dbus-devel
-* Mon Apr 24 2006 Patrick Laughton <jima(a)auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-1
- Initial Fedora Extras RPM
--- dnsmasq-2.30-fedora-extras.patch DELETED ---
18 years
rpms/dnsmasq/FC-6 dnsmasq-2.35-conf-dir.patch, NONE, 1.1 dnsmasq.spec, 1.13, 1.14 sources, 1.6, 1.7
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5421
Modified Files:
dnsmasq.spec sources
Added Files:
dnsmasq-2.35-conf-dir.patch
Log Message:
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-2
- Stop creating /etc/sysconfig on %%install
- Create /etc/dnsmasq.d on %%install
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-1
- Update to 2.35
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
dnsmasq-2.35-conf-dir.patch:
--- NEW FILE dnsmasq-2.35-conf-dir.patch ---
diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example 2006-10-18 15:24:50.000000000 -0500
+++ dnsmasq-2.35-patched/dnsmasq.conf.example 2006-11-06 11:46:38.000000000 -0600
@@ -382,4 +382,4 @@
# Include a another lot of configuration options.
#conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
+conf-dir=/etc/dnsmasq.d
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dnsmasq.spec 24 Oct 2006 16:37:10 -0000 1.13
+++ dnsmasq.spec 6 Nov 2006 18:25:32 -0000 1.14
@@ -1,5 +1,5 @@
Name: dnsmasq
-Version: 2.34
+Version: 2.35
Release: 2%{?dist}
Summary: A lightweight DHCP/caching DNS server
@@ -9,6 +9,7 @@
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
+Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%fedora" > "3" || "%aurora" > "2"
@@ -39,6 +40,7 @@
%if "%fedora" > "3" || "%aurora" > "2"
%patch1 -p1
%endif
+%patch2 -p1
%build
make %{?_smp_mflags}
@@ -49,7 +51,7 @@
# normally i'd do 'make install'...it's a bit messy, though
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
$RPM_BUILD_ROOT%{_mandir}/man8 \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+ $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
@@ -78,8 +80,9 @@
%files
%defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
+%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%dir /etc/dnsmasq.d
%if "%fedora" > "3" || "%aurora" > "2"
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%endif
@@ -89,6 +92,16 @@
%changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-2
+- Stop creating /etc/sysconfig on %%install
+- Create /etc/dnsmasq.d on %%install
+
+* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-1
+- Update to 2.35
+- Removed UPGRADING_to_2.0 from %%doc as per upstream change
+- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
+- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
+
* Tue Oct 24 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.34-2
- Fixed BZ#212005
- Moved %%postun scriptlet to %%post, where it made more sense
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Oct 2006 18:09:19 -0000 1.6
+++ sources 6 Nov 2006 18:25:32 -0000 1.7
@@ -1 +1 @@
-a40b79bec295bb4631b1c033cf0bbdf1 dnsmasq-2.34.tar.gz
+57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz
17 years, 5 months
rpms/dnsmasq/FC-5 dnsmasq-2.35-conf-dir.patch, NONE, 1.1 dnsmasq.spec, 1.8, 1.9 sources, 1.6, 1.7
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6480
Modified Files:
dnsmasq.spec sources
Added Files:
dnsmasq-2.35-conf-dir.patch
Log Message:
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-2
- Stop creating /etc/sysconfig on %%install
- Create /etc/dnsmasq.d on %%install
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-1
- Update to 2.35
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
dnsmasq-2.35-conf-dir.patch:
--- NEW FILE dnsmasq-2.35-conf-dir.patch ---
diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example 2006-10-18 15:24:50.000000000 -0500
+++ dnsmasq-2.35-patched/dnsmasq.conf.example 2006-11-06 11:46:38.000000000 -0600
@@ -382,4 +382,4 @@
# Include a another lot of configuration options.
#conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
+conf-dir=/etc/dnsmasq.d
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dnsmasq.spec 24 Oct 2006 16:39:09 -0000 1.8
+++ dnsmasq.spec 6 Nov 2006 18:59:20 -0000 1.9
@@ -1,5 +1,5 @@
Name: dnsmasq
-Version: 2.34
+Version: 2.35
Release: 2%{?dist}
Summary: A lightweight DHCP/caching DNS server
@@ -9,6 +9,7 @@
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
+Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%fedora" > "3" || "%aurora" > "2"
@@ -39,6 +40,7 @@
%if "%fedora" > "3" || "%aurora" > "2"
%patch1 -p1
%endif
+%patch2 -p1
%build
make %{?_smp_mflags}
@@ -49,7 +51,7 @@
# normally i'd do 'make install'...it's a bit messy, though
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
$RPM_BUILD_ROOT%{_mandir}/man8 \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+ $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
@@ -78,8 +80,9 @@
%files
%defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
+%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%dir /etc/dnsmasq.d
%if "%fedora" > "3" || "%aurora" > "2"
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%endif
@@ -89,6 +92,16 @@
%changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-2
+- Stop creating /etc/sysconfig on %%install
+- Create /etc/dnsmasq.d on %%install
+
+* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-1
+- Update to 2.35
+- Removed UPGRADING_to_2.0 from %%doc as per upstream change
+- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
+- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
+
* Tue Oct 24 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.34-2
- Fixed BZ#212005
- Moved %%postun scriptlet to %%post, where it made more sense
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Oct 2006 18:19:48 -0000 1.6
+++ sources 6 Nov 2006 18:59:20 -0000 1.7
@@ -1 +1 @@
-a40b79bec295bb4631b1c033cf0bbdf1 dnsmasq-2.34.tar.gz
+57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz
17 years, 5 months
rpms/dnsmasq/FC-3 dnsmasq-2.30-enable-dbus.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.5, 1.6 dnsmasq-2.30-fedora-extras.patch, 1.2, NONE
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-3
Modified Files:
dnsmasq.spec
Added Files:
dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch
Removed Files:
dnsmasq-2.30-fedora-extras.patch
Log Message:
Implementing request from upstream, unified spec/patchset, cleanup
dnsmasq-2.30-enable-dbus.patch:
--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h 2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h 2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
/* platform independent options- uncomment to enable */
/* #define HAVE_BROKEN_RTC */
/* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
#if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
# error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC
dnsmasq-2.30-initscript.patch:
--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
#
# Startup script for the DNS caching server
#
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dnsmasq.spec 25 Apr 2006 22:19:50 -0000 1.5
+++ dnsmasq.spec 27 Apr 2006 15:54:51 -0000 1.6
@@ -1,15 +1,20 @@
Name: dnsmasq
Version: 2.30
-Release: 2%{?dist}.3
+Release: 3%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
License: GPL
URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
-Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-fedora-ext...
+Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-initscript...
+Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if "%{dist}" != ".fc3"
+BuildRequires: dbus-devel
+%endif
+
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
@@ -29,6 +34,9 @@
%prep
%setup -q
%patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
%build
make %{?_smp_mflags}
@@ -72,13 +80,15 @@
%changelog
-* Tue Apr 25 2006 Patrick Laughton <jima(a)auroralinux.org> 2.30-2.fc3.3
-- Removed dbus support for FC3 (dbus version apparently too old)
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
-* Mon Apr 24 2006 Patrick Laughton <jima(a)auroralinux.org> 2.30-2
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-2
- Disabled stripping of binary while installing (oops)
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
- Added BuildReq for dbus-devel
-* Mon Apr 24 2006 Patrick Laughton <jima(a)auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-1
- Initial Fedora Extras RPM
--- dnsmasq-2.30-fedora-extras.patch DELETED ---
18 years
pavlix pushed to dnsmasq (master). "new version 2.75"
by notifications＠fedoraproject.org
From 68c179ea5c52b3acc89107b59cfa685e21d81a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda(a)redhat.com>
Date: Wed, 5 Aug 2015 16:09:49 +0200
Subject: new version 2.75
diff --git a/.gitignore b/.gitignore
index c16cb9f..5a695d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.70.tar.xz
/dnsmasq-2.71.tar.xz
/dnsmasq-2.72.tar.xz
+/dnsmasq-2.75.tar.xz
diff --git a/dnsmasq-2.72-configuration.patch b/dnsmasq-2.72-configuration.patch
deleted file mode 100644
index 109235b..0000000
--- a/dnsmasq-2.72-configuration.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up dnsmasq-2.72/dnsmasq.conf.example.syntax_err dnsmasq-2.72/dnsmasq.conf.example
---- dnsmasq-2.72/dnsmasq.conf.example.syntax_err 2014-10-06 10:30:31.841567305 +0200
-+++ dnsmasq-2.72/dnsmasq.conf.example 2014-10-06 10:33:51.195697413 +0200
-@@ -645,4 +645,4 @@
- #conf-dir=/etc/dnsmasq.d,.bak
-
- # Include all files in a directory which end in .conf
--#conf-dir=/etc/dnsmasq.d/*.conf
-\ No newline at end of file
-+#conf-dir=/etc/dnsmasq.d/,*.conf
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 38202f2..876d817 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -12,8 +12,8 @@
%define _hardened_build 1
Name: dnsmasq
-Version: 2.72
-Release: 4%{?extraversion:.%{extraversion}}%{?dist}
+Version: 2.75
+Release: 1%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -22,9 +22,6 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
Source1: %{name}.service
-# Patches
-Patch1: dnsmasq-2.72-configuration.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -59,8 +56,6 @@ query/remove a DHCP server's leases.
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
-%patch1 -p1 -b .syntax_err
-
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -142,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_*
%changelog
+* Wed Aug 05 2015 Pavel Šimerda <psimerda(a)redhat.com> - 2.75-1
+- new version 2.75
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.72-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index cd63e2a..5de2d4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0256e0a71e27c8d8a5c89a0d18f3cfe2 dnsmasq-2.72.tar.xz
+887236f1ddde6eb57cdb9d01916c9f72 dnsmasq-2.75.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=master&id=68c179...
8 years, 8 months
rpms/dnsmasq/devel dnsmasq-2.35-conf-dir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dnsmasq.spec, 1.13, 1.14 sources, 1.6, 1.7
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1828
Modified Files:
.cvsignore dnsmasq.spec sources
Added Files:
dnsmasq-2.35-conf-dir.patch
Log Message:
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-1
- Update to 2.35
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
dnsmasq-2.35-conf-dir.patch:
--- NEW FILE dnsmasq-2.35-conf-dir.patch ---
diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example 2006-10-18 15:24:50.000000000 -0500
+++ dnsmasq-2.35-patched/dnsmasq.conf.example 2006-11-06 11:46:38.000000000 -0600
@@ -382,4 +382,4 @@
# Include a another lot of configuration options.
#conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
+conf-dir=/etc/dnsmasq.d
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 19 Oct 2006 18:09:19 -0000 1.6
+++ .cvsignore 6 Nov 2006 17:58:49 -0000 1.7
@@ -1 +1 @@
-dnsmasq-2.34.tar.gz
+dnsmasq-2.35.tar.gz
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dnsmasq.spec 24 Oct 2006 16:26:49 -0000 1.13
+++ dnsmasq.spec 6 Nov 2006 17:58:49 -0000 1.14
@@ -1,6 +1,6 @@
Name: dnsmasq
-Version: 2.34
-Release: 2%{?dist}
+Version: 2.35
+Release: 1%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -9,6 +9,7 @@
Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
+Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%fedora" > "3" || "%aurora" > "2"
@@ -39,6 +40,7 @@
%if "%fedora" > "3" || "%aurora" > "2"
%patch1 -p1
%endif
+%patch2 -p1
%build
make %{?_smp_mflags}
@@ -78,8 +80,9 @@
%files
%defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
+%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%dir /etc/dnsmasq.d
%if "%fedora" > "3" || "%aurora" > "2"
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%endif
@@ -89,6 +92,12 @@
%changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.35-1
+- Update to 2.35
+- Removed UPGRADING_to_2.0 from %%doc as per upstream change
+- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
+- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
+
* Tue Oct 24 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.34-2
- Fixed BZ#212005
- Moved %%postun scriptlet to %%post, where it made more sense
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Oct 2006 18:09:19 -0000 1.6
+++ sources 6 Nov 2006 17:58:49 -0000 1.7
@@ -1 +1 @@
-a40b79bec295bb4631b1c033cf0bbdf1 dnsmasq-2.34.tar.gz
+57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz
17 years, 5 months
rpms/dnsmasq/devel dnsmasq.init,1.1,1.2 dnsmasq.spec,1.44,1.45
by Itamar Reis Peixoto
Author: itamarjp
Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10067
Modified Files:
dnsmasq.init dnsmasq.spec
Log Message:
fix dnsmasq.init bz 512664
Index: dnsmasq.init
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dnsmasq.init 17 Oct 2009 23:08:16 -0000 1.1
+++ dnsmasq.init 22 Nov 2009 11:47:49 -0000 1.2
@@ -24,6 +24,10 @@ if [ ! -z "${DOMAIN_SUFFIX}" ]; then
OPTIONS="-s $DOMAIN_SUFFIX"
fi
+pidfile=${PIDFILE-/var/run/dnsmasq.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/dnsmasq}
+
+
RETVAL=0
# See how we were called.
@@ -33,16 +37,14 @@ case "$1" in
daemon $dnsmasq $OPTIONS
RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
+ [ $RETVAL -eq 0 ] && touch ${lockfile}
;;
stop)
- if test "x`pidof dnsmasq`" != x; then
- echo -n "Shutting down dnsmasq: "
- killproc dnsmasq
- fi
+ echo -n "Shutting down dnsmasq: "
+ killproc -p ${pidfile} ${dnsmasq}
RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid
+ [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
;;
status)
status dnsmasq
@@ -50,7 +52,7 @@ case "$1" in
;;
reload)
echo -n "Reloading dnsmasq: "
- killproc dnsmasq -HUP
+ killproc -p ${pidfile} ${dnsmasq} -HUP
RETVAL=$?
echo
;;
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- dnsmasq.spec 18 Oct 2009 00:28:38 -0000 1.44
+++ dnsmasq.spec 22 Nov 2009 11:47:49 -0000 1.45
@@ -11,7 +11,7 @@
Name: dnsmasq
Version: 2.51
-Release: 1%{?extraversion}%{?dist}
+Release: 2%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -118,6 +118,9 @@ fi
%changelog
+* Sun Nov 22 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.51-2
+- fix bz 512664
+
* Sat Oct 17 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.51-1
- move initscript from patch to a plain text file
- drop (dnsmasq-configuration.patch) and use sed instead
14 years, 5 months
rpms/dnsmasq/devel .cvsignore, 1.27, 1.28 dnsmasq.init, 1.2, 1.3 dnsmasq.spec, 1.45, 1.46 import.log, 1.1, 1.2 sources, 1.27, 1.28
by Itamar Reis Peixoto
Author: itamarjp
Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12150/devel
Modified Files:
.cvsignore dnsmasq.init dnsmasq.spec import.log sources
Log Message:
- new version 2.5.2 and some bug fix
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore 18 Oct 2009 00:28:38 -0000 1.27
+++ .cvsignore 26 Jan 2010 16:24:32 -0000 1.28
@@ -1 +1 @@
-dnsmasq-2.51.tar.lzma
+dnsmasq-2.52.tar.lzma
Index: dnsmasq.init
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dnsmasq.init 22 Nov 2009 11:47:49 -0000 1.2
+++ dnsmasq.init 26 Jan 2010 16:24:33 -0000 1.3
@@ -62,7 +62,7 @@ case "$1" in
RETVAL=$?
;;
condrestart)
- if test "x`/sbin/pidof dnsmasq`" != x; then
+ if test "x`pidfileofproc dnsmasq`" != x; then
$0 stop
$0 start
RETVAL=$?
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- dnsmasq.spec 22 Nov 2009 11:47:49 -0000 1.45
+++ dnsmasq.spec 26 Jan 2010 16:24:33 -0000 1.46
@@ -10,8 +10,8 @@
%endif
Name: dnsmasq
-Version: 2.51
-Release: 2%{?extraversion}%{?dist}
+Version: 2.52
+Release: 1%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -50,7 +50,7 @@ for file in dnsmasq.conf.example man/dns
done
#enable dbus
-sed -i 's|/* #define HAVE_DBUS */|#define HAVE_DBUS|g' src/config.h
+sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
#enable /etc/dnsmasq.d fix bz 526703
sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.example
@@ -118,6 +118,11 @@ fi
%changelog
+* Tue Jan 26 2010 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.52-1
+- New Version 2.52
+- fix condrestart() in initscript bz 547605
+- fix sed to enable DBUS(the '*' need some escaping) bz 553161
+
* Sun Nov 22 2009 Itamar Reis Peixoto <itamar(a)ispbrasil.com.br> - 2.51-2
- fix bz 512664
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 18 Oct 2009 00:28:38 -0000 1.1
+++ import.log 26 Jan 2010 16:24:33 -0000 1.2
@@ -1 +1,2 @@
dnsmasq-2_51-1_fc12:HEAD:dnsmasq-2.51-1.fc12.src.rpm:1255825544
+dnsmasq-2_52-1_fc13:HEAD:dnsmasq-2.52-1.fc13.src.rpm:1264522855
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources 18 Oct 2009 00:28:38 -0000 1.27
+++ sources 26 Jan 2010 16:24:33 -0000 1.28
@@ -1 +1 @@
-0f048f3fd1f3888876867809d162cd89 dnsmasq-2.51.tar.lzma
+2d156f322564fdd71ad238040cd607ac dnsmasq-2.52.tar.lzma
14 years, 3 months
pemensik pushed to dnsmasq (f31). "Listen only localhost in default
configuration (..more)"
by notifications＠fedoraproject.org
Notification time stamped 2020-06-30 17:22:14 UTC
From 8c48bf6bf4bdc4d8bbe31138a810bb73e5352e15 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik(a)redhat.com>
Date: Jun 30 2020 17:20:35 +0000
Subject: Listen only localhost in default configuration
Require manual configuration to enable either local-service for any
connected networks or interface to listen all hosts on interface.
---
diff --git a/dnsmasq-2.81-configuration.patch b/dnsmasq-2.81-configuration.patch
new file mode 100644
index 0000000..0cf66c7
--- /dev/null
+++ b/dnsmasq-2.81-configuration.patch
@@ -0,0 +1,79 @@
+From d07d1bcdd739da00d0acb8c4561c33bc4d27a0da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com>
+Date: Tue, 30 Jun 2020 18:06:29 +0200
+Subject: [PATCH] Modify upstream configuration to safe defaults
+
+Most important change would be to listen only on localhost. Default
+configuration should not listen to request from remote hosts. Match also
+user and paths to directories shipped in Fedora.
+---
+ dnsmasq.conf.example | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example
+index bf19424..a130118 100644
+--- a/dnsmasq.conf.example
++++ b/dnsmasq.conf.example
+@@ -22,7 +22,7 @@
+
+ # Uncomment these to enable DNSSEC validation and caching:
+ # (Requires dnsmasq to be built with DNSSEC option.)
+-#conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf
++#conf-file=/usr/share/dnsmasq/trust-anchors.conf
+ #dnssec
+
+ # Replies which are not DNSSEC signed may be legitimate, because the domain
+@@ -96,14 +96,16 @@
+
+ # If you want dnsmasq to change uid and gid to something other
+ # than the default, edit the following lines.
+-#user=
+-#group=
++user=dnsmasq
++group=dnsmasq
+
+ # If you want dnsmasq to listen for DHCP and DNS requests only on
+ # specified interfaces (and the loopback) give the name of the
+ # interface (eg eth0) here.
+ # Repeat the line for more than one interface.
+ #interface=
++# Listen only on localhost by default
++interface=lo
+ # Or you can specify which interface _not_ to listen on
+ #except-interface=
+ # Or which to listen on by address (remember to include 127.0.0.1 if
+@@ -114,6 +116,10 @@
+ # disable DHCP and TFTP on it.
+ #no-dhcp-interface=
+
++# Serve DNS and DHCP only to networks directly connected to this machine.
++# Any interface= line will override it.
++#local-service
++
+ # On systems which support it, dnsmasq binds the wildcard address,
+ # even when it is listening on only some interfaces. It then discards
+ # requests that it shouldn't reply to. This has the advantage of
+@@ -535,7 +541,7 @@
+ # The DHCP server needs somewhere on disk to keep its lease database.
+ # This defaults to a sane location, but if you want to change it, use
+ # the line below.
+-#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
++#dhcp-leasefile=/var/lib/dnsmasq/dnsmasq.leases
+
+ # Set the DHCP server to authoritative mode. In this mode it will barge in
+ # and take over the lease for any client which broadcasts on the network,
+@@ -673,7 +679,11 @@
+ # Include all files in a directory which end in .conf
+ #conf-dir=/etc/dnsmasq.d/,*.conf
+
++# Include all files in /etc/dnsmasq.d except RPM backup files
++conf-dir=/etc/dnsmasq.d,.rpmnew,.rpmsave,.rpmorig
++
+ # If a DHCP client claims that its name is "wpad", ignore that.
+ # This fixes a security hole. see CERT Vulnerability VU#598349
+ #dhcp-name-match=set:wpad-ignore,wpad
+ #dhcp-ignore-names=tag:wpad-ignore
++
+--
+2.26.2
+
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 13e1bac..a6f1c60 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.80
-Release: 15%{?extraversion:.%{extraversion}}%{?dist}
+Release: 16%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
License: GPLv2 or GPLv3
@@ -24,6 +24,8 @@ Source2: dnsmasq-systemd-sysusers.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1495409
Patch1: dnsmasq-2.77-underflow.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1852373
+Patch2: dnsmasq-2.81-configuration.patch
Patch3: dnsmasq-2.78-fips.patch
Patch5: dnsmasq-2.79-randomize-ports.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1674067
@@ -90,12 +92,6 @@ for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
done
-# fix the path to the trust anchor
-sed -i 's|%%%%PREFIX%%%%|%{_prefix}|' dnsmasq.conf.example
-
-#set dnsmasq user / group
-sed -i 's|#user=|user=dnsmasq|' dnsmasq.conf.example
-sed -i 's|#group=|group=dnsmasq|' dnsmasq.conf.example
#set default user /group in src/config.h
sed -i 's|#define CHUSER "nobody"|#define CHUSER "dnsmasq"|' src/config.h
sed -i 's|#define CHGRP "dip"|#define CHGRP "dnsmasq"|' src/config.h
@@ -103,14 +99,6 @@ sed -i 's|#define CHGRP "dip"|#define CHGRP "dnsmasq"|' src/config.h
# optional parts
sed -i 's|^COPTS[[:space:]]*=|\0 -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_DNSSEC|' Makefile
-#enable /etc/dnsmasq.d fix bz 526703, ignore RPM backup files
-cat << EOF >> dnsmasq.conf.example
-
-# Include all files in /etc/dnsmasq.d except RPM backup files
-conf-dir=/etc/dnsmasq.d,.rpmnew,.rpmsave,.rpmorig
-EOF
-
-
%build
%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
%make_build -C contrib/lease-tools CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
@@ -182,6 +170,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
%{_mandir}/man1/dhcp_*
%changelog
+* Tue Jun 30 2020 Petr Menšík <pemensik(a)redhat.com> - 2.80-16
+- Accept queries only from local networks (CVE-2020-14312)
+
* Mon May 11 2020 Petr Menšík <pemensik(a)redhat.com> - 2.80-15
- Correct multiple entries with the same mac address (#1834454)
https://src.fedoraproject.org/rpms/dnsmasq/c/8c48bf6bf4bdc4d8bbe31138a810...
3 years, 10 months