[Git][libreoffice-team/libreoffice/libreoffice-online][master] 2 commits: remove accidentially committed parts...

Rene Engelhard rene at debian.org
Thu Jan 4 10:59:22 UTC 2018 

Rene Engelhard pushed to branch master at Debian LibreOffice Maintainers / libreoffice / libreoffice-online


Commits:
81e6ec9f by Rene Engelhard at 2017-12-21T19:20:04+01:00
remove accidentially committed parts...

- - - - -
259629c2 by Rene Engelhard at 2018-01-04T11:54:21+01:00
add Vcs-*: fields (salsa)

- - - - -


5 changed files:

- Makefile.am
- configure.ac
- debian/control
- loolwsd.service
- loolwsd.xml.in


Changes:

=====================================
Makefile.am
=====================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ if !ENABLE_DEBUG
 AM_CPPFLAGS += -DNDEBUG
 endif
 
-AM_LDFLAGS = -pthread $(ZLIB_LIBS)
+AM_LDFLAGS = -pthread -Wl,-E,-rpath,/snap/loolwsd/current/usr/lib $(ZLIB_LIBS)
 
 if ENABLE_SSL
 AM_LDFLAGS += -lssl -lcrypto


=====================================
configure.ac
=====================================
--- 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="true"
+LOOLWSD_LOG_TO_FILE="false"
 LOOLWSD_LOGFILE="/var/log/loolwsd.log"
-LOLEAFLET_LOGGING="true"
+LOLEAFLET_LOGGING="false"
 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="/var/log/loolwsd.log"
+   LOOLWSD_LOGFILE="/tmp/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 -Wshadow"
-CFLAGS="$CFLAGS -Wall -Wextra"
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror -Wshadow"
+CFLAGS="$CFLAGS -Wall -Wextra -Werror"
 
 # 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/lib/libreoffice"
+LO_PATH="/usr/lib64/libreoffice"
 JAIL_PATH=not-set
 SYSTEMPLATE_PATH=not-set
 have_lo_path=false
@@ -364,6 +364,16 @@ 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
@@ -389,7 +399,8 @@ AC_CONFIG_FILES([Makefile
                  test/Makefile
                  loleaflet/Makefile
                  loolwsd.spec
-                 loolwsd.xml])
+                 loolwsd.xml
+                 debian/loolwsd.postinst])
 AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
 
 AC_OUTPUT


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ Uploaders: Rene Engelhard <rene at debian.org>
 Build-Depends: debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:6.0.0~beta1~), libreoffice-core (>= 1:6.0.0~beta1~), dh-autoreconf, cpio, libcppunit-dev, zlib1g-dev, pkg-config
 Build-Depends-Indep: npm, node-jake, python, python-polib
 Standards-Version: 3.9.7
+Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice-online.git
+Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice-online
 
 Package: loolwsd
 Section: web


=====================================
loolwsd.service
=====================================
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -3,8 +3,8 @@ Description=LibreOffice Online WebSocket Daemon
 After=network.target
 
 [Service]
-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
+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
 User=lool
 KillMode=control-group
 Restart=always


=====================================
loolwsd.xml.in
=====================================
--- 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">@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>
+        <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>
         <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>



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice-online/compare/0e9468a9d21cba65a9ac8e13c697d1c183ee2d87...259629c2f3b8bf440135647daf008567fa32ab8a

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice-online/compare/0e9468a9d21cba65a9ac8e13c697d1c183ee2d87...259629c2f3b8bf440135647daf008567fa32ab8a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180104/ddcc58f6/attachment-0001.html>

More information about the Pkg-openoffice-commits mailing list