|
Patrick Laughton |
c318a1 |
%define testrelease 0
|
|
Patrick Laughton |
22ddee |
%define releasecandidate 0
|
|
Patrick Laughton |
e85159 |
%if 0%{testrelease}
|
|
Patrick Laughton |
e85159 |
%define extrapath test-releases/
|
|
Patrick Laughton |
4c9487 |
%define extraversion test30
|
|
Patrick Laughton |
e85159 |
%endif
|
|
Patrick Laughton |
e85159 |
%if 0%{releasecandidate}
|
|
Patrick Laughton |
e85159 |
%define extrapath release-candidates/
|
|
Patrick Laughton |
c318a1 |
%define extraversion rc1
|
|
Patrick Laughton |
e85159 |
%endif
|
|
Patrick Laughton |
9fa2ba |
|
|
Patrick Laughton |
b0365f |
Name: dnsmasq
|
|
Patrick Laughton |
a1e0af |
Version: 2.41
|
|
Patrick Laughton |
62e384 |
Release: 0.8%{?extraversion}%{?dist}
|
|
Patrick Laughton |
b0365f |
Summary: A lightweight DHCP/caching DNS server
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
Group: System Environment/Daemons
|
|
Patrick Laughton |
62e384 |
License: GPLv2 or GPLv3
|
|
Patrick Laughton |
b0365f |
URL: http://www.thekelleys.org.uk/dnsmasq/
|
|
Patrick Laughton |
f994f1 |
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz
|
|
Patrick Laughton |
f994f1 |
Patch0: %{name}-2.33-initscript.patch
|
|
Patrick Laughton |
91d4b3 |
Patch1: %{name}-configuration.patch
|
|
Patrick Laughton |
62e384 |
Patch2: %{name}-newglibc.patch
|
|
Patrick Laughton |
b0365f |
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
BuildRequires: dbus-devel
|
|
Patrick Laughton |
c81c9a |
BuildRequires: pkgconfig
|
|
Patrick Laughton |
cc527e |
|
|
Patrick Laughton |
c81c9a |
Requires(post): /sbin/chkconfig
|
|
Patrick Laughton |
b0365f |
Requires(post): /sbin/service
|
|
Patrick Laughton |
91d4b3 |
Requires(post): /bin/sed /bin/grep
|
|
Patrick Laughton |
b0365f |
Requires(preun): /sbin/chkconfig
|
|
Patrick Laughton |
b0365f |
Requires(preun): /sbin/service
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%description
|
|
Patrick Laughton |
b0365f |
Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server.
|
|
Patrick Laughton |
b0365f |
It is designed to provide DNS and, optionally, DHCP, to a small network.
|
|
Patrick Laughton |
b0365f |
It can serve the names of local machines which are not in the global
|
|
Patrick Laughton |
b0365f |
DNS. The DHCP server integrates with the DNS server and allows machines
|
|
Patrick Laughton |
b0365f |
with DHCP-allocated addresses to appear in the DNS with names configured
|
|
Patrick Laughton |
b0365f |
either in each host or in a central configuration file. Dnsmasq supports
|
|
Patrick Laughton |
b0365f |
static and dynamic DHCP leases and BOOTP for network booting of diskless
|
|
Patrick Laughton |
b0365f |
machines.
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%prep
|
|
Patrick Laughton |
9fa2ba |
%setup -q -n %{name}-%{version}%{?extraversion}
|
|
Patrick Laughton |
527509 |
%patch0 -p1
|
|
Patrick Laughton |
527509 |
%patch1 -p1
|
|
Patrick Laughton |
62e384 |
%patch2 -p1
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%build
|
|
Patrick Laughton |
b0365f |
make %{?_smp_mflags}
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%install
|
|
Patrick Laughton |
b0365f |
rm -rf $RPM_BUILD_ROOT
|
|
Patrick Laughton |
b0365f |
# normally i'd do 'make install'...it's a bit messy, though
|
|
Patrick Laughton |
b0365f |
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
|
|
Patrick Laughton |
c81c9a |
$RPM_BUILD_ROOT%{_mandir}/man8 \
|
|
Patrick Laughton |
91d4b3 |
$RPM_BUILD_ROOT%{_var}/lib/dnsmasq \
|
|
Patrick Laughton |
65d7a4 |
$RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
|
|
Patrick Laughton |
c81c9a |
$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
|
|
Patrick Laughton |
b0365f |
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
|
|
Patrick Laughton |
b0365f |
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
|
|
Patrick Laughton |
aa950b |
install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
|
|
Patrick Laughton |
60068e |
install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
|
|
Patrick Laughton |
6a4bb3 |
install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%clean
|
|
Patrick Laughton |
b0365f |
rm -rf $RPM_BUILD_ROOT
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%post
|
|
Patrick Laughton |
1b0973 |
if [ "$1" = "2" ]; then # if we're being upgraded
|
|
Patrick Laughton |
91d4b3 |
# if using the old leases location, move the file to the new one
|
|
Patrick Laughton |
91d4b3 |
# but only if we're not clobbering another file
|
|
Patrick Laughton |
91d4b3 |
#
|
|
Patrick Laughton |
91d4b3 |
if [ -f /var/lib/misc/dnsmasq.leases -a ! -f /var/lib/dnsmasq/dnsmasq.leases ]; then
|
|
Patrick Laughton |
91d4b3 |
# causes rpmlint to report dangerous-command-in-post,
|
|
Patrick Laughton |
91d4b3 |
# but that's the price of selinux compliance :-(
|
|
Patrick Laughton |
91d4b3 |
mv -f /var/lib/misc/dnsmasq.leases /var/lib/dnsmasq/dnsmasq.leases || :
|
|
Patrick Laughton |
91d4b3 |
fi
|
|
Patrick Laughton |
91d4b3 |
# ugly, but kind of necessary
|
|
Patrick Laughton |
91d4b3 |
if [ ! `grep -q dhcp-leasefile=/var/lib/misc/dnsmasq.leases %{_sysconfdir}/dnsmasq.conf` ]; then
|
|
Patrick Laughton |
91d4b3 |
cp %{_sysconfdir}/dnsmasq.conf %{_sysconfdir}/dnsmasq.conf.tmp || :
|
|
Patrick Laughton |
91d4b3 |
sed -e 's/var\/lib\/misc/var\/lib\/dnsmasq/' < %{_sysconfdir}/dnsmasq.conf.tmp > %{_sysconfdir}/dnsmasq.conf || :
|
|
Patrick Laughton |
91d4b3 |
rm -f %{_sysconfdir}/dnsmasq.conf.tmp || :
|
|
Patrick Laughton |
91d4b3 |
fi
|
|
Patrick Laughton |
1b0973 |
/sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
|
|
Patrick Laughton |
1b0973 |
else # if we're being installed
|
|
Patrick Laughton |
1b0973 |
/sbin/chkconfig --add dnsmasq
|
|
Patrick Laughton |
1b0973 |
fi
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%preun
|
|
Patrick Laughton |
1b0973 |
if [ "$1" = "0" ]; then # execute this only if we are NOT doing an upgrade
|
|
Patrick Laughton |
1b0973 |
/sbin/service dnsmasq stop >/dev/null 2>&1 || :
|
|
Patrick Laughton |
b0365f |
/sbin/chkconfig --del dnsmasq
|
|
Patrick Laughton |
b0365f |
fi
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%files
|
|
Patrick Laughton |
b0365f |
%defattr(-,root,root,-)
|
|
Patrick Laughton |
474aab |
%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
|
|
Patrick Laughton |
aa950b |
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
|
|
Patrick Laughton |
474aab |
%dir /etc/dnsmasq.d
|
|
Patrick Laughton |
91d4b3 |
%dir %{_var}/lib/dnsmasq
|
|
Patrick Laughton |
aa950b |
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
|
|
Patrick Laughton |
b0365f |
%{_initrddir}/dnsmasq
|
|
Patrick Laughton |
b0365f |
%{_sbindir}/dnsmasq
|
|
Patrick Laughton |
b0365f |
%{_mandir}/man8/dnsmasq*
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
b0365f |
%changelog
|
|
Patrick Laughton |
62e384 |
* Wed Feb 13 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.8
|
|
Patrick Laughton |
62e384 |
- Added upstream-authored patch for newer glibc (thanks Simon!)
|
|
Patrick Laughton |
62e384 |
|
|
Patrick Laughton |
22ddee |
* Wed Feb 13 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.7
|
|
Patrick Laughton |
22ddee |
- New upstream release
|
|
Patrick Laughton |
22ddee |
|
|
Patrick Laughton |
c318a1 |
* Wed Jan 30 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.6.rc1
|
|
Patrick Laughton |
c318a1 |
- Release candidate
|
|
Patrick Laughton |
c318a1 |
- Happy Birthday Isaac!
|
|
Patrick Laughton |
c318a1 |
|
|
Patrick Laughton |
4c9487 |
* Wed Jan 23 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.5.test30
|
|
Patrick Laughton |
4c9487 |
- Bugfix update
|
|
Patrick Laughton |
4c9487 |
|
|
Patrick Laughton |
d996be |
* Mon Dec 31 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.4.test26
|
|
Patrick Laughton |
d996be |
- Bugfix/feature enhancement update
|
|
Patrick Laughton |
d996be |
|
|
Patrick Laughton |
d927a5 |
* Thu Dec 13 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.3.test24
|
|
Patrick Laughton |
d927a5 |
- Upstream fix for fairly serious regression
|
|
Patrick Laughton |
d927a5 |
|
|
Patrick Laughton |
91d4b3 |
* Tue Dec 04 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.2.test20
|
|
Patrick Laughton |
a1e0af |
- New upstream test release
|
|
Patrick Laughton |
91d4b3 |
- Moving dnsmasq.leases to /var/lib/dnsmasq/ as per BZ#407901
|
|
Patrick Laughton |
91d4b3 |
- Ignoring dangerous-command-in-%%post rpmlint warning (as per above fix)
|
|
Patrick Laughton |
91d4b3 |
- Patch consolidation/cleanup
|
|
Patrick Laughton |
91d4b3 |
- Removed conditionals for Fedora <= 3 and Aurora 2.0
|
|
Patrick Laughton |
a1e0af |
|
|
Patrick Laughton |
f994f1 |
* Tue Sep 18 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.40-1
|
|
Patrick Laughton |
f994f1 |
- Finalized upstream release
|
|
Patrick Laughton |
f994f1 |
- Removing URLs from patch lines (CVS is the authoritative source)
|
|
Patrick Laughton |
f994f1 |
- Added more magic to make spinning rc/test packages more seamless
|
|
Patrick Laughton |
f994f1 |
|
|
Patrick Laughton |
9fa2ba |
* Sun Aug 26 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.40-0.1.rc2
|
|
Patrick Laughton |
9fa2ba |
- New upstream release candidate (feature-frozen), thanks Simon!
|
|
Patrick Laughton |
9fa2ba |
- License clarification
|
|
Patrick Laughton |
9fa2ba |
|
|
Patrick Laughton |
d1bbee |
* Tue May 29 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.39-1
|
|
Patrick Laughton |
d1bbee |
- New upstream version (bugfixes, enhancements)
|
|
Patrick Laughton |
d1bbee |
|
|
Patrick Laughton |
d000b5 |
* Mon Feb 12 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.38-1
|
|
Patrick Laughton |
d000b5 |
- New upstream version with bugfix for potential hang
|
|
Patrick Laughton |
d000b5 |
|
|
Patrick Laughton |
253ce1 |
* Tue Feb 06 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.37-1
|
|
Patrick Laughton |
253ce1 |
- New upstream version
|
|
Patrick Laughton |
253ce1 |
|
|
Patrick Laughton |
793056 |
* Wed Jan 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.36-1
|
|
Patrick Laughton |
793056 |
- New upstream version
|
|
Patrick Laughton |
793056 |
|
|
Patrick Laughton |
65d7a4 |
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.35-2
|
|
Patrick Laughton |
65d7a4 |
- Stop creating /etc/sysconfig on %%install
|
|
Patrick Laughton |
65d7a4 |
- Create /etc/dnsmasq.d on %%install
|
|
Patrick Laughton |
65d7a4 |
|
|
Patrick Laughton |
474aab |
* Mon Nov 06 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.35-1
|
|
Patrick Laughton |
474aab |
- Update to 2.35
|
|
Patrick Laughton |
474aab |
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
|
|
Patrick Laughton |
474aab |
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
|
|
Patrick Laughton |
474aab |
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
|
|
Patrick Laughton |
474aab |
|
|
Patrick Laughton |
1b0973 |
* Tue Oct 24 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.34-2
|
|
Patrick Laughton |
1b0973 |
- Fixed BZ#212005
|
|
Patrick Laughton |
1b0973 |
- Moved %%postun scriptlet to %%post, where it made more sense
|
|
Patrick Laughton |
1b0973 |
- Render scriptlets safer
|
|
Patrick Laughton |
1b0973 |
- Minor cleanup for consistency
|
|
Patrick Laughton |
1b0973 |
|
|
Patrick Laughton |
c99b31 |
* Thu Oct 19 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.34-1
|
|
Patrick Laughton |
c99b31 |
- Hardcoded version in patches, as I'm getting tired of updating them
|
|
Patrick Laughton |
c99b31 |
- Update to 2.34
|
|
Patrick Laughton |
c99b31 |
|
|
Patrick Laughton |
507262 |
* Mon Aug 28 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.33-2
|
|
Patrick Laughton |
507262 |
- Rebuild for FC6
|
|
Patrick Laughton |
507262 |
|
|
Patrick Laughton |
c81c9a |
* Tue Aug 15 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.33-1
|
|
Patrick Laughton |
c81c9a |
- Update
|
|
Patrick Laughton |
c81c9a |
|
|
Patrick Laughton |
cc527e |
* Sat Jul 22 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-3
|
|
Patrick Laughton |
cc527e |
- Added pkgconfig BuildReq due to reduced buildroot
|
|
Patrick Laughton |
cc527e |
|
|
Patrick Laughton |
b3b82d |
* Thu Jul 20 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-2
|
|
Patrick Laughton |
b3b82d |
- Forced update due to dbus version bump
|
|
Patrick Laughton |
b3b82d |
|
|
Patrick Laughton |
bc74c1 |
* Mon Jun 12 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.32-1
|
|
Patrick Laughton |
bc74c1 |
- Update from upstream
|
|
Patrick Laughton |
bc74c1 |
- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
|
|
Patrick Laughton |
bc74c1 |
|
|
Patrick Laughton |
60068e |
* Mon May 8 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.31-1
|
|
Patrick Laughton |
60068e |
- Removed dbus config patch (now provided upstream)
|
|
Patrick Laughton |
60068e |
- Patched in init script (no longer provided upstream)
|
|
Patrick Laughton |
60068e |
- Added DBus-interface to docs
|
|
Patrick Laughton |
60068e |
|
|
Patrick Laughton |
527509 |
* Tue May 2 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-4.2
|
|
Patrick Laughton |
00482d |
- More upstream-recommended cleanups :)
|
|
Patrick Laughton |
00482d |
- Killed sysconfig file (provides unneeded functionality)
|
|
Patrick Laughton |
00482d |
- Tweaked init script a little more
|
|
Patrick Laughton |
00482d |
|
|
Patrick Laughton |
aa950b |
* Tue May 2 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-4
|
|
Patrick Laughton |
aa950b |
- Moved options out of init script and into /etc/sysconfig/dnsmasq
|
|
Patrick Laughton |
aa950b |
- Disabled DHCP_LEASE in sysconfig file, fixing bug #190379
|
|
Patrick Laughton |
aa950b |
- Simon Kelley provided dbus/dnsmasq.conf, soon to be part of the tarball
|
|
Patrick Laughton |
aa950b |
|
|
Patrick Laughton |
9433ec |
* Thu Apr 27 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-3
|
|
Patrick Laughton |
9433ec |
- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
|
|
Patrick Laughton |
9433ec |
- Split initscript & enable-dbus patches, conditionalized dbus for FC3
|
|
Patrick Laughton |
9433ec |
- Tweaked name field in changelog entries (trying to be consistent)
|
|
Patrick Laughton |
9433ec |
|
|
Patrick Laughton |
9433ec |
* Mon Apr 24 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-2
|
|
Patrick Laughton |
b0365f |
- Disabled stripping of binary while installing (oops)
|
|
Patrick Laughton |
b0365f |
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
|
|
Patrick Laughton |
b0365f |
- Added BuildReq for dbus-devel
|
|
Patrick Laughton |
b0365f |
|
|
Patrick Laughton |
9433ec |
* Mon Apr 24 2006 Patrick "Jima" Laughton <jima@auroralinux.org> 2.30-1
|
|
Patrick Laughton |
b0365f |
- Initial Fedora Extras RPM
|