[libreoffice] 03/04: remove check if building as root given policy implies "build" should be able to run as root...

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 21110e0610675b52cba3186d7a5787743a6f73de
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Oct 18 15:02:57 2017 +0200

    remove check if building as root given policy implies "build" should be able to run as root...
---
 changelog                     |  3 +++
 patches/no-check-if-root.diff | 35 +++++++++++++++++++++++++++++++++++
 patches/series                |  1 +
 3 files changed, 39 insertions(+)

diff --git a/changelog b/changelog
index 1ce3e7a..b0a3650 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:5.4.3~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
 
+  * debian/patches/no-check-if-root.diff: remove (senseful, IMHO!) check
+    given policy implies "build" should be able to run as root... :(
+
  -- Rene Engelhard <rene at debian.org>  Tue, 17 Oct 2017 21:34:41 +0200
 
 libreoffice (1:5.4.2-4) UNRELEASED; urgency=medium
diff --git a/patches/no-check-if-root.diff b/patches/no-check-if-root.diff
new file mode 100644
index 0000000..1de9fd5
--- /dev/null
+++ b/patches/no-check-if-root.diff
@@ -0,0 +1,35 @@
+--- a/Makefile.in	2017-07-28 06:09:37.072183489 +0000
++++ b/Makefile.in	2017-10-18 12:43:59.215567467 +0000
+@@ -9,7 +9,7 @@
+ 
+ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
+ 
+-.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
++.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+ 
+ MAKECMDGOALS?=all
+ build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
+@@ -57,14 +57,6 @@
+ 
+ all: build
+ 
+-check-if-root:
+-	@if test `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
+-		echo; \
+-		echo 'No. You make ME a sandwich.'; \
+-		echo; \
+-		exit 1; \
+-	fi
+-
+ gb_Side ?= host
+ 
+ include $(BUILDDIR)/config_$(gb_Side).mk
+@@ -254,7 +246,7 @@
+ #
+ # Bootstrap
+ #
+-bootstrap: check-if-root compilerplugins
++bootstrap: compilerplugins
+ 
+ #
+ # Build
diff --git a/patches/series b/patches/series
index a78cdf4..b860555 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,4 @@
+no-check-if-root.diff
 debian-opt.diff
 jurt-soffice-location.diff
 split-evoab.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git