git: 25860d46f6e0 - 2021Q3 - net/gmid: Update to 1.7.1 (bugfix release)

[Nuno Teixeira]

The branch 2021Q3 has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=25860d46f6e013292c9ab400772bcff601a04b59

commit 25860d46f6e013292c9ab400772bcff601a04b59
Author:     Omar Polo <freebsd at omarpolo.com>
AuthorDate: 2021-07-11 12:13:16 +0000
Commit:     Nuno Teixeira <eduardo at FreeBSD.org>
CommitDate: 2021-07-12 07:31:41 +0000

    net/gmid: Update to 1.7.1 (bugfix release)
    
    ChangeLog: https://github.com/omar-polo/gmid/releases/tag/1.7.1
    
    PR:             257098
    (cherry picked from commit 3ebebb3ca8f29a03c58be0d9df45060977183e48)
---
 net/gmid/Makefile               |  8 ++++----
 net/gmid/distinfo               |  6 +++---
 net/gmid/files/gmid.conf.sample | 25 +++++++++++++++++--------
 net/gmid/pkg-descr              |  2 +-
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/net/gmid/Makefile b/net/gmid/Makefile
index 6107ff1600f7..69f56c6a77c5 100644
--- a/net/gmid/Makefile
+++ b/net/gmid/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gmid
-DISTVERSION=	v1.6.1
-PORTREVISION=	1
+DISTVERSION=	1.7.1
 CATEGORIES=	net
+MASTER_SITES=	https://github.com/omar-polo/gmid/releases/download/${DISTVERSION}/
 
 MAINTAINER=	freebsd at omarpolo.com
 COMMENT=	Simple and secure Gemini server
@@ -13,14 +13,14 @@ LIB_DEPENDS=	libevent.so:devel/libevent \
 		libtls.so:security/libressl
 
 USES=		localbase pkgconfig ssl
-USE_GITHUB=	yes
-GH_ACCOUNT=	omar-polo
 USE_RC_SUBR=	gmid
 
 HAS_CONFIGURE=	yes
 
 TEST_TARGET=	regress
 
+LDFLAGS+=	-lcrypto -lssl
+
 USERS=		_gmid
 GROUPS=		_gmid
 
diff --git a/net/gmid/distinfo b/net/gmid/distinfo
index 13b38ee14981..89c7d66e05eb 100644
--- a/net/gmid/distinfo
+++ b/net/gmid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619421708
-SHA256 (omar-polo-gmid-v1.6.1_GH0.tar.gz) = bdbc8f184812554f3574791dfe43e435fa6c4cafcbd70b4e1e7a48b2407a54a2
-SIZE (omar-polo-gmid-v1.6.1_GH0.tar.gz) = 59388
+TIMESTAMP = 1625991476
+SHA256 (gmid-1.7.1.tar.gz) = cb4ef2c1ed9950017ce51b0de97971a77124beed1eb2205de6118da0f2ebdbd1
+SIZE (gmid-1.7.1.tar.gz) = 78154
diff --git a/net/gmid/files/gmid.conf.sample b/net/gmid/files/gmid.conf.sample
index 1443c67c961e..b4680f8d2acf 100644
--- a/net/gmid/files/gmid.conf.sample
+++ b/net/gmid/files/gmid.conf.sample
@@ -3,13 +3,22 @@ user "_gmid"
 
 # it's a good idea to enable chroot, but
 # beware that can make CGI scripting harder
-#
-#chroot "/var/gemini"
+chroot "/var/gemini"
 
 # An example of a server block:
-#
-#server "localhost" {
-#	root "/var/gemini/localhost"
-#	cert "/usr/local/etc/ssl/gmid/gmid.crt"
-#	key  "/usr/local/etc/ssl/gmid/gmid.key"
-#}
+server "localhost" {
+	# set the directory to serve; it's relative to the
+	# chroot (if enabled)
+	root "/localhost"
+
+	# Set self-signed TLS cert and key.  It's better to keep
+	# the keys outside the chroot.
+	#
+	# You should generate them manually, for example:
+	# openssl req -x509 -newkey rsa:4096 -nodes		\
+	#	-out /usr/local/etc/ssl/gmid/localhost.crt	\
+	#	-keyout /usr/local/etc/ssl/gmid/localhost.key	\
+	# 	-subj "/CN=localhost"
+	cert "/usr/local/etc/ssl/gmid/localhost.crt"
+	key  "/usr/local/etc/ssl/gmid/localhost.key"
+}
diff --git a/net/gmid/pkg-descr b/net/gmid/pkg-descr
index 6e2c141ad413..63a83cac173d 100644
--- a/net/gmid/pkg-descr
+++ b/net/gmid/pkg-descr
@@ -3,4 +3,4 @@ features, among which Capsicum support and a "config-less"
 mode akin to "python -m http.server" to quickly serve local
 directories from the shell.
 
-WWW: https://github.com/omar-polo/gmid
+WWW: https://gmid.omarpolo.com