113 lines
3.5 KiB
Diff
113 lines
3.5 KiB
Diff
From 056fcd05b81258a249e40f7358d708d838929ad2 Mon Sep 17 00:00:00 2001
|
|
From: Michal Suchanek <msuchanek@suse.de>
|
|
Date: Fri, 29 Aug 2025 11:25:25 +0200
|
|
Subject: [PATCH] Create archive first
|
|
|
|
Signed-off-by: Chun-Yi Lee <jlee@suse.com>
|
|
---
|
|
brp-99-pesign | 95 +++++++++++++++++++++++++--------------------------
|
|
1 file changed, 47 insertions(+), 48 deletions(-)
|
|
|
|
Index: pesign-obs-integration-10.2+git20230612.4699910/brp-99-pesign
|
|
===================================================================
|
|
--- pesign-obs-integration-10.2+git20230612.4699910.orig/brp-99-pesign
|
|
+++ pesign-obs-integration-10.2+git20230612.4699910/brp-99-pesign
|
|
@@ -89,45 +89,6 @@ else
|
|
cert=/dev/null
|
|
fi
|
|
|
|
-if test -e $RPM_SOURCE_DIR/pesign-spec-macros; then
|
|
- sed "
|
|
- s:%{name}:$RPM_PACKAGE_NAME:g
|
|
- s:%{version}:$RPM_PACKAGE_VERSION:g
|
|
- " $RPM_SOURCE_DIR/pesign-spec-macros > $output/pesign-spec-macros
|
|
- spec_macros="--macros pesign-spec-macros"
|
|
-fi
|
|
-if test -e $RPM_SOURCE_DIR/pesign-copy-sources; then
|
|
- sed "
|
|
- s:%{name}:$RPM_PACKAGE_NAME:g
|
|
- s:%{version}:$RPM_PACKAGE_VERSION:g
|
|
- " $RPM_SOURCE_DIR/pesign-copy-sources > $output/pesign-copy-sources
|
|
- while read -r line; do
|
|
- if [ -n "${line}" ]; then
|
|
- source_files="${source_files}${RPM_SOURCE_DIR}/${line}\n"
|
|
- fi
|
|
- done < $output/pesign-copy-sources
|
|
- echo -e "$source_files" | head -c -1 | cpio -o > $output/source_files.cpio
|
|
- rm $output/pesign-copy-sources
|
|
-fi
|
|
-
|
|
-
|
|
-sed "
|
|
- s:@NAME@:$RPM_PACKAGE_NAME:g
|
|
- s:@PESIGN_GRUB_RESERVATION@:$pesign_grub_reservation:g
|
|
- s:@PESIGN_REPACKAGE_COMPRESS@:$pesign_repackage_compress:g
|
|
- s:@PESIGN_LOAD_SPEC_MACROS@:$spec_macros:g
|
|
- /@CERT@/ {
|
|
- r $cert
|
|
- d
|
|
- }
|
|
-" /usr/lib/rpm/pesign/pesign-repackage.spec.in >"$output/pesign-repackage.spec"
|
|
-
|
|
-for rpmlintrc in $RPM_SOURCE_DIR/*rpmlintrc; do
|
|
- if test -e "$rpmlintrc"; then
|
|
- cp "$rpmlintrc" "$output/"
|
|
- fi
|
|
-done
|
|
-
|
|
cd "$RPM_BUILD_ROOT"
|
|
args=()
|
|
for pattern in $files; do
|
|
@@ -149,7 +110,8 @@ mkdir -p "$archive_dir"
|
|
# create an empty nss database to make pesign happy
|
|
nss_db=$(mktemp -d)
|
|
trap 'rm -rf "$nss_db"' EXIT
|
|
-echo foofoofoo > "$nss_db/passwd"
|
|
+# strong password (in FIPS mode it is checked for strength)
|
|
+echo 'Eir4;Qua.daeJ,hP0' > "$nss_db/passwd"
|
|
certutil -N -d "$nss_db" -f "$nss_db/passwd"
|
|
|
|
echo "Creating $archive"
|
|
@@ -174,3 +136,41 @@ cd "$archive_dir"
|
|
find . -type f | cpio -H newc -o >"$archive"
|
|
rm -rf "$archive_dir"
|
|
|
|
+if test -e $RPM_SOURCE_DIR/pesign-spec-macros; then
|
|
+ sed "
|
|
+ s:%{name}:$RPM_PACKAGE_NAME:g
|
|
+ s:%{version}:$RPM_PACKAGE_VERSION:g
|
|
+ " $RPM_SOURCE_DIR/pesign-spec-macros > $output/pesign-spec-macros
|
|
+ spec_macros="--macros pesign-spec-macros"
|
|
+fi
|
|
+if test -e $RPM_SOURCE_DIR/pesign-copy-sources; then
|
|
+ sed "
|
|
+ s:%{name}:$RPM_PACKAGE_NAME:g
|
|
+ s:%{version}:$RPM_PACKAGE_VERSION:g
|
|
+ " $RPM_SOURCE_DIR/pesign-copy-sources > $output/pesign-copy-sources
|
|
+ while read -r line; do
|
|
+ if [ -n "${line}" ]; then
|
|
+ source_files="${source_files}${RPM_SOURCE_DIR}/${line}\n"
|
|
+ fi
|
|
+ done < $output/pesign-copy-sources
|
|
+ echo -e "$source_files" | head -c -1 | cpio -o > $output/source_files.cpio
|
|
+ rm $output/pesign-copy-sources
|
|
+fi
|
|
+
|
|
+
|
|
+sed "
|
|
+ s:@NAME@:$RPM_PACKAGE_NAME:g
|
|
+ s:@PESIGN_GRUB_RESERVATION@:$pesign_grub_reservation:g
|
|
+ s:@PESIGN_REPACKAGE_COMPRESS@:$pesign_repackage_compress:g
|
|
+ s:@PESIGN_LOAD_SPEC_MACROS@:$spec_macros:g
|
|
+ /@CERT@/ {
|
|
+ r $cert
|
|
+ d
|
|
+ }
|
|
+" /usr/lib/rpm/pesign/pesign-repackage.spec.in >"$output/pesign-repackage.spec"
|
|
+
|
|
+for rpmlintrc in $RPM_SOURCE_DIR/*rpmlintrc; do
|
|
+ if test -e "$rpmlintrc"; then
|
|
+ cp "$rpmlintrc" "$output/"
|
|
+ fi
|
|
+done
|