[112571] trunk/dports/net/dnsmasq

[Jeremy Lavergne]

Blah, my refreshed patches are botched. Fixing…

On Oct 26, 2013, at 14:45, snc at macports.org wrote:

> Revision
> 112571
> Author
> snc at macports.org
> Date
> 2013-10-26 11:45:29 -0700 (Sat, 26 Oct 2013)
> Log Message
> 
> dnsmasq: update to 2.67
> Modified Paths
> 
> 	• trunk/dports/net/dnsmasq/Portfile
> 	• trunk/dports/net/dnsmasq/files/patch-src-config.h.diff
> 	• trunk/dports/net/dnsmasq/files/patch-src-network.c.diff
> Added Paths
> 
> 	• trunk/dports/net/dnsmasq/files/patch-src-bfp.c.diff
> Diff
> 
> Modified: trunk/dports/net/dnsmasq/Portfile (112570 => 112571)
> 
> --- trunk/dports/net/dnsmasq/Portfile	2013-10-26 17:58:59 UTC (rev 112570)
> +++ trunk/dports/net/dnsmasq/Portfile	2013-10-26 18:45:29 UTC (rev 112571)
> 
> @@ -4,7 +4,7 @@
> 
>  PortSystem          1.0
> 
>  
> 
>  name                dnsmasq
> 
> -version             2.66
> 
> +version             2.67
> 
>  categories          net
> 
>  license             GPL
> 
>  maintainers         snc openmaintainer
> 
> @@ -33,10 +33,11 @@
> 
>  master_sites        http://www.thekelleys.org.uk/dnsmasq/
>  use_xz              yes
> 
>  
> 
> -checksums           rmd160  c46cc103eb50367d29f48cea53c4ca6fbf882c06 \
> -                    sha256  5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75
> 
> +checksums           rmd160  adc2d5ea9fb36f9a18d6aa6cfd8aef6151504a1c \
> +                    sha256  a8f1cec9d3f38d19c7c54e2879703d42748ace0f62c32e695b082051bdd2705d
> 
>  
> 
>  patchfiles          patch-src-config.h.diff \
> 
> +                    patch-src-bfp.c.diff \
> 
>                      patch-src-network.c.diff
> 
>  post-patch {
> 
>      reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/config.h
> 
> Added: trunk/dports/net/dnsmasq/files/patch-src-bfp.c.diff (0 => 112571)
> 
> --- trunk/dports/net/dnsmasq/files/patch-src-bfp.c.diff	                        (rev 0)
> +++ trunk/dports/net/dnsmasq/files/patch-src-bfp.c.diff	2013-10-26 18:45:29 UTC (rev 112571)
> 
> @@ -0,0 +1,11 @@
> 
> +--- src/bpf.c.orig	2013-10-26 14:42:06.000000000 -0400
> ++++ src/bpf.c	2013-10-26 14:42:53.000000000 -0400
> +@@ -145,7 +145,7 @@
> + 	      int i, j, prefix = 0;
> + 	      u32 valid = 0xffffffff, preferred = 0xffffffff;
> + 	      int flags = 0;
> +-#ifdef HAVE_BSD_NETWORK
> ++#if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__)
> + 	      struct in6_ifreq ifr6;
> + 
> + 	      memset(&ifr6, 0, sizeof(ifr6));
> 
> Modified: trunk/dports/net/dnsmasq/files/patch-src-config.h.diff (112570 => 112571)
> 
> --- trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	2013-10-26 17:58:59 UTC (rev 112570)
> +++ trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	2013-10-26 18:45:29 UTC (rev 112571)
> 
> @@ -1,29 +1,29 @@
> 
> ---- src/config.h.orig	2012-08-19 17:30:19.000000000 -0400
> -+++ src/config.h	2012-08-19 17:31:58.000000000 -0400
> -@@ -137,7 +137,7 @@
> 
> +--- src/config.h.orig	2013-10-25 05:37:30.000000000 -0400
> ++++ src/config.h	2013-10-26 14:20:29.000000000 -0400
> +@@ -151,7 +151,7 @@
> 
>   #   elif defined(__ANDROID__)
> 
>   #      define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
> 
>   #   else
> 
>  -#      define LEASEFILE "/var/lib/misc/dnsmasq.leases"
> 
> -+#      define LEASEFILE "@PREFIX@/var/lib/misc/dnsmasq.leases"
> 
> ++#      define LEASEFILE "/opt/pspp/var/lib/misc/dnsmasq.leases"
> 
>   #   endif
> 
>   #endif
> 
>   
> 
> -@@ -145,7 +145,7 @@
> 
> +@@ -159,7 +159,7 @@
> 
>   #   if defined(__FreeBSD__)
> 
>   #      define CONFFILE "/usr/local/etc/dnsmasq.conf"
> 
>   #   else
> 
>  -#      define CONFFILE "/etc/dnsmasq.conf"
> 
> -+#      define CONFFILE "@PREFIX@/etc/dnsmasq.conf"
> 
> ++#      define CONFFILE "/opt/pspp/etc/dnsmasq.conf"
> 
>   #   endif
> 
>   #endif
> 
>   
> 
> -@@ -161,7 +161,7 @@
> 
> +@@ -175,7 +175,7 @@
> 
>   #   if defined(__ANDROID__)
> 
>   #      define RUNFILE "/data/dnsmasq.pid"
> 
>   #    else
> 
>  -#      define RUNFILE "/var/run/dnsmasq.pid"
> 
> -+#      define RUNFILE "@PREFIX@/var/run/dnsmasq/dnsmasq.pid"
> 
> ++#      define RUNFILE "/opt/pspp/var/run/dnsmasq/dnsmasq.pid"
> 
>   #    endif
> 
>   #endif
> 
>   
> 
> Modified: trunk/dports/net/dnsmasq/files/patch-src-network.c.diff (112570 => 112571)
> 
> --- trunk/dports/net/dnsmasq/files/patch-src-network.c.diff	2013-10-26 17:58:59 UTC (rev 112570)
> +++ trunk/dports/net/dnsmasq/files/patch-src-network.c.diff	2013-10-26 18:45:29 UTC (rev 112571)
> 
> @@ -1,5 +1,5 @@
> 
> ---- src/network.c.orig	2011-07-25 06:21:49.000000000 -0400
> -+++ src/network.c	2011-07-25 06:22:13.000000000 -0400
> 
> +--- src/network.c.orig	2013-10-25 05:37:30.000000000 -0400
> ++++ src/network.c	2013-10-26 14:20:29.000000000 -0400
> 
>  @@ -14,6 +14,8 @@
> 
>      along with this program.  If not, see <http://www.gnu.org/licenses/
> >.
> 
>   */
> 
> @@ -8,4 +8,4 @@
> 
>  +
> 
>   #include "dnsmasq.h"
> 
>   
> 
> - #ifdef HAVE_LINUX_NETWORK
> 
> + #ifndef IN6_IS_ADDR_ULA
> 
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> https://lists.macosforge.org/mailman/listinfo/macports-changes