diff --git a/README.md b/README.md index 9cc669f1..f4022af4 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,10 @@ Here's some information on what's in the `patches` directory: ## Building -Right now, only Debian build scripts are provided. +Right now, only Debian and Ubuntu build scripts are provided. ### Debian and derivatives -**NOTE:** Tested on Debian Stretch 64-bit +**NOTE:** Tested on Debian Stretch 64-bit and Ubuntu Wily 64-bit git clone https://github.com/Eloston/ungoogled-chromium.git cd ungoogled-chromium diff --git a/build_templates/debian/changelog b/build_templates/debian/changelog index fc0a27f6..d4d8034f 100644 --- a/build_templates/debian/changelog +++ b/build_templates/debian/changelog @@ -1,3 +1,9 @@ +chromium-browser (47.0.2526.106-3) stretch; urgency=low + + * Do not output URLRequest URLs to stderr + + -- Eloston Fri, 08 Jan 2016 00:00:00 +0000 + chromium-browser (47.0.2526.106-2) stretch; urgency=low * Updated Debian build scripts to 47.0.2526.80-3 diff --git a/build_templates/debian/rules b/build_templates/debian/rules index 7deba86a..cc1c0998 100755 --- a/build_templates/debian/rules +++ b/build_templates/debian/rules @@ -145,7 +145,7 @@ override_dh_auto_install-arch: echo "Any files placed in this directory will be sourced prior to executing chromium." \ > debian/chromium/etc/chromium.d/README # update launcher script with build information - sed 's|@BUILD_DIST@|$(shell printf "%s %s/%s" $(lsb_release -si) $(lsb_release -sc) $(lsb_release -sr))|' \ + sed 's|@BUILD_DIST@|$(shell printf "%s %s/%s" $(shell lsb_release -si) $(shell lsb_release -sc) $(shell lsb_release -sr))|' \ < debian/scripts/chromium > debian/chromium/usr/bin/chromium # move icons into /usr/share for file in $(shell find chrome/app/theme/chromium -name product_logo_[0-9]* -a ! -name *mono*); do \ diff --git a/build_templates/ubuntu/changelog b/build_templates/ubuntu/changelog index f14bc8e9..164214d2 100644 --- a/build_templates/ubuntu/changelog +++ b/build_templates/ubuntu/changelog @@ -1,3 +1,9 @@ +chromium-browser (47.0.2526.106-3) wily; urgency=low + + * Do not output URLRequest URLs to stderr + + -- Eloston Fri, 08 Jan 2016 00:00:00 +0000 + chromium-browser (47.0.2526.106-2) wily; urgency=low * Initial build for Ubuntu Wily diff --git a/patches/patch_order b/patches/patch_order index fa493cd1..00f77891 100644 --- a/patches/patch_order +++ b/patches/patch_order @@ -74,4 +74,5 @@ ungoogled-chromium/disable-ipv6-pinging.patch ungoogled-chromium/disable-profile-avatar-downloading.patch ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch ungoogled-chromium/fix-building-without-safebrowsing.patch +ungoogled-chromium/disable-logging-urls-to-stderr.patch diff --git a/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch b/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch new file mode 100644 index 00000000..f41ca990 --- /dev/null +++ b/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch @@ -0,0 +1,63 @@ +description: Disable log_url_request, which logs URLs to stderr + +--- a/iridium/trknotify.cpp ++++ b/iridium/trknotify.cpp +@@ -4,10 +4,6 @@ + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +-#include +-#ifdef __linux__ +-# include +-#endif + #include "chrome/browser/infobars/infobar_service.h" + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" +@@ -19,27 +15,6 @@ + + namespace iridium { + +-void log_url_request(const std::string &caller, const GURL &url) +-{ +-#ifdef __linux__ +- bool tty = isatty(fileno(stderr)); +-#else +- bool tty = false; +-#endif +- const char *xred = tty ? "\033[1;37;41m" : ""; // ] +- const char *xfruit = tty ? "\033[33m" : ""; // ] +- const char *xdark = tty ? "\033[1;30m" : ""; // ] +- const char *xreset = tty ? "\033[0m" : ""; // ] +- +- if (url.scheme() == url::kTraceScheme) +- fprintf(stderr, "%s*** %s(%s)%s\n", xred, caller.c_str(), +- url.possibly_invalid_spec().c_str(), xreset); +- else +- fprintf(stderr, "%s***%s %s(%s)%s\n", xfruit, xdark, +- caller.c_str(), url.possibly_invalid_spec().c_str(), +- xreset); +-} +- + static void __trace_url_request(const std::string &caller, const GURL &url) + { + auto browser = chrome::FindLastActiveWithHostDesktopType(chrome::GetActiveDesktop()); +--- a/iridium/trknotify.h ++++ b/iridium/trknotify.h +@@ -12,7 +12,6 @@ + + namespace iridium { + +-extern void log_url_request(const std::string &, const GURL &); + extern void trace_url_request(const std::string &, const GURL &); + + }; /* namespace iridium */ +--- a/chrome/app/chrome_main.cc ++++ b/chrome/app/chrome_main.cc +@@ -32,7 +32,6 @@ int ChromeMain(int argc, const char** argv); + #if !defined(CHROME_MULTIPLE_DLL_CHILD) + static void trace_url_request(const std::string &caller, const GURL &url) + { +- iridium::log_url_request(caller, url); + if (url.scheme() != url::kTraceScheme) + /* Do not show infobar for non-trk URLs */ + return;