[libreoffice-online] 01/03: fix-sigsegv-with-libssl1.1.diff is upstream
Rene Engelhard
rene at moszumanska.debian.org
Thu Dec 21 18:04:04 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 7f9e48c207cf073d5a2e7a481edaf6d2799e5532
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Thu Dec 21 18:58:27 2017 +0100
fix-sigsegv-with-libssl1.1.diff is upstream
---
Makefile.am | 2 +-
configure.ac | 25 ++++++---------------
debian/patches/fix-sigsegv-with-libssl1.1.diff | 31 --------------------------
debian/patches/series | 1 -
loolwsd.service | 4 ++--
loolwsd.xml.in | 6 ++---
6 files changed, 13 insertions(+), 56 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7f8d0ca..9da0be7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ if !ENABLE_DEBUG
AM_CPPFLAGS += -DNDEBUG
endif
-AM_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib $(ZLIB_LIBS)
+AM_LDFLAGS = -pthread $(ZLIB_LIBS)
if ENABLE_SSL
AM_LDFLAGS += -lssl -lcrypto
diff --git a/configure.ac b/configure.ac
index 4989bee..fa46f49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,16 +120,16 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
ENABLE_DEBUG=
LOOLWSD_LOGLEVEL="warning"
-LOOLWSD_LOG_TO_FILE="false"
+LOOLWSD_LOG_TO_FILE="true"
LOOLWSD_LOGFILE="/var/log/loolwsd.log"
-LOLEAFLET_LOGGING="false"
+LOLEAFLET_LOGGING="true"
debug_msg="secure mode: product build"
if test "$enable_debug" = "yes"; then
AC_DEFINE([ENABLE_DEBUG],1,[Whether to compile in some extra debugging support code and disable some security pieces])
ENABLE_DEBUG=true
LOOLWSD_LOGLEVEL="trace"
LOOLWSD_LOG_TO_FILE="true"
- LOOLWSD_LOGFILE="/tmp/loolwsd.log"
+ LOOLWSD_LOGFILE="/var/log/loolwsd.log"
LOLEAFLET_LOGGING="true"
debug_msg="low security debugging mode"
else
@@ -166,8 +166,8 @@ AC_SUBST(MAX_DOCUMENTS)
# Test for build environment
CXXFLAGS="$CXXFLAGS -std=c++11"
-CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror -Wshadow"
-CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow"
+CFLAGS="$CFLAGS -Wall -Wextra"
# check for C++11 support
HAVE_CXX11=
@@ -202,7 +202,7 @@ AS_IF([test -n "$with_lokit_path"],
[CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])
lokit_msg="$with_lokit_path"
-LO_PATH="/usr/lib64/libreoffice"
+LO_PATH="/usr/lib/libreoffice"
JAIL_PATH=not-set
SYSTEMPLATE_PATH=not-set
have_lo_path=false
@@ -364,16 +364,6 @@ int main(int argc, char **argv)
[AC_MSG_RESULT([Yes])
LIBS="$LIBS -lpcre"])
-AC_PATH_PROG(NPM, npm, no)
-if test "$NPM" = "no"; then
- AC_MSG_ERROR([npm required to build loleaflet, but not installed])
-else
- NPM_VER=`npm -v | awk -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
- if test "$NPM_VER" -ge 30900 -a "$NPM_VER" -lt 31004; then
- AC_MSG_ERROR([This npm version is buggy, either upgrade to >= 3.10.4 or downgrade to < 3.9.0])
- fi
-fi
-
test "$prefix" = NONE && prefix=$ac_default_prefix
LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
while :; do
@@ -399,8 +389,7 @@ AC_CONFIG_FILES([Makefile
test/Makefile
loleaflet/Makefile
loolwsd.spec
- loolwsd.xml
- debian/loolwsd.postinst])
+ loolwsd.xml])
AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
AC_OUTPUT
diff --git a/debian/patches/fix-sigsegv-with-libssl1.1.diff b/debian/patches/fix-sigsegv-with-libssl1.1.diff
deleted file mode 100644
index a91e1fc..0000000
--- a/debian/patches/fix-sigsegv-with-libssl1.1.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 483a5d68e5f7e6b145d957c50120cd05c436387b Mon Sep 17 00:00:00 2001
-From: Pranav Kant <pranavk at collabora.co.uk>
-Date: Mon, 27 Nov 2017 16:29:26 +0530
-Subject: tdf#114073: Potential fix for crash with openssl1.1
-
-Using null ssl context to set options is surely not a good idea:
-
-unsigned long SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op)
-{
- return ctx->options |= op;
-}
-
-Change-Id: I2700350e0c3928e372488c81b8111c9ab0b48e06
-
-diff --git a/net/Ssl.cpp b/net/Ssl.cpp
-index dd0094b..a16caa2 100644
---- a/net/Ssl.cpp
-+++ b/net/Ssl.cpp
-@@ -50,8 +50,7 @@ SslContext::SslContext(const std::string& certFilePath,
- #endif
-
- #if OPENSSL_VERSION_NUMBER >= 0x10100003L
-- SSL_CTX_set_options(nullptr, 0);
-- OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
-+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, nullptr);
- #else
- SSL_library_init();
- SSL_load_error_strings();
---
-cgit v0.10.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 1449757..275cbda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ lo-path.diff
etc-default.diff
ssl-dir.diff
logs.diff
-fix-sigsegv-with-libssl1.1.diff
diff --git a/loolwsd.service b/loolwsd.service
index d43d590..68f5775 100644
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -3,8 +3,8 @@ Description=LibreOffice Online WebSocket Daemon
After=network.target
[Service]
-EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
+EnvironmentFile=-/etc/default/loolwsd
+ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/var/lib/lool/systemplate --o:child_root_path=/var/lib/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 754aa6c..fc81226 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -63,9 +63,9 @@
<ssl desc="SSL settings">
<enable type="bool" default="true">true</enable>
<termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
- <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
- <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
- <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
+ <cert_file_path desc="Path to the cert file" relative="false">@LOOLWSD_CONFIGDIR@/cert.pem</cert_file_path>
+ <key_file_path desc="Path to the key file" relative="false">@LOOLWSD_CONFIGDIR@/key.pem</key_file_path>
+ <ca_file_path desc="Path to the ca file" relative="false">@LOOLWSD_CONFIGDIR@/ca-chain.cert.pem</ca_file_path>
<cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"></cipher_list>
<hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
<max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
--
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