diff --git a/.gitignore b/.gitignore index 9d784f4..d3a8c75 100644 --- a/.gitignore +++ b/.gitignore @@ -26,11 +26,3 @@ /sscg-3.0.1.tar.gz /sscg-3.0.2.tar.gz /sscg-3.0.3.tar.gz -/sscg-3.0.5.tar.gz -/sscg-3.0.6.tar.gz -/sscg-3.0.7.tar.gz -/sscg-3.0.8.tar.gz -/sscg-4.0.0.tar.gz -/sscg-4.0.1.tar.gz -/sscg-4.0.2.tar.gz -/sscg-4.0.3.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index ad46396..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -specfile_path: .distro/sscg.spec - -files_to_sync: - - src: .distro/sscg.spec - dest: sscg.spec - - src: .packit.yaml - dest: .packit.yaml - - src: get_current_version.sh - dest: get_current_version.sh - -sync_changelog: true - -upstream_package_name: sscg -downstream_package_name: sscg - -upstream_tag_template: sscg-{version} - -archive_root_dir_template: "{upstream_pkg_name}-{upstream_pkg_name}-{version}" - -notifications: - pull_request: - successful_build: true - -srpm_build_deps: - - meson - - jq - -actions: - get-current-version: - - ./get_current_version.sh - -jobs: -- job: copr_build - trigger: pull_request - targets: - - fedora-all - - centos-stream-8 - - centos-stream-9 -- job: tests - trigger: pull_request - targets: - - fedora-all - - centos-stream-8 - - centos-stream-9 -- job: propose_downstream - trigger: release - dist_git_branches: - - fedora-all diff --git a/0001-Avoid-segfault-on-receiving-bad-CLI-arguments.patch b/0001-Avoid-segfault-on-receiving-bad-CLI-arguments.patch deleted file mode 100644 index c80dc87..0000000 --- a/0001-Avoid-segfault-on-receiving-bad-CLI-arguments.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0c37e7ace585cfb550a0ffd9d5c331d059fd687f Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Tue, 2 Dec 2025 12:12:26 -0500 -Subject: [PATCH] Avoid segfault on receiving bad CLI arguments - -Signed-off-by: Stephen Gallagher ---- - src/sscg.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/sscg.c b/src/sscg.c -index b9b191f109300f6447262858f57a3a8321a14966..00e2862c2d6be5c44a4a362fc926e1a07d31d7bf 100644 ---- a/src/sscg.c -+++ b/src/sscg.c -@@ -59,7 +59,7 @@ int - main (int argc, const char **argv) - { - int ret, sret; -- struct sscg_options *options; -+ struct sscg_options *options = NULL; - bool build_client_cert = false; - char *dhparams_file = NULL; - -@@ -342,7 +342,10 @@ main (int argc, const char **argv) - done: - if (ret != EOK) - { -- sscg_io_utils_delete_output_files (options->streams); -+ if (options) -+ { -+ sscg_io_utils_delete_output_files (options->streams); -+ } - } - talloc_zfree (main_ctx); - if (getenv ("SSCG_TALLOC_REPORT")) --- -2.52.0 - diff --git a/README.packit b/README.packit deleted file mode 100644 index 01582f6..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.76.0. diff --git a/get_current_version.sh b/get_current_version.sh deleted file mode 100755 index 6d959fe..0000000 --- a/get_current_version.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/bash - -# This file is part of sscg. -# -# sscg is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# sscg is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with sscg. If not, see . -# -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the -# OpenSSL library under certain conditions as described in each -# individual source file, and distribute linked combinations -# including the two. -# You must obey the GNU General Public License in all respects -# for all of the code used other than OpenSSL. If you modify -# file(s) with this exception, you may extend this exception to your -# version of the file(s), but you are not obligated to do so. If you -# do not wish to do so, delete this exception statement from your -# version. If you delete this exception statement from all source -# files in the program, then also delete it here. -# -# Copyright 2023 by Stephen Gallagher - -set -e - -tmpdir=$(mktemp -d) - -function common_finalize { - exitcode=$? - rm -Rf "$tmpdir" - return $exitcode -} - -trap common_finalize EXIT - -meson setup ${tmpdir}/getcurrentversion 2>&1 > /dev/null -meson introspect ${tmpdir}/getcurrentversion --projectinfo | jq -r .version diff --git a/sources b/sources index ebbdfd3..261d5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sscg-4.0.3.tar.gz) = f629cf7e32d4d4e7c1f58c4a53be925b96980e6fb3106e3a36a72f85c723bd79fba6aecdbf092b50f915a8833297bc7c6c1ccbe04fef488db38bbdc1e3a95b96 +SHA512 (sscg-3.0.3.tar.gz) = 5820a44deaabf67296bf218485a22a5b58fcf48c6c33e2617946d0edaded3554f1acb2fb170eb189cdf4f8a61bb29bcb0385dc54996f7d0acdc8f45048b8e081 diff --git a/sscg.spec b/sscg.spec index 4a60e76..791b0c8 100644 --- a/sscg.spec +++ b/sscg.spec @@ -9,26 +9,23 @@ %{!?meson_test: %global meson_test %{__meson} test -C %{_vpath_builddir} --num-processes %{_smp_build_ncpus} --print-errorlogs} Name: sscg -Version: 4.0.3 +Version: 3.0.3 Release: %autorelease -Summary: Simple Signed Certificate Generator +Summary: Simple SSL certificate generator -License: GPL-3.0-or-later WITH cryptsetup-OpenSSL-exception +License: GPLv3+ with exceptions URL: https://%{provider_prefix} -Source0: %{URL}/archive/refs/tags/sscg-%{version}.tar.gz +Source0: https://%{provider_prefix}/archive/refs/tags/%{repo}-%{version}.tar.gz BuildRequires: gcc BuildRequires: libtalloc-devel BuildRequires: openssl BuildRequires: openssl-devel BuildRequires: popt-devel +BuildRequires: libpath_utils-devel BuildRequires: meson BuildRequires: ninja-build BuildRequires: help2man -# Upstream patch to avoid segfaults when receiving bad CLI arguments -# https://github.com/sgallagher/sscg/commit/0c37e7ace585cfb550a0ffd9d5c331d059fd687f -Patch: 0001-Avoid-segfault-on-receiving-bad-CLI-arguments.patch - %description A utility to aid in the creation of more secure "self-signed" @@ -39,7 +36,7 @@ up a full PKI environment and without exposing the machine to a risk of false signatures from the service certificate. %prep -%autosetup -p1 -n sscg-sscg-%{version} +%autosetup -p1 -n %{name}-%{name}-%{version} %build