From nobody Mon May 22 07:13:54 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QPpb63TTgz4T8Nh; Mon, 22 May 2023 07:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QPpb622kjz43LY; Mon, 22 May 2023 07:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684739634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WLKSb2OkIbrsAexQmeXDTcH2CSSmxKNQWOeXOpGLJE=; b=p6o9iISoEXjQ40xxjAXXV9YNnaCdc7T6RhZjTmOV0+ITA/roBxP9cFA1JJZQS9t83Km/1E BeljTIfHbxboLURaTrY6aioLjRKYVU+X0Bk7qUHEBVejGmcD2SknKm5UlyrYVErEyPNSj4 RJkxegsn5UMt35zM4c+U5/1VqFAIivlKXGMDRx0H31P1BDzIOmL8PnLp2j1U6zsdqrPtMl f1W/YarrZUv7cBXs7r+Q/XCdgYKqt+5zN1SSavXnChht0zXylI3gBVy6QSqRENg0zVYUh+ x0Yz8o2+DphvJUddJwTUmRDRXT6kCdn3E0P9A4u+Ra3oz32KLzh+jECFZZhyWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684739634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1WLKSb2OkIbrsAexQmeXDTcH2CSSmxKNQWOeXOpGLJE=; b=K9iivdfcBmNIxZtoW7q/mFzQKV3/PCtrliW60UKFcVjBPZ1DP3ObPZCDeIWIyf32UCe+ue mVRpLoz7I84UTRxVkin30vNvsGo4vFMArn9uYsTO0BA0VTt4aYv1kVH4WBTYeeWTu1DoC4 OsKyXUzYIzui2laXbCoMPZZLN0Gy2zCz4DlyKqYxZyz/cZR1wiAA69OR8Lc8NmgMDC3/9r 4Fixq5V8Si/rPGFwnhqY2rrK8wL2842rwmYtOg12gFygIMsTczBUXO2zlLd3aUNpUepFt3 YrAkWbkv/mQHjm53bETYRkB7wdJhjd8jGxvN7fyuArw2p29BnApRRDOhV3vUsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684739634; a=rsa-sha256; cv=none; b=SwI5FXrFEpUB4dL77sWQqAZYMzSYFiq60PLVNg2707PJK0nxITX89t1/ND5/k6s/Awa54+ 15RMYe7jIg/Gys6uNsIQdkO4TGb6ZsZKfZck10Q8levHkaMPwKZ0n8m4ln9+5GKBC6uUdf 36nHYZunBzauTLgbzDoHFvrDCyj8zghRQizzBo9FSryYLs3DOP7L4ttGTnGD/MT/OUhLXz TtOrRMU105mg7F57HuDCbOpN1xjFn7pFv61zVSra+DuGDpk+XhM6A66EqRJYitq+H97iHv jg1/GQCuiMnU9XstlvLJRfAId7m0kjjA3WPXYf17Ih/ngPWzdQlVgWKTMBBrZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QPpb615mpz1NVc; Mon, 22 May 2023 07:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34M7Ds0f034921; Mon, 22 May 2023 07:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34M7DsCJ034920; Mon, 22 May 2023 07:13:54 GMT (envelope-from git) Date: Mon, 22 May 2023 07:13:54 GMT Message-Id: <202305220713.34M7DsCJ034920@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: e6bc20faecce - main - net/miniupnpd: Update to 2.3.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6bc20faecce397a944dce3ccee5b9bfd4ba4402 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6bc20faecce397a944dce3ccee5b9bfd4ba4402 commit e6bc20faecce397a944dce3ccee5b9bfd4ba4402 Author: R. Christian McDonald AuthorDate: 2023-05-05 07:58:18 +0000 Commit: Fernando Apesteguía CommitDate: 2023-05-22 07:08:55 +0000 net/miniupnpd: Update to 2.3.3 PR: 271244 Reported by: rcm@rcm.sh Approved by: squat@squat.no (maintainer, timeout > 2 weeks) --- 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)