prepare release 2.12.1

8 files changed, 21 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f9d2811..47b87ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2024-08-03  Omar Polo  <op@omarpolo.com>
 
+	* configure (VERSION): release 2.1 "From Mars To Sirius"
 	* add support for the proxy-protocol v1 in outgoing connections too;
 	needs to be enabled with the new `proxy-v1' flag in a `proxy' block.
 	* gg.c (parse_proxy): support IPv6 addresses in -P
diff --git a/Makefile b/Makefile
index 6e116fd..f550090 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ y.tab.c: parse.y
 lint:
 	man -Tlint -Wstyle -l gmid.8 gmid.conf.5 gemexp.1 gg.1 titan.1
 
-PUBKEY =	keys/gmid-2.0.pub
+PUBKEY =	keys/gmid-2.1.pub
 PRIVKEY =	set-PRIVKEY
 DISTFILES =	.cirrus.yml .dockerignore .gitignore ChangeLog LICENSE \
 		Makefile README.md config.c configure crypto.c dirs.c fcgi.c \
diff --git a/configure b/configure
index ec06912..e63f675 100755
--- a/configure
+++ b/configure
@@ -19,7 +19,7 @@
 set -e
 
 RELEASE=no
-VERSION=2.0.5-current
+VERSION=2.1
 
 usage()
 {
diff --git a/gmid.conf.5 b/gmid.conf.5
index 66e4299..57a6c4e 100644
--- a/gmid.conf.5
+++ b/gmid.conf.5
@@ -384,7 +384,7 @@ The port the server is listening on.
 .Dq GEMINI
 .It Ev SERVER_SOFTWARE
 The name and version of the server, i.e.
-.Dq gmid/2.0.5
+.Dq gmid/2.1
 .It Ev REMOTE_USER
 The subject of the client certificate if provided, otherwise unset.
 .It Ev TLS_CLIENT_ISSUER
diff --git a/keys/Makefile b/keys/Makefile
index 5582704..7f8cbf5 100644
--- a/keys/Makefile
+++ b/keys/Makefile
@@ -1,4 +1,4 @@
-DISTFILES =	Makefile gmid-1.7.pub gmid-1.8.pub gmid-2.0.pub
+DISTFILES =	Makefile gmid-1.7.pub gmid-1.8.pub gmid-2.0.pub gmid-2.1.pub
 
 all: false
 
diff --git a/keys/gmid-2.1.pub b/keys/gmid-2.1.pub
new file mode 100644
index 0000000..5dea3bb
--- /dev/null
+++ b/keys/gmid-2.1.pub
@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWSMZUrn4u03g0AwurM9kGiIfhetO5OISPlMMb4+th+Bw8ViotgbzKss
diff --git a/site/Makefile b/site/Makefile
index 69cc9da..9e1cc9d 100644
--- a/site/Makefile
+++ b/site/Makefile
@@ -21,8 +21,8 @@ REPOLOGY_URL =		https://repology.org/project/gmid/versions
 
 SUBST =		./subst GITHUB=https://github.com/omar-polo/gmid \
 			SITE=https://ftp.omarpolo.com \
-			VERS=2.0.5 \
-			PUBKEY=gmid-2.0.pub \
+			VERS=2.1 \
+			PUBKEY=gmid-2.1.pub \
 			TREE=https://github.com/omar-polo/gmid/blob/master
 
 SUBST_GEM =	${SUBST} MANEXT=txt  EXT=gmi  REPOLOGY=${REPOLOGY_URL}
diff --git a/site/changelog.gmi b/site/changelog.gmi
index 1322889..0ba9611 100644
--- a/site/changelog.gmi
+++ b/site/changelog.gmi
@@ -1,5 +1,17 @@
 # change log
 
+## 2024/08/03 - 2.0.5 “From Mars To Sirius”
+
+### New Features
+
+* support for the proxy protocol v1 both when accepting connections and when proxying via the new `proxy-v1' keyword available in `listen' and `proxy' directives.
+
+### Bug fixes
+
+* fixed typo in bound check that resulted in "chroot path too long" on some systems
+* correctly propagate the prefork value; was causing failures if it was changed from the default
+* titan: improve error check when reading from standard input; errors such as "no space left on device" would have been silently ignored.
+
 ## 2024/06/11 - 2.0.5 “Lady Stardust” security release
 
 This release fixes a logic error that can result in a DoS; therefore is a strongly reccomended update for all users.  It's safe to update to it from any version of the 2.0.x series.