Attachment 249392 Details for Bug 277505 – upstream patch inclusion

[patch] upstream patch inclusion

radvd.diff (text/plain), 1.72 KB, created by Franco Fichtner on 2024-03-22 07:48:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2024-03-22 07:48:30 UTC

Size: 1.72 KB

patch

obsolete

>diff --git a/net/radvd/Makefile b/net/radvd/Makefile
>index ab8ee570f8ca..37ae1eafba25 100644
>--- a/net/radvd/Makefile
>+++ b/net/radvd/Makefile
>@@ -4,6 +4,9 @@ PORTREVISION=	3
> CATEGORIES=	net
> MASTER_SITES=	http://www.litech.org/radvd/dist/
> 
>+PATCH_SITES=	https://github.com/${PORTNAME}-project/${PORTNAME}/commit/
>+PATCHFILES=	3f1aeb2.patch:-p1
>+
> MAINTAINER=	farrokhi@FreeBSD.org
> COMMENT=	Linux/BSD IPv6 router advertisement daemon
> WWW=		http://www.litech.org/radvd/
>diff --git a/net/radvd/distinfo b/net/radvd/distinfo
>index fef3589424da..481924fcc88a 100644
>--- a/net/radvd/distinfo
>+++ b/net/radvd/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1607081848
>+TIMESTAMP = 1707290399
> SHA256 (radvd-2.19.tar.gz) = c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0
> SIZE (radvd-2.19.tar.gz) = 222794
>+SHA256 (3f1aeb2.patch) = 8130a1f6e04292629c2c2cd9613beb4d4b085f0c08005e15b139bae10467f84c
>+SIZE (3f1aeb2.patch) = 3699
>diff --git a/net/radvd/files/patch-interface.c b/net/radvd/files/patch-interface.c
>deleted file mode 100644
>index 77bcbaba6a93..000000000000
>--- a/net/radvd/files/patch-interface.c
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- interface.c.orig	2020-12-29 09:42:21 UTC
>-+++ interface.c
>-@@ -61,6 +61,8 @@ void touch_iface(struct Interface *iface)
>- 
>- int setup_iface(int sock, struct Interface *iface)
>- {
>-+	int was_ready = iface->state_info.ready;
>-+
>- 	iface->state_info.changed = 0;
>- 	iface->state_info.ready = 0;
>- 
>-@@ -97,8 +99,11 @@ int setup_iface(int sock, struct Interface *iface)
>- 		return -1;
>- 	}
>- 
>-+	iface->state_info.ready = was_ready;
>-+
>- 	/* join the allrouters multicast group so we get the solicitations */
>- 	if (setup_allrouters_membership(sock, iface) < 0) {
>-+		iface->state_info.ready = 0;
>- 		return -1;
>- 	}
>-

Actions: View | Diff

Attachments on bug 277505: 248951 | 249392