Attachment 186864 Details for Bug 222739 – svn diff for dns/dnsmasq

[patch] svn diff for dns/dnsmasq

patch-dns_dnsmasq-2.78,1 (text/plain), 2.83 KB, created by Bernard Spil on 2017-10-02 14:18:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-10-02 14:18:48 UTC

Size: 2.83 KB

patch

obsolete

>Index: dns/dnsmasq/Makefile
>===================================================================
>--- dns/dnsmasq/Makefile	(revision 450581)
>+++ dns/dnsmasq/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	dnsmasq
>-DISTVERSION=	2.77
>-PORTREVISION=	1	# leave this in even if 0 to avoid PORTEPOCH bumps
>+DISTVERSION=	2.78
>+PORTREVISION=	0	# leave this in even if 0 to avoid PORTEPOCH bumps
> PORTEPOCH=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
>Index: dns/dnsmasq/distinfo
>===================================================================
>--- dns/dnsmasq/distinfo	(revision 450581)
>+++ dns/dnsmasq/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1496338430
>-SHA256 (dnsmasq-2.77.tar.xz) = 6eac3b1c50ae25170e3ff8c96ddb55236cf45007633fdb8a35b1f3e02f5f8b8a
>-SIZE (dnsmasq-2.77.tar.xz) = 487244
>+TIMESTAMP = 1506953238
>+SHA256 (dnsmasq-2.78.tar.xz) = 89949f438c74b0c7543f06689c319484bd126cc4b1f8c745c742ab397681252b
>+SIZE (dnsmasq-2.78.tar.xz) = 489172
>Index: dns/dnsmasq/files/patch-src_rfc2131.c
>===================================================================
>--- dns/dnsmasq/files/patch-src_rfc2131.c	(revision 450581)
>+++ dns/dnsmasq/files/patch-src_rfc2131.c	(nonexistent)
>@@ -1,30 +0,0 @@
>-commit 2446514e716075cfe2be35e2a9b9de4eacdbac99
>-Author: Chris Novakovic <chris@chrisn.me.uk>
>-Date:   Tue Jun 6 23:02:59 2017 +0100
>-
>-    Fix logic of appending ".<layer>" to PXE basename
>-    
>-    Commit f77700aa, which fixes a compiler warning, also breaks the
>-    behaviour of prepending ".<layer>" to basenames in --pxe-service: in
>-    situations where the basename contains a ".", the ".<layer>" suffix is
>-    erroneously added, and in situations where the basename doesn't contain
>-    a ".", the ".<layer>" suffix is erroneously omitted.
>-    
>-    A patch against the git HEAD is attached that inverts this logic and
>-    restores the expected behaviour of --pxe-service.
>-
>---- src/rfc2131.c.orig	2017-05-22 21:58:46 UTC
>-+++ src/rfc2131.c
>-@@ -836,10 +836,10 @@ size_t dhcp_reply(struct dhcp_context *c
>- 	  
>- 	  if (strchr(service->basename, '.'))
>- 	    snprintf((char *)mess->file, sizeof(mess->file),
>--		"%s.%d", service->basename, layer);
>-+		"%s", service->basename);
>- 	  else
>- 	    snprintf((char *)mess->file, sizeof(mess->file),
>--		"%s", service->basename);
>-+		"%s.%d", service->basename, layer);
>- 	  
>- 	  option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
>- 	  option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));
>
>Property changes on: dns/dnsmasq/files/patch-src_rfc2131.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

mandree: maintainer-approval+

Actions: View | Diff

Attachments on bug 222739: 186864