Attachment 241976 Details for Bug 271244 – net/miniupnpd: update to v2.3.3

[patch] net/miniupnpd: update to v2.3.3

0001-net-miniupnpd-update-to-v2.3.3.patch (text/plain), 3.89 KB, created by R. Christian McDonald on 2023-05-04 17:07:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R. Christian McDonald

Created: 2023-05-04 17:07:57 UTC

Size: 3.89 KB

patch

obsolete

>From 4b7543a39ffd32f9d3f0cfe677276e53f54446a1 Mon Sep 17 00:00:00 2001
>From: Christian McDonald <rcm@rcm.sh>
>Date: Thu, 4 May 2023 01:24:49 -0400
>Subject: [PATCH] net/miniupnpd: update to v2.3.3
>
>---
> net/miniupnpd/Makefile                 | 14 ++++++++----
> net/miniupnpd/distinfo                 |  6 +++---
> net/miniupnpd/files/patch-Makefile.bsd | 30 ++++----------------------
> 3 files changed, 17 insertions(+), 33 deletions(-)
>
>diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
>index b051b8a879fc..3c5e4e28f813 100644
>--- a/net/miniupnpd/Makefile
>+++ b/net/miniupnpd/Makefile
>@@ -1,9 +1,7 @@
> PORTNAME=	miniupnpd
>-PORTVERSION=	2.1.20200510
>+PORTVERSION=	2.3.3
> PORTEPOCH=	1
> CATEGORIES=	net
>-MASTER_SITES=	http://miniupnp.tuxfamily.org/files/ \
>-		http://miniupnp.free.fr/files/
> 
> MAINTAINER=	squat@squat.no
> COMMENT=	UPnP IGD implementation which uses pf/ipf
>@@ -13,6 +11,12 @@ LICENSE=	BSD3CLAUSE
> 
> USES=		cpe ssl
> CPE_VENDOR=	miniupnp_project
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	miniupnp
>+GH_PROJECT=	miniupnp
>+GH_TAGNAME=	e439318
>+
> USE_RC_SUBR=	miniupnpd
> 
> HAS_CONFIGURE=	yes
>@@ -21,6 +25,8 @@ MAKE_JOBS_UNSAFE=	yes
> CFLAGS+=	-I${OPENSSLINC}
> LDFLAGS+=	-L${OPENSSLLIB}
> 
>+WRKSRC_SUBDIR=	miniupnpd
>+
> PLIST_FILES=	etc/miniupnpd.conf.sample \
> 		man/man8/miniupnpd.8.gz \
> 		sbin/miniupnpd
>@@ -29,7 +35,7 @@ OPTIONS_DEFINE=			CHECK_PORTINUSE IPV6 LEASEFILE UPNP_IGDV2 \
> 				UPNP_STRICT
> OPTIONS_DEFAULT=		AUTODETECT_FW
> OPTIONS_SINGLE=			FIREWALL
>-OPTIONS_SINGLE_FIREWALL=	AUTODETECT_FW PF IPFW
>+OPTIONS_SINGLE_FIREWALL=	AUTODETECT_FW IPFW PF
> AUTODETECT_FW_DESC=		Try to autodetect firewall type
> CHECK_PORTINUSE_DESC=		Check if ports are in use
> IPFW_DESC=			Use IPFW as firewall type
>diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo
>index 1a5a458d1eeb..5dea730d0c4b 100644
>--- a/net/miniupnpd/distinfo
>+++ b/net/miniupnpd/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1591038112
>-SHA256 (miniupnpd-2.1.20200510.tar.gz) = 821e708f369cc1fb851506441fbc3a1f4a1b5a8bf8e84a9e71758a32f5127e8b
>-SIZE (miniupnpd-2.1.20200510.tar.gz) = 245426
>+TIMESTAMP = 1683175217
>+SHA256 (miniupnp-miniupnp-2.3.3-e439318_GH0.tar.gz) = 9324cd00db2d203f0f09e15d8556ff63b40de09bfa755b2b9a64856e146b3b44
>+SIZE (miniupnp-miniupnp-2.3.3-e439318_GH0.tar.gz) = 454838
>diff --git a/net/miniupnpd/files/patch-Makefile.bsd b/net/miniupnpd/files/patch-Makefile.bsd
>index 18b7f9c0c755..996743a4601d 100644
>--- a/net/miniupnpd/files/patch-Makefile.bsd
>+++ b/net/miniupnpd/files/patch-Makefile.bsd
>@@ -1,35 +1,13 @@
>---- Makefile.bsd.orig	2020-05-10 16:58:42 UTC
>+--- Makefile.bsd.orig	2023-02-17 03:09:33 UTC
> +++ Makefile.bsd
>-@@ -121,8 +121,7 @@ LIBS += -lssl -lcrypto
>- 
>- INSTALLBINDIR = $(PREFIX)/sbin
>- INSTALLETCDIR = $(PREFIX)/etc
>--# INSTALLMANDIR = $(PREFIX)/man
>--INSTALLMANDIR = /usr/share/man
>-+INSTALLMANDIR = $(MANPREFIX)/man
>- 
>- all:	$(EXECUTABLES)
>- 
>-@@ -140,10 +139,10 @@ install:	miniupnpd genuuid
>+@@ -150,8 +150,8 @@ install:	miniupnpd genuuid
>  	$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)
>  	$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)
>  	$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)
> -	$(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
>+-	$(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)
> +	$(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)/miniupnpd.conf.sample
>- 	# TODO : install man page correctly
>--#	$(INSTALL) -d $(INSTALLMANDIR)
>--#	$(INSTALL) miniupnpd.8 $(INSTALLMANDIR)/cat8/miniupnpd.0
> +	$(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)/man8
>-+	$(INSTALL) miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8
>+ 	$(INSTALL) -m 644 miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8
>  
>  # genuuid is using the uuid cli tool available under OpenBSD 4.0 in
>- # the uuid-1.5.0 package
>-@@ -187,7 +186,7 @@ dox:	miniupnpd.doxyconf
>- 	$(DOXYGEN) $>
>- 
>- miniupnpd: config.h $(ALLOBJS)
>--	$(CC) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS)
>-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS)
>- 
>- # BSDmake :
>- #	$(CC) $(LDFLAGS) -o $@ $> $(LIBS)
>-- 
>2.40.0
>

Actions: View | Diff

Attachments on bug 271244: 241976