Further improvements to arguments of AC_INIT

Reapply df6a3c2a, this time without regression.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>

Makefile.am

@@ -9,6 +9,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 @CODE_COVERAGE_RULES@
 
+CODE_COVERAGE_OUTPUT_FILE = @PACKAGE@-@PACKAGE_VERSION@-coverage.info
+CODE_COVERAGE_OUTPUT_DIRECTORY = @PACKAGE@-@PACKAGE_VERSION@-coverage
 CODE_COVERAGE_LCOV_RMOPTS_DEFAULT = --ignore-errors unused
 CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT = --ignore-errors unmapped
 

NEWS

@@ -1,5 +1,7 @@
 * Version 1.2.4 (unreleased)
-- Document that bug reports should be file against GitLab in console help.
+- Use "OpenConnect VPN server" as the long package name. Keep "ocserv" as a
+  short name.
+- usage: open issues on GitLab to report bugs.
 - Print bit rates as kb/s.
 - Fix logging to stderr: add missing newline.
 - Fixed compatibility with AnyConnect clients on Linux (#544)

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ(2.61)
-AC_INIT([ocserv], [1.2.3],
+AC_INIT([OpenConnect VPN Server], [1.2.3],
         [https://gitlab.com/openconnect/ocserv/-/issues],
 	[ocserv],
-	[https://ocserv.gitlab.io/www/])
+	[https://ocserv.openconnect-vpn.net/])
 PKG_PROG_PKG_CONFIG
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])

src/config.c

@@ -1611,7 +1611,7 @@ static const struct option long_options[] = {
 static
 void usage(void)
 {
-	fprintf(stderr, "ocserv - OpenConnect VPN server\n");
+	fprintf(stderr, PACKAGE" - "PACKAGE_NAME"\n");
 	fprintf(stderr, "Usage:  ocserv [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\n");
 
 	fprintf(stderr, "   -f, --foreground           Do not fork into background\n");
@@ -1630,7 +1630,7 @@ void usage(void)
 	fprintf(stderr, "   -s, --syslog               Log to syslog (default)\n");
 	fprintf(stderr, "   -h, --help                 Display extended usage information and exit\n\n");
 
-	fprintf(stderr, "OpenConnect VPN server (ocserv) is a VPN server compatible with the\n");
+	fprintf(stderr, PACKAGE_NAME" ("PACKAGE") is a VPN server compatible with the\n");
 	fprintf(stderr, "OpenConnect VPN client.  It follows the TLS and DTLS-based AnyConnect VPN\n");
 	fprintf(stderr, "protocol which is used by several CISCO routers.\n\n");
 

src/main-sec-mod-cmd.c

@@ -801,7 +801,7 @@ void run_sec_mod(sec_mod_instance_st * sec_mod_instance, unsigned int instance_i
 		 * the operating system. */
 		malloc_trim(0);
 #endif
-		setproctitle(PACKAGE_NAME "-sm");
+		setproctitle(PACKAGE "-sm");
 		close(fd[1]);
 		close(sfd[1]);
 		set_cloexec_flag (fd[0], 1);

src/main.c

@@ -804,7 +804,7 @@ static int check_tcp_wrapper(int fd)
 {
 	struct request_info req;
 
-	if (request_init(&req, RQ_FILE, fd, RQ_DAEMON, PACKAGE_NAME, 0) == NULL)
+	if (request_init(&req, RQ_FILE, fd, RQ_DAEMON, PACKAGE, 0) == NULL)
 		return -1;
 
 	sock_host(&req);
@@ -1106,7 +1106,7 @@ static void listen_watcher_cb (EV_P_ ev_io *w, int revents)
 				close(s->sec_mod_instances[i].sec_mod_fd_sync);
 			}
 
-			setproctitle(PACKAGE_NAME"-worker");
+			setproctitle(PACKAGE"-worker");
 			kill_on_parent_kill(SIGTERM);
 
 			set_self_oom_score_adj(s);
@@ -1433,7 +1433,7 @@ int main(int argc, char** argv)
 		exit(EXIT_FAILURE);
 	}
 
-	setproctitle(PACKAGE_NAME"-main");
+	setproctitle(PACKAGE"-main");
 
 	if (getuid() != 0) {
 		fprintf(stderr, "This server requires root access to operate.\n");

src/worker-vpn.c

@@ -1998,7 +1998,7 @@ static int connect_handler(worker_st * ws)
 	ret = cstp_puts(ws, "X-CSTP-Version: 1\r\n");
 	SEND_ERR(ret);
 
-	ret = cstp_puts(ws, "X-CSTP-Server-Name: "PACKAGE_STRING"\r\n");
+	ret = cstp_puts(ws, "X-CSTP-Server-Name: "PACKAGE_NAME"\r\n");
 	SEND_ERR(ret);
 
 	if (req->is_mobile) {

src/worker.c

@@ -180,7 +180,7 @@ int main(int argc, char **argv)
 #endif
 	sigprocmask(SIG_SETMASK, &sig_default_set, NULL);
 
-	setproctitle(PACKAGE_NAME "-worker");
+	setproctitle(PACKAGE "-worker");
 	kill_on_parent_kill(SIGTERM);
 
 	ws->main_pool = s->main_pool;