From 2e48ff2f6ceedfed4cd92462ce1b370e77a894a9 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 12 2020 01:10:48 +0000
Subject: Prepare for a new update


Reverting patches so we can apply the latest update
and changes can be seen in the spec file and sources.

---

diff --git a/nss/cmd/crmftest/Makefile b/nss/cmd/crmftest/Makefile
index e76d77f..369cdc8 100644
--- a/nss/cmd/crmftest/Makefile
+++ b/nss/cmd/crmftest/Makefile
@@ -58,7 +58,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 LDDIST = $(DIST)/lib
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-#EXTRA_LIBS += $(LDDIST)/sectool.lib
+EXTRA_LIBS += $(LDDIST)/sectool.lib
 endif
 
 include ../platrules.mk
diff --git a/nss/cmd/pk11mode/Makefile b/nss/cmd/pk11mode/Makefile
index af88c55..e9cbcac 100755
--- a/nss/cmd/pk11mode/Makefile
+++ b/nss/cmd/pk11mode/Makefile
@@ -29,9 +29,9 @@ include ../platlibs.mk
 ifeq ($(OS_ARCH), WINNT)
 
 EXTRA_LIBS += \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
 	$(NULL)
 
 else
diff --git a/nss/cmd/shlibsign/Makefile b/nss/cmd/shlibsign/Makefile
index 6a05aba..83f90fa 100644
--- a/nss/cmd/shlibsign/Makefile
+++ b/nss/cmd/shlibsign/Makefile
@@ -27,9 +27,9 @@ include $(CORE_DEPTH)/coreconf/config.mk
 ifeq ($(OS_ARCH), WINNT)
 
 EXTRA_LIBS += \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
 	$(NULL)
 
 else
@@ -56,8 +56,8 @@ CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
 endif
 CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
 
-MD_LIB_RELEASE_FILES = # $(CHECKLOC)
-#ALL_TRASH += $(CHECKLOC)
+MD_LIB_RELEASE_FILES = $(CHECKLOC)
+ALL_TRASH += $(CHECKLOC)
 endif
 
 #######################################################################
@@ -95,5 +95,5 @@ else
     endif
 endif
 
-libs install :: #$(CHECKLOC)
+libs install :: $(CHECKLOC)
 
diff --git a/nss/cmd/shlibsign/mangle/Makefile b/nss/cmd/shlibsign/mangle/Makefile
index 2e78f10..b52243e 100644
--- a/nss/cmd/shlibsign/mangle/Makefile
+++ b/nss/cmd/shlibsign/mangle/Makefile
@@ -27,9 +27,9 @@ include $(CORE_DEPTH)/coreconf/config.mk
 ifeq ($(OS_ARCH), WINNT)
 
 EXTRA_LIBS += \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
-	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
 	$(NULL)
 
 else
diff --git a/nss/coreconf/WIN32.mk b/nss/coreconf/WIN32.mk
index 0fc06d7..da8c9bf 100644
--- a/nss/coreconf/WIN32.mk
+++ b/nss/coreconf/WIN32.mk
@@ -106,7 +106,7 @@ ifdef NS_USE_GCC
     # The -mnop-fun-dllimport flag allows us to avoid a drawback of
     # the dllimport attribute that a pointer to a function marked as
     # dllimport cannot be used as as a constant address.
-    OS_CFLAGS += -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0501 -U__MMX__ -U__SSE__ -U__SSE2__ -D__CRT__NO_INLINE=1 -D_WSTRING_S_DEFINED=1
+    OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport
     _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
     DLLFLAGS  += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
     ifdef BUILD_OPT
diff --git a/nss/coreconf/WINNT.mk b/nss/coreconf/WINNT.mk
index 7ba7c38..6052e56 100644
--- a/nss/coreconf/WINNT.mk
+++ b/nss/coreconf/WINNT.mk
@@ -14,7 +14,7 @@ DEFINES += -DWINNT
 #
 # Win NT needs -GT so that fibers can work
 #
-#OS_CFLAGS += -GT
+OS_CFLAGS += -GT
 
 # WINNT uses the lib prefix, Win95 doesn't
 NSPR31_LIB_PREFIX = lib
diff --git a/nss/coreconf/rules.mk b/nss/coreconf/rules.mk
index 7bfdc24..5495b0c 100644
--- a/nss/coreconf/rules.mk
+++ b/nss/coreconf/rules.mk
@@ -366,7 +366,7 @@ else
 PWD := $(shell pwd)
 ifeq (,$(findstring ;,$(PATH)))
 ifndef USE_MSYS
-#PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
+PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
 endif
 endif
 endif
diff --git a/nss/lib/ckfw/builtins/config.mk b/nss/lib/ckfw/builtins/config.mk
index 599443b..b385ac6 100644
--- a/nss/lib/ckfw/builtins/config.mk
+++ b/nss/lib/ckfw/builtins/config.mk
@@ -15,7 +15,7 @@ PROGRAM        =
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
     SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-    RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
+    RES = $(OBJDIR)/$(LIBRARY_NAME).res
     RESNAME = $(LIBRARY_NAME).rc
 endif
 
diff --git a/nss/lib/ckfw/capi/Makefile b/nss/lib/ckfw/capi/Makefile
index 16508da..81780d2 100644
--- a/nss/lib/ckfw/capi/Makefile
+++ b/nss/lib/ckfw/capi/Makefile
@@ -42,9 +42,6 @@ EXTRA_LIBS += \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
-        -lcrypt32 \
-        -ladvapi32 \
-        -lrpcrt4 \
 	$(NULL)
 endif
 
diff --git a/nss/lib/dbm/src/mktemp.c b/nss/lib/dbm/src/mktemp.c
index 6756da2..bbf05cd 100644
--- a/nss/lib/dbm/src/mktemp.c
+++ b/nss/lib/dbm/src/mktemp.c
@@ -29,11 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifdef _WINDOWS
-#include <process.h>
-#include "winfile.h"
-#endif
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
@@ -54,6 +49,11 @@ static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #include <unistd.h>
 #endif
 
+#ifdef _WINDOWS
+#include <process.h>
+#include "winfile.h"
+#endif
+
 static int _gettemp(char *path, register int *doopen, int extraFlags);
 
 int
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index a841e57..68fcddf 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -147,17 +147,6 @@ else
     endif
 endif
 else
-# 64-bit Windows
-ifdef NS_USE_GCC
-    # win64/gcc - use the x86 code for now, skipping optimization
-    ifdef BUILD_OPT
-	OPTIMIZER += -Os
-    endif
-    ASFILES  =
-    DEFINES += -DMPI_AMD64 -DMP_USE_UINT_DIGIT
-    DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
-else
-# MSVC
     # -DMP_NO_MP_WORD
     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
 ifdef NS_USE_GCC
@@ -182,7 +171,6 @@ else
 endif
 endif
 endif
-endif
 
 ifeq ($(OS_TARGET),IRIX)
 ifeq ($(USE_N32),1)
diff --git a/nss/lib/freebl/config.mk b/nss/lib/freebl/config.mk
index 3899739..918a663 100644
--- a/nss/lib/freebl/config.mk
+++ b/nss/lib/freebl/config.mk
@@ -50,7 +50,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 
-RES     = $(OBJDIR)/$(LIBRARY_NAME).res.o
+RES     = $(OBJDIR)/$(LIBRARY_NAME).res
 RESNAME = freebl.rc
 
 ifdef NS_USE_GCC
diff --git a/nss/lib/freebl/mpi/mpi-priv.h b/nss/lib/freebl/mpi/mpi-priv.h
index b45785b..e81d0fe 100644
--- a/nss/lib/freebl/mpi/mpi-priv.h
+++ b/nss/lib/freebl/mpi/mpi-priv.h
@@ -220,7 +220,7 @@ void s_mp_sqr_comba_32(const mp_int *A, mp_int *B);
 #define MPI_ASM_DECL
 #endif
 
-#if defined(MPI_AMD64) && defined(MP_ASSEMBLY_MULTIPLY)
+#ifdef MPI_AMD64
 
 mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit);
 mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit);
diff --git a/nss/lib/nss/config.mk b/nss/lib/nss/config.mk
index 2240dd9..170e999 100644
--- a/nss/lib/nss/config.mk
+++ b/nss/lib/nss/config.mk
@@ -10,7 +10,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
+RES = $(OBJDIR)/$(LIBRARY_NAME).res
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
diff --git a/nss/lib/smime/config.mk b/nss/lib/smime/config.mk
index 5a5790d..85d39e8 100644
--- a/nss/lib/smime/config.mk
+++ b/nss/lib/smime/config.mk
@@ -11,7 +11,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/smime.res.o
+RES = $(OBJDIR)/smime.res
 RESNAME = smime.rc
 
 ifdef NS_USE_GCC
diff --git a/nss/lib/softoken/config.mk b/nss/lib/softoken/config.mk
index 271a418..2924b24 100644
--- a/nss/lib/softoken/config.mk
+++ b/nss/lib/softoken/config.mk
@@ -17,7 +17,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
+RES = $(OBJDIR)/$(LIBRARY_NAME).res
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
diff --git a/nss/lib/softoken/legacydb/config.mk b/nss/lib/softoken/legacydb/config.mk
index c76b5ab..ac7240e 100644
--- a/nss/lib/softoken/legacydb/config.mk
+++ b/nss/lib/softoken/legacydb/config.mk
@@ -18,7 +18,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
+RES = $(OBJDIR)/$(LIBRARY_NAME).res
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
diff --git a/nss/lib/ssl/config.mk b/nss/lib/ssl/config.mk
index 1295de0..40b1c30 100644
--- a/nss/lib/ssl/config.mk
+++ b/nss/lib/ssl/config.mk
@@ -28,7 +28,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/ssl.res.o
+RES = $(OBJDIR)/ssl.res
 RESNAME = ssl.rc
 
 ifdef NS_USE_GCC
diff --git a/nss/lib/sysinit/config.mk b/nss/lib/sysinit/config.mk
index 1a0d826..037641b 100644
--- a/nss/lib/sysinit/config.mk
+++ b/nss/lib/sysinit/config.mk
@@ -15,8 +15,8 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-#RES = $(OBJDIR)/$(LIBRARY_NAME).res
-#RESNAME = $(LIBRARY_NAME).rc
+RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
diff --git a/nss/lib/util/config.mk b/nss/lib/util/config.mk
index c3d55ee..a3e7202 100644
--- a/nss/lib/util/config.mk
+++ b/nss/lib/util/config.mk
@@ -10,7 +10,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
+RES = $(OBJDIR)/$(LIBRARY_NAME).res
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC