[libreoffice-online] 03/04: New upstream version 5.4.2.2
Rene Engelhard
rene at moszumanska.debian.org
Sat Nov 11 17:29:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice-online.
commit 40d07cc28716769f232712020462bfe7501e2282
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sat Nov 11 18:27:13 2017 +0100
New upstream version 5.4.2.2
---
configure | 20 ++++++++++----------
configure.ac | 2 +-
dist_git_hash | 2 +-
loleaflet/dist/menubar.css | 2 +-
loleaflet/src/control/Control.Scroll.js | 8 ++++++--
loolwsd-systemplate-setup | 2 +-
loolwsd.spec | 6 +++---
net/Ssl.cpp | 16 +++++++++++++++-
8 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/configure b/configure
index 25ff7e5..468555c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libreoffice-online 5.4.1.2.
+# Generated by GNU Autoconf 2.69 for libreoffice-online 5.4.2.2.
#
# Report bugs to <libreoffice at lists.freedesktop.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libreoffice-online'
PACKAGE_TARNAME='libreoffice-online'
-PACKAGE_VERSION='5.4.1.2'
-PACKAGE_STRING='libreoffice-online 5.4.1.2'
+PACKAGE_VERSION='5.4.2.2'
+PACKAGE_STRING='libreoffice-online 5.4.2.2'
PACKAGE_BUGREPORT='libreoffice at lists.freedesktop.org'
PACKAGE_URL=''
@@ -1379,7 +1379,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libreoffice-online 5.4.1.2 to adapt to many kinds of systems.
+\`configure' configures libreoffice-online 5.4.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1450,7 +1450,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libreoffice-online 5.4.1.2:";;
+ short | recursive ) echo "Configuration of libreoffice-online 5.4.2.2:";;
esac
cat <<\_ACEOF
@@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libreoffice-online configure 5.4.1.2
+libreoffice-online configure 5.4.2.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2097,7 +2097,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libreoffice-online $as_me 5.4.1.2, which was
+It was created by libreoffice-online $as_me 5.4.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -11941,7 +11941,7 @@ fi
# Define the identity of the package.
PACKAGE='libreoffice-online'
- VERSION='5.4.1.2'
+ VERSION='5.4.2.2'
cat >>confdefs.h <<_ACEOF
@@ -18194,7 +18194,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libreoffice-online $as_me 5.4.1.2, which was
+This file was extended by libreoffice-online $as_me 5.4.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18260,7 +18260,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libreoffice-online config.status 5.4.1.2
+libreoffice-online config.status 5.4.2.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ec36ae8..8aab94d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([libreoffice-online], [5.4.1.2], [libreoffice at lists.freedesktop.org])
+AC_INIT([libreoffice-online], [5.4.2.2], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/dist_git_hash b/dist_git_hash
index 39647e1..3cc6a58 100644
--- a/dist_git_hash
+++ b/dist_git_hash
@@ -1 +1 @@
-319dc1d7
+fac62cbe
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index d3a35fc..1d8e5ee 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -69,7 +69,7 @@
background: #538ecd;
color: #fff;
}
-.lo-menu > li {
+.lo-menu > li, .lo-menu > li > a.disabled {
background: #efefef; /* top-level menus remain greyish */
}
.lo-menu > li > a:hover, .lo-menu > li > a:focus, .lo-menu > li > a:active, .lo-menu > li > a.highlighted {
diff --git a/loleaflet/src/control/Control.Scroll.js b/loleaflet/src/control/Control.Scroll.js
index 3bbb5c5..d11a9bc 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -221,9 +221,13 @@ L.Control.Scroll = L.Control.extend({
// used on window resize
if (this._map._docLayer._docType === 'spreadsheet') {
var offset = new L.Point(e.x - this._prevScrollX, e.y - this._prevScrollY);
- if (!offset.equals(new L.Point(0, 0))) {
- this._onUpdateRowColumnHeaders({x: e.x, y: e.y, offset: offset});
+ if (offset.x === 0) {
+ offset.x = 1;
}
+ if (offset.y === 0) {
+ offset.y = 1;
+ }
+ this._onUpdateRowColumnHeaders({x: e.x, y: e.y, offset: offset});
}
this._ignoreScroll = null;
$('.scroll-container').mCustomScrollbar('stop');
diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 729220c..790bbb3 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -9,7 +9,7 @@ INSTDIR=$2
test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
-mkdir $CHROOT || exit 1
+mkdir -p $CHROOT || exit 1
CHROOT=`cd $CHROOT && /bin/pwd`
INSTDIR=`cd $INSTDIR && /bin/pwd`
diff --git a/loolwsd.spec b/loolwsd.spec
index 1149d7b..d51fbaa 100644
--- a/loolwsd.spec
+++ b/loolwsd.spec
@@ -11,12 +11,12 @@ Name: loolwsd%{name_suffix}
%else
Name: loolwsd
%endif
-Version: 5.4.1.2
+Version: 5.4.2.2
Release: 1%{?dist}
Vendor: %{vendor}
Summary: LibreOffice Online WebSocket Daemon
License: MPL
-Source0: loolwsd-5.4.1.2.tar.gz
+Source0: loolwsd-5.4.2.2.tar.gz
BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.5
%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libpcap
@@ -58,7 +58,7 @@ Obsoletes: loleaflet <= 1.5.8
%debug_package
%endif
%prep
-%setup -n loolwsd-5.4.1.2
+%setup -n loolwsd-5.4.2.2
%build
%configure \
diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index e350257..64f279d 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -42,13 +42,18 @@ SslContext::SslContext(const std::string& certFilePath,
_mutexes.emplace_back(new std::mutex);
}
-#if OPENSSL_VERSION_NUMBER >= 0x0907000L
+#if OPENSSL_VERSION_NUMBER >= 0x0907000L && OPENSSL_VERSION_NUMBER < 0x10100003L
OPENSSL_config(nullptr);
#endif
+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+ SSL_CTX_set_options(nullptr, 0);
+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
+#else
SSL_library_init();
SSL_load_error_strings();
OpenSSL_add_all_algorithms();
+#endif
CRYPTO_set_locking_callback(&SslContext::lock);
CRYPTO_set_id_callback(&SslContext::id);
@@ -233,10 +238,19 @@ void SslContext::initDH()
throw std::runtime_error("Error creating Diffie-Hellman parameters: " + msg);
}
+#if OPENSSL_VERSION_NUMBER >= 0x10100003L
+ // OpenSSL v1.1.0 has public API changes
+ // p, g and length of the Diffie-Hellman param can't be set directly anymore,
+ // instead DH_set0_pqg and DH_set_length are used
+ BIGNUM* p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), 0);
+ BIGNUM* g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), 0);
+ if ((DH_set0_pqg(dh, p, NULL, g) == 0) || (DH_set_length(dh, 160) == 0))
+#else
dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), 0);
dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), 0);
dh->length = 160;
if ((!dh->p) || (!dh->g))
+#endif
{
DH_free(dh);
throw std::runtime_error("Error creating Diffie-Hellman parameters");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git
More information about the Pkg-openoffice-commits
mailing list