git: 73fc549fd2fd - main - net/mpd5: add missing change after previous revision

[Eugene Grosbein]

The branch main has been updated by eugen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=73fc549fd2fdd05312bb8f8551dfdb2d146f604d

commit 73fc549fd2fdd05312bb8f8551dfdb2d146f604d
Author:     Eugene Grosbein <eugen at FreeBSD.org>
AuthorDate: 2021-09-18 16:11:17 +0000
Commit:     Eugene Grosbein <eugen at FreeBSD.org>
CommitDate: 2021-09-18 16:11:17 +0000

    net/mpd5: add missing change after previous revision
    
    Add r2420 from upstream to speedup multihomed L2TP server a bit.
---
 net/mpd5/Makefile                    |  2 +-
 net/mpd5/files/patch-l2tp-multihomed | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index fcfda2185cb9..95544283135b 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mpd
 DISTVERSION=	5.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
 PKGNAMESUFFIX=	5
diff --git a/net/mpd5/files/patch-l2tp-multihomed b/net/mpd5/files/patch-l2tp-multihomed
index 55d28f5d693e..477c817b9f29 100644
--- a/net/mpd5/files/patch-l2tp-multihomed
+++ b/net/mpd5/files/patch-l2tp-multihomed
@@ -1,7 +1,7 @@
 Index: src/l2tp.c
 ===================================================================
 --- src/l2tp.c	(revision 2418)
-+++ src/l2tp.c	(revision 2419)
++++ src/l2tp.c	(revision 2420)
 @@ -1415,9 +1415,21 @@ L2tpServerEvent(int type, void *arg)
  	tun->self_port = s->self_port;
  	tun->alive = 1;
@@ -49,7 +49,7 @@ Index: src/l2tp.c
 Index: src/util.c
 ===================================================================
 --- src/util.c	(revision 2418)
-+++ src/util.c	(revision 2419)
++++ src/util.c	(revision 2420)
 @@ -16,8 +16,9 @@
  #include <netdb.h>
  #include <tcpd.h>
@@ -76,13 +76,13 @@ Index: src/util.c
 +	struct {
 +		struct  msghdr msg;
 +		struct	iovec iov;
-+		union {		/* ensure correct alignment for space */
-+			struct cmsghdr cm;
-+			char space[CMSG_SPACE(sizeof(struct in_addr))];
-+		} buf;
-+		char	io[1024];
 +	} b;
++	union {	/* ensure correct alignment for space */
++		struct cmsghdr cm;
++		char space[CMSG_SPACE(sizeof(struct in_addr))];
++	} buf;
 +
++	char	io[1024];
 +	struct	cmsghdr *p;
 +	ssize_t	size;
 +
@@ -93,10 +93,10 @@ Index: src/util.c
 +	memset(&b, 0, sizeof(b));
 +	b.msg.msg_iov = &b.iov;
 +	b.msg.msg_iovlen = 1;
-+	b.msg.msg_control = &b.buf;
-+	b.msg.msg_controllen = sizeof(b.buf);
-+	b.iov.iov_base = &b.io;
-+	b.iov.iov_len = sizeof(b.io);
++	b.msg.msg_control = &buf;
++	b.msg.msg_controllen = sizeof(buf);
++	b.iov.iov_base = &io;
++	b.iov.iov_len = sizeof(io);
 +
 +	if ((size = recvmsg(sock, &b.msg, 0)) < 0) {
 +		Perror("%s: recvmsg: %s", __FUNCTION__, strerror(errno));
@@ -113,7 +113,7 @@ Index: src/util.c
 Index: src/util.h
 ===================================================================
 --- src/util.h	(revision 2418)
-+++ src/util.h	(revision 2419)
++++ src/util.h	(revision 2420)
 @@ -98,6 +98,7 @@ extern u_long GenerateMagic(void);
  extern int GetAnyIpAddress(struct u_addr *ipaddr, const char *ifname);
  extern int GetEther(struct u_addr *addr, struct sockaddr_dl *hwaddr);