Attachment 226351 Details for Bug 257098 – diff for the update

[patch] diff for the update

gmid-1.7-update.patch (text/plain), 2.94 KB, created by Omar Polo on 2021-07-10 14:27:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Omar Polo

Created: 2021-07-10 14:27:35 UTC

Size: 2.94 KB

patch

obsolete

>diff --git a/net/gmid/Makefile b/net/gmid/Makefile
>index 6107ff1600f7..16443b57c73a 100644
>--- a/net/gmid/Makefile
>+++ b/net/gmid/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	gmid
>-DISTVERSION=	v1.6.1
>-PORTREVISION=	1
>+DISTVERSION=	1.7
> CATEGORIES=	net
>+MASTER_SITES=	https://github.com/omar-polo/gmid/releases/download/${DISTVERSION}/
> 
> MAINTAINER=	freebsd@omarpolo.com
> COMMENT=	Simple and secure Gemini server
>@@ -10,11 +10,9 @@ LICENSE=	ISCL
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	libevent.so:devel/libevent \
>-		libtls.so:security/libressl
>+		libtls.so:security/libretls
> 
> USES=		localbase pkgconfig ssl
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	omar-polo
> USE_RC_SUBR=	gmid
> 
> HAS_CONFIGURE=	yes
>@@ -24,6 +22,11 @@ TEST_TARGET=	regress
> USERS=		_gmid
> GROUPS=		_gmid
> 
>+# Because base OpenSSL doesn't install a .pc file for pkg-config, some
>+# flags cannot be obtained automatically by the configure script.
>+CONFIGURE_ENV+= CFLAGS="-I${OPENSSLINC}" \
>+                LDFLAGS="-L${OPENSSLLIB} -lcrypto -lssl"
>+
> post-build:
> 	${STRIP_CMD} ${WRKSRC}/gmid
> 
>diff --git a/net/gmid/distinfo b/net/gmid/distinfo
>index 13b38ee14981..8220c1afdd63 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 = 1625925591
>+SHA256 (gmid-1.7.tar.gz) = 9ef30bce37208ef74afede49778cf3276583ae3aa97de8237eaaff5481ff8dd4
>+SIZE (gmid-1.7.tar.gz) = 692295
>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

Actions: View | Diff

Attachments on bug 257098: 226351 | 226364 | 226365 | 226366