Merge dd0bb74b0f into 8aba5d8b21

ChangeLog

@@ -1,13 +1,3 @@
-2024-04-03  Omar Polo  <op@omarpolo.com>
-
-	* configure: improve function checking in the configure
-	* have/landlock.c: fix landlock test
-	* gmid.c (main_print_conf): fix config dumping with -nn
-
-2024-03-03  Omar Polo  <op@omarpolo.com>
-
-	* gmid.c: fix `log access path' with a chroot
-
 2024-01-30  Anna “CyberTailor”
 
 	* contrib/vim/indent/gmid.vim: fix indent

configure

@@ -19,7 +19,7 @@
 set -e
 
 RELEASE=no
-VERSION=2.0.2-current
+VERSION=2.0.1-current
 
 usage()
 {
@@ -146,7 +146,7 @@ NEED_OPENBSD_SOURCE=0
 NEED_LIBBSD_OPENBSD_VIS=0
 
 COMPATS=
-COMP="${CC} ${CFLAGS} -Werror=implicit-function-declaration"
+COMP="${CC} ${CFLAGS} -Wno-unused -Werror"
 
 # singletest name var extra-cflags extra-libs msg
 singletest() {

gmid.c

@@ -605,8 +605,8 @@ main_print_conf(struct conf *conf)
 
 	TAILQ_FOREACH(h, &conf->hosts, vhosts) {
 		printf("\nserver \"%s\" {\n", h->domain);
-		printf("	cert \"%s\"\n", h->cert_path);
-		printf("	key \"%s\"\n", h->key_path);
+		printf("	cert \"%s\"\n", h->cert);
+		printf("	key \"%s\"\n", h->key);
 		/* TODO: print locations... */
 		printf("}\n");
 	}

gmid.conf.5

@@ -11,7 +11,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd April 4, 2024
+.Dd January 11, 2024
 .Dt GMID.CONF 5
 .Os
 .Sh NAME
@@ -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.2
+.Dq gmid/2.0.1
 .It Ev REMOTE_USER
 The subject of the client certificate if provided, otherwise unset.
 .It Ev TLS_CLIENT_ISSUER

have/landlock.c

@@ -19,8 +19,6 @@
 #include <sys/stat.h>
 #include <sys/syscall.h>
 
-#include <stddef.h>
-
 #ifndef landlock_create_ruleset
 static inline int
 landlock_create_ruleset(const struct landlock_ruleset_attr *attr, size_t size,

regress/regress

@@ -20,9 +20,6 @@ fi
 run_test test_punycode
 run_test test_iri
 
-# Run configuration dumping test.
-run_test test_dump_config
-
 if [ "${SKIP_RUNTIME_TESTS:-0}" -eq 1 ]; then
 	echo
 	echo "======================"

regress/tests.sh

@@ -8,34 +8,6 @@ test_iri() {
 	./iri_test
 }
 
-test_dump_config() {
-	dont_check_server_alive=yes
-	gen_config '' ''
-
-        exp="$(mktemp)"
-	got="$(mktemp)"
-	cat <<EOF >$exp
-prefork 3
-
-server "localhost" {
-	cert "$PWD/localhost.pem"
-	key "$PWD/localhost.key"
-}
-EOF
-
-	$gmid -nn -c reg.conf > $got 2>/dev/null
-
-	ret=0
-	if ! cmp -s "$exp" "$got"; then
-    		echo "config differs!" >&2
-    		diff -u "$exp" "$got" >&2
-    		ret=1
-	fi
-
-	rm "$exp" "$got"
-	return $ret
-}
-
 test_gemexp() {
 	dont_check_server_alive=yes
 

site/Makefile

@@ -21,7 +21,7 @@ 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.2 \
+			VERS=2.0.1 \
 			PUBKEY=gmid-2.0.pub \
 			TREE=https://github.com/omar-polo/gmid/blob/master
 

site/changelog.gmi

@@ -1,13 +1,5 @@
 # change log
 
-## 2024/04/04 - 2.0.2 “Lady Stardust” bugfix release
-
-- fix `log access path' with `chroot' enabled.
-- fix config dumping (-nn).
-- rework grammar to allow semicolors after top-level statements.
-- don't make the log styles reserved keywords.
-- contrib/vim: fixed indent, from Anna “CyberTailor”, thanks!
-
 ## 2024/01/24 - 2.0.1 “Lady Stardust” bugfix release
 
 * convert gmid to the new imsg API