tweak and update freebsd task

See Codeberg issue #1.

.cirrus.yml

@@ -19,11 +19,11 @@ linux_arm_task:
     - make
     - make regress REGRESS_HOST="*"
 
-freebsd_13_task:
+freebsd_14_task:
   freebsd_instance:
-    image_family: freebsd-13-0
+    image_family: freebsd-14-0
-  test_script:
+  install_script: pkg install -y libevent libressl pkgconf
-    - pkg install -y libevent libressl pkgconf
+  script:
     - ./configure CFLAGS='-O2 -pipe -Wno-deprecated-declarations' -Werror
     - make
     - make regress

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-${VERSION}.pub
+PUBKEY =	keys/gmid-2.0.pub
 PRIVKEY =	set-PRIVKEY
 DISTFILES =	.cirrus.yml .dockerignore .gitignore ChangeLog LICENSE \
 		Makefile README.md config.c configure crypto.c dirs.c fcgi.c \

parse.y

@@ -150,13 +150,12 @@ typedef struct {
 %%
 
 conf		: /* empty */
-		| conf include '\n'
+		| conf include nl
-		| conf '\n'
+		| conf varset nl
-		| conf varset '\n'
+		| conf option nl
-		| conf option '\n'
+		| conf vhost nl
-		| conf vhost '\n'
+		| conf types nl
-		| conf types '\n'
+		| conf error nl		{ file->errors++; }
-		| conf error '\n'		{ file->errors++; }
 		;
 
 include		: INCLUDE STRING		{
@@ -617,7 +616,7 @@ mediaopts_l	: mediaopts_l mediaoptsl nl
 mediaoptsl	: STRING {
 			free(current_media);
 			current_media = $1;
-		} medianames_l optsemicolon
+		} medianames_l
 		| include
 		;
 
@@ -633,17 +632,13 @@ medianamesl	: numberstring {
 		;
 
 nl		: '\n' optnl
+		| ';' optnl
 		;
 
-optnl		: '\n' optnl		/* zero or more newlines */
+optnl		: nl
-		| ';' optnl		/* semicolons too */
 		| /*empty*/
 		;
 
-optsemicolon	: ';'
-		|
-		;
-
 %%
 
 static const struct keyword {

regress/tests.sh

@@ -287,6 +287,7 @@ test_fastcgi_deprecated_syntax() {
 test_macro_expansion() {
 	cat <<EOF > reg.conf
 pwd = "$PWD"
+common_opts = "lang it; auto index on"
 
 server "localhost" {
 	# the quoting of \$ is for sh
@@ -294,6 +295,7 @@ server "localhost" {
 	key  \$pwd "/localhost.key"
 	root \$pwd "/testdata"
 	listen on $REGRESS_HOST port $port
+	@common_opts
 }
 EOF
 
@@ -305,7 +307,7 @@ EOF
 	run
 
 	fetch /
-	check_reply "20 text/gemini" "# hello world"
+	check_reply "20 text/gemini;lang=it" "# hello world"
 }
 
 test_proxy_relay_to() {