From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
To: 26924@debbugs.gnu.org
Subject: bug#26924: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian
Date: Mon, 15 May 2017 01:05:02 +1000 [thread overview]
Message-ID: <bb77bf06-c641-4ea3-f33f-68e9b1fe6642@openmailbox.org> (raw)
In-Reply-To: <a474bf3a-2be1-5d4a-28d8-0ef3267e29ce@openmailbox.org>
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0003-gnu-calibre-Import-dont-load-icons-patch-from-debian.patch --]
[-- Type: text/x-patch, Size: 3733 bytes --]
From 169822860f83ad167cc25bae66d8c9cd58af34af Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 21:40:24 +1000
Subject: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian
* gnu/packages/patches/calibre-dont-load-remote-icons.patch: New file.
* gnu/packages/ebooks.scm (calibre): Add reference to patch file.
---
gnu/packages/ebook.scm | 1 +
.../patches/calibre-dont-load-remote-icons.patch | 45 ++++++++++++++++++++++
2 files changed, 46 insertions(+)
create mode 100644 gnu/packages/patches/calibre-dont-load-remote-icons.patch
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index a2b26c931..cc43259e2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -80,6 +80,7 @@
(delete-file-recursively "src/unrar")
(delete-file "src/odf/thumbnail.py")))
(patches (search-patches "calibre-drop-unrar.patch"
+ "calibre-dont-load-remote-icons.patch"
"calibre-no-updates-dialog.patch"))))
(build-system python-build-system)
(native-inputs
diff --git a/gnu/packages/patches/calibre-dont-load-remote-icons.patch b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
new file mode 100644
index 000000000..216826307
--- /dev/null
+++ b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
@@ -0,0 +1,45 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Mon, 14 Nov 2016 22:41:24 +0100
+Subject: content-server: Don't load external URLs for privacy
+
+Spotted by lintian.
+---
+ resources/content_server/browse/browse.html | 4 +---
+ resources/content_server/index.html | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
+index 36f7199..e615707 100644
+--- a/resources/content_server/browse/browse.html
++++ b/resources/content_server/browse/browse.html
+@@ -7,7 +7,7 @@
+ <title>..:: calibre {library} ::.. {title}</title>
+ <meta http-equiv="X-UA-Compatible" content="IE=100" />
+ <meta name="robots" content="noindex" />
+- <link rel="icon" type="image/x-icon" href="//calibre-ebook.com/favicon.ico" />
++ <link rel="icon" type="image/x-icon" href="favicon.ico" />
+
+ <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" />
+ <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
+@@ -63,8 +63,6 @@
+ <input type="image"
+ src="{prefix}/static/button-donate.png"
+ name="submit"></input>
+- <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
+- width="1" height="1"></img>
+ </div>
+ </form>
+ <div id="calibre-home-link" title="Go to the calibre website"></div>
+diff --git a/resources/content_server/index.html b/resources/content_server/index.html
+index 51cc33a..e71d0e8 100644
+--- a/resources/content_server/index.html
++++ b/resources/content_server/index.html
+@@ -9,7 +9,7 @@
+ <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script>
+ <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script>
+ <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script>
+- <link rel="icon" href="//calibre-ebook.com/favicon.ico" type="image/x-icon" />
++ <link rel="icon" href="favicon.ico" type="image/x-icon" />
+ </head>
+ <body>
+ <div id="banner">
--
2.12.2
next prev parent reply other threads:[~2017-05-14 15:06 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-14 15:00 bug#26924: [PATCH 0/12] Update Calibre to 2.85.1 Brendan Tildesley
2017-05-14 15:02 ` bug#26924: [PATCH 01/12] " Brendan Tildesley
2017-05-15 16:34 ` Marius Bakke
2017-05-14 15:03 ` bug#26924: [PATCH 02/12] " Brendan Tildesley
2017-05-14 15:16 ` Brendan Tildesley
2017-05-15 16:36 ` Marius Bakke
2017-05-14 15:05 ` Brendan Tildesley [this message]
2017-05-15 16:38 ` bug#26924: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian Marius Bakke
2017-05-14 15:05 ` bug#26924: [PATCH 04/12] gnu: calibre: Import unbundle feedparser patch from Brendan Tildesley
2017-05-15 16:51 ` Marius Bakke
2017-05-14 15:06 ` bug#26924: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown Brendan Tildesley
2017-05-15 16:56 ` Marius Bakke
2017-05-14 15:07 ` bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file Brendan Tildesley
2017-05-15 17:00 ` Marius Bakke
2017-05-16 1:02 ` Brendan Tildesley
2017-05-19 21:07 ` Marius Bakke
2017-05-14 15:08 ` bug#26924: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts Brendan Tildesley
2017-05-15 17:05 ` Marius Bakke
2017-05-14 15:09 ` bug#26924: [PATCH 08/12] gnu: calibre: Unbundle chardet Brendan Tildesley
2017-05-15 17:06 ` Marius Bakke
2017-05-14 15:09 ` bug#26924: [PATCH 09/12] gnu: calibre: Add missing dependencies Brendan Tildesley
2017-05-15 17:09 ` Marius Bakke
2017-05-14 15:10 ` bug#26924: [PATCH 10/12] gnu: chmlib: Use #:prefix license: Brendan Tildesley
2017-05-15 17:27 ` Marius Bakke
2017-05-14 15:11 ` bug#26924: [PATCH 11/12] gnu: calibre: Add exhaustive license list Brendan Tildesley
2017-05-15 17:23 ` Marius Bakke
2017-05-14 15:14 ` bug#26924: [PATCH 12/12] gnu: calibre: Don't create uninstaller Brendan Tildesley
2017-05-15 17:24 ` Marius Bakke
2017-05-15 16:32 ` bug#26924: [PATCH 0/12] Update Calibre to 2.85.1 Marius Bakke
2017-05-16 4:48 ` bug#26924: [PATCH 1/12] Update Calibre to 2.85.1 [REVISED] Brendan Tildesley
2017-05-16 4:50 ` bug#26924: [PATCH 02/10] gnu: calibre: Import dont-load-icons patch from debian Brendan Tildesley
2017-05-16 4:51 ` bug#26924: [PATCH 03/10] gnu: calibre: Import unbundle feedparser patch from Brendan Tildesley
2017-05-16 4:52 ` bug#26924: [PATCH 04/10] gnu: calibre: Unbundle python2-markdown Brendan Tildesley
2017-05-16 4:53 ` bug#26924: [PATCH 05/10] gnu: calibre: Undelete GPLv2 icon file Brendan Tildesley
2017-05-16 4:54 ` bug#26924: [PATCH 06/10] gnu: calibre: Unbundle liberation fonts Brendan Tildesley
2017-05-16 4:55 ` bug#26924: [PATCH 07/10] gnu: calibre: Unbundle chardet Brendan Tildesley
2017-05-16 4:56 ` bug#26924: [PATCH 08/10] gnu: calibre: Add missing dependencies Brendan Tildesley
2017-05-16 4:58 ` bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list Brendan Tildesley
2017-05-19 21:58 ` Marius Bakke
2017-05-16 4:59 ` bug#26924: [PATCH 10/10] gnu: calibre: Don't create uninstaller Brendan Tildesley
2017-05-19 21:21 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bb77bf06-c641-4ea3-f33f-68e9b1fe6642@openmailbox.org \
--to=brendan.tildesley@openmailbox.org \
--cc=26924@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).