[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst nss/makefile.mk scp2/source

[Don Lewis]

 external_deps.lst                    |    6 ++----
 nss/makefile.mk                      |    2 +-
 scp2/source/ooo/file_library_ooo.scp |    2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 422a9e11481f7e6a20e5142ef9d016df64370be2
Author: Don Lewis <truckman at apache.org>
Date:   Mon Jul 25 09:04:56 2016 +0000

    Now that https downloads on the buildbots are fixed, switch OOO_EXTRAS
    
    back to the main SourceForge site instead of an individual mirror.
    Change the nss download URL back to https.

diff --git a/external_deps.lst b/external_deps.lst
index ae6cc38..553d6ab 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -26,9 +26,7 @@
 
 # The primary fallback site.
 # OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
-# OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
-# Use a specific mirror to avoid HTTPS redirections.
-OOO_EXTRAS=http://pilotfiber.dl.sourceforge.net/project/oooextras.mirror/
+OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
 
 # Must not fallback to svn
 # SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
@@ -315,7 +313,7 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && ENABLE_JAVASCRIPT==YES)
 if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
     MD5 = 4ec9a36c0f7c9360b149491c013b8d50
     name = nss-3.25-with-nspr-4.12.tar.gz
-    URL1 = http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_25_RTM/src/$(name)
+    URL1 = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_25_RTM/src/$(name)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)
commit e0667bfaf22f7535bb4b73d33039cc53ea1e4426
Author: Don Lewis <truckman at apache.org>
Date:   Mon Jul 25 08:21:28 2016 +0000

    The nss upgrade in r1753163 broke packaging on Windows (if nss is
    
    enabled, which it is not by default) and Mac (not actually verified).
    These two platforms do not build a separate libfreeblpriv3.so (or
    Windows equivalent) but instead bundle it into libfreebl3.so.  Since a
    separate libfreeblpriv3.so is only required on Linux (see #i105566# and
    moz#513024#), only attempt to package this library on Linux.  Since a
    separate libfreeblpriv3.so does not seem to be required on FreeBSD,
    don't build it there.

diff --git a/nss/makefile.mk b/nss/makefile.mk
index 5d7ee14..eb9aaa5 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -73,7 +73,7 @@ PATCH_FILES+=nss_linux.patch
 .ENDIF
 
 .IF "$(OS)"=="FREEBSD"
-BUILD_ACTION+=FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1
+BUILD_ACTION+=NSS_DISABLE_GTESTS=1
 .ENDIF
 
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1958563..50902a9 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1643,7 +1643,9 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #ifdef BUNDLE_NSS_LIBS
 
 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_Nss3, nss3)
 STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)