rpms/dracut
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix(ossl): copy executables for the test suite

Browse Source 
and also fix CFLAGS in case of std=c99.

Related: RHEL-76323

From-source-git-commit: d4b71c7fc24ba1245a86c41f904b05a18cbe3e15
This commit is contained in:
Pavel Valena 2025-02-17 22:05:46 +01:00
parent 8011e2add0
commit 3b5a2ce903
2 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
0015-fix-ossl-copy-executables-for-the-test-suite.patch Normal file
View File

@ -0,0 +1,85 @@
From d4b71c7fc24ba1245a86c41f904b05a18cbe3e15 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Mon, 17 Feb 2025 17:31:35 +0100
Subject: [PATCH 15/15] fix(ossl): copy executables for the test suite
and also fix CFLAGS in case of std=c99.
Related: RHEL-76323
---
Makefile | 20 ++++++++++++--------
src/ossl/Makefile | 2 +-
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 4bc88561..51095b0a 100644
--- a/Makefile
+++ b/Makefile
@@ -88,11 +88,14 @@ util/util: $(UTIL_OBJECTS)
dracut-util: src/util/util
cp -a $< $@
-ossl: src/ossl/Makefile
+ossl:
$(MAKE) -C src/ossl
ossl-config: ossl
+ cp -a src/ossl/src/ossl-config $@
+
ossl-files: ossl
+ cp -a src/ossl/src/ossl-files $@
.PHONY: indent-c
indent-c:
@@ -205,20 +208,20 @@ endif
$(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
done \
fi
- if [ -f src/install/dracut-install ]; then \
+ if [ -r src/install/dracut-install ]; then \
install -m 0755 src/install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
fi
- if [ -f src/skipcpio/skipcpio ]; then \
+ if [ -r src/skipcpio/skipcpio ]; then \
install -m 0755 src/skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
fi
- if [ -f dracut-util ]; then \
+ if [ -r dracut-util ]; then \
install -m 0755 dracut-util $(DESTDIR)$(pkglibdir)/dracut-util; \
fi
- if [ -f src/ossl/src/ossl-config ]; then \
- install -m 0755 src/ossl/src/ossl-config $(DESTDIR)$(pkglibdir)/ossl-config; \
+ if [ -r ossl-config ]; then \
+ install -m 0755 ossl-config $(DESTDIR)$(pkglibdir)/ossl-config; \
fi
- if [ -f src/ossl/src/ossl-files ]; then \
- install -m 0755 src/ossl/src/ossl-files $(DESTDIR)$(pkglibdir)/ossl-files; \
+ if [ -r ossl-files ]; then \
+ install -m 0755 ossl-files $(DESTDIR)$(pkglibdir)/ossl-files; \
fi
ifeq ($(enable_dracut_cpio),yes)
install -m 0755 dracut-cpio $(DESTDIR)$(pkglibdir)/dracut-cpio
@@ -245,6 +248,7 @@ clean:
$(RM) $(manpages)
$(RM) dracut.pc
$(RM) dracut-cpio src/dracut-cpio/target/release/dracut-cpio*
+ $(RM) ossl-files ossl-config
$(MAKE) -C test clean
$(MAKE) -C src/ossl clean
diff --git a/src/ossl/Makefile b/src/ossl/Makefile
index 200dcbb5..43e7b464 100644
--- a/src/ossl/Makefile
+++ b/src/ossl/Makefile
@@ -1,7 +1,7 @@
.PHONY: all clean tests
CFLAGS ?= -std=c99 -Wall -Werror -pedantic -D_XOPEN_SOURCE=600
-CRYPTO_FLAGS = -lcrypto -Wl,-pie -Wl,-z,now
+CRYPTO_FLAGS = -lcrypto -Wl,-pie -Wl,-z,now -fPIE
TARGETS = src/ossl-config src/ossl-files
TESTS_CONFIG = $(wildcard tests/config/*.cnf)
--
2.47.1

8
dracut.spec
View File

@ -8,7 +8,7 @@
Name: dracut
Version: 105
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Initramfs generator using udev
@ -64,6 +64,9 @@ Patch13: 0013-feat-add-openssl-module.patch
# fix(openssl): harden ossl build CFLAGS
# Author: Pavel Valena <pvalena@redhat.com>
Patch14: 0014-fix-openssl-harden-ossl-build-CFLAGS.patch
# fix(ossl): copy executables for the test suite
# Author: Pavel Valena <pvalena@redhat.com>
Patch15: 0015-fix-ossl-copy-executables-for-the-test-suite.patch
# Please use source-git to work with this spec file:
# HowTo: https://packit.dev/source-git/work-with-source-git
@ -482,6 +485,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
%changelog
* Mon Feb 17 2025 Pavel Valena <pvalena@redhat.com> - 105-3
- fix(ossl): copy executables for the test suite
* Mon Feb 17 2025 Pavel Valena <pvalena@redhat.com> - 105-2
- fix(openssl): harden ossl build CFLAGS
Related: RHEL-76323