From 62fc1baecd712710d7ff7df7eea90058c8aea842 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Apr 22 2025 14:58:18 +0000 Subject: [PATCH 1/2] build: install the pkcs11 admin script and db migrations The new admin script to register PKCS11 keys as well as the associated database migration were not added to the autotools scripts and as such were not installed, which makes them less useful. Signed-off-by: Jeremy Cline --- diff --git a/Makefile.am b/Makefile.am index d91bea9..2849755 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ endif bin_SCRIPTS = src/sigul dist_bin_SCRIPTS = src/sigul_setup_client sbin_SCRIPTS = src/sigul_bridge src/sigul_server src/sigul_server_add_admin \ - src/sigul_server_create_db + src/sigul_server_create_db src/sigul_server_add_pkcs11_token dist_config_DATA = config/bridge.conf config/client.conf config/server.conf man_MANS = doc/sigul.1 doc/sigul_bridge.8 doc/sigul_server.8 \ doc/sigul_server_add_admin.8 doc/sigul_server_create_db.8 @@ -46,7 +46,7 @@ python_PYTHON = src/bridge.py \ src/double_tls.py \ src/errors.py \ src/server.py src/server_add_admin.py src/server_common.py src/server_gpg.py \ - src/server_create_db.py \ + src/server_create_db.py src/server_add_pkcs11_token.py \ src/utils.py nodist_python_PYTHON = src/settings.py @@ -141,6 +141,14 @@ src/sigul_server_create_db: src/script.in Makefile < $(srcdir)/src/script.in > $@ chmod a+x $@ +src/sigul_server_add_pkcs11_token: src/script.in Makefile + $(MKDIR_P) src + sed -e 's|@''PYTHON''@|$(PYTHON)|g' \ + -e 's|@''pkgdatadir''@|$(pkgdatadir)|g' \ + -e 's|@''program''@|server_add_pkcs11_token|g' \ + < $(srcdir)/src/script.in > $@ + chmod a+x $@ + clean-local: $(SHELL) $(top_srcdir)/tests/testsuite --clean @@ -154,8 +162,10 @@ installcheck-local: atconfig $(top_srcdir)/tests/testsuite install-data-local: $(MKDIR_P) $(DESTDIR)$(logdir) $(DESTDIR)$(piddir) \ - $(DESTDIR)$(serverdatadir)/gnupg + $(DESTDIR)$(serverdatadir)/gnupg $(DESTDIR)$(pkgdatadir)/migrations chmod 0700 $(DESTDIR)$(serverdatadir) $(DESTDIR)$(serverdatadir)/gnupg + install -m 0644 dbschema_v10_to_v11.sql $(DESTDIR)$(pkgdatadir)/migrations/ + install -m 0644 dbschema_v11_to_v12.sql $(DESTDIR)$(pkgdatadir)/migrations/ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure.ac { \ From 8e2ee64595b3ec9f1d050f0a32c16ba932eaa4fe Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Apr 22 2025 15:01:54 +0000 Subject: [PATCH 2/2] Bump version to 1.4 Signed-off-by: Jeremy Cline --- diff --git a/NEWS b/NEWS index 6911743..894b746 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Changes in 1.4: +- Install the new sigul_server_add_pkcs11_token script +- Install the database migrations + Changes in version 1.3: - Add AuthorityKeyIdentifier extension if missing from certificates - Switch Koji authentication from krb_login to gssapi_login diff --git a/configure.ac b/configure.ac index db4d479..32bd0fc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([sigul], [1.3], [patrick@puiterwijk.org], , +AC_INIT([sigul], [1.4], [patrick@puiterwijk.org], , [https://pagure.io/sigul/]) AC_COPYRIGHT( [Copyright (C) 2009-2021 Red Hat, Inc. All rights reserved.