From f2c1cb079dce0558bcb71476819deeca4e75b0f7 Mon Sep 17 00:00:00 2001 From: Eloston Date: Tue, 25 Apr 2017 15:51:39 -0700 Subject: [PATCH] Tweak debian packaging; update BUILDING.md Remove chromium-suid-sandbox package Add note about Debian jessie Fix order of Debian building commands Remove version requirement of libspeechd-dev in the conservative flavor --- BUILDING.md | 8 ++++++-- .../debian/conservative/chromium.install.in | 2 ++ .../packaging/debian/conservative/control | 18 +----------------- .../standard/chromium-suid-sandbox.install.in | 1 - .../chromium-suid-sandbox.lintian-overrides | 2 -- .../debian/standard/chromium.install.in | 2 ++ .../debian/standard/chromium.lintian-overrides | 3 +++ resources/packaging/debian/standard/control | 16 ---------------- 8 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 resources/packaging/debian/standard/chromium-suid-sandbox.install.in delete mode 100644 resources/packaging/debian/standard/chromium-suid-sandbox.lintian-overrides diff --git a/BUILDING.md b/BUILDING.md index d6e0333b..168ec6a8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -80,8 +80,8 @@ mkdir build/downloads ./utilikit/prepare_sources.py ./utilikit/substitute_domains.py ./utilikit/generate_build_files.py debian --flavor standard --apply-domain-substitution -dpkg-checkbuilddeps # Checks and reports any additional packages needed cd build/sandbox +dpkg-checkbuilddeps # Checks and reports any additional packages needed dpkg-buildpackage -b -uc ``` @@ -89,10 +89,14 @@ Packages will appear under `build/`. Deviations for different Debian versions or flavors: -Ubuntu 16.04 (xenial) and Debian 8 (jessie): +Ubuntu 16.04 (xenial): * Set `UTILIKIT_CONFIG_TYPE=linux_conservative` * Use `--flavor conservative` in `generate_build_files.py` +Debian 8.0 (jessie) is currently not working at this time, due to `utilikit` using Python 3.5 features and the lack of a build configuration that will work on it. + +Other versions or derivatives are not officially supported, but it still may be possible to build on them with the settings from one listed above. + ### Windows **These instructions are out-of-date** diff --git a/resources/packaging/debian/conservative/chromium.install.in b/resources/packaging/debian/conservative/chromium.install.in index 601358d8..4b4ac6fe 100644 --- a/resources/packaging/debian/conservative/chromium.install.in +++ b/resources/packaging/debian/conservative/chromium.install.in @@ -1,5 +1,7 @@ $ungoog{build_output}/chromium usr/lib/chromium +$ungoog{build_output}/chrome-sandbox usr/lib/chromium + $ungoog{build_output}/libffmpeg.so usr/lib/chromium $ungoog{build_output}/icudtl.dat usr/lib/chromium diff --git a/resources/packaging/debian/conservative/control b/resources/packaging/debian/conservative/control index 5b652bc3..c6a16097 100644 --- a/resources/packaging/debian/conservative/control +++ b/resources/packaging/debian/conservative/control @@ -70,7 +70,7 @@ Build-Depends: libasound2-dev, libsqlite3-dev, libjsoncpp-dev, - libspeechd-dev (>= 0.8.3), + libspeechd-dev, libminizip-dev, libhunspell-dev, libharfbuzz-dev, @@ -171,19 +171,3 @@ Description: web browser - WebDriver support automatic webdriver. . See http://code.google.com/p/selenium/wiki/ChromeDriver for details. - -Package: chromium-suid-sandbox -Architecture: i386 amd64 arm64 armhf -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - chromium (= ${binary:Version}), -Description: web browser - SUID sandbox helper executable - Web browser that aims to build a safer, faster, and more stable internet - browsing experience. - . - This package provides the SUID helper executable - . - You may not need this package if your kernel supports user namespaces. See https://chromium.googlesource.com/chromium/src/+/${binary:Version}/docs/linux_sandboxing.md#User-namespaces-sandbox for details. - . - See https://chromium.googlesource.com/chromium/src/+/${binary:Version}/docs/linux_suid_sandbox.md for details. diff --git a/resources/packaging/debian/standard/chromium-suid-sandbox.install.in b/resources/packaging/debian/standard/chromium-suid-sandbox.install.in deleted file mode 100644 index 24621d81..00000000 --- a/resources/packaging/debian/standard/chromium-suid-sandbox.install.in +++ /dev/null @@ -1 +0,0 @@ -$ungoog{build_output}/chrome-sandbox usr/lib/chromium diff --git a/resources/packaging/debian/standard/chromium-suid-sandbox.lintian-overrides b/resources/packaging/debian/standard/chromium-suid-sandbox.lintian-overrides deleted file mode 100644 index 14218d7e..00000000 --- a/resources/packaging/debian/standard/chromium-suid-sandbox.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# sandbox is intentionally suid -setuid-binary usr/lib/chromium/chrome-sandbox 4755 root/root diff --git a/resources/packaging/debian/standard/chromium.install.in b/resources/packaging/debian/standard/chromium.install.in index b65cba8e..62ed131c 100644 --- a/resources/packaging/debian/standard/chromium.install.in +++ b/resources/packaging/debian/standard/chromium.install.in @@ -1,5 +1,7 @@ $ungoog{build_output}/chromium usr/lib/chromium +$ungoog{build_output}/chrome-sandbox usr/lib/chromium + $ungoog{build_output}/*.bin usr/lib/chromium $ungoog{build_output}/*.pak usr/lib/chromium diff --git a/resources/packaging/debian/standard/chromium.lintian-overrides b/resources/packaging/debian/standard/chromium.lintian-overrides index c2b12f1d..f03118a0 100644 --- a/resources/packaging/debian/standard/chromium.lintian-overrides +++ b/resources/packaging/debian/standard/chromium.lintian-overrides @@ -2,3 +2,6 @@ embedded-library usr/lib/chromium/chromium: srtp embedded-library usr/lib/chromium/chromium: lcms2 embedded-library usr/lib/chromium/chromium: sqlite + +# sandbox is intentionally suid +setuid-binary usr/lib/chromium/chrome-sandbox 4755 root/root diff --git a/resources/packaging/debian/standard/control b/resources/packaging/debian/standard/control index 7d8391b0..627975e0 100644 --- a/resources/packaging/debian/standard/control +++ b/resources/packaging/debian/standard/control @@ -173,19 +173,3 @@ Description: web browser - WebDriver support automatic webdriver. . See http://code.google.com/p/selenium/wiki/ChromeDriver for details. - -Package: chromium-suid-sandbox -Architecture: i386 amd64 arm64 armhf -Depends: - ${misc:Depends}, - ${shlibs:Depends}, - chromium (= ${binary:Version}), -Description: web browser - SUID sandbox helper executable - Web browser that aims to build a safer, faster, and more stable internet - browsing experience. - . - This package provides the SUID helper executable - . - You may not need this package if your kernel supports user namespaces. See https://chromium.googlesource.com/chromium/src/+/${binary:Version}/docs/linux_sandboxing.md#User-namespaces-sandbox for details. - . - See https://chromium.googlesource.com/chromium/src/+/${binary:Version}/docs/linux_suid_sandbox.md for details.