Makefile.am | 9 ++++++--- debian/loolwsd.postinst.in | 1 - docker/Dockerfile | 1 - loolwsd.spec.in | 4 ---- 4 files changed, 6 insertions(+), 9 deletions(-)
New commits: commit 7c3322e7e0462644cc6a91d6f8ecec359485499b Author: Andras Timar <[email protected]> Date: Wed May 9 12:41:12 2018 +0200 do not distribute unused or internal dev tool binaries: loolmap, loolmount, loolstress Change-Id: Ice905d08a695805f594df5731039f747ac88cf28 Reviewed-on: https://gerrit.libreoffice.org/54027 Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/Makefile.am b/Makefile.am index cf85d10d3..8107c3539 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,8 @@ SUBDIRS = . test loleaflet export ENABLE_DEBUG bin_PROGRAMS = \ - loolwsd loolforkit loolmap loolmount \ - loolconvert loolstress loolconfig loolsocketdump + loolwsd loolforkit \ + loolconvert loolconfig loolsocketdump dist_bin_SCRIPTS = loolwsd-systemplate-setup @@ -87,7 +87,10 @@ loolwsd_SOURCES = $(loolwsd_sources) \ noinst_PROGRAMS = clientnb \ connect \ lokitclient \ - loolwsd_fuzzer + loolwsd_fuzzer \ + loolmap \ + loolstress \ + loolmount connect_SOURCES = tools/Connect.cpp \ common/Log.cpp \ diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in index 59e4f898b..ef2ba9eb1 100755 --- a/debian/loolwsd.postinst.in +++ b/debian/loolwsd.postinst.in @@ -5,7 +5,6 @@ set -e case "$1" in configure) setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit || true - setcap cap_sys_admin=ep /usr/bin/loolmount || true adduser --quiet --system --group --home /opt/lool lool mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd diff --git a/docker/Dockerfile b/docker/Dockerfile index 16d98e317..ef5d683ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,7 +28,6 @@ COPY /scripts/run-lool.sh / # set up LibreOffice Online (normally done by postinstall script of package) RUN setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit -RUN setcap cap_sys_admin=ep /usr/bin/loolmount RUN adduser --quiet --system --group --home /opt/lool lool RUN mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd RUN rm -rf /var/cache/loolwsd/* diff --git a/loolwsd.spec.in b/loolwsd.spec.in index aa39153c2..4ff151202 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -96,10 +96,7 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd %files /usr/bin/loolwsd /usr/bin/loolwsd-systemplate-setup -/usr/bin/loolmap /usr/bin/loolforkit -/usr/bin/loolmount -/usr/bin/loolstress /usr/bin/loolconvert /usr/bin/loolconfig /usr/share/loolwsd/discovery.xml @@ -135,7 +132,6 @@ getent passwd lool >/dev/null || useradd -g lool -r lool %post setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit -setcap cap_sys_admin=ep /usr/bin/loolmount mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd rm -rf /var/cache/loolwsd/* _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
