rpms/dnsmasq/devel dnsmasq-2.30-initscript.patch, 1.2, 1.3 dnsmasq.spec, 1.3, 1.4
Patrick Laughton (jima)
fedora-extras-commits at redhat.com
Tue May 2 16:19:59 UTC 2006
Author: jima
Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510/devel
Modified Files:
dnsmasq-2.30-initscript.patch dnsmasq.spec
Log Message:
More upstream-recommended cleanups :)
dnsmasq-2.30-initscript.patch:
Index: dnsmasq-2.30-initscript.patch
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq-2.30-initscript.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsmasq-2.30-initscript.patch 2 May 2006 15:51:01 -0000 1.2
+++ dnsmasq-2.30-initscript.patch 2 May 2006 16:19:59 -0000 1.3
@@ -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-05-02 09:35:27.000000000 -0500
-+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh 2006-05-02 09:48:47.000000000 -0500
+--- dnsmasq-2.30/rpm/dnsmasq.rh 2006-04-23 08:26:21.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,7 +10,7 @@
# description: This script starts your DNS caching server
# processname: dnsmasq
# pidfile: /var/run/dnsmasq.pid
-@@ -19,19 +19,10 @@
+@@ -19,33 +19,9 @@
dnsmasq=/usr/sbin/dnsmasq
[ -f $dnsmasq ] || exit 0
@@ -23,17 +23,29 @@
-# 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`
+ DOMAIN_SUFFIX=`dnsdomainname`
-
-OPTIONS=""
-+# source /etc/sysconfig/dnsmasq if it exists
-+[ -f /etc/sysconfig/dnsmasq ] && . /etc/sysconfig/dnsmasq
-
-+# apply options from /etc/sysconfig/dnsmasq if they're set
- if [ ! -z "${MAILHOSTNAME}" ]; then
- OPTIONS="$OPTIONS -m $MAILHOSTNAME"
+-
+-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
-@@ -72,7 +63,13 @@
+
+ RETVAL=0
+@@ -72,7 +48,13 @@
status dnsmasq
RETVAL=$?
;;
@@ -48,20 +60,3 @@
$0 stop
$0 start
RETVAL=$?
-diff -urN dnsmasq-2.30/rpm/dnsmasq.sysconfig dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig
---- dnsmasq-2.30/rpm/dnsmasq.sysconfig 1969-12-31 18:00:00.000000000 -0600
-+++ dnsmasq-2.30-patched/rpm/dnsmasq.sysconfig 2006-05-02 09:49:42.000000000 -0500
-@@ -0,0 +1,13 @@
-+# 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
-+# (deprecated!)
-+#DHCP_LEASE="/var/lib/dhcp/dhcpd.leases"
-+DOMAIN_SUFFIX=`dnsdomainname`
-+# other options?
-+OPTIONS=""
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dnsmasq.spec 2 May 2006 15:51:01 -0000 1.3
+++ dnsmasq.spec 2 May 2006 16:19:59 -0000 1.4
@@ -1,6 +1,6 @@
Name: dnsmasq
Version: 2.30
-Release: 4%{?dist}
+Release: 4.1%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -34,10 +34,10 @@
%prep
%setup -q
-%patch0 -p1
+#%patch0 -p1
%if "%{dist}" != ".fc3"
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
+#%patch2 -p1
%endif
%build
@@ -53,7 +53,6 @@
$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 rpm/dnsmasq.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dnsmasq
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/
@@ -80,7 +79,6 @@
%defattr(-,root,root,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/dnsmasq
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%{_initrddir}/dnsmasq
%{_sbindir}/dnsmasq
@@ -88,6 +86,11 @@
%changelog
+* Tue May 2 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-4.1
+- More upstream-recommended cleanups :)
+- Killed sysconfig file (provides unneeded functionality)
+- Tweaked init script a little more
+
* Tue May 2 2006 Patrick "Jima" Laughton <jima at 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
More information about the fedora-extras-commits
mailing list