~ruther/guix-local

7010d231dbef94b09c310a8ad44889bcabb2161a — Brendan Tildesley 8 years ago cd6171c
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)[source]: Add reference to patch file.
* gnu/local.mk (dist_path_DATA): Add it.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
M gnu/local.mk => gnu/local.mk +1 -0
@@ 520,6 520,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 	\

M gnu/packages/ebook.scm => gnu/packages/ebook.scm +1 -0
@@ 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

A gnu/packages/patches/calibre-dont-load-remote-icons.patch => gnu/packages/patches/calibre-dont-load-remote-icons.patch +45 -0
@@ 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">