[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2019-07-29 Thread Mechtilde Stehmann (via logerrit)
 external_deps.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d82f5390958f8dda66856afb3e01c9d15c9b87b
Author: Mechtilde Stehmann 
AuthorDate: Mon Jul 29 15:51:24 2019 +
Commit: Mechtilde Stehmann 
CommitDate: Mon Jul 29 15:51:24 2019 +

change for better converting file to csv

diff --git a/external_deps.lst b/external_deps.lst
index 87216d493d64..5a7ea068e7cb 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -294,8 +294,8 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_HUNSPELL!=YES)
-name = hunspell-1.3.3.tar.gz
 MD5 = 4967da60b23413604c9e563beacc63b4
+name = hunspell-1.3.3.tar.gz
 URL1 = 
https://sourceforge.net/projects/hunspell/files/Hunspell/1.3.3/hunspell-1.3.3.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2019-05-21 Thread Matthias Seidel (via logerrit)
 external_deps.lst |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit b07a7bac7c795a45c0cc8516a097ae4df4d13872
Author: Matthias Seidel 
AuthorDate: Tue May 21 15:50:19 2019 +
Commit: Matthias Seidel 
CommitDate: Tue May 21 15:50:19 2019 +

Further updates to links

diff --git a/external_deps.lst b/external_deps.lst
index e8943cf0f4d4..87216d493d64 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -24,7 +24,6 @@
 # longer, server is temporarily not available) a fallback server is used.
 
 # The primary fallback site.
-# OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
 OOO_EXTRAS=https://sourceforge.net/projects/oooextras.mirror/files/
 
 
@@ -238,13 +237,13 @@ if (WITH_CATA_FONTS == YES)
 if (WITH_CATA_FONTS==YES)
 MD5 = 3c90ac73fd13bd79684d9dc073840328
 name = croscorefonts-1.31.0.tar.bz2
-URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+URL1 = https://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATA_FONTS==YES)
 MD5 = 368f114c078f94214a308a74c7e991bc
 name = crosextrafonts-20130214.tar.gz
-URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+URL1 = https://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
@@ -279,7 +278,7 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_COINMP!=YES)
 if (WITH_CATB_FONTS==YES)
 MD5 = c74b7223abe75949b4af367942d96c7a
 name = crosextrafonts-carlito-20130920.tar.gz
-URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+URL1 = https://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATB_FONTS == YES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2019-05-21 Thread Matthias Seidel (via logerrit)
 external_deps.lst |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 148295be26870f869faabc75b65dfb16a8df2924
Author: Matthias Seidel 
AuthorDate: Tue May 21 13:06:50 2019 +
Commit: Matthias Seidel 
CommitDate: Tue May 21 13:06:50 2019 +

Updated links

diff --git a/external_deps.lst b/external_deps.lst
index 69fdbc0b2e62..e8943cf0f4d4 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -59,7 +59,7 @@ if (SYSTEM_MDDS != YES)
 if (SYSTEM_LIBTEXTCAT != YES)
 MD5 = 128cfc86ed5953e57fe0f5ae98b62c2e
 name = libtextcat-2.2.tar.gz
-URL1 = http://software.wise-guys.nl/download/libtextcat-2.2.tar.gz
+URL1 = https://software.wise-guys.nl/download/libtextcat-2.2.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA == TRUE)
@@ -142,7 +142,7 @@ if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || 
ENABLE_REPORTBUILDER==YES))
 if (SYSTEM_JPEG != YES)
 MD5 = 52654eb3b2e60c35731ea8fc87f1bd29
 name = jpeg-8d.tar.gz
-URL1 = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
+URL1 = https://www.ijg.org/files/jpegsrc.v8d.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA==TRUE)
@@ -154,7 +154,7 @@ if (SOLAR_JAVA==TRUE)
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
 MD5 = ac5eb30bf5798aa14b1ae6d0e7da58df
 name = openssl-1.0.2p.tar.gz
-URL1 = http://www.openssl.org/source/openssl-1.0.2p.tar.gz
+URL1 = https://www.openssl.org/source/openssl-1.0.2p.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
@@ -202,7 +202,7 @@ if (ENABLE_MEDIAWIKI == YES)
 if (SYSTEM_PYTHON != YES)
 MD5 = 045fb3440219a1f6923fefdabde63342
 name = Python-2.7.15.tgz
-URL1 = http://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz
+URL1 = https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
@@ -285,7 +285,7 @@ if (WITH_CATB_FONTS==YES)
 if (WITH_CATB_FONTS == YES)
 MD5 = 1725634df4bb3dcb1b2c91a6175f8789
 name = GentiumBasic_1102.zip
-URL1 = http://software.sil.org/downloads/d/gentium/GentiumBasic_1102.zip
+URL1 = https://software.sil.org/downloads/r/gentium/GentiumBasic_1102.zip
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2018-09-26 Thread Libreoffice Gerrit user
 external_deps.lst |   44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

New commits:
commit f52278136a8c5d11a925f4a7f52b04d3e4df06a0
Author: Matthias Seidel 
AuthorDate: Wed Sep 26 22:20:04 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Sep 26 22:20:04 2018 +

Deleted whitespace, added https for some URLs

diff --git a/external_deps.lst b/external_deps.lst
index c5b434e59383..69fdbc0b2e62 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -1,22 +1,22 @@
 # Format of this file:
 #
-# Comments start with '#' and are ignored.  Empty lines (only whitespace) are 
ignored.
+# Comments start with '#' and are ignored. Empty lines (only whitespace) are 
ignored.
 #
 # All other lines have one of two different formats:
-# 
-# if ()  
-# starts a block that specifies the download site(s) of an external 
library.
-# 
+#
+# if ()
+#starts a block that specifies the download site(s) of an external library.
+#
 # =
-#defines a variable.  A definition after an "if" statement is only valid 
up to the next
-#"if" statement.  Previous definitions are replaced.
+#defines a variable. A definition after an "if" statement is only valid up 
to the next
+#"if" statement. Previous definitions are replaced.
 # can contain references to other variables in the form 
$()
 #
 # Some variables have special names:
 #MD5 defines the MD5 check-sum of a library
-#URL1 to URL9 define alternative download sites.  The first one that 
provides the library
+#URL1 to URL9 define alternative download sites. The first one that 
provides the library
 #with matching MD5 wins.
-#name is the name under which the library tar-ball is stored.  It 
overrides the name of the
+#name is the name under which the library tar-ball is stored. It overrides 
the name of the
 #downloaded file.
 
 # Wherever possible the external tar-balls are loaded from their original 
distribution sites.
@@ -35,7 +35,7 @@ 
OOO_EXTRAS=https://sourceforge.net/projects/oooextras.mirror/files/
 if ( true )
 MD5 = 0168229624cfac409e766913506961a8
 name = ucpp-1.3.2.tar.gz
-URL1 =  
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-1.3.2.tar.gz
+URL1 = 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-1.3.2.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_UNIT_TESTS == YES)
@@ -55,7 +55,7 @@ if (SYSTEM_MDDS != YES)
 name = mdds_0.3.1.tar.bz2
 URL1 = 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_0.3.1.tar.bz2
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- 
+
 if (SYSTEM_LIBTEXTCAT != YES)
 MD5 = 128cfc86ed5953e57fe0f5ae98b62c2e
 name = libtextcat-2.2.tar.gz
@@ -76,7 +76,7 @@ if ( true )
 if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=YES)
 MD5 = 17960f35b2239654ba608cf1f3e256b3
 name = lucene-2.9.4-src.tar.gz
-URL1 = 
http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
+URL1 = 
https://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
@@ -112,13 +112,13 @@ if (GUI!=UNX || SYSTEM_ZLIB!=YES)
 if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
 name = commons-httpclient-3.1-src.tar.gz
-URL1 = 
http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/$(name)
+URL1 = 
https://archive.apache.org/dist/httpcomponents/commons-httpclient/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 MD5 = db87f7004cefc9d17f7ac841f86122bd
 name = commons-codec-1.9-src.tar.gz
-URL1 = http://archive.apache.org/dist/commons/codec/source/$(name)
+URL1 = https://archive.apache.org/dist/commons/codec/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
@@ -136,7 +136,7 @@ if ( true )
 if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
 MD5 = e8e197d628436490886d17cffa108fe3
 name = commons-logging-1.1.3-src.tar.gz
-URL1 = http://archive.apache.org/dist/commons/logging/source/$(name)
+URL1 = https://archive.apache.org/dist/commons/logging/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_JPEG != YES)
@@ -148,7 +148,7 @@ if (SYSTEM_JPEG != YES)
 if (SOLAR_JAVA==TRUE)
 MD5 = 4c8c505cc3cba4c467c479e3e0f09ba4
 name = commons-lang3-3.3-src.tar.gz
-URL1 = http://archive.apache.org/dist/commons/lang/source/$(name)
+URL1 = https://archive.apache.org/dist/commons/lang/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
@@ -160,13 +160,13 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
 if ( true )
 MD5 = 98492e965963f852ab29f9e61b2ad700
 name = apr-1.5.2.tar.gz
-URL1 = 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst openssl/makefile.mk openssl/openssllnx.patch openssl/openssl.patch

2018-08-30 Thread Libreoffice Gerrit user
 external_deps.lst|6 +-
 openssl/makefile.mk  |4 -
 openssl/openssl.patch|  112 ++-
 openssl/openssllnx.patch |   18 +++
 4 files changed, 76 insertions(+), 64 deletions(-)

New commits:
commit f1293fc1719a7dca21c17ac4ffc9a00ab135a3ab
Author: Don Lewis 
AuthorDate: Thu Aug 30 23:08:51 2018 +
Commit: Don Lewis 
CommitDate: Thu Aug 30 23:08:51 2018 +

Upgrade bundled openssl to version 1.0.2p.

diff --git a/external_deps.lst b/external_deps.lst
index d88a0f37b128..441cc11209de 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -152,9 +152,9 @@ if (SOLAR_JAVA==TRUE)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
-MD5 = 9392e65072ce4b614c1392eefc1f23d0
-name = openssl-1.0.2h.tar.gz
-URL1 = http://www.openssl.org/source/openssl-1.0.2h.tar.gz
+MD5 = ac5eb30bf5798aa14b1ae6d0e7da58df
+name = openssl-1.0.2p.tar.gz
+URL1 = http://www.openssl.org/source/openssl-1.0.2p.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index dc97bb1c7459..64249e01487f 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -42,10 +42,10 @@ TARGET=openssl
 @echo "openssl disabled"
 .ENDIF
 
-OPENSSL_NAME=openssl-1.0.2h
+OPENSSL_NAME=openssl-1.0.2p
 
 TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=9392e65072ce4b614c1392eefc1f23d0
+TARFILE_MD5=ac5eb30bf5798aa14b1ae6d0e7da58df
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 27a01adffaa2..1a6da3720b13 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,7 +1,7 @@
-diff -ur misc/openssl-1.0.2h/Configure misc/build/openssl-1.0.2h/Configure
 misc/openssl-1.0.2h/Configure  2016-05-03 06:44:42.0 -0700
-+++ misc/build/openssl-1.0.2h/Configure2016-08-14 23:51:42.672229000 
-0700
-@@ -475,19 +475,20 @@
+diff -ur misc/openssl-1.0.2p/Configure misc/build/openssl-1.0.2p/Configure
+--- misc/openssl-1.0.2p/Configure  2018-08-14 05:49:04.0 -0700
 misc/build/openssl-1.0.2p/Configure2018-08-26 14:51:25.39791 
-0700
+@@ -477,19 +477,20 @@
  "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib 
-O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL 
BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
   *BSD [do see comment about ${BSDthreads} above!]
@@ -31,7 +31,19 @@ diff -ur misc/openssl-1.0.2h/Configure 
misc/build/openssl-1.0.2h/Configure
  
  "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 
-march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} 
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
-@@ -2031,10 +2032,12 @@
+@@ -592,9 +593,9 @@
+ "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE 
-D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT 
EXPORT_VAR_AS_FN:".eval{my 
$asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
+ # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
+ # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
+-"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${x86_asm}:win32n:win32",
++"VC-WIN32","cl:-W3 -w44129 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${x86_asm}:win32n:win32",
+ # Unified CE target
+-"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${x86_asm}:win32n:win32",
++"debug-VC-WIN32","cl:-W3 -W44129 -WX -Gs0 -GF -Gy -Zi -nologo 
-DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN 
-D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG 
RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+ "VC-CE","clWINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN 
${x86_gcc_opts}:${no_asm}:win32",
+ 
+ # Borland C++ 4.5
+@@ -2065,10 +2066,12 @@
if ( $perl =~ m@^/@) {
("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my 
$dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . 
'";');
("apps/CA.pl",$perl,'^#!/', '#!%s');
@@ -43,11 +55,11 @@ diff -ur misc/openssl-1.0.2h/Configure 
misc/build/openssl-1.0.2h/Configure
 +  ("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s');
}
if 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.14-mingw.patch python/python-2.7.14-msvs9-dir.patch python/python-2.7.14-msvs9-no

2018-06-01 Thread Pedro Giffuni
 external_deps.lst   |6 
 python/makefile.mk  |4 
 python/prj/d.lst|  136 ++---
 python/python-2.7.14-mingw.patch|  571 
 python/python-2.7.15-msvs9-dir.patch|4 
 python/python-2.7.15-msvs9-no-host-python.patch |4 
 python/python-2.7.15-msvs9-python-path.patch|4 
 python/python-2.7.15-msvs9-subsystem.patch  |8 
 python/python-2.7.15-msvs9-win64-target.patch   |4 
 python/python-2.7.15-msvs9-win64.patch  |  162 +++---
 python/python-2.7.15-msvs9.patch|  162 +++---
 python/python-2.7.15-nohardlink.patch   |4 
 python/python-2.7.15-sysbase.patch  |6 
 python/python-freebsd.patch |   42 -
 python/python-md5.patch |6 
 python/python-solaris.patch |4 
 python/python-solver-before-std.patch   |6 
 python/python-ssl.patch |   12 
 python/pyversion.mk |2 
 19 files changed, 288 insertions(+), 859 deletions(-)

New commits:
commit cb258c5635c15d9c828b3e6f583b9fe866e92672
Author: Pedro Giffuni 
Date:   Fri Jun 1 21:15:27 2018 +

Update internal Python to bugfix version 2.7.15.

The new version includes fixes for security issues among the regular
maintainance changes upstream does.

For this version we are also dropping the mingw build support. It was not 
terribly
difficult to maintain but AFAICT it has never been tested.

Tested on:  FreeBSD

diff --git a/external_deps.lst b/external_deps.lst
index 96c1740eeea8..4243d5be5c0e 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -200,9 +200,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = cee2e4b33ad3750da77b2e85f2f8b724
-name = Python-2.7.14.tgz
-URL1 = http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz
+MD5 = 045fb3440219a1f6923fefdabde63342
+name = Python-2.7.15.tgz
+URL1 = http://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 4fb62c021f58..ae1029e36190 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=cee2e4b33ad3750da77b2e85f2f8b724
+TARFILE_MD5=045fb3440219a1f6923fefdabde63342
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
@@ -96,7 +96,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && 
$(GNUMAKE) install &&
 # WINDOWS
 # --
 .IF "$(COM)"=="GCC"
-PATCH_FILES=python-$(PYVERSION)-mingw.patch
+#PATCH_FILES=python-$(PYVERSION)-mingw.patch
 BUILD_DIR=
 MYCWD=$(shell cygpath -m $(shell @pwd))/$(INPATH)/misc/build
 python_CFLAGS=-mno-cygwin -mthreads
diff --git a/python/prj/d.lst b/python/prj/d.lst
index d423579a4878..231cd00282f9 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
 mkdir: %_DEST%\lib%_EXT%\python\unittest
 mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 
-..\%__SRC%\misc\build\Python-2.7.14\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\lib-old\* 
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\lib-tk\* 
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\site-packages\* 
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\encodings\* 
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\email\* 
%_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\email\mime\* 
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\compiler\* 
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\hotshot\* 
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\distutils\* 
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\distutils\command\* 
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\dom\* 
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\parsers\* 
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\sax\* 
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\curses\* 
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\plat-linux2\* 
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\config\* 
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.14\Lib\bsddb\* 
%_DEST%\lib%_EXT%\python\bsddb\*

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2018-04-28 Thread Matthias Seidel
 external_deps.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d026d117df306db27262d5911fa516b45ebbd93
Author: Matthias Seidel 
Date:   Sat Apr 28 21:33:38 2018 +

Download URL1 for stax-src-1.2.0.zip was at Codehaus.org, which was shut 
down in 2015. This was causing the download to fail:

(500 Can't connect to dist.codehaus.org:80 (Name or service not known))

Since we always ended up downloading from SourceForge this is now default, 
adding a fallback at http://maven.ibiblio.org.

diff --git a/external_deps.lst b/external_deps.lst
index 2df2ad8f124f..96c1740eeea8 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -190,8 +190,8 @@ if (SOLAR_JAVA == TRUE)
 if (SOLAR_JAVA == TRUE)
 MD5 = 980143f96b3f6ce45d2e4947da21a5e9
 name = stax-src-1.2.0.zip
-URL1 = http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
-URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip
 
 if (ENABLE_MEDIAWIKI == YES)
 MD5 = a7983f859eafb2677d7ff386a023bc40
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2018-03-03 Thread Andrea Pescetti
 external_deps.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8683cfd616e1e11b62b5ccdedaec7a3d4bda8dfe
Author: Andrea Pescetti 
Date:   Sat Mar 3 22:42:38 2018 +

#i127724# Enable fallback URL for dejavu package

diff --git a/external_deps.lst b/external_deps.lst
index ed008d687d65..2df2ad8f124f 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -233,7 +233,7 @@ if (WITH_CATA_FONTS == YES)
 MD5 = d0efec10b9f110a32e9b8f796e21782c
 name = dejavu-fonts-ttf-2.37.tar.bz2
 URL1 = https://sourceforge.net/projects/dejavu/files/dejavu/2.37/$(name)
-# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATA_FONTS==YES)
 MD5 = 3c90ac73fd13bd79684d9dc073840328
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2017-10-22 Thread Damjan Jovanovic
 external_deps.lst |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit a84e818dbc26edaa2f46d6d1d786dd2c301fa6b8
Author: Damjan Jovanovic 
Date:   Sun Oct 22 13:19:01 2017 +

Download cairo and pixman if enabled and system

libraries aren't used.

Patch by: me

diff --git a/external_deps.lst b/external_deps.lst
index 2703e235c294..ed008d687d65 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -337,3 +337,13 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_GRAPHITE!=YES && 
ENABLE_GRAPHITE==TRUE)
 name = silgraphite-2.3.1.tar.gz
 URL1 = 
https://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/silgraphite-2.3.1.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
+if (ENABLE_CATEGORY_B==YES && SYSTEM_CAIRO!=YES && ENABLE_CAIRO==TRUE)
+MD5 = 4ea70ea87b47e92d318d4e7f5b940f47
+name = cairo-1.8.0.tar.gz
+URL1 = https://www.cairographics.org/releases/$(name)
+
+if (ENABLE_CATEGORY_B==YES && SYSTEM_CAIRO!=YES && ENABLE_CAIRO==TRUE)
+MD5 = 09357cc74975b01714e00c5899ea1881
+name = pixman-0.12.0.tar.gz
+URL1 = https://www.cairographics.org/releases/$(name)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.13-mingw.patch python/python-2.7.13-nohardlink.patch python/python-2.7.13-pcbuild

2017-10-21 Thread Pedro Giffuni
 external_deps.lst |6 -
 python/makefile.mk|2 
 python/prj/d.lst  |  108 +--
 python/python-2.7.14-mingw.patch  |  150 +-
 python/python-2.7.14-nohardlink.patch |6 -
 python/python-2.7.14-pcbuild.patch|  190 --
 python/python-2.7.14-sysbase.patch|8 -
 python/python-freebsd.patch   |   46 
 python/python-md5.patch   |6 -
 python/python-solaris.patch   |4 
 python/python-solver-before-std.patch |6 -
 python/python-ssl.patch   |   12 +-
 python/pyversion.mk   |2 
 13 files changed, 270 insertions(+), 276 deletions(-)

New commits:
commit 0b41270b2ea8ad2b328768b0c4103b83f878d6df
Author: Pedro Giffuni 
Date:   Sun Oct 22 00:38:37 2017 +

Update Python to version 2.7.14.

Released on 2017-09-16.
ChangeLog available here:


https://raw.githubusercontent.com/python/cpython/84471935ed2f62b8c5758fd544c7d37076fe0fa5/Misc/NEWS

Tested on:  FreeBSD

diff --git a/external_deps.lst b/external_deps.lst
index ecd9ae58405e..2703e235c294 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -200,9 +200,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = 17add4bf0ad0ec2f08e0cae6d205c700
-name = Python-2.7.13.tgz
-URL1 = http://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz
+MD5 = cee2e4b33ad3750da77b2e85f2f8b724
+name = Python-2.7.14.tgz
+URL1 = http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 22ab60e75c98..14994b5608e5 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=17add4bf0ad0ec2f08e0cae6d205c700
+TARFILE_MD5=cee2e4b33ad3750da77b2e85f2f8b724
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
diff --git a/python/prj/d.lst b/python/prj/d.lst
index b521c1e1c65b..99571b8f2733 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
 mkdir: %_DEST%\lib%_EXT%\python\unittest
 mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 
-..\%__SRC%\misc\build\Python-2.7.13\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib-old\* 
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib-tk\* 
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\site-packages\* 
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\encodings\* 
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\email\* 
%_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\email\mime\* 
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\compiler\* 
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\hotshot\* 
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\distutils\* 
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\distutils\command\* 
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\dom\* 
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\parsers\* 
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\sax\* 
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\curses\* 
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\plat-linux2\* 
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\config\* 
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\bsddb\* 
%_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\logging\* 
%_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\idlelib\* 
%_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\idlelib\Icons\* 
%_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\wsgiref\* 
%_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\* 
%_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\fixes\* 
%_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\pgen2\* 
%_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\sqlite3\* 
%_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\ctypes\* 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2016-10-16 Thread Pedro Giffuni
 external_deps.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 711520040bc6d67ed2a0562c78e06e0f309ec877
Author: Pedro Giffuni 
Date:   Mon Oct 17 02:21:59 2016 +

Update Gentium URL.

This was causing breakage on the buildbot.

diff --git a/external_deps.lst b/external_deps.lst
index 47543ca..3eba2f0 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -289,7 +289,7 @@ if (WITH_CATB_FONTS==YES)
 if (WITH_CATB_FONTS == YES)
 MD5 = 1725634df4bb3dcb1b2c91a6175f8789
 name = GentiumBasic_1102.zip
-URL1 = http://software.sil.org/downloads/gentium/GentiumBasic_1102.zip
+URL1 = http://software.sil.org/downloads/d/gentium/GentiumBasic_1102.zip
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2016-09-17 Thread Pedro Giffuni
 external_deps.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a44afc71e63fe8c61b20d30effa1acb7dcaf07c1
Author: Pedro Giffuni 
Date:   Sat Sep 17 14:58:48 2016 +

Google code is deprecated.

Set the new URLs for ucpp and gtest to a new backup site set by Google.
This may disappear eventually, but for now we still have access
to those tarballs.

diff --git a/external_deps.lst b/external_deps.lst
index a3306fd..c7529be 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -39,13 +39,13 @@ 
OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
 if ( true )
 MD5 = 0168229624cfac409e766913506961a8
 name = ucpp-1.3.2.tar.gz
-URL1 = http://ucpp.googlecode.com/files/ucpp-1.3.2.tar.gz
+URL1 =  
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-1.3.2.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_UNIT_TESTS == YES)
 MD5 = 2d6ec8ccdf5c46b05ba54a9fd1d130d7
 name = gtest-1.7.0.zip
-URL1 = http://googletest.googlecode.com/files/gtest-1.7.0.zip
+URL1 = 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/googletest/gtest-1.7.0.zip
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst more_fonts/fonts more_fonts/prj

2016-09-03 Thread Pedro Giffuni
 external_deps.lst   |6 +++---
 more_fonts/fonts/ttf_dejavu/makefile.mk |6 +++---
 more_fonts/prj/d.lst|4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ebd68735659d7306ad8730047f0327d8266f5809
Author: Pedro Giffuni 
Date:   Sat Sep 3 22:49:25 2016 +

Update dejavu fonts to version 2.37.

Most notable feature is the addition of DejaVuMathTeXGyre.ttf.

Complete Changelog at:
http://dejavu-fonts.org/wiki/Changelog

While here also remove now obsolete version 2.35.

diff --git a/external_deps.lst b/external_deps.lst
index 876c6af..a3306fd 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -234,9 +234,9 @@ if (SYSTEM_CURL != YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATA_FONTS == YES)
-MD5 = 59eaca5acf5c7c8212e92778e3e01f32
-name = dejavu-fonts-ttf-2.35.tar.bz2
-URL1 = 
http://sourceforge.net/projects/dejavu/files/dejavu/2.35/$(name)/download
+MD5 = d0efec10b9f110a32e9b8f796e21782c
+name = dejavu-fonts-ttf-2.37.tar.bz2
+URL1 = 
http://sourceforge.net/projects/dejavu/files/dejavu/2.37/$(name)/download
 # URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATA_FONTS==YES)
diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk 
b/more_fonts/fonts/ttf_dejavu/makefile.mk
index 970b84d..7b3baca 100644
--- a/more_fonts/fonts/ttf_dejavu/makefile.mk
+++ b/more_fonts/fonts/ttf_dejavu/makefile.mk
@@ -39,9 +39,9 @@ TARGET=ttf_dejavu
 
 # --- Files 
 
-TARFILE_NAME=dejavu-fonts-ttf-2.35
-TARFILE_MD5=59eaca5acf5c7c8212e92778e3e01f32
-TARFILE_ROOTDIR=dejavu-fonts-ttf-2.35
+TARFILE_NAME=dejavu-fonts-ttf-2.37
+TARFILE_MD5=d0efec10b9f110a32e9b8f796e21782c
+TARFILE_ROOTDIR=dejavu-fonts-ttf-2.37
 
 PATCH_FILES=
 
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 0a2ba3b..6620f41 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -1,8 +1,8 @@
 mkdir: %COMMON_DEST%\pck%_EXT%
 ..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf
 # TODO: replace explicit versions by wildcard when the build system learns to 
handle them
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\ttf\*.ttf  
%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE
%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.37\ttf\*.ttf  
%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.37\LICENSE
%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
 ..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf   
%COMMON_DEST%\pck%_EXT%\*.ttf
 ..\%__SRC%\misc\build\crosextrafonts-20130214\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
 ..\%__SRC%\misc\build\crosextrafonts-carlito-20130920\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.8-mingw.patch python/python-2.7.8-nohardlink.patch python/python-2.7.8-pcbuild.pa

2016-09-02 Thread Pedro Giffuni
 external_deps.lst |6 
 python/makefile.mk|2 
 python/prj/d.lst  |  108 +-
 python/python-2.7.8-mingw.patch   | 1056 
 python/python-2.7.8-nohardlink.patch  |   11 
 python/python-2.7.8-pcbuild.patch | 1768 --
 python/python-2.7.8-sysbase.patch |   14 
 python/python-2.7.9-mingw.patch   | 1056 
 python/python-2.7.9-nohardlink.patch  |   11 
 python/python-2.7.9-pcbuild.patch | 1750 +
 python/python-2.7.9-sysbase.patch |   14 
 python/python-freebsd.patch   |  125 --
 python/python-md5.patch   |6 
 python/python-solaris.patch   |4 
 python/python-solver-before-std.patch |8 
 python/python-ssl.patch   |   18 
 python/pyversion.mk   |2 
 17 files changed, 2933 insertions(+), 3026 deletions(-)

New commits:
commit 0b44f5c65c2674aa5e39273f696a9040beb99bb9
Author: Pedro Giffuni 
Date:   Fri Sep 2 04:43:14 2016 +

python: update to version 2.7.9.

The new version  contains many fixes including the following
vulnerabilities:

CVE-2013-1752
CVE-2013-1753

Which may or may not apply to AOO.
It is also an important step as it uses features from the newer OpenSSL
version that was imported in r1756954.

Tested on FreeBSD, may still need adjustments for MS-Windows.

diff --git a/external_deps.lst b/external_deps.lst
index bfbaaf1..8012615 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = d4bca0159acb0b44a781292b5231936f
-name = Python-2.7.8.tgz
-URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
+MD5 = 5eebcaa0030dc4061156d3429657fb83
+name = Python-2.7.9.tgz
+URL1 = http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 2a146a1..5ab7893 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=d4bca0159acb0b44a781292b5231936f
+TARFILE_MD5=5eebcaa0030dc4061156d3429657fb83
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
diff --git a/python/prj/d.lst b/python/prj/d.lst
index ac5bd1d..39ee038 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
 mkdir: %_DEST%\lib%_EXT%\python\unittest
 mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 
-..\%__SRC%\misc\build\Python-2.7.8\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-old\* 
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-tk\* 
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\site-packages\* 
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\encodings\* 
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\email\mime\* 
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\compiler\* 
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\hotshot\* 
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\* 
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\command\* 
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\dom\* 
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\parsers\* 
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\sax\* 
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\curses\* 
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\plat-linux2\* 
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\config\* 
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\logging\* 
%_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\* 
%_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\Icons\* 
%_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\wsgiref\* 
%_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\* 
%_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\fixes\* 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxml2/libxml2-c99.patch libxml2/libxml2-configure.patch libxml2/libxml2-long-path.patch libxml2/makefile.mk

2016-08-28 Thread Don Lewis
 external_deps.lst   |4 +--
 libxml2/libxml2-c99.patch   |   48 
 libxml2/libxml2-configure.patch |   12 +-
 libxml2/libxml2-long-path.patch |4 +--
 libxml2/makefile.mk |7 +++--
 5 files changed, 62 insertions(+), 13 deletions(-)

New commits:
commit a8ee4f315bbd286c6efcc271e4289c4abb220a77
Author: Don Lewis 
Date:   Sun Aug 28 20:42:46 2016 +

Upgrade bundled libxml2 from version 2.9.3 to version 2.9.4 to fix:

CVE-2016-1762
CVE-2016-1833
CVE-2016-1834
CVE-2016-1835
CVE-2016-1836
CVE-2016-1837
CVE-2016-1838
CVE-2016-1839
CVE-2016-1840
CVE-2016-3627
CVE-2016-3705
CVE-2016-4449
CVE-2016-4483
It is not known whether any of these affect OpenOffice.

Import a post-2.9.4 patch from the upstream git repo to fix a build
problem on systems with pre-C99 compilers.

diff --git a/external_deps.lst b/external_deps.lst
index 2c7e376..bfbaaf1 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -174,8 +174,8 @@ if ( true )
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXML != YES)
-MD5 = daece17e045f1c107610e137ab50c179
-name = libxml2-2.9.3.tar.gz
+MD5 = ae249165c173b1ff386ee8ad676815f5
+name = libxml2-2.9.4.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
diff --git a/libxml2/libxml2-c99.patch b/libxml2/libxml2-c99.patch
new file mode 100644
index 000..7ce8f80
--- /dev/null
+++ b/libxml2/libxml2-c99.patch
@@ -0,0 +1,48 @@
+From d77e5fc4bcdb7da748c9cca116a601ae4df60d21 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan 
+Date: Tue, 31 May 2016 21:04:50 +0800
+Subject: relaxng.c, xmlschemas.c: Fix build on pre-C99 compilers
+
+Make sure that the variables are declared at the top of the block.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=767063
+ ---
+ relaxng.c| 3 ++-
+ xmlschemas.c | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/relaxng.c b/relaxng.c
+index 56a3344..3d3e69c 100644
+diff -ur misc/libxml2-2.9.4/relaxng.c misc/build/libxml2-2.9.4/relaxng.c
+--- misc/libxml2-2.9.4/relaxng.c   2016-05-23 00:25:25.0 -0700
 misc/build/libxml2-2.9.4/relaxng.c 2016-08-28 00:37:26.017097000 -0700
+@@ -2088,6 +2088,7 @@
+  const xmlChar * arg2)
+ {
+ char msg[1000];
++xmlChar *result;
+ 
+ if (arg1 == NULL)
+ arg1 = BAD_CAST "";
+@@ -2215,7 +2216,7 @@
+ snprintf(msg, 1000, "Unknown error code %d\n", err);
+ }
+ msg[1000 - 1] = 0;
+-xmlChar *result = xmlCharStrdup(msg);
++result = xmlCharStrdup(msg);
+ return (xmlEscapeFormatString());
+ }
+ 
+diff -ur misc/libxml2-2.9.4/xmlschemas.c misc/build/libxml2-2.9.4/xmlschemas.c
+--- misc/libxml2-2.9.4/xmlschemas.c2016-05-23 00:25:25.0 -0700
 misc/build/libxml2-2.9.4/xmlschemas.c  2016-08-28 00:37:26.025519000 
-0700
+@@ -3168,8 +3168,8 @@
+   "valid.");
+   }
+   if (expected) {
+-  msg = xmlStrcat(msg, BAD_CAST " Expected is '");
+   xmlChar *expectedEscaped = xmlCharStrdup(expected);
++  msg = xmlStrcat(msg, BAD_CAST " Expected is '");
+   msg = xmlStrcat(msg, xmlEscapeFormatString());
+   FREE_AND_NULL(expectedEscaped);
+   msg = xmlStrcat(msg, BAD_CAST "'.\n");
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index 8d5437f..bc5bea2 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,6 +1,6 @@
-diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.3/include/libxml/xmlversion.h
 misc/libxml2-2.9.3/include/libxml/xmlversion.h 2015-11-20 
01:49:39.0 -0800
-+++ misc/build/libxml2-2.9.3/include/libxml/xmlversion.h   2016-03-26 
09:46:21.124032000 -0700
+diff -ur misc/libxml2-2.9.4/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.4/include/libxml/xmlversion.h
+--- misc/libxml2-2.9.4/include/libxml/xmlversion.h 2015-11-20 
01:49:39.0 -0800
 misc/build/libxml2-2.9.4/include/libxml/xmlversion.h   2016-03-26 
09:46:21.124032000 -0700
 @@ -273,7 +273,7 @@
   *
   * Whether iconv support is available
@@ -19,9 +19,9 @@ diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.3
  #define LIBXML_DEBUG_ENABLED
  #endif
  
-diff -ur misc/libxml2-2.9.3/xml2-config.in 
misc/build/libxml2-2.9.3/xml2-config.in
 misc/libxml2-2.9.3/xml2-config.in  2015-05-06 05:04:36.0 -0700
-+++ misc/build/libxml2-2.9.3/xml2-config.in2016-03-26 10:00:17.756184000 
-0700
+diff -ur misc/libxml2-2.9.4/xml2-config.in 
misc/build/libxml2-2.9.4/xml2-config.in
+--- misc/libxml2-2.9.4/xml2-config.in  2015-05-06 05:04:36.0 -0700
 misc/build/libxml2-2.9.4/xml2-config.in2016-03-26 10:00:17.756184000 
-0700
 @@ -1,9 +1,14 @@
  #! /bin/sh
  
diff --git 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2016-08-27 Thread Andrea Pescetti
 external_deps.lst |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0dce2a7c99fbd6962460ed61242bf39d47a9da6c
Author: Andrea Pescetti 
Date:   Sat Aug 27 14:03:52 2016 +

#i127090# Provide fallback copy of gtest-1.7.0.zip on OOoExtras

diff --git a/external_deps.lst b/external_deps.lst
index 2de3b62a..2c7e376 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -46,6 +46,7 @@ if (ENABLE_UNIT_TESTS == YES)
 MD5 = 2d6ec8ccdf5c46b05ba54a9fd1d130d7
 name = gtest-1.7.0.zip
 URL1 = http://googletest.googlecode.com/files/gtest-1.7.0.zip
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
 MD5 = 067201ea8b126597670b5eff72e1f66c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst redland/prj redland/raptor redland/rasqal redland/redland redland/redlandversion.mk scp2/source

2016-08-26 Thread Don Lewis
 external_deps.lst  |   18 
 redland/prj/d.lst  |   16 
 redland/raptor/makefile.mk |   31 -
 redland/raptor/raptor-1.4.18.patch.autotools   |  217 -
 redland/raptor/raptor-1.4.18.patch.dmake   |  121 -
 redland/raptor/raptor-1.4.18.patch.fixes   |   42 -
 redland/raptor/raptor-1.4.18.patch.ooo_build   |   43 -
 redland/raptor/raptor-1.4.18.patch.win32   |   78 ---
 redland/raptor/raptor2-2.0.15.patch.dmake  |  136 +
 redland/raptor/raptor2-2.0.15.patch.win32  |  487 
 redland/rasqal/makefile.mk |   21 
 redland/rasqal/rasqal-0.9.16.patch.autotools   |  211 
 redland/rasqal/rasqal-0.9.16.patch.dmake   |  100 
 redland/rasqal/rasqal-0.9.16.patch.ooo_build   |   56 --
 redland/rasqal/rasqal-0.9.16.patch.win32   |   43 -
 redland/rasqal/rasqal-0.9.33.patch.dmake   |  153 ++
 redland/rasqal/rasqal-0.9.33.patch.ooo_build   |   14 
 redland/rasqal/rasqal-0.9.33.patch.win32   |  398 
 redland/redland/makefile.mk|   46 +
 redland/redland/redland-1.0.17.patch.autotools |   21 
 redland/redland/redland-1.0.17.patch.dmake |  122 +
 redland/redland/redland-1.0.17.patch.ooo_build |   32 +
 redland/redland/redland-1.0.17.patch.win32 |  598 +
 redland/redland/redland-1.0.8.patch.autotools  |  229 -
 redland/redland/redland-1.0.8.patch.dmake  |  119 
 redland/redland/redland-1.0.8.patch.ooo_build  |   22 
 redland/redland/redland-1.0.8.patch.win32  |  154 --
 redland/redlandversion.mk  |4 
 scp2/source/ooo/file_library_ooo.scp   |4 
 29 files changed, 2046 insertions(+), 1490 deletions(-)

New commits:
commit 59b7d113bc939c00e8a2b8c395d1cfcb3e51b38b
Author: Don Lewis 
Date:   Fri Aug 26 07:13:14 2016 +

Upgrade bundled raptor from raptor-1.4.18 to raptor2-2.0.15 to get the

fix for CVE-2012-0037.  It is not know whether this vulnerability
affects OpenOffice.

Also upgrade rasqal from version 0.9.16 to version 0.9.33 and redland
from version 1.0.8 to version 1.0.17 since all three packages are
closely related parts of the OpenOffice redland module for handling RDF.

OpenDocument version 1.2 documents contain an RDF metadata blob for
things like bookmarks and OLE objects.

diff --git a/external_deps.lst b/external_deps.lst
index 744f055..2de3b62a 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -89,21 +89,21 @@ if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = 284e768eeda0e2898b0d5bf7e26a016e
-name = raptor-1.4.18.tar.gz
-URL1 = http://download.librdf.org/source/raptor-1.4.18.tar.gz
+MD5 = a39f6c07ddb20d7dd2ff1f95fa21e2cd
+name = raptor2-2.0.15.tar.gz
+URL1 = http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = ca66e26082cab8bb817185a116db809b
-name = redland-1.0.8.tar.gz
-URL1 = http://download.librdf.org/source/redland-1.0.8.tar.gz
+MD5 = e5be03eda13ef68aabab6e42aa67715e
+name = redland-1.0.17.tar.gz
+URL1 = http://download.librdf.org/source/redland-1.0.17.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = fca8706f2c4619e2fa3f8f42f8fc1e9d
-name = rasqal-0.9.16.tar.gz
-URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz
+MD5 = 1f5def51ca0026cd192958ef07228b52
+name = rasqal-0.9.33.tar.gz
+URL1 = http://download.librdf.org/source/rasqal-0.9.33.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (GUI!=UNX || SYSTEM_ZLIB!=YES)
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index f96f3a5..4311b2a 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,13 +1,13 @@
 mkdir: %_DEST%\inc%_EXT%\external
 ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
-symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
-symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
-symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
+..\%__SRC%\lib\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so.0
+symlink: %_DEST%\lib%_EXT%\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so
+..\%__SRC%\lib\libraptor2.0.dylib %_DEST%\lib%_EXT%\libraptor2.0.dylib
+symlink: %_DEST%\lib%_EXT%\libraptor2.0.dylib 
%_DEST%\lib%_EXT%\libraptor2.dylib
+..\%__SRC%\lib\librasqal.so.3 %_DEST%\lib%_EXT%\librasqal.so.3

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst LICENSE openssl/makefile.mk openssl/openssl-0.9.8zh-clang.patch openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/open

2016-08-19 Thread Don Lewis
 LICENSE |2 
 external_deps.lst   |6 
 openssl/makefile.mk |   42 
 openssl/openssl-0.9.8zh-clang.patch |   11 
 openssl/openssl.patch   |  170 -
 openssl/openssllnx.patch| 3823 
 openssl/opensslmacosx.patch | 3751 ---
 openssl/version.mk  |4 
 set_soenv.in|   11 
 9 files changed, 136 insertions(+), 7684 deletions(-)

New commits:
commit cd952b405afd18a7c938b5c92e2e99f1c895e3f0
Author: Don Lewis 
Date:   Fri Aug 19 18:28:06 2016 +

Update the bundled version of OpenSSL from 0.9.8zh to 1.0.2h which

fixes many vulnerabiliies and adds support for newer, more secure
ciphers and versions of the protocol.

Note: OpenSSL version 1.0.2h contains two known minor vulnerabilites,
CVE-2016-2177 and CVE-2016-2178, which will be fixed in the next
OpenSSL release.  Their potential impact is low enough that that
various Linux distros have chosen not to apply the upstream patches
to the versions that they distribute.

On Windows, there is an optional new dependency on NASM,
.  If NASM is not available, then the C
implementations of the low-level crypto code will be used instead
of the optimized assembly language versions.  Since OpenOffice is
not a heavy user of this code, the impact should be minor.  If NASM
is installed, but its location is not in $PATH, the directory
containing nasm.exe should be passed to configure using --with-nasm-home.

The fallback to the C crypto implementation also happens on Linux
if the version of gcc is sufficently old to indicate that the
toolchain is likely to not support the some of the instructions in
the assembly language versions of the code.

diff --git a/LICENSE b/LICENSE
index 47c911b..e724dd0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1222,7 +1222,7 @@ OpenSSL License
 ---
 
 
-Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
diff --git a/external_deps.lst b/external_deps.lst
index 1123895..744f055 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -155,9 +155,9 @@ if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
-MD5 = c813c065dd53d7bd0a560a870ddd0af5
-name = openssl-0.9.8zh.tar.gz
-URL1 = http://www.openssl.org/source/openssl-0.9.8zh.tar.gz
+MD5 = 9392e65072ce4b614c1392eefc1f23d0
+name = openssl-1.0.2h.tar.gz
+URL1 = http://www.openssl.org/source/openssl-1.0.2h.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index d67449e..6762f64 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -42,17 +42,17 @@ TARGET=openssl
 @echo "openssl disabled"
 .ENDIF
 
-OPENSSL_NAME=openssl-0.9.8zh
+OPENSSL_NAME=openssl-1.0.2h
 
 TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=c813c065dd53d7bd0a560a870ddd0af5
+TARFILE_MD5=9392e65072ce4b614c1392eefc1f23d0
 
 CONFIGURE_DIR=.
 CONFIGURE_ACTION=config
 CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared 
 
 BUILD_DIR=.
-BUILD_ACTION=make CC='$(CC)'
+BUILD_ACTION=make CC='$(CC)' build_libs
 
 OUT2LIB = libssl.*
 OUT2LIB += libcrypto.*
@@ -60,25 +60,32 @@ OUT2INC += include/openssl/*
 
 UNAME=$(shell uname)
 
+.IF "$(COM)"=="GCC" && "$(CCNUMVER)">="00040006" || "$(OS)"=="WNT" && 
"$(NASM_PATH)"=="NO_NASM_HOME"
+  NO_ASM="no-asm"
+.ELSE
+  NO_ASM=
+.ENDIF
+
 .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
 PATCH_FILES=openssllnx.patch
-ADDITIONAL_FILES:= \
-libcrypto_OOo_0_9_8zh.map \
-libssl_OOo_0_9_8zh.map
 .IF "$(CPU)" == "I"
 .IF "$(UNAME)" == "GNU/kFreeBSD"
-CONFIGURE_ACTION=Configure debian-kfreebsd-i386
+CONFIGURE_ACTION=Configure debian-kfreebsd-i386 no-dso no-shared 
$(NO_ASM)
+.ELIF "$(UNAME)" == "FreeBSD"
+CONFIGURE_ACTION=Configure BSD-x86-elf no-dso no-shared $(NO_ASM)
 .ELSE
-CONFIGURE_ACTION=Configure linux-elf
+CONFIGURE_ACTION=Configure linux-generic32 no-dso no-shared 
$(NO_ASM)
 .ENDIF
 .ELIF "$(BUILD64)" == "1"
 .IF "$(UNAME)" == "GNU/kFreeBSD"
-CONFIGURE_ACTION=Configure debian-kfreebsd-amd64
+CONFIGURE_ACTION=Configure debian-kfreebsd-amd64 no-dso no-shared 
$(NO_ASM)
+.ELIF "$(UNAME)" == "FreeBSD"
+CONFIGURE_ACTION=Configure BSD-x86_64 no-dso no-shared $(NO_ASM)
 .ELSE
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxslt/libxslt-configure.patch libxslt/libxslt-CVE-2015-7995.patch libxslt/libxslt-internal-symbols.patch libxslt/libxsltversion

2016-08-13 Thread Don Lewis
 external_deps.lst  |4 -
 libxslt/libxslt-CVE-2015-7995.patch|   24 --
 libxslt/libxslt-configure.patch|   74 +
 libxslt/libxslt-internal-symbols.patch |   18 
 libxslt/libxslt-win_manifest.patch |6 +-
 libxslt/libxsltversion.mk  |2 
 libxslt/makefile.mk|5 --
 7 files changed, 30 insertions(+), 103 deletions(-)

New commits:
commit 8bec619aefa8913e08f10878cd6ae98340e37e21
Author: Don Lewis 
Date:   Fri Aug 12 22:37:50 2016 +

Upgrade bundled libxslt from version 1.1.28 to version 1.1.29 to fix:

CVE-2016-1683
CVE-2016-1684
Whether any of these affect the OpenOffice usage of libxslt is not known.
OpenOffice uses libxslt for help, document signing and encryption, and
for RDF.

libxslt-CVE-2015-7995.patch is no longer needed because this issue
has been fixed upstream.

Re-roll the other patches, some of which got simplified because of
upstream fixes.

diff --git a/external_deps.lst b/external_deps.lst
index d81dec1..1123895 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -179,8 +179,8 @@ if (SYSTEM_LIBXML != YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXSLT != YES)
-MD5 = 9667bf6f9310b957254fdcf6596600b7
-name = libxslt-1.1.28.tar.gz
+MD5 = a129d3c44c022de3b9dcf6d6f288d72e
+name = libxslt-1.1.29.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
diff --git a/libxslt/libxslt-CVE-2015-7995.patch 
b/libxslt/libxslt-CVE-2015-7995.patch
deleted file mode 100644
index 59a6fbf..000
--- a/libxslt/libxslt-CVE-2015-7995.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard 
-Date: Thu, 29 Oct 2015 19:33:23 +0800
-Subject: Fix for type confusion in preprocessing attributes
-
-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
-We need to check that the parent node is an element before dereferencing
-its namespace

- libxslt/preproc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
 misc/libxslt-1.1.28/libxslt/preproc.c  2012-09-11 22:59:42.0 
-0700
-+++ misc/build/libxslt-1.1.28/libxslt/preproc.c2016-03-26 
11:04:43.636524000 -0700
-@@ -2245,7 +2245,8 @@
-   } else if (IS_XSLT_NAME(inst, "attribute")) {
-   xmlNodePtr parent = inst->parent;
- 
--  if ((parent == NULL) || (parent->ns == NULL) ||
-+  if ((parent == NULL) ||
-+  (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
-   ((parent->ns != inst->ns) &&
-(!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
-   (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index 4b82fa3..24567a6 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,36 +1,18 @@
-diff -ur misc/libxslt-1.1.28/ltmain.sh misc/build/libxslt-1.1.28/ltmain.sh
 misc/libxslt-1.1.28/ltmain.sh  2012-11-20 23:21:48.0 -0800
-+++ misc/build/libxslt-1.1.28/ltmain.sh2016-03-27 11:14:40.564087000 
-0700
-@@ -7331,13 +7331,13 @@
- #
- case $version_type in
- # correct linux to gnu/linux during the next big refactor
--darwin|linux|osf|windows|none)
-+darwin|freebsd-elf|linux|osf|windows|none)
-   func_arith $number_major + $number_minor
-   current=$func_arith_result
-   age="$number_minor"
-   revision="$number_revision"
-   ;;
--freebsd-aout|freebsd-elf|qnx|sunos)
-+freebsd-aout|qnx|sunos)
-   current="$number_major"
-   revision="$number_minor"
-   age="0"
-@@ -7414,8 +7414,8 @@
- ;;
+diff -ur misc/libxslt-1.1.29/configure misc/build/libxslt-1.1.29/configure
+--- misc/libxslt-1.1.29/configure  2016-05-23 18:49:13.0 -0700
 misc/build/libxslt-1.1.29/configure2016-08-11 11:06:10.448691000 
-0700
+@@ -6691,7 +6691,7 @@
  
-   freebsd-elf)
--major=".$current"
--versuffix=".$current"
-+major=.$(($current - $age))
-+versuffix="$major.$age.$revision"
- ;;
+ cygwin*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
  
-   irix | nonstopux)
-diff -ur misc/libxslt-1.1.28/xslt-config.in 
misc/build/libxslt-1.1.28/xslt-config.in
 misc/libxslt-1.1.28/xslt-config.in 2012-09-04 07:26:23.0 -0700
-+++ misc/build/libxslt-1.1.28/xslt-config.in   2016-03-26 10:54:11.377552000 
-0700
+diff -ur misc/libxslt-1.1.29/xslt-config.in 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2016-07-15 Thread Don Lewis
 external_deps.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d82c7a031e0ba8e36fd9a3db756336025bc4cd12
Author: Don Lewis 
Date:   Fri Jul 15 06:33:53 2016 +

#i126892# The iweb sourceforge mirror appears to have been removed from

rotation, switch to the pilotfiber mirror.

diff --git a/external_deps.lst b/external_deps.lst
index 722850d..6d85e10 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -28,7 +28,7 @@
 # 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://iweb.dl.sourceforge.net/project/oooextras.mirror/
+OOO_EXTRAS=http://pilotfiber.dl.sourceforge.net/project/oooextras.mirror/
 
 # Must not fallback to svn
 # 
SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxml2/libxml2-configure.patch libxml2/libxml2-fixes.patch libxml2/libxml2-long-path.patch libxml2/libxml2-runtest.patch libxml2

2016-06-15 Thread Don Lewis
 external_deps.lst   |8 +--
 libxml2/libxml2-configure.patch |   71 ++
 libxml2/libxml2-fixes.patch |   41 ---
 libxml2/libxml2-long-path.patch |   45 +++--
 libxml2/libxml2-runtest.patch   |   11 -
 libxml2/libxml2-testapi.patch   |   20 -
 libxml2/makefile.mk |   13 ++
 libxslt/libxslt-CVE-2015-7995.patch |   24 +++
 libxslt/libxslt-bsd.patch   |   26 
 libxslt/libxslt-configure.patch |   74 +---
 libxslt/libxslt-win_manifest.patch  |5 +-
 libxslt/libxsltversion.mk   |2 
 libxslt/makefile.mk |9 +---
 13 files changed, 114 insertions(+), 235 deletions(-)

New commits:
commit c1173fdcf0046593b6b2783eb423601eb6f47b20
Author: Don Lewis 
Date:   Wed Jun 15 05:36:41 2016 +

#i126893#: Upgrade bundled libxml2 version to 2.9.3 and libxslt to 1.1.28

These security vulnerabilities have been fixed since the release of
libxml2-2.7.8 which is bundled with OpenOffice:
CVE-2011-3202
CVE-2011-3919
CVE-2013-0338
CVE-2013-0339
CVE-2013-2877
CVE-2014-0191
CVE-2014-3660
CVE-2015-1819
CVE-2015-5312
CVE-2015-7497
CVE-2015-7498
CVE-2015-7499
CVE-2015-7500
CVE-2015-7941
CVE-2015-7942
CVE-2015-8035
CVE-2015-8241
CVE-2015-8242

This vulnerability has been fixed since the release of libxslt-1.1.26:
CVE-2015-7995

Upgrade libxml2 to version 2.9.3 which has no publicly disclosed
vulnerabilities at this time.

Rebase libxml2-configure.patch to the new version of libxml2.  The
freebsd-elf change to ltmain.sh is no longer necessary and is eliminated
from the patch.  The fixes in libxml2-fixes.patch were either fixed
upstream or don't seem to apply anymore, so this patch file was deleted.
The fixes in libxml2-testapi.patch and libxml2-runtest.patch are in now
in the upstream source, so these patch files have been deleted.
The libxml2-mingw.patch and Solaris-specific libxml2-global-symbols.patch
were not updated and are disconnected from the build.  Several of the
fixes in libxml2-long-path.patch are now fixed upstream.

Upgrade libxslt to version 1.1.28 and add libxslt-CVE-2015-7995.patch,
which is imported from the FreeBSD port and which appears to have been
cherry picked from upstream.

Rebase libxslt-configure.patch to the new version of libxslt, with
the libtool-related changes coming from the libxslt port to FreeBSD.
The fixes in libxslt-bsd.patch are now present in the upstream
source, so this patch was deleted.

Tested by:  kschenk

diff --git a/external_deps.lst b/external_deps.lst
index 61bd7a5..722850d 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -175,14 +175,14 @@ if ( true )
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXML != YES)
-MD5 = 8127a65e8c3b08856093099b52599c86
-name = libxml2-2.7.8.tar.gz
+MD5 = daece17e045f1c107610e137ab50c179
+name = libxml2-2.9.3.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXSLT != YES)
-MD5 = e61d0364a30146aaa3001296f853b2b9
-name = libxslt-1.1.26.tar.gz
+MD5 = 9667bf6f9310b957254fdcf6596600b7
+name = libxslt-1.1.28.tar.gz
 URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index b396b55..8d5437f 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,19 +1,7 @@
 misc/libxml2-2.7.8/ltmain.sh   2009-10-06 17:39:54.0 +0100
-+++ misc/build/libxml2-2.7.8/ltmain.sh 2009-12-17 11:43:56.0 +
-@@ -6599,8 +6599,8 @@
- ;;
- 
-   freebsd-elf)
--major=".$current"
--versuffix=".$current"
-+major=.`expr $current - $age`
-+versuffix=".$major.$age.$revision";
- ;;
- 
-   irix | nonstopux)
 misc/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 
11:45:19.0 +
-+++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h   2009-12-17 
11:45:36.0 +
-@@ -264,7 +264,7 @@
+diff -ur misc/libxml2-2.9.3/include/libxml/xmlversion.h 
misc/build/libxml2-2.9.3/include/libxml/xmlversion.h
+--- misc/libxml2-2.9.3/include/libxml/xmlversion.h 2015-11-20 
01:49:39.0 -0800
 misc/build/libxml2-2.9.3/include/libxml/xmlversion.h   2016-03-26 
09:46:21.124032000 -0700
+@@ -273,7 +273,7 @@
   *
   * Whether iconv support is available
   */
@@ -22,7 +10,7 @@
  #define LIBXML_ICONV_ENABLED
  #endif
  
-@@ -291,7 +291,7 @@
+@@ -300,7 +300,7 @@
   *
   * Whether Debugging module is configured in
   */
@@ -31,26 +19,9 @@
  #define LIBXML_DEBUG_ENABLED
  #endif
  
-@@ -300,7 +300,7 @@

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

2016-05-24 Thread Pedro Giffuni
 external_deps.lst|8 
 scp2/source/ooo/file_library_ooo.scp |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8766bb149ae58a519e0f45fb84a5fb23df306448
Author: Pedro Giffuni 
Date:   Tue May 24 21:41:06 2016 +

Update APR and APR-util.

Update APR to version 1.5.2.
Update APR-util to version 1.5.4

This brings many updates and fixes that have little effect over Apache
OpenOffice at this time.

Tested on FreeBSD.

diff --git a/external_deps.lst b/external_deps.lst
index b8992aa..61bd7a5 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -163,14 +163,14 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
-MD5 = 97262fe54dddaf583eaaee3497a426e1
-name = apr-1.4.5.tar.gz
+MD5 = 98492e965963f852ab29f9e61b2ad700
+name = apr-1.5.2.tar.gz
 URL1 = http://archive.apache.org/dist/apr/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
-MD5 = 666a5d56098a9debf998510e304c8095
-name = apr-util-1.4.1.tar.gz
+MD5 = 866825c04da827c6e5f53daff5569f42
+name = apr-util-1.5.4.tar.gz
 URL1 = http://archive.apache.org/dist/apr/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index df8c8b3..4c6bca6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -2034,7 +2034,7 @@ File gid_File_Lib_Apr
#ifdef MACOSX
 Name = 
STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
#elif FREEBSD
-Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.4));
+Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.5));
 #else
 Name = 
STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
 #endif
@@ -2053,7 +2053,7 @@ File gid_File_Lib_AprUtil
#ifdef MACOSX
 Name = 
STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
#elif FREEBSD
-Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.4));
+Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.5));
#else
 Name = 
STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2016-02-13 Thread Damjan Jovanovic
 external_deps.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ce8b7f08c7f8e468accd181d3859b56e1ae25d8
Author: Damjan Jovanovic 
Date:   Sat Feb 13 06:33:35 2016 +

Fix the upstream URL for vigra in external_deps.lst

Patch by: me

diff --git a/external_deps.lst b/external_deps.lst
index d480f22..8110c44 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -218,7 +218,7 @@ if (SYSTEM_BOOST != YES)
 if (SYSTEM_VIGRA != YES)
 MD5 = d62650a6f908e85643e557a236ea989c
 name = vigra1.6.0.tar.gz
-URL1 = http://hci.iwr.uni-heidelberg.de/vigra/vigra1.6.0.tar.gz
+URL1 = 
http://hci.iwr.uni-heidelberg.de/vigra-old-versions/vigra1.6.0.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_EXPAT != YES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2016-01-09 Thread Andrea Pescetti
 external_deps.lst |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 43fb38f6c55b9c2b30d938cb5a30e7d875ba2bfc
Author: Andrea Pescetti 
Date:   Sat Jan 9 18:56:32 2016 +

#i126781# Replace external FTP sources with HTTP/HTTPS downloads

Patch By: j.nitschke 

diff --git a/external_deps.lst b/external_deps.lst
index dbb7cbe..d480f22 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -86,7 +86,7 @@ if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=YES)
 if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
 MD5 = 1f24ab1d39f4a51faf22244c94a6203f
 name = xmlsec1-1.2.14.tar.gz
-URL1 = ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-1.2.14.tar.gz
+URL1 = http://xmlsoft.org/sources/xmlsec/releases/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
@@ -176,13 +176,13 @@ if ( true )
 if (SYSTEM_LIBXML != YES)
 MD5 = 8127a65e8c3b08856093099b52599c86
 name = libxml2-2.7.8.tar.gz
-URL1 = ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
+URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_LIBXSLT != YES)
 MD5 = e61d0364a30146aaa3001296f853b2b9
 name = libxslt-1.1.26.tar.gz
-URL1 = ftp://xmlsoft.org/libxml2/libxslt-1.1.26.tar.gz
+URL1 = http://xmlsoft.org/sources/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA == TRUE)
@@ -307,13 +307,13 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_HUNSPELL!=YES)
 if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && ENABLE_JAVASCRIPT==YES)
 MD5 = 99d94103662a8d0b571e247a77432ac5
 name = rhino1_7R3.zip
-URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip
+URL1 = https://ftp.mozilla.org/pub/js/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
 MD5 = 067a04150b1d8b64f7da3019688a7547
 name = nss-3.14.4-with-nspr-4.9.5.tar.gz
-URL1 = 
ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_4_RTM/src/nss-3.14.4-with-nspr-4.9.5.tar.gz
+URL1 = 
https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_4_RTM/src/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && 
SOLAR_JAVA==TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.6-mingw.patch python/python-2.7.6-nohardlink.patch python/python-2.7.6-pcbuild.pa

2016-01-03 Thread Pedro Giffuni
 external_deps.lst |6 
 python/makefile.mk|2 
 python/prj/d.lst  |  108 
 python/python-2.7.6-mingw.patch   | 7316 --
 python/python-2.7.6-nohardlink.patch  |   11 
 python/python-2.7.6-pcbuild.patch | 1768 
 python/python-2.7.6-sysbase.patch |   13 
 python/python-2.7.8-mingw.patch   | 1056 
 python/python-2.7.8-nohardlink.patch  |   11 
 python/python-2.7.8-pcbuild.patch | 1768 
 python/python-2.7.8-sysbase.patch |   14 
 python/python-freebsd.patch   |  133 
 python/python-md5.patch   |8 
 python/python-solaris.patch   |6 
 python/python-solver-before-std.patch |8 
 python/python-ssl.patch   |   22 
 python/pyversion.mk   |2 
 17 files changed, 3026 insertions(+), 9226 deletions(-)

New commits:
commit fe1b988bc30ed6dc0133f71f5fa51fb6de97fc2b
Author: Pedro Giffuni 
Date:   Sun Jan 3 19:14:32 2016 +

Revert r1722700, bringing back the bundled Python version to 2.7.8

The buildbots were not fetching the original tarball so
we cached thin in ext_sources (r1722746).

Found by:   damjan

diff --git a/external_deps.lst b/external_deps.lst
index 5131500..dbb7cbe 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = 1d8728eb0dfcac72a0fd99c17ec7f386
-name = Python-2.7.6.tgz
-URL1 = http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz
+MD5 = d4bca0159acb0b44a781292b5231936f
+name = Python-2.7.8.tgz
+URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 7949af9..2a146a1 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386
+TARFILE_MD5=d4bca0159acb0b44a781292b5231936f
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
diff --git a/python/prj/d.lst b/python/prj/d.lst
index fd8d0a2..ac5bd1d 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
 mkdir: %_DEST%\lib%_EXT%\python\unittest
 mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 
-..\%__SRC%\misc\build\Python-2.7.6\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-old\* 
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-tk\* 
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\site-packages\* 
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\encodings\* 
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\email\mime\* 
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\compiler\* 
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\hotshot\* 
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\* 
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\command\* 
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\dom\* 
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\parsers\* 
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\sax\* 
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\curses\* 
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\plat-linux2\* 
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\config\* 
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\logging\* 
%_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\* 
%_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\Icons\* 
%_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\wsgiref\* 
%_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\* 
%_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\fixes\* 
%_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\pgen2\* 
%_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.6\Lib\sqlite3\* 
%_DEST%\lib%_EXT%\python\sqlite3\*

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.6-mingw.patch python/python-2.7.6-nohardlink.patch python/python-2.7.6-pcbuild.pa

2016-01-02 Thread Pedro Giffuni
 external_deps.lst |6 
 python/makefile.mk|2 
 python/prj/d.lst  |  108 
 python/python-2.7.6-mingw.patch   | 7316 ++
 python/python-2.7.6-nohardlink.patch  |   11 
 python/python-2.7.6-pcbuild.patch | 1768 
 python/python-2.7.6-sysbase.patch |   13 
 python/python-2.7.8-mingw.patch   | 1056 
 python/python-2.7.8-nohardlink.patch  |   11 
 python/python-2.7.8-pcbuild.patch | 1768 
 python/python-2.7.8-sysbase.patch |   14 
 python/python-freebsd.patch   |  133 
 python/python-md5.patch   |8 
 python/python-solaris.patch   |6 
 python/python-solver-before-std.patch |8 
 python/python-ssl.patch   |   22 
 python/pyversion.mk   |2 
 17 files changed, 9226 insertions(+), 3026 deletions(-)

New commits:
commit 4c42db0c84cce455b0487535977d620340da0397
Author: Pedro Giffuni 
Date:   Sun Jan 3 05:10:43 2016 +

Revert r1722635: Update Python bundled version to 2.7.8

It broke the buildots .. requires some investigation.

diff --git a/external_deps.lst b/external_deps.lst
index dbb7cbe..5131500 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_PYTHON != YES)
-MD5 = d4bca0159acb0b44a781292b5231936f
-name = Python-2.7.8.tgz
-URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
+MD5 = 1d8728eb0dfcac72a0fd99c17ec7f386
+name = Python-2.7.6.tgz
+URL1 = http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 2a146a1..7949af9 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
 
 
 TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=d4bca0159acb0b44a781292b5231936f
+TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386
 PATCH_FILES=\
 python-solaris.patch \
 python-freebsd.patch \
diff --git a/python/prj/d.lst b/python/prj/d.lst
index ac5bd1d..fd8d0a2 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
 mkdir: %_DEST%\lib%_EXT%\python\unittest
 mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
 
-..\%__SRC%\misc\build\Python-2.7.8\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-old\* 
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-tk\* 
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\site-packages\* 
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\encodings\* 
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\email\mime\* 
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\compiler\* 
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\hotshot\* 
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\* 
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\command\* 
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\dom\* 
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\parsers\* 
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\sax\* 
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\curses\* 
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\plat-linux2\* 
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\config\* 
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\logging\* 
%_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\* 
%_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\Icons\* 
%_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\wsgiref\* 
%_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\* 
%_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\fixes\* 
%_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\pgen2\* 
%_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\sqlite3\* 
%_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\ctypes\* 
%_DEST%\lib%_EXT%\python\ctypes\*

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst more_fonts/fonts more_fonts/prj scp2/source

2015-12-26 Thread Pedro Giffuni
 external_deps.lst  |6 ++
 more_fonts/fonts/fc_local.conf |   14 +++---
 more_fonts/fonts/ttf_crosextra/makefile.mk |   61 +
 more_fonts/prj/build.lst   |1 
 more_fonts/prj/d.lst   |1 
 scp2/source/ooo/file_font_ooo.scp  |   38 +-
 6 files changed, 97 insertions(+), 24 deletions(-)

New commits:
commit 534fa5c25363d7bf21e971a11c624ebcee0c1c2b
Author: Pedro Giffuni 
Date:   Sat Dec 26 23:49:16 2015 +

Bring new crosextra font: Caladea

Caladea is a modern Latin typeface inspired by the contrast, style and
ornaments of Khmer typefaces and writing styles. Its main objective is to
be used to write Latin texts in a Khmer context, but it is also an elegant
choice for all kinds of texts.

Designed by Carolina Giovagnoli and Andres Torresi
for Huerta Tipografica under an Apache 2.0 License.


This is specially interesting as it is metrically compatible with
MS Cambria.

While here sort out some issues:
- Sadly, we don't really carry an equivalent for "Arial Narrow".
- There is not need for Arimo in the Windows platform.

diff --git a/external_deps.lst b/external_deps.lst
index 2ed03df..9b7c873 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -245,6 +245,12 @@ if (WITH_CATA_FONTS==YES)
 URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
+if (WITH_CATA_FONTS==YES)
+MD5 = 368f114c078f94214a308a74c7e991bc
+name = crosextrafonts-20130214.tar.gz
+URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
 if ( true )
 MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab
 name = SampleICC-1.3.2.tar.gz
diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
index f4dfc87..07b39c8 100644
--- a/more_fonts/fonts/fc_local.conf
+++ b/more_fonts/fonts/fc_local.conf
@@ -25,19 +25,21 @@

 

- Arimo
- 
- Arial Narrow
- 
+ Caladea
+ 
+ Cambria
+ 

 
 
+

- Arial Narrow
+ Cambria
  
- Arimo
+ Caladea
  

+
 
 
 
diff --git a/more_fonts/fonts/ttf_crosextra/makefile.mk 
b/more_fonts/fonts/ttf_crosextra/makefile.mk
new file mode 100644
index 000..7de1bb8
--- /dev/null
+++ b/more_fonts/fonts/ttf_crosextra/makefile.mk
@@ -0,0 +1,61 @@
+#**
+#  
+#  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
+#  regarding copyright ownership.  The ASF licenses this file
+#  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=more_fonts
+TARGET=ttf_crosextra
+
+# --- Settings -
+
+.INCLUDE : settings.mk
+
+.IF "$(WITH_CATA_FONTS)" != "YES"
+
+@all:
+@echo "category A licensed CrossCore font is disabled."
+
+.ELSE
+
+# --- Files 
+
+TARFILE_NAME=crosextrafonts-20130214
+TARFILE_MD5=368f114c078f94214a308a74c7e991bc
+
+PATCH_FILES=
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets --
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(WITH_FONTS)"!="NO"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
+.ENDIF
diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst
index ae64cf7..c001a21 100644
--- a/more_fonts/prj/build.lst
+++ b/more_fonts/prj/build.lst
@@ -1,4 +1,5 @@
 bs more_fonts  :   solenv NULL
 bs more_fonts\fonts\ttf_dejavu nmake   -   all 
deja_fonts NULL
 bs more_fonts\fonts\ttf_croscore   nmake   -   all cros_fonts NULL
+bs more_fonts\fonts\ttf_crosextra  nmake   -   all xtra_fonts NULL
 bs more_fonts\fonts\ttf_gentiumnmake   -   all gent_fonts NULL
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index d33c4b5..ccf3760 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -4,5 +4,6 @@ mkdir: %COMMON_DEST%\pck%_EXT%
 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

2015-01-23 Thread Pedro Giffuni
 external_deps.lst |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1c1efea327d26d61e3feccbd0ee0275707ba997d
Author: Pedro Giffuni p...@apache.org
Date:   Fri Jan 23 18:45:39 2015 +

Update URL2 for croscorefonts.

We have been carrying the newer fonts for a while in the
backup repository along with other candidates.

diff --git a/external_deps.lst b/external_deps.lst
index 8395e7c..c679394 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -243,6 +243,7 @@ if (WITH_CATA_FONTS==YES)
 MD5 = cfa8bec07bf5b6856dd20f0cb28b3929
 name = croscorefonts-1.23.0.tar.gz
 URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
 MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits