From e2291ee74b9e96c1845ad313ef25803a3b81f6df61f9912aafa05214d55aee9e Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Wed, 1 Nov 2023 07:16:53 +0000 Subject: [PATCH 1/4] Accepting request 1116045 from home:dancermak:branches:Base:System Create pesign-systemd subpackage to remove systemd dependency OBS-URL: https://build.opensuse.org/request/show/1116045 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=72 --- pesign.changes | 5 +++++ pesign.spec | 35 +++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/pesign.changes b/pesign.changes index 58c2a07..989d642 100644 --- a/pesign.changes +++ b/pesign.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 6 13:13:09 UTC 2023 - Dan Čermák + +- Create pesign-systemd subpackage to remove systemd dependency + ------------------------------------------------------------------- Wed Feb 22 08:05:20 UTC 2023 - Gary Ching-Pang Lin diff --git a/pesign.spec b/pesign.spec index cfabdaf..fd1cef4 100644 --- a/pesign.spec +++ b/pesign.spec @@ -48,25 +48,24 @@ BuildRequires: popt-devel BuildRequires: sysuser-tools BuildRequires: pkgconfig(systemd) %sysusers_requires -%{?systemd_requires} ExclusiveArch: ia64 %ix86 x86_64 aarch64 %arm riscv64 +Recommends: %{name}-systemd %description Signing tool for PE-COFF binaries. It is vaguely compliant with the PE and Authenticode specifications. +%package systemd +Summary: Systemd units for pesign +Requires: %{name} = %{version} +%{?systemd_requires} +BuildArch: noarch + +%description systemd +Systemd units for the pesign package. + %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%autosetup -p1 %build %sysusers_generate_pre %{SOURCE1} %{name} %{name}.conf @@ -92,16 +91,18 @@ rm -rf %{buildroot}%{_libdir}/libdpe* install -Dm0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf %pre -f %{name}.pre + +%pre systemd %service_add_pre pesign.service -%preun +%preun systemd %service_del_preun pesign.service -%post +%post systemd %service_add_post pesign.service systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || : -%postun +%postun systemd %service_del_postun pesign.service %files @@ -120,7 +121,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || : %config %{_sysconfdir}/popt.d/pesign.popt %{_rpmmacrodir}/macros.pesign %{_mandir}/man?/* -%{_unitdir}/pesign.service %{_sysusersdir}/pesign.conf %{_tmpfilesdir}/pesign.conf %dir %{_libexecdir}/pesign @@ -130,4 +130,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || : %ghost %dir %attr(0770,pesign,pesign) /run/%{name} %dir %attr(0770,pesign,pesign) %{_localstatedir}/lib/%{name} +%files systemd +%{_unitdir}/pesign.service + %changelog From 6a0097bbb57189328f9d218038b84c6f655a64881bbf2ede48e74c0ff4d7c269 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Wed, 1 Nov 2023 08:11:05 +0000 Subject: [PATCH 2/4] Move rcpesign to pesign-systemd OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=73 --- pesign.changes | 5 +++++ pesign.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pesign.changes b/pesign.changes index 989d642..ad1039b 100644 --- a/pesign.changes +++ b/pesign.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 1 08:10:30 UTC 2023 - Gary Ching-Pang Lin + +- Move rcpesign to pesign-systemd + ------------------------------------------------------------------- Fri Oct 6 13:13:09 UTC 2023 - Dan Čermák diff --git a/pesign.spec b/pesign.spec index fd1cef4..3163f5e 100644 --- a/pesign.spec +++ b/pesign.spec @@ -114,7 +114,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || : %{_bindir}/pesigcheck %{_bindir}/authvar %{_bindir}/pesum -%{_sbindir}/rcpesign %dir %{_sysconfdir}/pesign %{_sysconfdir}/pesign/* %dir %{_sysconfdir}/popt.d @@ -130,7 +129,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || : %ghost %dir %attr(0770,pesign,pesign) /run/%{name} %dir %attr(0770,pesign,pesign) %{_localstatedir}/lib/%{name} -%files systemd +%files systemd +%{_sbindir}/rcpesign %{_unitdir}/pesign.service %changelog From 59ee53db0c1bd79d54d3bad7d8acc630b4179a983ae96e7919c8a3502fc87125 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Wed, 1 Nov 2023 08:28:02 +0000 Subject: [PATCH 3/4] - Move rcpesign and %{_tmpfilesdir}/pesign.conf to pesign-systemd OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=74 --- pesign.changes | 4 ++-- pesign.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pesign.changes b/pesign.changes index ad1039b..da57193 100644 --- a/pesign.changes +++ b/pesign.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Wed Nov 1 08:10:30 UTC 2023 - Gary Ching-Pang Lin +Wed Nov 1 08:27:33 UTC 2023 - Gary Ching-Pang Lin -- Move rcpesign to pesign-systemd +- Move rcpesign and %{_tmpfilesdir}/pesign.conf to pesign-systemd ------------------------------------------------------------------- Fri Oct 6 13:13:09 UTC 2023 - Dan Čermák diff --git a/pesign.spec b/pesign.spec index 3163f5e..37f3701 100644 --- a/pesign.spec +++ b/pesign.spec @@ -121,7 +121,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || : %{_rpmmacrodir}/macros.pesign %{_mandir}/man?/* %{_sysusersdir}/pesign.conf -%{_tmpfilesdir}/pesign.conf %dir %{_libexecdir}/pesign %{_libexecdir}/pesign/pesign-rpmbuild-helper %dir %{_sysconfdir}/pki/ @@ -132,5 +131,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/pesign.conf || : %files systemd %{_sbindir}/rcpesign %{_unitdir}/pesign.service +%{_tmpfilesdir}/pesign.conf %changelog From e5f945d5675cd67d73dc209dabc1a48089772c98383d9bd3762878cb69961505 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Thu, 2 Nov 2023 06:44:50 +0000 Subject: [PATCH 4/4] Accepting request 1121772 from home:gary_lin:branches:Base:System - Add the Provides tag for the files moved to pesign-systemd OBS-URL: https://build.opensuse.org/request/show/1121772 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=75 --- pesign.changes | 5 +++++ pesign.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/pesign.changes b/pesign.changes index da57193..b09268b 100644 --- a/pesign.changes +++ b/pesign.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 2 03:20:49 UTC 2023 - Gary Ching-Pang Lin + +- Add the Provides tag for the files moved to pesign-systemd + ------------------------------------------------------------------- Wed Nov 1 08:27:33 UTC 2023 - Gary Ching-Pang Lin diff --git a/pesign.spec b/pesign.spec index 37f3701..0cff7c3 100644 --- a/pesign.spec +++ b/pesign.spec @@ -60,6 +60,9 @@ Summary: Systemd units for pesign Requires: %{name} = %{version} %{?systemd_requires} BuildArch: noarch +Provides: pesign:%{_sbindir}/rcpesign +Provides: pesign:%{_tmpfilesdir}/pesign.conf +Provides: pesign:%{_unitdir}/pesign.service %description systemd Systemd units for the pesign package.