rpms/dnsmasq/FC-5 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3
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-serv16708/FC-5
Modified Files:
dnsmasq-2.30-initscript.patch dnsmasq.spec
Added Files:
dnsmasq-2.30-dbus-config.patch
Log Message:
Fixed bug #190379
Moved options from init script to sysconfig file
Added dbus configuration file
dnsmasq-2.30-dbus-config.patch:
--- NEW FILE dnsmasq-2.30-dbus-config.patch ---
diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf
--- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600
+++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500
@@ -0,0 +1,16 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <policy user="root">
+ <allow own="uk.org.thekelleys.dnsmasq"/>
+ <allow send_destination="uk.org.thekelleys.dnsmasq"/>
+ <allow send_interface="uk.org.thekelleys.dnsmasq"/>
+ </policy>
+ <policy context="default">
+ <deny own="uk.org.thekelleys.dnsmasq"/>
+ <deny send_destination="uk.org.thekelleys.dnsmasq"/>
+ <deny send_interface="uk.org.thekelleys.dnsmasq"/>
+ </policy>
+</busconfig>
+
dnsmasq-2.30-initscript.patch:
Index: dnsmasq-2.30-initscript.patch
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq-2.30-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:52 -0000 1.1
+++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:50 -0000 1.2
@@ -1,6 +1,6 @@
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
++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500
@@ -2,7 +2,7 @@
#
# Startup script for the DNS caching server
@@ -10,3 +10,53 @@
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid
+@@ -19,33 +19,9 @@
+ dnsmasq=/usr/sbin/dnsmasq
+ [ -f $dnsmasq ] || exit 0
+
+-# change this line if you want dnsmasq to serve an MX record for
+-# the host it is running on.
+-MAILHOSTNAME=""
+-# change this line if you want dns to get its upstream servers from
+-# somewhere other that /etc/resolv.conf
+-RESOLV_CONF=""
+-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from
+-# a dhcpd's lease file
+-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
+ DOMAIN_SUFFIX=`dnsdomainname`
+-
+-OPTIONS=""
+-
+-if [ ! -z "${MAILHOSTNAME}" ]; then
+- OPTIONS="$OPTIONS -m $MAILHOSTNAME"
+-fi
+-
+-if [ ! -z "${RESOLV_CONF}" ]; then
+- OPTIONS="$OPTIONS -r $RESOLV_CONF"
+-fi
+-
+-if [ ! -z "${DHCP_LEASE}" ]; then
+- OPTIONS="$OPTIONS -l $DHCP_LEASE"
+-fi
+-
+ if [ ! -z "${DOMAIN_SUFFIX}" ]; then
+- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX"
++ OPTIONS="-s $DOMAIN_SUFFIX"
+ fi
+
+ RETVAL=0
+@@ -72,7 +48,13 @@
+ status dnsmasq
+ RETVAL=$?
+ ;;
+- restart|reload)
++ reload)
++ echo -n "Reloading dnsmasq: "
++ killproc dnsmasq -HUP
++ RETVAL=$?
++ echo
++ ;;
++ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2
+++ dnsmasq.spec 2 May 2006 16:37:50 -0000 1.3
@@ -1,6 +1,6 @@
Name: dnsmasq
Version: 2.30
-Release: 3%{?dist}
+Release: 4.2%{?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}-%{version}-initscript...
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu...
+Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-confi...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{dist}" != ".fc3"
@@ -36,6 +37,7 @@
%patch0 -p1
%if "%{dist}" != ".fc3"
%patch1 -p1
+%patch2 -p1
%endif
%build
@@ -46,9 +48,12 @@
rm -rf $RPM_BUILD_ROOT
# 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%{_mandir}/man8 \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+ $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
+install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
@@ -73,13 +78,24 @@
%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0
-%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%{_initrddir}/dnsmasq
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*
%changelog
+* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-4.2
+- More upstream-recommended cleanups :)
+- Killed sysconfig file (provides unneeded functionality)
+- Tweaked init script a little more
+
+* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)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
+
* 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
17 years, 12 months
rpms/dnsmasq/FC-4 dnsmasq-2.30-dbus-config.patch, NONE, 1.1 dnsmasq-2.30-initscript.patch, 1.1, 1.2 dnsmasq.spec, 1.2, 1.3
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-serv16708/FC-4
Modified Files:
dnsmasq-2.30-initscript.patch dnsmasq.spec
Added Files:
dnsmasq-2.30-dbus-config.patch
Log Message:
Fixed bug #190379
Moved options from init script to sysconfig file
Added dbus configuration file
dnsmasq-2.30-dbus-config.patch:
--- NEW FILE dnsmasq-2.30-dbus-config.patch ---
diff -urN dnsmasq-2.30/dbus/dnsmasq.conf dnsmasq-2.30-patched/dbus/dnsmasq.conf
--- dnsmasq-2.30/dbus/dnsmasq.conf 1969-12-31 18:00:00.000000000 -0600
+++ dnsmasq-2.30-patched/dbus/dnsmasq.conf 2006-05-02 09:52:56.000000000 -0500
@@ -0,0 +1,16 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <policy user="root">
+ <allow own="uk.org.thekelleys.dnsmasq"/>
+ <allow send_destination="uk.org.thekelleys.dnsmasq"/>
+ <allow send_interface="uk.org.thekelleys.dnsmasq"/>
+ </policy>
+ <policy context="default">
+ <deny own="uk.org.thekelleys.dnsmasq"/>
+ <deny send_destination="uk.org.thekelleys.dnsmasq"/>
+ <deny send_interface="uk.org.thekelleys.dnsmasq"/>
+ </policy>
+</busconfig>
+
dnsmasq-2.30-initscript.patch:
Index: dnsmasq-2.30-initscript.patch
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq-2.30-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq-2.30-initscript.patch 27 Apr 2006 15:54:52 -0000 1.1
+++ dnsmasq-2.30-initscript.patch 2 May 2006 16:37:49 -0000 1.2
@@ -1,6 +1,6 @@
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
++++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 11:07:16.000000000 -0500
@@ -2,7 +2,7 @@
#
# Startup script for the DNS caching server
@@ -10,3 +10,53 @@
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid
+@@ -19,33 +19,9 @@
+ dnsmasq=/usr/sbin/dnsmasq
+ [ -f $dnsmasq ] || exit 0
+
+-# change this line if you want dnsmasq to serve an MX record for
+-# the host it is running on.
+-MAILHOSTNAME=""
+-# change this line if you want dns to get its upstream servers from
+-# somewhere other that /etc/resolv.conf
+-RESOLV_CONF=""
+-# change this if you want dnsmasq to cache any "hostname" or "client-hostname" from
+-# a dhcpd's lease file
+-DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
+ DOMAIN_SUFFIX=`dnsdomainname`
+-
+-OPTIONS=""
+-
+-if [ ! -z "${MAILHOSTNAME}" ]; then
+- OPTIONS="$OPTIONS -m $MAILHOSTNAME"
+-fi
+-
+-if [ ! -z "${RESOLV_CONF}" ]; then
+- OPTIONS="$OPTIONS -r $RESOLV_CONF"
+-fi
+-
+-if [ ! -z "${DHCP_LEASE}" ]; then
+- OPTIONS="$OPTIONS -l $DHCP_LEASE"
+-fi
+-
+ if [ ! -z "${DOMAIN_SUFFIX}" ]; then
+- OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX"
++ OPTIONS="-s $DOMAIN_SUFFIX"
+ fi
+
+ RETVAL=0
+@@ -72,7 +48,13 @@
+ status dnsmasq
+ RETVAL=$?
+ ;;
+- restart|reload)
++ reload)
++ echo -n "Reloading dnsmasq: "
++ killproc dnsmasq -HUP
++ RETVAL=$?
++ echo
++ ;;
++ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsmasq.spec 27 Apr 2006 15:54:52 -0000 1.2
+++ dnsmasq.spec 2 May 2006 16:37:49 -0000 1.3
@@ -1,6 +1,6 @@
Name: dnsmasq
Version: 2.30
-Release: 3%{?dist}
+Release: 4.2%{?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}-%{version}-initscript...
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu...
+Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-dbus-confi...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{dist}" != ".fc3"
@@ -36,6 +37,7 @@
%patch0 -p1
%if "%{dist}" != ".fc3"
%patch1 -p1
+%patch2 -p1
%endif
%build
@@ -46,9 +48,12 @@
rm -rf $RPM_BUILD_ROOT
# 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%{_mandir}/man8 \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+ $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
+install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
@@ -73,13 +78,24 @@
%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0
-%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%{_initrddir}/dnsmasq
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*
%changelog
+* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.30-4.2
+- More upstream-recommended cleanups :)
+- Killed sysconfig file (provides unneeded functionality)
+- Tweaked init script a little more
+
+* Tue May 2 2006 Patrick "Jima" Laughton <jima(a)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
+
* 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
17 years, 12 months
rpms/dnsmasq/FC-5 dnsmasq-2.33-enable-dbus.patch, NONE, 1.1 dnsmasq-2.33-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.5, 1.6 sources, 1.4, 1.5 dnsmasq-2.32-enable-dbus.patch, 1.1, NONE dnsmasq-2.32-initscript.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-serv7125/FC-5
Modified Files:
dnsmasq.spec sources
Added Files:
dnsmasq-2.33-enable-dbus.patch dnsmasq-2.33-initscript.patch
Removed Files:
dnsmasq-2.32-enable-dbus.patch dnsmasq-2.32-initscript.patch
Log Message:
Update, fixing for reduced buildroot
dnsmasq-2.33-enable-dbus.patch:
--- NEW FILE dnsmasq-2.33-enable-dbus.patch ---
diff -urN dnsmasq-2.33/src/config.h dnsmasq-2.33-patched/src/config.h
--- dnsmasq-2.33/src/config.h 2006-08-04 06:02:36.000000000 -0500
+++ dnsmasq-2.33-patched/src/config.h 2006-08-15 15:14:19.000000000 -0500
@@ -156,7 +156,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.33-initscript.patch:
--- NEW FILE dnsmasq-2.33-initscript.patch ---
diff -urN dnsmasq-2.33/rpm/dnsmasq.init dnsmasq-2.33-patched/rpm/dnsmasq.init
--- dnsmasq-2.33/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600
+++ dnsmasq-2.33-patched/rpm/dnsmasq.init 2006-08-15 15:12:17.000000000 -0500
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# Startup script for the DNS caching server
+#
+# chkconfig: - 99 01
+# description: This script starts your DNS caching server
+# processname: dnsmasq
+# pidfile: /var/run/dnsmasq.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+dnsmasq=/usr/sbin/dnsmasq
+[ -f $dnsmasq ] || exit 0
+
+DOMAIN_SUFFIX=`dnsdomainname`
+if [ ! -z "${DOMAIN_SUFFIX}" ]; then
+ OPTIONS="-s $DOMAIN_SUFFIX"
+fi
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+ start)
+ echo -n "Starting dnsmasq: "
+ daemon $dnsmasq $OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
+ ;;
+ stop)
+ if test "x`pidof dnsmasq`" != x; then
+ echo -n "Shutting down dnsmasq: "
+ killproc dnsmasq
+ fi
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid
+ ;;
+ status)
+ status dnsmasq
+ RETVAL=$?
+ ;;
+ reload)
+ echo -n "Reloading dnsmasq: "
+ killproc dnsmasq -HUP
+ RETVAL=$?
+ echo
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ condrestart)
+ if test "x`/sbin/pidof dnsmasq`" != x; then
+ $0 stop
+ $0 start
+ RETVAL=$?
+ fi
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
+
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dnsmasq.spec 12 Jun 2006 15:01:16 -0000 1.5
+++ dnsmasq.spec 15 Aug 2006 20:52:31 -0000 1.6
@@ -1,5 +1,5 @@
Name: dnsmasq
-Version: 2.32
+Version: 2.33
Release: 1%{?dist}
Summary: A lightweight DHCP/caching DNS server
@@ -15,7 +15,9 @@
BuildRequires: dbus-devel
%endif
-Requires(post): /sbin/chkconfig
+BuildRequires: pkgconfig
+
+Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
@@ -46,9 +48,9 @@
rm -rf $RPM_BUILD_ROOT
# 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}/dbus-1/system.d
+ $RPM_BUILD_ROOT%{_mandir}/man8 \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+ $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
%if "%fedora" > "3" || "%aurora" > "2"
@@ -88,6 +90,10 @@
%changelog
+* Tue Aug 15 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.33-1
+- Update
+- Added pkgconfig BuildReq due to reduced buildroot
+
* Mon Jun 12 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.32-1
- Update from upstream
- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 Jun 2006 15:01:16 -0000 1.4
+++ sources 15 Aug 2006 20:52:31 -0000 1.5
@@ -1 +1 @@
-d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz
+45696461b6e6bc929273b1191ca50447 dnsmasq-2.33.tar.gz
--- dnsmasq-2.32-enable-dbus.patch DELETED ---
--- dnsmasq-2.32-initscript.patch DELETED ---
17 years, 8 months
rpms/dnsmasq/FC-3 dnsmasq-2.32-enable-dbus.patch, NONE, 1.1 dnsmasq-2.32-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.10, 1.11 sources, 1.3, 1.4 dnsmasq-2.31-enable-dbus.patch, 1.1, NONE dnsmasq-2.31-initscript.patch, 1.1, 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-serv12360/FC-3
Modified Files:
dnsmasq.spec sources
Added Files:
dnsmasq-2.32-enable-dbus.patch dnsmasq-2.32-initscript.patch
Removed Files:
dnsmasq-2.31-enable-dbus.patch dnsmasq-2.31-initscript.patch
Log Message:
Update to 2.32
dnsmasq-2.32-enable-dbus.patch:
--- NEW FILE dnsmasq-2.32-enable-dbus.patch ---
diff -urN dnsmasq-2.32/src/config.h dnsmasq-2.32-patched/src/config.h
--- dnsmasq-2.32/src/config.h 2006-06-09 14:52:06.000000000 -0500
+++ dnsmasq-2.32-patched/src/config.h 2006-06-12 09:07:08.000000000 -0500
@@ -156,7 +156,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.32-initscript.patch:
--- NEW FILE dnsmasq-2.32-initscript.patch ---
diff -urN dnsmasq-2.32/rpm/dnsmasq.init dnsmasq-2.32-patched/rpm/dnsmasq.init
--- dnsmasq-2.32/rpm/dnsmasq.init 1969-12-31 18:00:00.000000000 -0600
+++ dnsmasq-2.32-patched/rpm/dnsmasq.init 2006-06-12 09:06:09.000000000 -0500
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# Startup script for the DNS caching server
+#
+# chkconfig: - 99 01
+# description: This script starts your DNS caching server
+# processname: dnsmasq
+# pidfile: /var/run/dnsmasq.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+dnsmasq=/usr/sbin/dnsmasq
+[ -f $dnsmasq ] || exit 0
+
+DOMAIN_SUFFIX=`dnsdomainname`
+if [ ! -z "${DOMAIN_SUFFIX}" ]; then
+ OPTIONS="-s $DOMAIN_SUFFIX"
+fi
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+ start)
+ echo -n "Starting dnsmasq: "
+ daemon $dnsmasq $OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
+ ;;
+ stop)
+ if test "x`pidof dnsmasq`" != x; then
+ echo -n "Shutting down dnsmasq: "
+ killproc dnsmasq
+ fi
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid
+ ;;
+ status)
+ status dnsmasq
+ RETVAL=$?
+ ;;
+ reload)
+ echo -n "Reloading dnsmasq: "
+ killproc dnsmasq -HUP
+ RETVAL=$?
+ echo
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ condrestart)
+ if test "x`/sbin/pidof dnsmasq`" != x; then
+ $0 stop
+ $0 start
+ RETVAL=$?
+ fi
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
+
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dnsmasq.spec 15 May 2006 16:14:15 -0000 1.10
+++ dnsmasq.spec 12 Jun 2006 15:01:13 -0000 1.11
@@ -1,6 +1,6 @@
Name: dnsmasq
-Version: 2.31
-Release: 1%{?dist}.1
+Version: 2.32
+Release: 1%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -88,7 +88,8 @@
%changelog
-* Mon May 15 2006 Patrick "Jima" Laughton <jima(a)fedoraproject.org> 2.31-1.fc3.1
+* Mon Jun 12 2006 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.32-1
+- Update from upstream
- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
* Mon May 8 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.31-1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 May 2006 17:05:40 -0000 1.3
+++ sources 12 Jun 2006 15:01:13 -0000 1.4
@@ -1 +1 @@
-26932aec55865b5b4ffe53e7abcf9396 dnsmasq-2.31.tar.gz
+d1f593a8352db1d6ad3dccc9b775295d dnsmasq-2.32.tar.gz
--- dnsmasq-2.31-enable-dbus.patch DELETED ---
--- dnsmasq-2.31-initscript.patch DELETED ---
17 years, 10 months
rpms/dnsmasq/F-12 .cvsignore, 1.27, 1.28 dnsmasq.init, 1.1, 1.2 dnsmasq.spec, 1.43, 1.44 import.log, 1.1, 1.2 sources, 1.27, 1.28
by Itamar Reis Peixoto
Author: itamarjp
Update of /cvs/pkgs/rpms/dnsmasq/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24330/F-12
Modified Files:
.cvsignore dnsmasq.init dnsmasq.spec import.log sources
Log Message:
- new version + some bug fix
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore 19 Nov 2009 07:47:15 -0000 1.27
+++ .cvsignore 26 Jan 2010 17:23:42 -0000 1.28
@@ -1 +1 @@
-dnsmasq-2.51.tar.lzma
+dnsmasq-2.52.tar.lzma
Index: dnsmasq.init
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/dnsmasq.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dnsmasq.init 19 Nov 2009 07:47:16 -0000 1.1
+++ dnsmasq.init 26 Jan 2010 17:23:42 -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
;;
@@ -60,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/F-12/dnsmasq.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- dnsmasq.spec 19 Nov 2009 07:47:16 -0000 1.43
+++ dnsmasq.spec 26 Jan 2010 17:23:42 -0000 1.44
@@ -10,7 +10,7 @@
%endif
Name: dnsmasq
-Version: 2.51
+Version: 2.52
Release: 1%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
@@ -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,14 @@ 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
+
* 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
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 19 Nov 2009 07:47:16 -0000 1.1
+++ import.log 26 Jan 2010 17:23:42 -0000 1.2
@@ -1 +1,2 @@
dnsmasq-2_51-1_fc12:F-12:dnsmasq-2.51-1.fc12.src.rpm:1258616775
+dnsmasq-2_52-1_fc13:F-12:dnsmasq-2.52-1.fc13.src.rpm:1264526528
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/F-12/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources 19 Nov 2009 07:47:16 -0000 1.27
+++ sources 26 Jan 2010 17:23:42 -0000 1.28
@@ -1 +1 @@
-0f048f3fd1f3888876867809d162cd89 dnsmasq-2.51.tar.lzma
+2d156f322564fdd71ad238040cd607ac dnsmasq-2.52.tar.lzma
14 years, 3 months
rpms/dnsmasq/devel dnsmasq-2.30-fedora-extras.patch, NONE, 1.1 dnsmasq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11222/devel
Modified Files:
.cvsignore sources
Added Files:
dnsmasq-2.30-fedora-extras.patch dnsmasq.spec
Log Message:
auto-import dnsmasq-2.30-2 on branch devel from dnsmasq-2.30-2.src.rpm
dnsmasq-2.30-fedora-extras.patch:
--- NEW FILE dnsmasq-2.30-fedora-extras.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
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-24 15:04:28.000000000 -0500
@@ -167,8 +167,8 @@
/* platform independent options- uncomment to enable */
/* #define HAVE_BROKEN_RTC */
-/* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_ISC_READER
+#define HAVE_DBUS
#if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
# error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC
--- NEW FILE dnsmasq.spec ---
Name: dnsmasq
Version: 2.30
Release: 2%{?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...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
%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
%setup -q
%patch0 -p1
%build
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
# 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
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/chkconfig --add dnsmasq
%preun
if [ $1 = 0 ]; then # execute this only if we are NOT doing an upgrade
service dnsmasq stop >/dev/null 2>&1
/sbin/chkconfig --del dnsmasq
fi
%postun
if [ "$1" -ge "1" ]; then
service dnsmasq restart >/dev/null 2>&1
fi
%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0
%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf
%{_initrddir}/dnsmasq
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*
%changelog
* Mon Apr 24 2006 Patrick 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
- Initial Fedora Extras RPM
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Apr 2006 16:50:36 -0000 1.1
+++ .cvsignore 25 Apr 2006 16:51:25 -0000 1.2
@@ -0,0 +1 @@
+dnsmasq-2.30.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Apr 2006 16:50:36 -0000 1.1
+++ sources 25 Apr 2006 16:51:25 -0000 1.2
@@ -0,0 +1 @@
+91db9ef2c63269debf7794783074b751 dnsmasq-2.30.tar.gz
18 years
[dnsmasq] Applied J��hann's patch, minor cleanup
by Patrick Laughton
commit a4a3c3269d60960a3cabeb78c4f9c5bf2116843d
Author: Patrick Laughton <jima(a)fedoraproject.org>
Date: Mon Aug 8 16:21:55 2011 -0500
Applied Jóhann's patch, minor cleanup
* Thu Jul 26 2011 Jóhann B. Guðmundsson <johannbg(a)gmail.com> - 2.52-3
- Introduce systemd unit file, drop SysV support
dnsmasq.init | 77 ----------------------------------------------------------
dnsmasq.spec | 66 +++++++++++++++++++++++++++----------------------
2 files changed, 36 insertions(+), 107 deletions(-)
---
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 7fb794d..e5b50e7 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -11,24 +11,24 @@
Name: dnsmasq
Version: 2.52
-Release: 2%{?extraversion}%{?dist}
+Release: 3%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
License: GPLv2 or GPLv3
URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
-Source1: %{name}.init
+Source1: %{name}.service
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
BuildRequires: pkgconfig
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(post): initscripts
+BuildRequires: systemd-units
+Requires(post): systemd-units systemd-sysv chkconfig
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
%description
Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server.
@@ -71,40 +71,40 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
-install -Dp -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+# Systemd
+mkdir -p %{buildroot}%{_unitdir}
+install -m644 %{SOURCE1} %{buildroot}%{_unitdir}
+rm -rf %{buildroot}%{_initrddir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
-if [ "$1" = "2" ]; then # if we're being upgraded
- # 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
- /sbin/service dnsmasq condrestart >/dev/null 2>&1 || :
-else # if we're being installed
- /sbin/chkconfig --add dnsmasq
+if [ $1 -eq 1 ] ; then
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%preun
-if [ "$1" = "0" ]; then # execute this only if we are NOT doing an upgrade
- /sbin/service dnsmasq stop >/dev/null 2>&1 || :
- /sbin/chkconfig --del dnsmasq
+if [ $1 -eq 0 ]; then
+ /bin/systemctl --no-reload dnsmasq.service > /dev/null 2>&1 || :
+ /bin/systemctl stop dnsmasq.service > /dev/null 2>&1 || :
fi
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ /bin/systemctl try-restart dnsmasq.service >/dev/null 2>&1 || :
+fi
+
+%triggerun -- dnsmasq < 2.52-3
+%{_bindir}/systemd-sysv-convert --save dnsmasq >/dev/null 2>&1 ||:
+/bin/systemctl enable dnsmasq.service >/dev/null 2>&1
+/sbin/chkconfig --del dnsmasq >/dev/null 2>&1 || :
+/bin/systemctl try-restart dnsmasq.service >/dev/null 2>&1 || :
+
%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
@@ -112,12 +112,18 @@ fi
%dir /etc/dnsmasq.d
%dir %{_var}/lib/dnsmasq
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
-%{_initrddir}/dnsmasq
+%{_unitdir}/%{name}.service
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*
%changelog
+* Mon Aug 08 2011 Patrick "Jima" Laughton <jima(a)fedoraproject.org> - 2.52-3
+- Applied Jóhann's patch, minor cleanup
+
+* Thu Jul 26 2011 Jóhann B. Guðmundsson <johannbg(a)gmail.com> - 2.52-3
+- Introduce systemd unit file, drop SysV support
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.52-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 8 months
pavlix pushed to dnsmasq (f23). "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
---
.gitignore | 1 +
dnsmasq-2.72-configuration.patch | 10 ----------
dnsmasq.spec | 12 +++++-------
sources | 2 +-
4 files changed, 7 insertions(+), 18 deletions(-)
delete mode 100644 dnsmasq-2.72-configuration.patch
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.11.2
http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=f23&id=68c179ea5...
8 years, 6 months
pavlix pushed to dnsmasq (f22). "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
---
.gitignore | 1 +
dnsmasq-2.72-configuration.patch | 10 ----------
dnsmasq.spec | 12 +++++-------
sources | 2 +-
4 files changed, 7 insertions(+), 18 deletions(-)
delete mode 100644 dnsmasq-2.72-configuration.patch
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.11.2
http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=f22&id=68c179ea5...
8 years, 6 months
pavlix pushed to dnsmasq (f21). "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
---
.gitignore | 1 +
dnsmasq-2.72-configuration.patch | 10 ----------
dnsmasq.spec | 12 +++++-------
sources | 2 +-
4 files changed, 7 insertions(+), 18 deletions(-)
delete mode 100644 dnsmasq-2.72-configuration.patch
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.11.2
http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=f21&id=68c179ea5...
8 years, 6 months