2008-01-31 02:28:41 +00:00
|
|
|
%define testrelease 0
|
2008-02-13 15:21:24 +00:00
|
|
|
%define releasecandidate 0
|
2007-09-18 15:36:39 +00:00
|
|
|
%if 0%{testrelease}
|
|
|
|
%define extrapath test-releases/
|
2008-01-23 18:57:57 +00:00
|
|
|
%define extraversion test30
|
2007-09-18 15:36:39 +00:00
|
|
|
%endif
|
|
|
|
%if 0%{releasecandidate}
|
|
|
|
%define extrapath release-candidates/
|
2008-01-31 02:28:41 +00:00
|
|
|
%define extraversion rc1
|
2007-09-18 15:36:39 +00:00
|
|
|
%endif
|
2007-08-27 21:40:07 +00:00
|
|
|
|
2006-04-25 16:51:25 +00:00
|
|
|
Name: dnsmasq
|
2009-10-18 00:28:38 +00:00
|
|
|
Version: 2.51
|
2009-11-22 11:47:49 +00:00
|
|
|
Release: 2%{?extraversion}%{?dist}
|
2006-04-25 16:51:25 +00:00
|
|
|
Summary: A lightweight DHCP/caching DNS server
|
|
|
|
|
|
|
|
Group: System Environment/Daemons
|
2008-02-14 03:05:21 +00:00
|
|
|
License: GPLv2 or GPLv3
|
2006-04-25 16:51:25 +00:00
|
|
|
URL: http://www.thekelleys.org.uk/dnsmasq/
|
2009-08-12 17:05:49 +00:00
|
|
|
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.lzma
|
2009-10-17 23:08:16 +00:00
|
|
|
Source1: %{name}.init
|
2006-04-25 16:51:25 +00:00
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
|
|
|
|
BuildRequires: dbus-devel
|
2006-08-15 20:35:02 +00:00
|
|
|
BuildRequires: pkgconfig
|
2006-07-22 14:20:16 +00:00
|
|
|
|
2009-10-17 23:08:16 +00:00
|
|
|
Requires(post): chkconfig
|
|
|
|
Requires(preun): chkconfig
|
|
|
|
# This is for /sbin/service
|
|
|
|
Requires(preun): initscripts
|
|
|
|
Requires(post): initscripts
|
2006-04-25 16:51:25 +00:00
|
|
|
|
|
|
|
%description
|
|
|
|
Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server.
|
|
|
|
It is designed to provide DNS and, optionally, DHCP, to a small network.
|
|
|
|
It can serve the names of local machines which are not in the global
|
|
|
|
DNS. The DHCP server integrates with the DNS server and allows machines
|
|
|
|
with DHCP-allocated addresses to appear in the DNS with names configured
|
|
|
|
either in each host or in a central configuration file. Dnsmasq supports
|
|
|
|
static and dynamic DHCP leases and BOOTP for network booting of diskless
|
|
|
|
machines.
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
2007-08-27 21:40:07 +00:00
|
|
|
%setup -q -n %{name}-%{version}%{?extraversion}
|
2009-10-17 23:08:16 +00:00
|
|
|
|
|
|
|
# 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"
|
|
|
|
done
|
|
|
|
|
|
|
|
#enable dbus
|
|
|
|
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
|
|
|
|
|
2006-04-25 16:51:25 +00:00
|
|
|
|
|
|
|
%build
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
# normally i'd do 'make install'...it's a bit messy, though
|
2009-10-17 23:08:16 +00:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
|
2006-08-15 20:35:02 +00:00
|
|
|
$RPM_BUILD_ROOT%{_mandir}/man8 \
|
2007-12-04 15:46:52 +00:00
|
|
|
$RPM_BUILD_ROOT%{_var}/lib/dnsmasq \
|
2006-11-06 18:08:15 +00:00
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
|
2006-08-15 20:35:02 +00:00
|
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
|
2006-04-25 16:51:25 +00:00
|
|
|
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
|
|
|
|
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
|
2006-05-02 15:51:01 +00:00
|
|
|
install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
|
2009-10-17 23:08:16 +00:00
|
|
|
install -Dp -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
|
2007-05-29 16:34:11 +00:00
|
|
|
install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
|
2006-04-25 16:51:25 +00:00
|
|
|
|
|
|
|
%clean
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
%post
|
2006-10-24 16:26:49 +00:00
|
|
|
if [ "$1" = "2" ]; then # if we're being upgraded
|
2007-12-04 15:46:52 +00:00
|
|
|
# if using the old leases location, move the file to the new one
|
|
|
|
# but only if we're not clobbering another file
|
|
|
|
#
|
|
|
|
if [ -f /var/lib/misc/dnsmasq.leases -a ! -f /var/lib/dnsmasq/dnsmasq.leases ]; then
|
|
|
|
# causes rpmlint to report dangerous-command-in-post,
|
|
|
|
# but that's the price of selinux compliance :-(
|
|
|
|
mv -f /var/lib/misc/dnsmasq.leases /var/lib/dnsmasq/dnsmasq.leases || :
|
|
|
|
fi
|
|
|
|
# ugly, but kind of necessary
|
|
|
|
if [ ! `grep -q dhcp-leasefile=/var/lib/misc/dnsmasq.leases %{_sysconfdir}/dnsmasq.conf` ]; then
|
|
|
|
cp %{_sysconfdir}/dnsmasq.conf %{_sysconfdir}/dnsmasq.conf.tmp || :
|
|
|
|
sed -e 's/var\/lib\/misc/var\/lib\/dnsmasq/' < %{_sysconfdir}/dnsmasq.conf.tmp > %{_sysconfdir}/dnsmasq.conf || :
|
|
|
|
rm -f %{_sysconfdir}/dnsmasq.conf.tmp || :
|
|
|
|
fi
|
2006-10-24 16:26:49 +00:00
|
|
|
/sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
|
|
|
|
else # if we're being installed
|
|
|
|
/sbin/chkconfig --add dnsmasq
|
|
|
|
fi
|
2006-04-25 16:51:25 +00:00
|
|
|
|
|
|
|
%preun
|
2006-10-24 16:26:49 +00:00
|
|
|
if [ "$1" = "0" ]; then # execute this only if we are NOT doing an upgrade
|
|
|
|
/sbin/service dnsmasq stop >/dev/null 2>&1 || :
|
2006-04-25 16:51:25 +00:00
|
|
|
/sbin/chkconfig --del dnsmasq
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
%defattr(-,root,root,-)
|
2006-11-06 17:58:49 +00:00
|
|
|
%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
|
2006-05-02 15:51:01 +00:00
|
|
|
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
|
2006-11-06 17:58:49 +00:00
|
|
|
%dir /etc/dnsmasq.d
|
2007-12-04 15:46:52 +00:00
|
|
|
%dir %{_var}/lib/dnsmasq
|
2006-05-02 15:51:01 +00:00
|
|
|
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
|
2006-04-25 16:51:25 +00:00
|
|
|
%{_initrddir}/dnsmasq
|
|
|
|
%{_sbindir}/dnsmasq
|
|
|
|
%{_mandir}/man8/dnsmasq*
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
2009-11-22 11:47:49 +00:00
|
|
|
* Sun Nov 22 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 2.51-2
|
|
|
|
- fix bz 512664
|
|
|
|
|
2009-10-18 00:28:38 +00:00
|
|
|
* Sat Oct 17 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 2.51-1
|
2009-10-17 23:08:16 +00:00
|
|
|
- move initscript from patch to a plain text file
|
|
|
|
- drop (dnsmasq-configuration.patch) and use sed instead
|
|
|
|
- enable /etc/dnsmasq.d fix bz 526703
|
|
|
|
- change requires to package name instead of file
|
2009-10-18 00:28:38 +00:00
|
|
|
- new version 2.51
|
2009-10-17 23:08:16 +00:00
|
|
|
|
2009-10-05 10:26:35 +00:00
|
|
|
* Mon Oct 5 2009 Mark McLoughlin <markmc@redhat.com> - 2.48-4
|
|
|
|
- Fix multiple TFTP server vulnerabilities (CVE-2009-2957, CVE-2009-2958)
|
|
|
|
|
2009-08-12 17:05:49 +00:00
|
|
|
* Wed Aug 12 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.48-3
|
|
|
|
- Use lzma compressed upstream tarball.
|
|
|
|
|
2009-07-24 20:24:04 +00:00
|
|
|
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.48-2
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
|
|
2009-06-10 12:36:25 +00:00
|
|
|
* Wed Jun 10 2009 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.48-1
|
|
|
|
- Bugfix/feature enhancement update
|
|
|
|
- Fixing BZ#494094
|
|
|
|
|
2009-05-29 14:08:10 +00:00
|
|
|
* Fri May 29 2009 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.47-1
|
|
|
|
- Bugfix/feature enhancement update
|
|
|
|
|
2009-02-24 12:12:18 +00:00
|
|
|
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.46-2
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
|
|
2008-12-29 01:39:59 +00:00
|
|
|
* Mon Dec 29 2008 Matěj Cepl <mcepl@redhat.com> - 2.45-2
|
|
|
|
- rebuilt
|
|
|
|
|
2008-07-22 00:52:10 +00:00
|
|
|
* Mon Jul 21 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.45-1
|
|
|
|
- Upstream release (bugfixes)
|
|
|
|
|
2008-07-16 19:28:52 +00:00
|
|
|
* Wed Jul 16 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.43-2
|
2008-07-16 19:11:57 +00:00
|
|
|
- New upstream release, contains fixes for CVE-2008-1447/CERT VU#800113
|
2008-07-16 19:28:52 +00:00
|
|
|
- Dropped patch for newer glibc (merged upstream)
|
2008-07-16 19:11:57 +00:00
|
|
|
|
2008-02-14 03:05:21 +00:00
|
|
|
* Wed Feb 13 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.8
|
|
|
|
- Added upstream-authored patch for newer glibc (thanks Simon!)
|
|
|
|
|
2008-02-13 15:21:24 +00:00
|
|
|
* Wed Feb 13 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.7
|
|
|
|
- New upstream release
|
|
|
|
|
2008-01-31 02:28:41 +00:00
|
|
|
* Wed Jan 30 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.6.rc1
|
|
|
|
- Release candidate
|
|
|
|
- Happy Birthday Isaac!
|
|
|
|
|
2008-01-23 18:57:57 +00:00
|
|
|
* Wed Jan 23 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.5.test30
|
|
|
|
- Bugfix update
|
|
|
|
|
2007-12-31 12:39:26 +00:00
|
|
|
* Mon Dec 31 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.4.test26
|
|
|
|
- Bugfix/feature enhancement update
|
|
|
|
|
2007-12-13 13:16:32 +00:00
|
|
|
* Thu Dec 13 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.3.test24
|
|
|
|
- Upstream fix for fairly serious regression
|
|
|
|
|
2007-12-04 15:46:52 +00:00
|
|
|
* Tue Dec 04 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.2.test20
|
2007-10-22 20:20:33 +00:00
|
|
|
- New upstream test release
|
2007-12-04 15:46:52 +00:00
|
|
|
- Moving dnsmasq.leases to /var/lib/dnsmasq/ as per BZ#407901
|
|
|
|
- Ignoring dangerous-command-in-%%post rpmlint warning (as per above fix)
|
|
|
|
- Patch consolidation/cleanup
|
|
|
|
- Removed conditionals for Fedora <= 3 and Aurora 2.0
|
2007-10-22 20:20:33 +00:00
|
|
|
|
2007-09-18 15:15:26 +00:00
|
|
|
* Tue Sep 18 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.40-1
|
|
|
|
- Finalized upstream release
|
|
|
|
- Removing URLs from patch lines (CVS is the authoritative source)
|
|
|
|
- Added more magic to make spinning rc/test packages more seamless
|
|
|
|
|
2007-08-27 21:40:07 +00:00
|
|
|
* Sun Aug 26 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.40-0.1.rc2
|
|
|
|
- New upstream release candidate (feature-frozen), thanks Simon!
|
|
|
|
- License clarification
|
|
|
|
|
2007-05-29 16:01:00 +00:00
|
|
|
* Tue May 29 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.39-1
|
|
|
|
- New upstream version (bugfixes, enhancements)
|
|
|
|
|
2007-02-12 21:49:28 +00:00
|
|
|
* Mon Feb 12 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.38-1
|
|
|
|
- New upstream version with bugfix for potential hang
|
|
|
|
|
2007-02-06 19:56:31 +00:00
|
|
|
* Tue Feb 06 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.37-1
|
|
|
|
- New upstream version
|
|
|
|
|
2007-01-24 19:49:18 +00:00
|
|
|
* Wed Jan 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.36-1
|
|
|
|
- New upstream version
|
|
|
|
|
2006-11-06 18:08:15 +00:00
|
|
|
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.35-2
|
|
|
|
- Stop creating /etc/sysconfig on %%install
|
|
|
|
- Create /etc/dnsmasq.d on %%install
|
|
|
|
|
2006-11-06 17:58:49 +00:00
|
|
|
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima@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
|
|
|
|
|
2006-10-24 16:26:49 +00:00
|
|
|
* Tue Oct 24 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.34-2
|
|
|
|
- Fixed BZ#212005
|
|
|
|
- Moved %%postun scriptlet to %%post, where it made more sense
|
|
|
|
- Render scriptlets safer
|
|
|
|
- Minor cleanup for consistency
|
|
|
|
|
2006-10-19 18:09:19 +00:00
|
|
|
* Thu Oct 19 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.34-1
|
|
|
|
- Hardcoded version in patches, as I'm getting tired of updating them
|
|
|
|
- Update to 2.34
|
|
|
|
|
2006-08-28 17:03:59 +00:00
|
|
|
* Mon Aug 28 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.33-2
|
|
|
|
- Rebuild for FC6
|
|
|
|
|
2006-08-15 20:35:02 +00:00
|
|
|
* Tue Aug 15 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.33-1
|
|
|
|
- Update
|
|
|
|
|
2006-07-22 14:20:16 +00:00
|
|
|
* Sat Jul 22 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-3
|
|
|
|
- Added pkgconfig BuildReq due to reduced buildroot
|
|
|
|
|
2006-07-20 13:23:20 +00:00
|
|
|
* Thu Jul 20 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-2
|
|
|
|
- Forced update due to dbus version bump
|
|
|
|
|
2006-06-12 14:30:20 +00:00
|
|
|
* Mon Jun 12 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-1
|
|
|
|
- Update from upstream
|
|
|
|
- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
|
|
|
|
|
2006-05-08 15:51:19 +00:00
|
|
|
* Mon May 8 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.31-1
|
|
|
|
- Removed dbus config patch (now provided upstream)
|
|
|
|
- Patched in init script (no longer provided upstream)
|
|
|
|
- Added DBus-interface to docs
|
|
|
|
|
2006-05-02 16:28:07 +00:00
|
|
|
* Tue May 2 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-4.2
|
2006-05-02 16:19:59 +00:00
|
|
|
- More upstream-recommended cleanups :)
|
|
|
|
- Killed sysconfig file (provides unneeded functionality)
|
|
|
|
- Tweaked init script a little more
|
|
|
|
|
2006-05-02 15:51:01 +00:00
|
|
|
* Tue May 2 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-4
|
|
|
|
- Moved options out of init script and into /etc/sysconfig/dnsmasq
|
|
|
|
- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379
|
|
|
|
- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball
|
|
|
|
|
2006-04-27 15:16:45 +00:00
|
|
|
* Thu Apr 27 2006 Patrick "Jima" Laughton <jima@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@auroralinux.org> 2.30-2
|
2006-04-25 16:51:25 +00:00
|
|
|
- Disabled stripping of binary while installing (oops)
|
|
|
|
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
|
|
|
|
- Added BuildReq for dbus-devel
|
|
|
|
|
2006-04-27 15:16:45 +00:00
|
|
|
* Mon Apr 24 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-1
|
2006-04-25 16:51:25 +00:00
|
|
|
- Initial Fedora Extras RPM
|