fix: Fix 5 components with non-first-parent upstream commits

base/comps/components.toml

@@ -2000,7 +2000,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.linkchecker]
 [components.linux-atm]
 [components.linux-firmware]
-[components.linux-sgx]
 [components.linux-sgx-enclaves-prebuilt]
 [components.linux-system-roles]
 [components.linuxconsoletools]
@@ -2368,7 +2367,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.pcg-cpp]
 [components.pciutils]
 [components.pcm]
-[components.pcp]
 [components.pcs]
 [components.pcsc-lite]
 [components.pcsc-lite-ccid]

base/comps/linux-sgx/linux-sgx.comp.toml

@@ -0,0 +1,4 @@
+[components.linux-sgx]
+# Pin past the default snapshot to correct a previously selected
+# non-first-parent commit on the f43 branch.
+spec = { type = "upstream", upstream-commit = "2049ba7b4df26e7a7ed754336c72b9082f5ee0c9" }

base/comps/openscap/openscap.comp.toml

@@ -1,3 +1,8 @@
+[components.openscap]
+# Pin past the default snapshot to correct a previously selected
+# non-first-parent commit on the f43 branch.
+spec = { type = "upstream", upstream-commit = "25ae681cc80c81e5c86418198c04593eca68531f" }
+
 [components.openscap.build]
 # Disable the optional `apt` integration. Upstream gates it on a
 # `%bcond_without apt` (default-on for Fedora, default-off for

base/comps/pcp/pcp.comp.toml

@@ -0,0 +1,4 @@
+[components.pcp]
+# Pin past the default snapshot to correct a previously selected
+# non-first-parent commit on the f43 branch.
+spec = { type = "upstream", upstream-commit = "ca70e01ed8f01b26cf221bfcdd816d2ae71cb87e" }

base/comps/systemtap/systemtap.comp.toml

@@ -1,3 +1,6 @@
 [components.systemtap]
+# Pin past the default snapshot to correct a previously selected
+# non-first-parent commit on the f43 branch.
+spec = { type = "upstream", upstream-commit = "d06e77cc8d15d8f0fc861c82cde5af7f7a12beb1" }
 # Release: 1%{?release_override}%{?dist}
 release = { calculation = "manual" }

locks/linux-sgx.lock

@@ -1,6 +1,6 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
-import-commit = 'afd42ddd421bb38b5851f9ad92a55948e9f3238a'
-upstream-commit = 'afd42ddd421bb38b5851f9ad92a55948e9f3238a'
-input-fingerprint = 'sha256:479c56d2e8d64370c2680c4dae50aab910dd3feb902bdc0baf47f63e40526d61'
-resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
+import-commit = '2049ba7b4df26e7a7ed754336c72b9082f5ee0c9'
+upstream-commit = '2049ba7b4df26e7a7ed754336c72b9082f5ee0c9'
+input-fingerprint = 'sha256:2899da94349e3880b3d66076d19df5f194bfe9578e2dce7f3cdaf27289aacfac'
+resolution-input-hash = 'sha256:feca9c61e90483d7284d01334a5002556bb28222a9402c1febd10511ff480bd0'

locks/openscap.lock

@@ -1,6 +1,6 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
-import-commit = 'bf5627bf8a35044563c84e7a90638c7a87c1d6a7'
-upstream-commit = 'bf5627bf8a35044563c84e7a90638c7a87c1d6a7'
-input-fingerprint = 'sha256:7549f855fe2b34304f57656af7b1a0af83265c74f78c72b9da78059ccc93971e'
-resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
+import-commit = '25ae681cc80c81e5c86418198c04593eca68531f'
+upstream-commit = '25ae681cc80c81e5c86418198c04593eca68531f'
+input-fingerprint = 'sha256:83b5014d0896ccbb3e57f5c754b996917140f177bc57af1314e275c622ca1e5f'
+resolution-input-hash = 'sha256:9173b76f366d6392a16198f4cdbdf44f4d2789322eedd1d785bac85a65f35b89'

locks/pcp.lock

@@ -1,6 +1,6 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
-import-commit = '91f4ce40de29a10186f74d75dd0c2f1e2769354b'
-upstream-commit = '91f4ce40de29a10186f74d75dd0c2f1e2769354b'
-input-fingerprint = 'sha256:8ec8f56b4b8fa4863607278119a1986a1ac739ca5f270048f63def3219775979'
-resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
+import-commit = 'ca70e01ed8f01b26cf221bfcdd816d2ae71cb87e'
+upstream-commit = 'ca70e01ed8f01b26cf221bfcdd816d2ae71cb87e'
+input-fingerprint = 'sha256:53e6f186133203e79de9616c800bb628f8b2b2a2d0a9cfbd011a3285cbaf5b65'
+resolution-input-hash = 'sha256:810ddf55b3b08725dc7cdc8308833ac7827eebee5f1a83e396c22689f3fca061'

locks/systemtap.lock

@@ -1,6 +1,6 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
-import-commit = 'a5c5bd1293b3c1d39c7f9a1c39370d7d7bd1e374'
-upstream-commit = 'a5c5bd1293b3c1d39c7f9a1c39370d7d7bd1e374'
-input-fingerprint = 'sha256:4a9ba40aa14efdd15f24addddfcf1c96bc4837f855b3b6ba792315d58a1ee460'
-resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
+import-commit = 'd06e77cc8d15d8f0fc861c82cde5af7f7a12beb1'
+upstream-commit = 'd06e77cc8d15d8f0fc861c82cde5af7f7a12beb1'
+input-fingerprint = 'sha256:2da25aa9ad786ee5b902a843031823c05dc00331401b1750c3f278696b205663'
+resolution-input-hash = 'sha256:839b5466d4855563ee48b649e3fe11da139d12b234cdf7508df2a0b850388295'

locks/yarnpkg.lock

@@ -1,6 +1,6 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
-import-commit = '67fc0c2761282f257cef9eae198d24bd62247016'
-upstream-commit = '67fc0c2761282f257cef9eae198d24bd62247016'
-input-fingerprint = 'sha256:1b165f30d91836362b3ad949df0902bec9b1a7367feed89c778b4768450805a7'
+import-commit = '2787ceb4087c2477217567d362f87976cbca75bb'
+upstream-commit = '2787ceb4087c2477217567d362f87976cbca75bb'
+input-fingerprint = 'sha256:3f939237df8469cf2bbf7c2edd56f68b80015a37ea4f9fb1d87018d496d73338'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

specs/l/linux-sgx/0000-Add-support-for-building-against-host-openssl-crypto.patch

@@ -1,7 +1,7 @@
-From 1cd5674ab9d90d663b4aada9c02cd1a2115c0b24 Mon Sep 17 00:00:00 2001
+From f3d15471fc97351df73b6d7af95561c9ecfa3a6c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Thu, 13 Feb 2025 14:12:38 +0000
-Subject: [PATCH 00/17] Add support for building against host openssl crypto
+Subject: [PATCH 00/16] Add support for building against host openssl crypto
  lib
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -28,10 +28,10 @@ Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
  7 files changed, 27 insertions(+), 22 deletions(-)
 
 diff --git a/buildenv.mk b/buildenv.mk
-index 4689c603..acae2106 100644
+index 379b87ce..b9f625cb 100644
 --- a/buildenv.mk
 +++ b/buildenv.mk
-@@ -371,3 +371,16 @@ else
+@@ -356,3 +356,16 @@ else
      SGX_LIB_DIR := $(SGX_SDK)/lib64/$(MITIGATION_LIB_PATH)
      SGX_BIN_DIR := $(SGX_SDK)/bin/x64
  endif
@@ -49,11 +49,11 @@ index 4689c603..acae2106 100644
 +OPENSSL_CRYPTO_LIBS = $(OPENSSL_CRYPTO_PREBUILT_DIR)/lib/linux64/libcrypto.a
 +endif
 diff --git a/psw/ae/aesm_service/Makefile b/psw/ae/aesm_service/Makefile
-index 498d6e2f..bac84292 100644
+index 350addeb..24613afe 100644
 --- a/psw/ae/aesm_service/Makefile
 +++ b/psw/ae/aesm_service/Makefile
-@@ -46,6 +46,9 @@ ifeq ($(BUILD_REF_LE), 1)
-      AESM_CONFIG += -DREF_LE=ON
+@@ -42,6 +42,9 @@ else
+      AESM_CONFIG += -DCMAKE_BUILD_TYPE=Release
  endif
 
 +AESM_CONFIG += -DOPENSSL_CRYPTO_CFLAGS=$(OPENSSL_CRYPTO_CFLAGS)
@@ -63,19 +63,19 @@ index 498d6e2f..bac84292 100644
      SQLITECFLAGS += -m32
  else
 diff --git a/psw/ae/aesm_service/source/utils/CMakeLists.txt b/psw/ae/aesm_service/source/utils/CMakeLists.txt
-index a3843bdf..2c9c87b3 100644
+index a4b3d1af..f8003e42 100644
 --- a/psw/ae/aesm_service/source/utils/CMakeLists.txt
 +++ b/psw/ae/aesm_service/source/utils/CMakeLists.txt
-@@ -45,7 +45,7 @@ target_include_directories(utils PRIVATE
-     ${PROJECT_SOURCE_DIR}/../../../../external/epid-sdk
+@@ -44,7 +44,7 @@ target_include_directories(utils PRIVATE
+     ${PROJECT_SOURCE_DIR}/../../../../common/inc/internal
      ${PROJECT_SOURCE_DIR}/../../../../external/rdrand
      ${PROJECT_SOURCE_DIR}/../../data/constants/linux
 -    ${PROJECT_SOURCE_DIR}/../../../../external/dcap_source/prebuilt/openssl/inc
 +    ${OPENSSL_CRYPTO_CFLAGS}
  )
 
  target_compile_definitions(utils PRIVATE
-@@ -55,7 +55,7 @@ target_compile_definitions(utils PRIVATE
+@@ -54,7 +54,7 @@ target_compile_definitions(utils PRIVATE
  set_property(TARGET utils APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,defs")
 
  target_link_libraries(utils
@@ -85,7 +85,7 @@ index a3843bdf..2c9c87b3 100644
      ${CMAKE_SOURCE_DIR}/../../../../external/rdrand/src/librdrand.a
  )
 diff --git a/psw/urts/linux/Makefile b/psw/urts/linux/Makefile
-index 7e0b6a08..3d08ee5c 100644
+index 2e291857..275a9d45 100644
 --- a/psw/urts/linux/Makefile
 +++ b/psw/urts/linux/Makefile
 @@ -43,8 +43,6 @@ CFLAGS += -fPIC -Werror -g
@@ -148,7 +148,7 @@ index 1ed9f286..ed177c86 100644
 
  sgx_sign: $(OBJS) enclaveparser
 diff --git a/sdk/simulation/uae_service_sim/linux/Makefile b/sdk/simulation/uae_service_sim/linux/Makefile
-index c66beed2..45ddb576 100644
+index d80a3d06..3d5b5628 100644
 --- a/sdk/simulation/uae_service_sim/linux/Makefile
 +++ b/sdk/simulation/uae_service_sim/linux/Makefile
 @@ -34,9 +34,6 @@ include $(TOP_DIR)/buildenv.mk
@@ -158,19 +158,19 @@ index c66beed2..45ddb576 100644
 -PREBUILT_OPENSSL_DIR := $(LINUX_EXTERNAL_DIR)/dcap_source/prebuilt/openssl
 -CRYPTO_LIB := -L$(PREBUILT_OPENSSL_DIR)/lib/linux64 -lcrypto
 -
- INCLUDES := -I..                                            \
-             -I$(COMMON_DIR)/inc                             \
-             -I$(COMMON_DIR)/inc/internal                    \
-@@ -48,7 +45,7 @@ INCLUDES := -I..                                            \
-             -I$(LINUX_PSW_DIR)/ae/inc                       \
-             -I$(LINUX_PSW_DIR)/ae/inc/internal              \
-             -I$(LINUX_PSW_DIR)/ae/common                    \
--            -I$(PREBUILT_OPENSSL_DIR)/inc
-+            $(OPENSSL_CRYPTO_CFLAGS)
-
-
- CXXFLAGS += -Wall -fPIC $(INCLUDES) -Werror -g $(CET_FLAGS)
-@@ -60,7 +57,7 @@ RDRAND_MAKEFILE := $(RDRAND_LIBDIR)/Makefile
+ INCLUDES := -I..                                                   \
+             -I$(COMMON_DIR)/inc                                    \
+             -I$(COMMON_DIR)/inc/internal                           \
+@@ -47,7 +44,7 @@ INCLUDES := -I..                                                   \
+             -I$(LINUX_PSW_DIR)/ae/inc                              \
+             -I$(LINUX_PSW_DIR)/ae/inc/internal                     \
+             -I$(LINUX_PSW_DIR)/ae/common                           \
+-            -I$(PREBUILT_OPENSSL_DIR)/inc                          \
++            $(OPENSSL_CRYPTO_CFLAGS)                               \
+             -I$(DCAP_DIR)/QuoteGeneration/quote_wrapper/common/inc \
+             -I$(DCAP_DIR)/QuoteGeneration/pce_wrapper/inc
+
+@@ -61,7 +58,7 @@ RDRAND_MAKEFILE := $(RDRAND_LIBDIR)/Makefile
 
  EXTERNAL_LIB += -L$(RDRAND_LIBDIR) -lrdrand
  EXTERNAL_LIB += -L$(RDRAND_LIBDIR) -lrt
@@ -180,7 +180,7 @@ index c66beed2..45ddb576 100644
  vpath %.cpp $(LINUX_PSW_DIR)/ae/common \
              $(LINUX_SDK_DIR)/simulation/urtssim \
 diff --git a/sdk/simulation/urtssim/linux/Makefile b/sdk/simulation/urtssim/linux/Makefile
-index e756d468..ea8ca78c 100644
+index 79f20a2b..8af19905 100644
 --- a/sdk/simulation/urtssim/linux/Makefile
 +++ b/sdk/simulation/urtssim/linux/Makefile
 @@ -42,9 +42,6 @@ endif
@@ -202,7 +202,7 @@ index e756d468..ea8ca78c 100644
 
  CPPFLAGS += -I$(COMMON_DIR)/inc/internal      \
              -I$(LINUX_PSW_DIR)/urts/linux     \
-@@ -128,7 +125,7 @@ LDFLAGS += $(COMMON_LDFLAGS) -Wl,--version-script=$(LINUX_PSW_DIR)/urts/linux/ur
+@@ -127,7 +124,7 @@ LDFLAGS += $(COMMON_LDFLAGS) -Wl,--version-script=$(LINUX_PSW_DIR)/urts/linux/ur
  LIBURTSSIM_SHARED := libsgx_urts_sim.so
  LIBURTS_DEPLOY := libsgx_urts_deploy.so
 
@@ -212,5 +212,5 @@ index e756d468..ea8ca78c 100644
 
  .PHONY: all
 -- 
-2.52.0
+2.53.0
 

specs/l/linux-sgx/0001-Add-support-for-building-against-host-tinyxml2-lib.patch

@@ -1,7 +1,7 @@
-From 4f4340cc0e4c06b06f6531c00254bdcb2d4adf9e Mon Sep 17 00:00:00 2001
+From 79bc4b56fd25fbf49927be31513556ec9d86e6ec Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Thu, 13 Feb 2025 14:01:10 +0000
-Subject: [PATCH 01/17] Add support for building against host tinyxml2 lib
+Subject: [PATCH 01/16] Add support for building against host tinyxml2 lib
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -22,10 +22,10 @@ Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
  2 files changed, 18 insertions(+), 4 deletions(-)
 
 diff --git a/buildenv.mk b/buildenv.mk
-index acae2106..6dac4028 100644
+index b9f625cb..86d30af6 100644
 --- a/buildenv.mk
 +++ b/buildenv.mk
-@@ -384,3 +384,17 @@ OPENSSL_CRYPTO_CFLAGS = -I$(OPENSSL_CRYPTO_PREBUILT_DIR)/inc
+@@ -369,3 +369,17 @@ OPENSSL_CRYPTO_CFLAGS = -I$(OPENSSL_CRYPTO_PREBUILT_DIR)/inc
  OPENSSL_CRYPTO_LDFLAGS = -L$(OPENSSL_CRYPTO_PREBUILT_DIR)/lib/linux64 -lcrypto
  OPENSSL_CRYPTO_LIBS = $(OPENSSL_CRYPTO_PREBUILT_DIR)/lib/linux64/libcrypto.a
  endif
@@ -80,5 +80,5 @@ index ed177c86..1dcb6f51 100644
 
  sgx_sign: $(OBJS) enclaveparser
 -- 
-2.52.0
+2.53.0
 

specs/l/linux-sgx/0002-Add-support-for-building-against-host-CppMicroServic.patch

@@ -1,7 +1,7 @@
-From 52367555ba7ec1a3591dc0e6fb3b3cc4cef03517 Mon Sep 17 00:00:00 2001
+From b59cf0e4fb227486ba743f4d02b9cede4b2e08ec Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Thu, 13 Feb 2025 14:01:10 +0000
-Subject: [PATCH 02/17] Add support for building against host CppMicroServices
+Subject: [PATCH 02/16] Add support for building against host CppMicroServices
  lib
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -29,10 +29,10 @@ Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
  3 files changed, 28 insertions(+), 11 deletions(-)
 
 diff --git a/buildenv.mk b/buildenv.mk
-index 6dac4028..915e2eb4 100644
+index 86d30af6..8aafa610 100644
 --- a/buildenv.mk
 +++ b/buildenv.mk
-@@ -398,3 +398,13 @@ TINYXML2_LDFLAGS =
+@@ -383,3 +383,13 @@ TINYXML2_LDFLAGS =
  TINYXML2_OBJ = tinyxml2.o
  TINYXML2_DIR = $(LINUX_EXTERNAL_DIR)/tinyxml2/
  endif
@@ -47,7 +47,7 @@ index 6dac4028..915e2eb4 100644
 +CPPMICROSERVICES_CMAKE_DIR = $(CPPMICROSERVICES_INSTALL_DIR)/share/cppmicroservices4/cmake
 +endif
 diff --git a/psw/ae/aesm_service/Makefile b/psw/ae/aesm_service/Makefile
-index bac84292..89a15875 100644
+index 24613afe..b469bffb 100644
 --- a/psw/ae/aesm_service/Makefile
 +++ b/psw/ae/aesm_service/Makefile
 @@ -32,10 +32,8 @@
@@ -62,17 +62,17 @@ index bac84292..89a15875 100644
  ifdef DEBUG
      AESM_CONFIG += -DCMAKE_BUILD_TYPE=Debug
  else
-@@ -48,6 +46,7 @@ endif
+@@ -44,6 +42,7 @@ endif
 
  AESM_CONFIG += -DOPENSSL_CRYPTO_CFLAGS=$(OPENSSL_CRYPTO_CFLAGS)
  AESM_CONFIG += -DOPENSSL_CRYPTO_LIBS=$(OPENSSL_CRYPTO_LIBS)
 +AESM_CONFIG += -DCPPMICROSERVICES_CMAKE_DIR=$(CPPMICROSERVICES_CMAKE_DIR)
 
  ifeq ($(ARCH), x86)
      SQLITECFLAGS += -m32
-@@ -66,7 +65,9 @@ CFLAGS := $(filter-out -Werror, $(CFLAGS))
+@@ -61,7 +60,9 @@ CFLAGS += -fpie
+ CFLAGS := $(filter-out -Werror, $(CFLAGS))
 
- WHITE_LIST_FILE := $(LINUX_PSW_DIR)/ae/data/prebuilt/white_list_cert_to_be_verify.bin
  APPNAME         := source/build/bin/aesm_service
 -CPPMICROSERVICES:= $(CPPMICROSERVICES_DIR)/build/lib/libCppMicroServices.so.4.0.0
 +ifeq ($(USE_HOST_CPPMICROSERVICES), 0)
@@ -81,7 +81,7 @@ index bac84292..89a15875 100644
  RDRAND_LIBDIR :=$(LINUX_EXTERNAL_DIR)/rdrand/src
  RDRAND_MAKEFILE := $(RDRAND_LIBDIR)/Makefile
 
-@@ -80,21 +81,25 @@ copy_data_file:
+@@ -71,21 +72,25 @@ all: $(APPNAME) $(APPNAME_DEBUG) | $(BUILD_DIR)
 
  $(APPNAME): $(CPPMICROSERVICES) source/build/CMakeCache.txt urts RDRAND
  	$(MAKE) -C source/build
@@ -111,7 +111,7 @@ index bac84292..89a15875 100644
  endif
 
  source/build/CMakeCache.txt: $(CPPMICROSERVICES)
-@@ -124,8 +129,10 @@ $(BUILD_DIR):
+@@ -115,8 +120,10 @@ $(BUILD_DIR):
  .PHONY: clean
  clean:
  	@$(RM) -r source/build
@@ -125,7 +125,7 @@ index bac84292..89a15875 100644
  ifeq ($(RDRAND_MAKEFILE), $(wildcard $(RDRAND_MAKEFILE)))
  	@$(MAKE) distclean -C $(RDRAND_LIBDIR)
 diff --git a/psw/ae/aesm_service/source/CMakeLists.txt b/psw/ae/aesm_service/source/CMakeLists.txt
-index 5728e9b4..7f368a97 100644
+index 735c5fa5..065b7527 100644
 --- a/psw/ae/aesm_service/source/CMakeLists.txt
 +++ b/psw/ae/aesm_service/source/CMakeLists.txt
 @@ -46,7 +46,7 @@ else()
@@ -138,5 +138,5 @@ index 5728e9b4..7f368a97 100644
  cmake_minimum_required(VERSION ${US_CMAKE_MINIMUM_REQUIRED_VERSION})
  cmake_policy(VERSION ${US_CMAKE_MINIMUM_REQUIRED_VERSION})
 -- 
-2.52.0
+2.53.0