From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAURt-0008Cm-PP for guix-patches@gnu.org; Tue, 16 May 2017 00:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAURq-00032X-Lw for guix-patches@gnu.org; Tue, 16 May 2017 00:51:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44593) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAURq-00032O-Gl for guix-patches@gnu.org; Tue, 16 May 2017 00:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAURq-0005rO-B7 for guix-patches@gnu.org; Tue, 16 May 2017 00:51:02 -0400 Subject: bug#26924: [PATCH 02/10] gnu: calibre: Import dont-load-icons patch from debian Resent-Message-ID: References: From: Brendan Tildesley Message-ID: Date: Tue, 16 May 2017 14:50:04 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------CA73ED4B8AD6603D3644C76D" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26924@debbugs.gnu.org This is a multi-part message in MIME format. --------------CA73ED4B8AD6603D3644C76D Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------CA73ED4B8AD6603D3644C76D Content-Type: text/x-patch; name="0002-gnu-calibre-Import-dont-load-icons-patch-from-debian.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0002-gnu-calibre-Import-dont-load-icons-patch-from-debian.pa"; filename*1="tch" >From a8b461b4fc868bd3415b7ec199869eaba30692b9 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 13 May 2017 21:40:24 +1000 Subject: [PATCH 02/10] 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/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 1 + .../patches/calibre-dont-load-remote-icons.patch | 45 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 gnu/packages/patches/calibre-dont-load-remote-icons.patch diff --git a/gnu/local.mk b/gnu/local.mk index 28a283ab7..4c5aabffa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -515,6 +515,7 @@ dist_patch_DATA = \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \ %D%/packages/patches/calibre-drop-unrar.patch \ + %D%/packages/patches/calibre-dont-load-remote-icons.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.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 +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 @@ + ..:: calibre {library} ::.. {title} + + +- ++ + + + +@@ -63,8 +63,6 @@ + +- + + + +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 @@ + + + +- ++ + + +