Bump nssadapter version to bring in shared PKCS11 session fix

- Drop LDFLAGS nssadapter patch which is now upstream in 0.1.1

Resolves: RHEL-155044

.gitignore

@@ -45,3 +45,4 @@
 /openjdk-25.0.1+8.tar.xz
 /nssadapter-0.1.0.tar.xz
 /openjdk-25.0.2+10.tar.xz
+/nssadapter-0.1.1.tar.xz

java-25-openjdk.spec

@@ -324,7 +324,7 @@
 # Define current Git revision for the crypto policy & FIPS support patches
 %global fipsver e55ada9353e
 # Define nssadapter variables
-%global nssadapter_version 0.1.0
+%global nssadapter_version 0.1.1
 %global nssadapter_name nssadapter-%{nssadapter_version}
 # Define whether the crypto policy is expected to be active when testing
 %global crypto_policy_active true
@@ -1415,7 +1415,8 @@ Patch2004: jdk8377526-libpng-1.6.55.patch
 # NSS adapter patches
 #
 #############################################
-Patch3001: nssadapter-ldflags.patch
+
+# Currently empty
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1943,7 +1944,7 @@ popd # openjdk
 
 # Patch NSS adapter
 pushd %{nssadapter_name}
-%patch -P3001 -p1
+# Nothing to do
 popd # nssadapter
 
 # The OpenJDK version file includes the current
@@ -2621,10 +2622,13 @@ exit 0
 - Add JDK-8377526 libpng 1.6.55 ahead of 25.0.3
 - Bump libpng version to 1.6.55 following JDK-8375063 & JDK-8377526
 - Bump harfbuzz version to 12.3.2 following JDK-8375057
+- Bump nssadapter version to bring in shared PKCS11 session fix
+- Drop LDFLAGS nssadapter patch which is now upstream in 0.1.1
 - Resolves: RHEL-155000
 - Resolves: RHEL-146649
 - Resolves: RHEL-148327
 - Resolves: RHEL-148830
+- Resolves: RHEL-155044
 
 * Wed Feb 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-2
 - Bump rpmrelease for CentOS build

nssadapter-ldflags.patch

@@ -1,41 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5175f21..571748a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,12 +13,12 @@ DEVEL_PKGS    = nss nss-softokn
- LIB_DIR       = $(shell pkg-config --variable=libdir nss-softokn)
- SHARED_LIBS   = pthread softokn3 nss3
- STATIC_LIBS   = freebl
--SHR_CFLAGS    = -shared -fPIC -fvisibility=hidden -Wl,--exclude-libs,ALL       \
--                $(addprefix -l,$(SHARED_LIBS))                                 \
-+SHR_CFLAGS    = -shared -fPIC -fvisibility=hidden                              \
-                 $(strip $(shell pkg-config --cflags $(DEVEL_PKGS)))            \
-                 -Wpedantic -Wall -Wextra -Wconversion -Werror
- DBG_CFLAGS    = -Wno-error=unused-variable -Wno-error=unused-parameter -DDEBUG \
-                 -O0 -g
-+SHR_LDFLAGS   = -Wl,--exclude-libs,ALL $(addprefix -l,$(SHARED_LIBS))
- 
- # https://clang.llvm.org/docs/ClangFormatStyleOptions.html
- CLANG_FORMAT_STYLE = {                                                         \
-@@ -53,10 +53,12 @@ endif
- 
- .PHONY: release ## Build the library in RELEASE mode (default)
- release: BLD_CFLAGS = $(SHR_CFLAGS) $(CFLAGS)
-+release: BLD_LDFLAGS = $(SHR_LDFLAGS) $(LDFLAGS)
- release: $(CLEAN_IF_PREVIOUS_BUILD_MODE_IS_DEBUG) $(OUTPUT)
- 
- .PHONY: debug ## Build the library in DEBUG mode
- debug: BLD_CFLAGS = $(SHR_CFLAGS) $(DBG_CFLAGS) $(CFLAGS)
-+debug: BLD_LDFLAGS = $(SHR_LDFLAGS) $(LDFLAGS)
- debug: CREATE_DBG_SENTINEL_IF_NEEDED = touch $(DBG_SENTINEL)
- debug: $(CLEAN_IF_PREVIOUS_BUILD_MODE_IS_RELEASE) $(OUTPUT)
- 
-@@ -73,7 +75,7 @@ $(BIN_DIR):
- 
- $(OUTPUT): $(BIN_DIR) $(SRC_FILES)
- 	@$(CREATE_DBG_SENTINEL_IF_NEEDED)
--	$(CC) $(BLD_CFLAGS) $(filter %.c, $+)                                      \
-+	$(CC) $(BLD_CFLAGS) $(filter %.c, $+) $(BLD_LDFLAGS) \
- 	      $(addprefix $(LIB_DIR)/lib,$(addsuffix .a,$(STATIC_LIBS))) -o $@
- 
- 

sources

@@ -1,3 +1,3 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
 SHA512 (openjdk-25.0.2+10.tar.xz) = 238580373693cb0221f8678df1b1c838b9ae6fc8311c2ece496908444bee640315cba8a3e439866b647021f471b96f011aad35eb3e7ae2369a19d9489c6ddb2d
-SHA512 (nssadapter-0.1.0.tar.xz) = 581f49d1a27550e3a2fa0a9d407f43c507627a8439827904d14daaf24e071d9f73884a2abe4cb3d36d26f1af09ef7d20724b2d40c9bac202e0316fac6c1a636b
+SHA512 (nssadapter-0.1.1.tar.xz) = 2b4675cfbfa2ccb6c9a4870a4b58ae555267f5b8c9bdb0cf37b075483e6e9ea929561c05070453cf0d67b0b029de5408274555bf2ff50e9533219e898b2717f9