Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

net/miniupnpd: update to 2.3.1 #163

Closed
wants to merge 1 commit into from
Closed

net/miniupnpd: update to 2.3.1 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions net/miniupnpd/Makefile
View file
Open in desktop
@@ -1,5 +1,5 @@
PORTNAME= miniupnpd
PORTVERSION= 2.1.20200510
PORTVERSION= 2.3.1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \
Expand All @@ -25,7 +25,7 @@ PLIST_FILES= etc/miniupnpd.conf.sample \
man/man8/miniupnpd.8.gz \
sbin/miniupnpd

OPTIONS_DEFINE= CHECK_PORTINUSE IPV6 LEASEFILE UPNP_IGDV2 \
OPTIONS_DEFINE= PF_FILTER_RULES CHECK_PORTINUSE IPV6 LEASEFILE UPNP_IGDV2 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't look like this serves a functional change and we set "PF" through tools.git:

config/22.7/make.conf:net_miniupnpd_SET= CHECK_PORTINUSE PF

UPNP_STRICT
OPTIONS_DEFAULT= AUTODETECT_FW
OPTIONS_SINGLE= FIREWALL
Expand Down
6 changes: 3 additions & 3 deletions net/miniupnpd/distinfo
View file
Open in desktop
@@ -1,3 +1,3 @@
TIMESTAMP = 1591038112
SHA256 (miniupnpd-2.1.20200510.tar.gz) = 821e708f369cc1fb851506441fbc3a1f4a1b5a8bf8e84a9e71758a32f5127e8b
SIZE (miniupnpd-2.1.20200510.tar.gz) = 245426
TIMESTAMP = 1666091646
SHA256 (miniupnpd-2.3.1.tar.gz) = d1dfd4c0276549bbd3d5e434b913f1212481b5f726a9258f90f65e8ccb493b33
SIZE (miniupnpd-2.3.1.tar.gz) = 258050
34 changes: 9 additions & 25 deletions net/miniupnpd/files/patch-Makefile.bsd
View file
Open in desktop
@@ -1,35 +1,19 @@
--- Makefile.bsd.orig 2020-05-10 16:58:42 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
--- Makefile.bsd 2021-08-21 09:32:42.000000000 +0100
+++ Makefile.bsd.new 2022-10-18 12:36:44.886103000 +0100
@@ -150,8 +150,10 @@
$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)
$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)
$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)
- $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
+ $(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)
+ $(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)
@@ -260,4 +262,3 @@
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<

# BSDmake :
# $(CC) $(LDFLAGS) -o $@ $> $(LIBS)
# $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $(.TARGET) $(.IMPSRC)
-