1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
| | From 4734b834755822f962af29e9395daa7338084e21 Mon Sep 17 00:00:00 2001
Message-ID: <4734b834755822f962af29e9395daa7338084e21.1714059680.git.cdo@mutix.org>
From: Christina O'Donnell <cdo@mutix.org>
Date: Thu, 25 Apr 2024 16:35:50 +0100
Subject: [PATCH] nss: Disable library signing.
---
nss/cmd/shlibsign/Makefile | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
diff --git a/nss/cmd/shlibsign/Makefile b/nss/cmd/shlibsign/Makefile
index a119205..7a85c1d 100644
--- a/nss/cmd/shlibsign/Makefile
+++ b/nss/cmd/shlibsign/Makefile
@@ -43,22 +43,9 @@ EXTRA_SHARED_LIBS += \
endif
-
-# sign any and all shared libraries that contain the word freebl
-ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
+# Disable library signing as it's non-deterministic
CHECKLIBS =
CHECKLOC =
-else
-CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
-CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
-ifndef NSS_DISABLE_DBM
-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
-endif
-CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
-
-MD_LIB_RELEASE_FILES = $(CHECKLOC)
-ALL_TRASH += $(CHECKLOC)
-endif
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
@@ -78,23 +65,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
include ../platrules.mk
-SRCDIR = $(call core_abspath,.)
-
-%.chk: %.$(DLL_SUFFIX)
-ifeq ($(OS_TARGET), OS2)
- cd $(OBJDIR) ; cmd.exe /c $(SRCDIR)/sign.cmd $(DIST) \
- $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
- $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
-else
- ifeq ($(CROSS_COMPILE),1)
- # do nothing
- else
- cd $(OBJDIR) ; sh $(SRCDIR)/sign.sh $(call core_abspath,$(DIST)) \
- $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
- $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
- endif
-endif
-
libs: install
ifdef CHECKLOC
$(MAKE) $(CHECKLOC)
base-commit: 2951778f8e8855bed24754a57ecc43f02a2843dd
--
2.41.0
|