- Dropped patch for newer glibc (merged upstream)
This commit is contained in:
Patrick Laughton
parent
ce211c7e6f
commit
3d10ffe3e5
@ -1,52 +1,19 @@
|
||||
diff -up dnsmasq-2.41test20/src/config.h.orig dnsmasq-2.41test20/src/config.h
|
||||
--- dnsmasq-2.41test20/src/config.h.orig 2007-11-27 14:09:01.000000000 -0600
|
||||
+++ dnsmasq-2.41test20/src/config.h 2007-12-04 08:21:49.000000000 -0600
|
||||
@@ -42,7 +42,7 @@
|
||||
#elif defined(__sun__)
|
||||
# define LEASEFILE "/var/cache/dnsmasq.leases"
|
||||
#else
|
||||
-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
||||
+# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases"
|
||||
#endif
|
||||
#if defined(__FreeBSD__)
|
||||
# define CONFFILE "/usr/local/etc/dnsmasq.conf"
|
||||
@@ -182,7 +182,7 @@ NOTES:
|
||||
#define HAVE_TFTP
|
||||
/* #define HAVE_BROKEN_RTC */
|
||||
/* #define HAVE_ISC_READER */
|
||||
-/* #define HAVE_DBUS */
|
||||
+#define HAVE_DBUS
|
||||
diff -urN dnsmasq-2.43/contrib/dnslist/dnslist.pl dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl
|
||||
--- dnsmasq-2.43/contrib/dnslist/dnslist.pl 2008-06-02 13:58:52.000000000 -0500
|
||||
+++ dnsmasq-2.43-patched/contrib/dnslist/dnslist.pl 2008-07-16 14:23:16.000000000 -0500
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
#if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
|
||||
# error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC
|
||||
diff -up dnsmasq-2.41test20/man/es/dnsmasq.8.orig dnsmasq-2.41test20/man/es/dnsmasq.8
|
||||
--- dnsmasq-2.41test20/man/es/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600
|
||||
+++ dnsmasq-2.41test20/man/es/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600
|
||||
@@ -1075,7 +1075,7 @@ un CPU de 1GHz y aproximadamente 60MB de
|
||||
|
||||
.IR /etc/ethers
|
||||
|
||||
-.IR /var/lib/misc/dnsmasq.leases
|
||||
+.IR /var/lib/dnsmasq/dnsmasq.leases
|
||||
|
||||
.IR /var/db/dnsmasq.leases
|
||||
|
||||
diff -up dnsmasq-2.41test20/man/dnsmasq.8.orig dnsmasq-2.41test20/man/dnsmasq.8
|
||||
--- dnsmasq-2.41test20/man/dnsmasq.8.orig 2007-11-27 14:09:01.000000000 -0600
|
||||
+++ dnsmasq-2.41test20/man/dnsmasq.8 2007-12-04 08:33:07.000000000 -0600
|
||||
@@ -1070,7 +1070,7 @@ file needs a 1GHz processor and about 60
|
||||
|
||||
.IR /etc/ethers
|
||||
|
||||
-.IR /var/lib/misc/dnsmasq.leases
|
||||
+.IR /var/lib/dnsmasq/dnsmasq.leases
|
||||
|
||||
.IR /var/db/dnsmasq.leases
|
||||
|
||||
diff -up dnsmasq-2.41test20/dnsmasq.conf.example.orig dnsmasq-2.41test20/dnsmasq.conf.example
|
||||
--- dnsmasq-2.41test20/dnsmasq.conf.example.orig 2007-11-27 14:09:01.000000000 -0600
|
||||
+++ dnsmasq-2.41test20/dnsmasq.conf.example 2007-12-04 08:44:16.000000000 -0600
|
||||
@@ -344,7 +344,7 @@
|
||||
# Location of state file. (This is the dnsmasq default.)
|
||||
# Change with -s <file>
|
||||
-my $dnsmasq_state_file = '/var/lib/misc/dnsmasq.leases';
|
||||
+my $dnsmasq_state_file = '/var/lib/dnsmasq/dnsmasq.leases';
|
||||
# Location of template. (Assumed to be in current directory.)
|
||||
# Change with -t <file>
|
||||
my $html_template_file = 'dnslist.tt2';
|
||||
diff -urN dnsmasq-2.43/dnsmasq.conf.example dnsmasq-2.43-patched/dnsmasq.conf.example
|
||||
--- dnsmasq-2.43/dnsmasq.conf.example 2008-06-02 13:58:52.000000000 -0500
|
||||
+++ dnsmasq-2.43-patched/dnsmasq.conf.example 2008-07-16 14:23:29.000000000 -0500
|
||||
@@ -351,7 +351,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.
|
||||
@ -55,9 +22,60 @@ diff -up dnsmasq-2.41test20/dnsmasq.conf.example.orig dnsmasq-2.41test20/dnsmasq
|
||||
|
||||
# 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,
|
||||
@@ -461,4 +461,4 @@
|
||||
diff -urN dnsmasq-2.43/man/dnsmasq.8 dnsmasq-2.43-patched/man/dnsmasq.8
|
||||
--- dnsmasq-2.43/man/dnsmasq.8 2008-07-10 10:48:14.000000000 -0500
|
||||
+++ dnsmasq-2.43-patched/man/dnsmasq.8 2008-07-16 14:22:35.000000000 -0500
|
||||
@@ -1116,7 +1116,7 @@
|
||||
|
||||
# Include a another lot of configuration options.
|
||||
#conf-file=/etc/dnsmasq.more.conf
|
||||
-#conf-dir=/etc/dnsmasq.d
|
||||
+conf-dir=/etc/dnsmasq.d
|
||||
.IR /etc/ethers
|
||||
|
||||
-.IR /var/lib/misc/dnsmasq.leases
|
||||
+.IR /var/lib/dnsmasq/dnsmasq.leases
|
||||
|
||||
.IR /var/db/dnsmasq.leases
|
||||
|
||||
diff -urN dnsmasq-2.43/man/es/dnsmasq.8 dnsmasq-2.43-patched/man/es/dnsmasq.8
|
||||
--- dnsmasq-2.43/man/es/dnsmasq.8 2008-06-02 13:58:52.000000000 -0500
|
||||
+++ dnsmasq-2.43-patched/man/es/dnsmasq.8 2008-07-16 14:22:48.000000000 -0500
|
||||
@@ -1145,7 +1145,7 @@
|
||||
|
||||
.IR /etc/ethers
|
||||
|
||||
-.IR /var/lib/misc/dnsmasq.leases
|
||||
+.IR /var/lib/dnsmasq/dnsmasq.leases
|
||||
|
||||
.IR /var/db/dnsmasq.leases
|
||||
|
||||
diff -urN dnsmasq-2.43/man/fr/dnsmasq.8 dnsmasq-2.43-patched/man/fr/dnsmasq.8
|
||||
--- dnsmasq-2.43/man/fr/dnsmasq.8 2008-07-11 03:28:28.000000000 -0500
|
||||
+++ dnsmasq-2.43-patched/man/fr/dnsmasq.8 2008-07-16 14:22:54.000000000 -0500
|
||||
@@ -1280,7 +1280,7 @@
|
||||
|
||||
.IR /etc/ethers
|
||||
|
||||
-.IR /var/lib/misc/dnsmasq.leases
|
||||
+.IR /var/lib/dnsmasq/dnsmasq.leases
|
||||
|
||||
.IR /var/db/dnsmasq.leases
|
||||
|
||||
diff -urN dnsmasq-2.43/src/config.h dnsmasq-2.43-patched/src/config.h
|
||||
--- dnsmasq-2.43/src/config.h 2008-07-11 03:44:17.000000000 -0500
|
||||
+++ dnsmasq-2.43-patched/src/config.h 2008-07-16 14:21:02.000000000 -0500
|
||||
@@ -43,7 +43,7 @@
|
||||
#elif defined(__sun__) || defined (__sun)
|
||||
# define LEASEFILE "/var/cache/dnsmasq.leases"
|
||||
#else
|
||||
-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
||||
+# define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases"
|
||||
#endif
|
||||
#if defined(__FreeBSD__)
|
||||
# define CONFFILE "/usr/local/etc/dnsmasq.conf"
|
||||
@@ -167,7 +167,7 @@
|
||||
#define HAVE_TFTP
|
||||
/* #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
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
Name: dnsmasq
|
||||
Version: 2.43
|
||||
Release: 1%{?extraversion}%{?dist}
|
||||
Release: 2%{?extraversion}%{?dist}
|
||||
Summary: A lightweight DHCP/caching DNS server
|
||||
|
||||
Group: System Environment/Daemons
|
||||
@ -20,7 +20,6 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
|
||||
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?extraversion}.tar.gz
|
||||
Patch0: %{name}-2.33-initscript.patch
|
||||
Patch1: %{name}-configuration.patch
|
||||
Patch2: %{name}-newglibc.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: dbus-devel
|
||||
@ -47,7 +46,6 @@ machines.
|
||||
%setup -q -n %{name}-%{version}%{?extraversion}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags}
|
||||
@ -111,8 +109,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 16 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.43-1
|
||||
* Wed Jul 16 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.43-2
|
||||
- New upstream release, contains fixes for CVE-2008-1447/CERT VU#800113
|
||||
- Dropped patch for newer glibc (merged upstream)
|
||||
|
||||
* Wed Feb 13 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.41-0.8
|
||||
- Added upstream-authored patch for newer glibc (thanks Simon!)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user