Author: jue Date: 2006-01-15 12:30:38 +0100 (Sun, 15 Jan 2006) New Revision: 569 Added: crux-2.1/ports/opt/dnsmasq/dnsmasq-2.25.patch Removed: crux-2.1/ports/opt/dnsmasq/dnsmasq-2.24.patch Modified: crux-2.1/ports/opt/dnsmasq/.md5sum crux-2.1/ports/opt/dnsmasq/Pkgfile Log: dnsmasq: update to 2.25 Modified: crux-2.1/ports/opt/dnsmasq/.md5sum =================================================================== --- crux-2.1/ports/opt/dnsmasq/.md5sum 2006-01-14 23:48:51 UTC (rev 568) +++ crux-2.1/ports/opt/dnsmasq/.md5sum 2006-01-15 11:30:38 UTC (rev 569) @@ -1,3 +1,3 @@ 90efed52fc4fab31022bd8e1f8d69eb5 dnsmasq -e74cbc3246aa814d923c2583112324a2 dnsmasq-2.24.patch -d269531be1f130ab642c71c593138d31 dnsmasq-2.24.tar.gz +e74cbc3246aa814d923c2583112324a2 dnsmasq-2.25.patch +a5a387aed551acf91990567a5e8e4fa4 dnsmasq-2.25.tar.gz Modified: crux-2.1/ports/opt/dnsmasq/Pkgfile =================================================================== --- crux-2.1/ports/opt/dnsmasq/Pkgfile 2006-01-14 23:48:51 UTC (rev 568) +++ crux-2.1/ports/opt/dnsmasq/Pkgfile 2006-01-15 11:30:38 UTC (rev 569) @@ -4,16 +4,18 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=dnsmasq -version=2.24 +version=2.25 release=1 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.gz \ $name-$version.patch dnsmasq) build () { cd $name-$version + patch -p1 < $SRC/$name-$version.patch make make PREFIX=$PKG/usr install + install -D -m 755 $SRC/dnsmasq $PKG/etc/rc.d/dnsmasq install -m 644 dnsmasq.conf.example $PKG/etc/dnsmasq.conf install -d $PKG/var/lib/dhcp Deleted: crux-2.1/ports/opt/dnsmasq/dnsmasq-2.24.patch =================================================================== --- crux-2.1/ports/opt/dnsmasq/dnsmasq-2.24.patch 2006-01-14 23:48:51 UTC (rev 568) +++ crux-2.1/ports/opt/dnsmasq/dnsmasq-2.24.patch 2006-01-15 11:30:38 UTC (rev 569) @@ -1,55 +0,0 @@ -diff -Nru dnsmasq-2.24.orig/Makefile dnsmasq-2.24/Makefile ---- dnsmasq-2.24.orig/Makefile 2005-11-27 09:54:12.000000000 +0100 -+++ dnsmasq-2.24/Makefile 2005-11-27 09:55:51.000000000 +0100 -@@ -1,6 +1,6 @@ - PREFIX?=/usr/local - BINDIR = ${PREFIX}/sbin --MANDIR = ${PREFIX}/share/man -+MANDIR = ${PREFIX}/man - LOCALEDIR = ${PREFIX}/share/locale - - SRC = src -diff -Nru dnsmasq-2.24.orig/dnsmasq.conf.example dnsmasq-2.24/dnsmasq.conf.example ---- dnsmasq-2.24.orig/dnsmasq.conf.example 2005-11-27 09:54:12.000000000 +0100 -+++ dnsmasq-2.24/dnsmasq.conf.example 2005-11-27 09:55:08.000000000 +0100 -@@ -59,8 +59,8 @@ - - # If you want dnsmasq to change uid and gid to something other - # than the default, edit the following lines. --#user= --#group= -+user=nobody -+group=nobody - - # If you want dnsmasq to listen for DHCP and DNS requests only on - # specified interfaces (and the loopback) give the name of the -@@ -262,7 +262,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. --#dhcp-leasefile=/var/lib/misc/dnsmasq.leases -+# dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases - - # 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, -diff -Nru dnsmasq-2.24.orig/src/config.h dnsmasq-2.24/src/config.h ---- dnsmasq-2.24.orig/src/config.h 2005-11-27 09:54:12.000000000 +0100 -+++ dnsmasq-2.24/src/config.h 2005-11-27 09:55:08.000000000 +0100 -@@ -35,7 +35,7 @@ - #if defined(__FreeBSD__) || defined (__OpenBSD__) - # define LEASEFILE "/var/db/dnsmasq.leases" - #else --# define LEASEFILE "/var/lib/misc/dnsmasq.leases" -+# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases" - #endif - #if defined(__FreeBSD__) - # define CONFFILE "/usr/local/etc/dnsmasq.conf" -@@ -44,7 +44,7 @@ - #endif - #define DEFLEASE 3600 /* default lease time, 1 hour */ - #define CHUSER "nobody" --#define CHGRP "dip" -+#define CHGRP "nobody" - #define IP6INTERFACES "/proc/net/if_inet6" - #define UPTIME "/proc/uptime" - #define DHCP_SERVER_PORT 67 Copied: crux-2.1/ports/opt/dnsmasq/dnsmasq-2.25.patch (from rev 555, crux-2.1/ports/opt/dnsmasq/dnsmasq-2.24.patch)