aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. Christian McDonald <rcm@rcm.sh>2023-05-05 07:58:18 +0000
committerFernando ApesteguĂ­a <fernape@FreeBSD.org>2023-05-22 07:08:55 +0000
commite6bc20faecce397a944dce3ccee5b9bfd4ba4402 (patch)
treee383c6154e7ee852eb3ce4f63cef37e43e1dd91d
parent4f3963f7db891c62a573f85f8becbfba49b6a7a6 (diff)
downloadports-e6bc20faecce397a944dce3ccee5b9bfd4ba4402.tar.gz
ports-e6bc20faecce397a944dce3ccee5b9bfd4ba4402.zip
net/miniupnpd: Update to 2.3.3
PR: 271244 Reported by: rcm@rcm.sh Approved by: squat@squat.no (maintainer, timeout > 2 weeks)
-rw-r--r--net/miniupnpd/Makefile14
-rw-r--r--net/miniupnpd/distinfo6
-rw-r--r--net/miniupnpd/files/patch-Makefile.bsd30
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)