Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net
In directory vz-cvs-3.sog:/tmp/cvs-serv3678
Modified Files:
dnsmasq.info dnsmasq.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: dnsmasq.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net/dnsmasq.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dnsmasq.info 11 Jul 2011 04:08:34 -0000 1.1
+++ dnsmasq.info 2 Apr 2012 22:33:00 -0000 1.2
@@ -15,19 +15,19 @@
# maintainership of) the affected package.
Package: dnsmasq
-Version: 2.24
+Version: 2.57
Revision: 1
Maintainer: Max Horn <[email protected]>
BuildDepends: fink (>= 0.24.12)
Depends: daemonic
Source: http://www.thekelleys.org.uk/dnsmasq/%n-%v.tar.gz
-Source-MD5: d269531be1f130ab642c71c593138d31
+Source-MD5: d10faeb409717eae94718d7716ca63a4
PatchFile: %n.patch
-PatchFile-MD5: 54a2e0aea5dbf2834f6fe64d3ec4f278
+PatchFile-MD5: 1be538af00a4ad841cdd12caaf6dee71
PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
-CompileScript: PREFIX=%p make
+CompileScript: make PREFIX=%p
InstallScript: <<
- PREFIX=%i make install
+ make install PREFIX=%p DESTDIR=%d
<<
DaemonicFile: <<
<service>
Index: dnsmasq.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net/dnsmasq.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dnsmasq.patch 11 Jul 2011 04:08:34 -0000 1.1
+++ dnsmasq.patch 2 Apr 2012 22:33:00 -0000 1.2
@@ -1,24 +1,32 @@
-diff -ru dnsmasq-2.20/src/config.h dnsmasq-2.20-patched/src/config.h
---- dnsmasq-2.20/src/config.h 2005-01-16 18:25:56.000000000 +0100
-+++ dnsmasq-2.20-patched/src/config.h 2005-02-14 17:34:09.000000000 +0100
-@@ -31,16 +31,16 @@
+diff -ru dnsmasq-2.57/src/config.h dnsmasq-2.57-patched/src/config.h
+--- dnsmasq-2.57/src/config.h 2011-02-18 11:18:39.000000000 +0100
++++ dnsmasq-2.57-patched/src/config.h 2011-03-02 15:34:01.000000000 +0100
+@@ -39,25 +39,15 @@
#else
# define RESOLVFILE "/etc/resolv.conf"
#endif
-#define RUNFILE "/var/run/dnsmasq.pid"
+#define RUNFILE "@PREFIX@/var/run/dnsmasq.pid"
- #if defined(__FreeBSD__) || defined (__OpenBSD__)
--# define LEASEFILE "/var/db/dnsmasq.leases"
-+# define LEASEFILE "@PREFIX@/var/db/dnsmasq.leases"
- #else
--# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
-+# define LEASEFILE "@PREFIX@/var/lib/misc/dnsmasq.leases"
- #endif
- #if defined(__FreeBSD__)
- # define CONFFILE "/usr/local/etc/dnsmasq.conf"
- #else
--# define CONFFILE "/etc/dnsmasq.conf"
-+# define CONFFILE "@PREFIX@/etc/dnsmasq.conf"
+
+-#ifndef LEASEFILE
+-# if defined(__FreeBSD__) || defined (__OpenBSD__) ||
defined(__DragonFly__) || defined(__NetBSD__)
+-# define LEASEFILE "/var/db/dnsmasq.leases"
+-# elif defined(__sun__) || defined (__sun)
+-# define LEASEFILE "/var/cache/dnsmasq.leases"
+-# elif defined(__ANDROID__)
+-# define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
+-# else
+-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
+-# endif
+-#endif
++#define LEASEFILE "@PREFIX@/var/db/dnsmasq.leases"
+
+ #ifndef CONFFILE
+ # if defined(__FreeBSD__)
+ # define CONFFILE "/usr/local/etc/dnsmasq.conf"
+ # else
+-# define CONFFILE "/etc/dnsmasq.conf"
++# define CONFFILE "@PREFIX@/etc/dnsmasq.conf"
+ # endif
#endif
- #define DEFLEASE 3600 /* default lease time, 1 hour */
- #define CHUSER "nobody"
+
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
