This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-nss
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/Pilot-Pirx-nss by this push:
new c6fbdaec42 Additional files
c6fbdaec42 is described below
commit c6fbdaec42f4549b547a354241c9acc2321d26f4
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Jan 21 23:15:32 2024 +0100
Additional files
---
main/libxmlsec/xmlsec1-configure.patch | 2 +-
main/postprocess/rebase/coffbase.txt | 6 +++---
main/scp2/source/ooo/file_library_ooo.scp | 15 +++++++--------
main/solenv/inc/libs.mk | 12 ++++++------
main/xmlsecurity/tools/standalone/csfit/makefile.mk | 12 +++++-------
5 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/main/libxmlsec/xmlsec1-configure.patch
b/main/libxmlsec/xmlsec1-configure.patch
index f2f5f4e8f6..e65292738f 100644
--- a/main/libxmlsec/xmlsec1-configure.patch
+++ b/main/libxmlsec/xmlsec1-configure.patch
@@ -759,7 +759,7 @@
XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib
gdi32.lib
-XMLSEC_NSS_SOLIBS = smime3.lib ssl3.lib nss3.lib libnspr4.lib
libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
-+XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib
gdi32.lib
++XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib licnspr4.lib libplds4.lib
libplc4.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib
libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib
Advapi32.lib
diff --git a/main/postprocess/rebase/coffbase.txt
b/main/postprocess/rebase/coffbase.txt
index 44ce0c8e00..9cc20dcc86 100644
--- a/main/postprocess/rebase/coffbase.txt
+++ b/main/postprocess/rebase/coffbase.txt
@@ -336,7 +336,7 @@ mswordmi.dll 0x0000000059560000 0x00110000
mysqlcppconn.dll 0x00000000594c0000 0x00090000
mysqlmi.dll 0x0000000059480000 0x00030000
neon.dll 0x0000000059450000 0x00020000
-nspr4.dll 0x0000000059410000 0x00030000
+libnspr4.dll 0x0000000059410000 0x00030000
nss3.dll 0x0000000059330000 0x000d0000
nssckbi.dll 0x00000000592c0000 0x00060000
nssdbm3.dll 0x0000000059290000 0x00020000
@@ -345,8 +345,8 @@ odbcbasemi.dll 0x00000000591f0000 0x00060000
odbcmi.dll 0x00000000591d0000 0x00010000
ooofilt_x64.dll 0x0000000059130000 0x00090000
oooimprovementmi.dll 0x0000000059100000 0x00020000
-plc4.dll 0x00000000590e0000 0x00010000
-plds4.dll 0x00000000590c0000 0x00010000
+libplc4.dll 0x00000000590e0000 0x00010000
+libplds4.dll 0x00000000590c0000 0x00010000
propertyhdl.dll 0x0000000059070000 0x00040000
propertyhdl_x64.dll 0x0000000058fe0000 0x00080000
python26.dll 0x0000000058da0000 0x00230000
diff --git a/main/scp2/source/ooo/file_library_ooo.scp
b/main/scp2/source/ooo/file_library_ooo.scp
index 79f332f75f..d6b76568d6 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#include "macros.inc"
// IAccessible2 implementation
@@ -1627,13 +1626,13 @@ STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
#ifdef LINUX
STD_LIB_FILE( gid_File_Lib_Freeblpriv3, freeblpriv3)
#endif
-STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
+STD_LIB_FILE( gid_File_Lib_Nspr4, libnspr4)
STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
STD_LIB_FILE( gid_File_Lib_Nssdbm3, nssdbm3)
STD_LIB_FILE( gid_File_Lib_Nssutil3, nssutil3)
-STD_LIB_FILE( gid_File_Lib_Plc4, plc4)
-STD_LIB_FILE( gid_File_Lib_Plds4, plds4)
+STD_LIB_FILE( gid_File_Lib_Plc4, libplc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, libplds4)
STD_LIB_FILE( gid_File_Lib_Smime3, smime3)
STD_LIB_FILE( gid_File_Lib_Softokn3, softokn3)
STD_LIB_FILE( gid_File_Lib_Ssl3, ssl3)
diff --git a/main/solenv/inc/libs.mk b/main/solenv/inc/libs.mk
index 9dda10160f..6d4efd8d71 100644
--- a/main/solenv/inc/libs.mk
+++ b/main/solenv/inc/libs.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
LIBSMKREV!:="$$Revision$$"
@@ -385,7 +385,7 @@ REGLIB=ireg.lib
EXTLIB=iext.lib
SOTLIB=isot.lib
MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
-MOZBASELIB=nspr4.lib xpcom.lib
+MOZBASELIB=libnspr4.lib xpcom.lib
LDAPSDKLIB=nsldap32v50.lib
PAPILIB=ipap.lib
SFX2LIB=sfx.lib
@@ -402,7 +402,7 @@ XMLSECLIB-MS=libxmlsec-mscrypto.lib
XMLSECLIB-NSS=libxmlsec-nss.lib
LIBXML2LIB=libxml2.lib
NSS3LIB=nss3.lib
-NSPR4LIB=nspr4.lib
+NSPR4LIB=libnspr4.lib
PLC4LIB=plc4.lib
NSSCRYPTOLIBS=$(XMLSECLIB-NSS) $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB)
$(NSPR4LIB) $(PLC4LIB)
MSCRYPTOLIBS=$(XMLSECLIB-MS) $(XMLSECLIB) $(LIBXML2LIB) crypt32.lib
advapi32.lib
diff --git a/main/xmlsecurity/tools/standalone/csfit/makefile.mk
b/main/xmlsecurity/tools/standalone/csfit/makefile.mk
index 1a3bb1e099..4b8d1993e5 100644
--- a/main/xmlsecurity/tools/standalone/csfit/makefile.mk
+++ b/main/xmlsecurity/tools/standalone/csfit/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,20 +7,18 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
PRJ=..$/..$/..
PRJNAME=xmlsecurity
@@ -59,7 +57,7 @@ SHARE_LIBS = \
$(SALLIB)
.IF "$(GUI)"=="WNT"
-SHARE_LIBS+= "ixml2.lib" "nss3.lib" "nspr4.lib" "libxmlsec.lib"
"libxmlsec-nss.lib" "xsec_xmlsec.lib"
+SHARE_LIBS+= "ixml2.lib" "nss3.lib" "libnspr4.lib" "libxmlsec.lib"
"libxmlsec-nss.lib" "xsec_xmlsec.lib"
.ELSE
SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec1" "-lxmlsec1-nss"
"-lxsec_xmlsec"
.ENDIF
