Author: jue Date: 2006-03-18 09:53:58 +0100 (Sat, 18 Mar 2006) New Revision: 961 Added: crux-2.1/ports/opt/dnsmasq/dnsmasq-config.patch crux-2.2/ports/opt/dnsmasq/dnsmasq-config.patch Removed: crux-2.1/ports/opt/dnsmasq/dnsmasq-2.26.patch crux-2.2/ports/opt/dnsmasq/dnsmasq-2.26.patch Modified: crux-2.1/ports/opt/dnsmasq/.md5sum crux-2.1/ports/opt/dnsmasq/Pkgfile crux-2.2/ports/opt/dnsmasq/.md5sum crux-2.2/ports/opt/dnsmasq/Pkgfile Log: dnsmasq: update to 2.27 Modified: crux-2.1/ports/opt/dnsmasq/.md5sum =================================================================== --- crux-2.1/ports/opt/dnsmasq/.md5sum 2006-03-18 08:38:49 UTC (rev 960) +++ crux-2.1/ports/opt/dnsmasq/.md5sum 2006-03-18 08:53:58 UTC (rev 961) @@ -1,3 +1,3 @@ 90efed52fc4fab31022bd8e1f8d69eb5 dnsmasq -e74cbc3246aa814d923c2583112324a2 dnsmasq-2.26.patch -ae04abb5db4a8cc43c24f432f0c44d5c dnsmasq-2.26.tar.gz +489198ec87101087043adc98bbe062dc dnsmasq-2.27.tar.gz +b9f04d55b69e12b47439497f0902eca7 dnsmasq-config.patch Modified: crux-2.1/ports/opt/dnsmasq/Pkgfile =================================================================== --- crux-2.1/ports/opt/dnsmasq/Pkgfile 2006-03-18 08:38:49 UTC (rev 960) +++ crux-2.1/ports/opt/dnsmasq/Pkgfile 2006-03-18 08:53:58 UTC (rev 961) @@ -4,15 +4,15 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=dnsmasq -version=2.26 +version=2.27 release=1 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.gz \ - $name-$version.patch dnsmasq) + $name-config.patch dnsmasq) build () { cd $name-$version - patch -p1 < $SRC/$name-$version.patch + patch -p1 < $SRC/$name-config.patch make make PREFIX=$PKG/usr install Deleted: crux-2.1/ports/opt/dnsmasq/dnsmasq-2.26.patch =================================================================== --- crux-2.1/ports/opt/dnsmasq/dnsmasq-2.26.patch 2006-03-18 08:38:49 UTC (rev 960) +++ crux-2.1/ports/opt/dnsmasq/dnsmasq-2.26.patch 2006-03-18 08:53:58 UTC (rev 961) @@ -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-config.patch (from rev 953, crux-2.1/ports/opt/dnsmasq/dnsmasq-2.26.patch) =================================================================== --- crux-2.1/ports/opt/dnsmasq/dnsmasq-2.26.patch 2006-03-16 17:58:52 UTC (rev 953) +++ crux-2.1/ports/opt/dnsmasq/dnsmasq-config.patch 2006-03-18 08:53:58 UTC (rev 961) @@ -0,0 +1,55 @@ +diff -Nru dnsmasq-2.27.orig/Makefile dnsmasq-2.27/Makefile +--- dnsmasq-2.27.orig/Makefile 2006-03-17 10:29:17.000000000 +0100 ++++ dnsmasq-2.27/Makefile 2006-03-17 10:29:33.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.27.orig/dnsmasq.conf.example dnsmasq-2.27/dnsmasq.conf.example +--- dnsmasq-2.27.orig/dnsmasq.conf.example 2006-03-17 10:29:17.000000000 +0100 ++++ dnsmasq-2.27/dnsmasq.conf.example 2006-03-17 10:29:36.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 +@@ -273,7 +273,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.27.orig/src/config.h dnsmasq-2.27/src/config.h +--- dnsmasq-2.27.orig/src/config.h 2006-03-17 10:29:17.000000000 +0100 ++++ dnsmasq-2.27/src/config.h 2006-03-17 10:29:37.000000000 +0100 +@@ -36,7 +36,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" +@@ -45,7 +45,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 Modified: crux-2.2/ports/opt/dnsmasq/.md5sum =================================================================== --- crux-2.2/ports/opt/dnsmasq/.md5sum 2006-03-18 08:38:49 UTC (rev 960) +++ crux-2.2/ports/opt/dnsmasq/.md5sum 2006-03-18 08:53:58 UTC (rev 961) @@ -1,3 +1,3 @@ 90efed52fc4fab31022bd8e1f8d69eb5 dnsmasq -e74cbc3246aa814d923c2583112324a2 dnsmasq-2.26.patch -ae04abb5db4a8cc43c24f432f0c44d5c dnsmasq-2.26.tar.gz +489198ec87101087043adc98bbe062dc dnsmasq-2.27.tar.gz +b9f04d55b69e12b47439497f0902eca7 dnsmasq-config.patch Modified: crux-2.2/ports/opt/dnsmasq/Pkgfile =================================================================== --- crux-2.2/ports/opt/dnsmasq/Pkgfile 2006-03-18 08:38:49 UTC (rev 960) +++ crux-2.2/ports/opt/dnsmasq/Pkgfile 2006-03-18 08:53:58 UTC (rev 961) @@ -4,15 +4,15 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=dnsmasq -version=2.26 +version=2.27 release=1 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.gz \ - $name-$version.patch dnsmasq) + $name-config.patch dnsmasq) build () { cd $name-$version - patch -p1 < $SRC/$name-$version.patch + patch -p1 < $SRC/$name-config.patch make make PREFIX=$PKG/usr install Deleted: crux-2.2/ports/opt/dnsmasq/dnsmasq-2.26.patch =================================================================== --- crux-2.2/ports/opt/dnsmasq/dnsmasq-2.26.patch 2006-03-18 08:38:49 UTC (rev 960) +++ crux-2.2/ports/opt/dnsmasq/dnsmasq-2.26.patch 2006-03-18 08:53:58 UTC (rev 961) @@ -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.2/ports/opt/dnsmasq/dnsmasq-config.patch (from rev 953, crux-2.2/ports/opt/dnsmasq/dnsmasq-2.26.patch) =================================================================== --- crux-2.2/ports/opt/dnsmasq/dnsmasq-2.26.patch 2006-03-16 17:58:52 UTC (rev 953) +++ crux-2.2/ports/opt/dnsmasq/dnsmasq-config.patch 2006-03-18 08:53:58 UTC (rev 961) @@ -0,0 +1,55 @@ +diff -Nru dnsmasq-2.27.orig/Makefile dnsmasq-2.27/Makefile +--- dnsmasq-2.27.orig/Makefile 2006-03-17 10:29:17.000000000 +0100 ++++ dnsmasq-2.27/Makefile 2006-03-17 10:29:33.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.27.orig/dnsmasq.conf.example dnsmasq-2.27/dnsmasq.conf.example +--- dnsmasq-2.27.orig/dnsmasq.conf.example 2006-03-17 10:29:17.000000000 +0100 ++++ dnsmasq-2.27/dnsmasq.conf.example 2006-03-17 10:29:36.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 +@@ -273,7 +273,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.27.orig/src/config.h dnsmasq-2.27/src/config.h +--- dnsmasq-2.27.orig/src/config.h 2006-03-17 10:29:17.000000000 +0100 ++++ dnsmasq-2.27/src/config.h 2006-03-17 10:29:37.000000000 +0100 +@@ -36,7 +36,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" +@@ -45,7 +45,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