Attachment 164385 Details for Bug 204896 – Revised patch including fixes for DOCS and LICENSE*

Revised patch including fixes for DOCS and LICENSE*

ladvd.svndiff.txt (text/plain), 8.43 KB, created by Thomas Zander on 2015-12-19 17:03:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2015-12-19 17:03:57 UTC

Size: 8.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 404013)
>+++ Makefile	(working copy)
>@@ -2,16 +2,15 @@
> # $FreeBSD$
> 
> PORTNAME=	ladvd
>-PORTVERSION=	1.0.4
>-PORTREVISION=	2
>+PORTVERSION=	1.1.0
>+DISTVERSIONPREFIX=v
> CATEGORIES=	net
>-MASTER_SITES=	GOOGLE_CODE \
>-		http://blinkenlights.nl/software/ladvd/
> 
> MAINTAINER=	sten@blinkenlights.nl
>-COMMENT=	Minimal LLDP/CDP daemon
>+COMMENT=	Minimal LLDP/CDP/EDP/FDP/NDP sender daemon
> 
> LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
> 
> LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
> 
>@@ -18,10 +17,13 @@
> USERS=		ladvd
> GROUPS=		${USERS}
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	sspans
>+USES=		autoreconf libtool pkgconfig
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-chroot-dir=/var/empty
> 
>-PORTDOCS=	*
>+PORTDOCS=	README TODO HACKING
> USE_RC_SUBR=	ladvd
> SUB_FILES=	pkg-message
> 
>@@ -32,8 +34,13 @@
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch-DOCS-off:
>-	@@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \
>-		${WRKSRC}/doc/Makefile.in
>+.include <bsd.port.options.mk>
> 
>+.if ${OSVERSION} < 1000000
>+CFLAGS_amd64=   -fPIC
>+.endif
>+
>+post-patch:
>+	${REINPLACE_CMD} -e 's|LICENSE||' ${WRKSRC}/doc/Makefile.am
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 404013)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ladvd-1.0.4.tar.gz) = 90033d04004bd30e058faca96c0e632000d44b2ef0a65c70f9d972abda4a22ba
>-SIZE (ladvd-1.0.4.tar.gz) = 463939
>+SHA256 (sspans-ladvd-v1.1.0_GH0.tar.gz) = 6db4b3270d90469e7081695f62ed13b88ac15bd41b8467c81eec5d035742ae57
>+SIZE (sspans-ladvd-v1.1.0_GH0.tar.gz) = 108845
>Index: files/patch-src__cli.c
>===================================================================
>--- files/patch-src__cli.c	(revision 404013)
>+++ files/patch-src__cli.c	(nonexistent)
>@@ -1,10 +0,0 @@
>---- ./src/cli.c.orig	2012-01-01 16:17:19.000000000 -0800
>-+++ ./src/cli.c	2013-10-20 23:18:59.000000000 -0700
>-@@ -24,6 +24,7 @@
>- #include <sys/file.h>
>- #include <sys/un.h>
>- #include <netdb.h>
>-+#include <limits.h>
>- 
>- extern struct proto protos[];
>- int status = EXIT_SUCCESS;
>
>Property changes on: files/patch-src__cli.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
>Index: files/patch-src__compat__setproctitle.c
>===================================================================
>--- files/patch-src__compat__setproctitle.c	(revision 404013)
>+++ files/patch-src__compat__setproctitle.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- ./src/compat/setproctitle.c.orig	2011-12-20 05:11:03.000000000 -0800
>-+++ ./src/compat/setproctitle.c	2013-10-20 23:21:24.000000000 -0700
>-@@ -144,7 +144,7 @@
>- 			vsnprintf(buf + len, sizeof(buf) - len , fmt, ap);
>- 	}
>- 	va_end(ap);
>--	strnvis(ptitle, buf, sizeof(ptitle),
>-+	strnvis(ptitle, sizeof(ptitle), buf,
>- 	    VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL);
>- 
>- #if SPT_TYPE == SPT_PSTAT
>
>Property changes on: files/patch-src__compat__setproctitle.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
>Index: files/patch-src__compat__vis.c
>===================================================================
>--- files/patch-src__compat__vis.c	(revision 404013)
>+++ files/patch-src__compat__vis.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- ./src/compat/vis.c.orig	2011-12-20 05:11:03.000000000 -0800
>-+++ ./src/compat/vis.c	2013-10-20 23:20:15.000000000 -0700
>-@@ -161,7 +161,7 @@
>- }
>- 
>- int
>--strnvis(char *dst, const char *src, size_t siz, int flag)
>-+strnvis(char *dst, size_t siz, const char *src, int flag)
>- {
>- 	char *start, *end;
>- 	char tbuf[5];
>
>Property changes on: files/patch-src__compat__vis.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
>Index: files/patch-src__compat__vis.h
>===================================================================
>--- files/patch-src__compat__vis.h	(revision 404013)
>+++ files/patch-src__compat__vis.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- ./src/compat/vis.h.orig	2011-12-20 05:11:03.000000000 -0800
>-+++ ./src/compat/vis.h	2013-10-20 23:20:50.000000000 -0700
>-@@ -80,7 +80,7 @@
>- 
>- char	*vis(char *, int, int, int);
>- int	strvis(char *, const char *, int);
>--int	strnvis(char *, const char *, size_t, int);
>-+int	strnvis(char *, size_t, const char *, int);
>- int	strvisx(char *, const char *, size_t, int);
>- int	strunvis(char *, const char *);
>- int	unvis(char *, char, int *, int);
>
>Property changes on: files/patch-src__compat__vis.h
>___________________________________________________________________
>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
>Index: files/patch-src__proto__tlv.c
>===================================================================
>--- files/patch-src__proto__tlv.c	(revision 404013)
>+++ files/patch-src__proto__tlv.c	(nonexistent)
>@@ -1,20 +0,0 @@
>---- ./src/proto/tlv.c.orig	2012-01-01 16:17:19.000000000 -0800
>-+++ ./src/proto/tlv.c	2013-10-20 23:22:04.000000000 -0700
>-@@ -41,7 +41,7 @@
>- 	    *(src + srclen) = '\0';
>- 	    len = srclen * 4 + 1;
>- 	    str = my_malloc(len);
>--	    strnvis(str, src, len, VIS_NL|VIS_TAB|VIS_GLOB|VIS_OCTAL);
>-+	    strnvis(str, len, src, VIS_NL|VIS_TAB|VIS_GLOB|VIS_OCTAL);
>- 	    break;
>- 	case PEER_CAP:
>- 	    memcpy(&cap, value, sizeof(uint16_t));
>-@@ -92,7 +92,7 @@
>-     *(str + srclen) = '\0';
>-     len = srclen * 4 + 1;
>-     safe = my_malloc(len);
>--    strnvis(safe, str, len, VIS_SAFE|VIS_OCTAL);
>-+    strnvis(safe, len, str, VIS_SAFE|VIS_OCTAL);
>-     return safe;
>- }
>- 
>
>Property changes on: files/patch-src__proto__tlv.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
>Index: files/patch-src__util.c
>===================================================================
>--- files/patch-src__util.c	(revision 404013)
>+++ files/patch-src__util.c	(nonexistent)
>@@ -1,22 +0,0 @@
>---- src/util.c.orig	2011-12-20 14:11:03.000000000 +0100
>-+++ src/util.c	2015-03-08 22:30:38.673935000 +0100
>-@@ -213,9 +213,6 @@
>-     FILE *file;
>-     int ret = 0;
>- 
>--    if (path == NULL || line == NULL)
>--	return(0);
>--
>-     if ((file = fopen(path, "r")) == NULL)
>- 	return(0);
>- 
>-@@ -232,9 +229,6 @@
>- int write_line(const char *path, char *line, uint16_t len) {
>-     int fd, ret;
>- 
>--    if (path == NULL || line == NULL)
>--	return(0);
>--
>-     if ((fd = open(path, O_WRONLY|O_TRUNC)) == -1)
>- 	return(0);
>- 
>
>Property changes on: files/patch-src__util.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
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 404013)
>+++ files/pkg-message.in	(working copy)
>@@ -1,6 +1,6 @@
> *******************************************************************
>  If you want to run ladvd at startup you'll need the following
>- line in /etc/rc.conf(.local):
>+ line in %%PREFIX%%/rc.conf(.local):
> 
>     ladvd_enable="YES"
> 
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 404013)
>+++ pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
> ladvd is a minimal link layer advertisement daemon which supports
>-LLDP, CDP, EDP, FDP and NDP advertisements.
>+sending LLDP, CDP, EDP, FDP and NDP advertisements.
> 
>-WWW: http://code.google.com/p/ladvd/
>+WWW: https://github.com/sspans/ladvd

Flags:

riggs: maintainer-approval? (sten)

Actions: View

Attachments on bug 204896: 163652 | 163653 | 163669 | 164385