[libreoffice-online] 01/01: update patches
Rene Engelhard
rene at moszumanska.debian.org
Sat Nov 11 23:06:21 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 60ab053d883a463c7eee504912b3d010bb593fb9
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sun Nov 12 00:04:28 2017 +0100
update patches
---
debian/patches/etc-default.diff | 10 +++---
debian/patches/lo-path.diff | 75 +++++++----------------------------------
debian/patches/logs.diff | 7 ++--
debian/patches/no-werror.diff | 8 ++---
debian/patches/ssl-dir.diff | 19 +++++------
5 files changed, 34 insertions(+), 85 deletions(-)
diff --git a/debian/patches/etc-default.diff b/debian/patches/etc-default.diff
index 5eede1c..c8c0715 100644
--- a/debian/patches/etc-default.diff
+++ b/debian/patches/etc-default.diff
@@ -1,11 +1,13 @@
---- a/loolwsd.service-old 2017-02-27 15:54:49.447501193 +0100
-+++ b/loolwsd.service 2017-02-27 15:55:01.303577325 +0100
-@@ -3,7 +3,7 @@
+diff --git a/loolwsd.service b/loolwsd.service
+index d43d590..46f01cd 100644
+--- a/loolwsd.service
++++ b/loolwsd.service
+@@ -3,7 +3,7 @@ Description=LibreOffice Online WebSocket Daemon
After=network.target
[Service]
-EnvironmentFile=-/etc/sysconfig/loolwsd
+EnvironmentFile=-/etc/default/loolwsd
- ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/var/lib/lool/systemplate --o:lo_template_path=/usr/lib/libreoffice --o:child_root_path=/var/lib/lool/child-roots --o:file_server_root_path=/usr/share/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
diff --git a/debian/patches/lo-path.diff b/debian/patches/lo-path.diff
index 994cf41..3bc04ec 100644
--- a/debian/patches/lo-path.diff
+++ b/debian/patches/lo-path.diff
@@ -1,65 +1,3 @@
-diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
-index 0d30524..48dae3e 100755
---- a/loolwsd-systemplate-setup
-+++ b/loolwsd-systemplate-setup
-@@ -6,7 +6,7 @@ test $# -eq 2 || { echo "Usage: $0 <chroot template directory for system libs to
-
- CHROOT=$1
- INSTDIR=$2
--POCOLIBDIRS="/usr/local/lib /opt/poco/lib"
-+POCOLIBDIRS="/usr/lib"
-
- test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
-
-@@ -57,8 +57,7 @@ done |
- grep -v dynamic | cut -d " " -f 3 | grep -E '^(/lib|/usr)' | sort -u | sed -e 's,^/,,'
-
- # Poco libraries and their dependencies
--find $POCOLIBDIRS -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*'
--find $POCOLIBDIRS /usr/lib64 -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
-+find $POCOLIBDIRS -name '*Poco*.so' -o -name '*Poco*.so.[0-9]*' |
- while read file; do
- echo $file
- ldd $file 2>/dev/null
-diff --git a/loolwsd.service b/loolwsd.service
-index 34b1bb8..251305e 100644
---- a/loolwsd.service
-+++ b/loolwsd.service
-@@ -4,7 +4,7 @@ After=network.target
-
- [Service]
- EnvironmentFile=-/etc/sysconfig/loolwsd
--ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/collaboraoffice5.1 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
-+ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/var/lib/lool/systemplate --o:lo_template_path=/usr/lib/libreoffice --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 c3a550b..9bf0bd2 100644
---- a/loolwsd.xml.in
-+++ b/loolwsd.xml.in
-@@ -5,7 +5,7 @@
-
- <tile_cache_path desc="Path to a directory where to keep the tile cache." type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
- <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
-- <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/opt/collaboraoffice5.1"></lo_template_path>
-+ <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/usr/lib/libreoffice"></lo_template_path>
- <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
-
- <server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string" default=""></server_name>
-diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
-index 64eabf0..b62ce4b 100644
---- a/wsd/LOOLWSD.cpp
-+++ b/wsd/LOOLWSD.cpp
-@@ -1485,7 +1485,7 @@ void LOOLWSD::initialize(Application& self)
- static const std::map<std::string, std::string> DefAppConfig
- = { { "tile_cache_path", LOOLWSD_CACHEDIR },
- { "sys_template_path", "systemplate" },
-- { "lo_template_path", "/opt/collaboraoffice5.1" },
-+ { "lo_template_path", "/usr/lib/libreoffice" },
- { "child_root_path", "jails" },
- { "lo_jail_subpath", "lo" },
- { "server_name", "" },
diff --git a/configure.ac b/configure.ac
index 876bb9b..357995a 100644
--- a/configure.ac
@@ -73,3 +11,16 @@ index 876bb9b..357995a 100644
JAIL_PATH=not-set
SYSTEMPLATE_PATH=not-set
have_lo_path=false
+diff --git a/loolwsd.service b/loolwsd.service
+index d43d590..a89c6ed 100644
+--- a/loolwsd.service
++++ b/loolwsd.service
+@@ -4,7 +4,7 @@ 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
++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/debian/patches/logs.diff b/debian/patches/logs.diff
index 6c98eb3..312df36 100644
--- a/debian/patches/logs.diff
+++ b/debian/patches/logs.diff
@@ -1,10 +1,10 @@
enable logging even without debug and make a debug build also use a standard path
diff --git a/configure.ac b/configure.ac
-index 09a129b..3876aa8 100644
+index 8aab94d..4de45b8 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -112,9 +112,9 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
+@@ -112,16 +112,16 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
ENABLE_DEBUG=
LOOLWSD_LOGLEVEL="warning"
@@ -16,12 +16,11 @@ index 09a129b..3876aa8 100644
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])
-@@ -115,7 +115,7 @@ if test "$enable_debug" = "yes"; then
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
- AC_DEFINE([ENABLE_DEBUG],0,[Whether to compile in some extra debugging support code and disable some security pieces])
diff --git a/debian/patches/no-werror.diff b/debian/patches/no-werror.diff
index c6ddbc3..68ef549 100644
--- a/debian/patches/no-werror.diff
+++ b/debian/patches/no-werror.diff
@@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac
-index 7268ea2..6c7cd3e 100644
+index 8aab94d..a390543 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -149,8 +149,8 @@ fi
+@@ -158,8 +158,8 @@ AC_SUBST(MAX_DOCUMENTS)
# Test for build environment
CXXFLAGS="$CXXFLAGS -std=c++11"
@@ -11,5 +11,5 @@ index 7268ea2..6c7cd3e 100644
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow"
+CFLAGS="$CFLAGS -Wall -Wextra"
- with_lokit_path=`readlink -f $with_lokit_path`
- AS_IF([test -n "$with_lokit_path"],
+ # check for C++11 support
+ HAVE_CXX11=
diff --git a/debian/patches/ssl-dir.diff b/debian/patches/ssl-dir.diff
index f16eca8..74633fa 100644
--- a/debian/patches/ssl-dir.diff
+++ b/debian/patches/ssl-dir.diff
@@ -1,20 +1,17 @@
-make install installs loolwsd.xml in /etc/libreoffice-online. And the build
-gets -DLOOLWSD_CONFIGDIR='"/etc/libreoffice-online"' set. Look there then.
-
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
-index c3a550b..492d3ac 100644
+index eed5128..4a3c7ac 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
-@@ -46,9 +46,9 @@
+@@ -54,9 +54,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">true</termination>
+ <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>
- </ssl>
-
- <storage desc="Backend storage">
++ <key_file_path desc="Path to the key file" relative="false">@LOOLWSD_CONFIGFDIR@/key.pem</key_file_path>
++ <ca_file_path desc="Path to the ca file" relative="false">@LOOLWSD_CONFIGFDIR@/ca-chain.cert.pem</ca_file_path>
+ <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>
+ <report_uri desc="HPKP's report-uri directive - pin validation failure are reported at this URL" enable="false"></report_uri>
--
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