From 1481a5ca05b74415ac03fc58981f9a784ae4c551 Mon Sep 17 00:00:00 2001
From: Davide Caratti <dcaratti@redhat.com>
Date: Tue, 25 Jun 2024 12:24:15 +0200
Subject: [PATCH] fix potential regressions after rebase from f40

- Add gating.yaml and rpminspect.yaml to clear OSCI dashboard errors
- Fix build configuration (OpenSSL default profile and enablement of
  SUITE B-192)
- Build with -fPIE and disable OpenSSL ENGINE API

Resolves: RHEL-43439, RHEL-44685

Signed-off-by: Davide Caratti <dcaratti@redhat.com>
---
 gating.yaml     | 6 ++++++
 hostapd.spec    | 7 ++++++-
 rpminspect.yaml | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 gating.yaml
 create mode 100644 rpminspect.yaml

diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..d353613
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
diff --git a/hostapd.spec b/hostapd.spec
index 0494255..6f572e4 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -66,6 +66,8 @@ Logwatch scripts for hostapd.
 cd hostapd
 cat defconfig | sed \
     -e '$ a CONFIG_SAE=y' \
+    -e '$ a CONFIG_SUITEB192=y' \
+    -e '$ a CONFIG_TLS_DEFAULT_CIPHERS="PROFILE=SYSTEM:3DES"' \
     -e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
     -e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
     -e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
@@ -82,7 +84,10 @@ cat defconfig | sed \
     > .config
 echo "CFLAGS += -I%{_includedir}/libnl3" >> .config
 echo "LIBS += -L%{_libdir}" >> .config
-make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="${CFLAGS:-%optflags} -fPIE -DPIE -DOPENSSL_NO_ENGINE"
+export CXXFLAGS="${CXXFLAGS:-%optflags} -fPIE -DPIE -DOPENSSL_NO_ENGINE"
+export LDFLAGS="${LDFLAGS:-%optflags} -pie -Wl,-z,now"
+make %{?_smp_mflags} V=1
 
 
 %install
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..0c3bdf7
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,3 @@
+---
+inspections:
+    badfuncs: off