guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

09/23: gnu: calibre: Remove unrar test.


From: guix-commits
Subject: 09/23: gnu: calibre: Remove unrar test.
Date: Sun, 5 May 2019 11:15:24 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit 15871b40872b9534a9dc3af9fda163601a360a51
Author: Brendan Tildesley <address@hidden>
Date:   Sun May 5 14:04:02 2019 +0200

    gnu: calibre: Remove unrar test.
    
    * gnu/packages/patches/calibre-remove-test-unrar.patch: New file.
    * gnu/packages/ebook.scm (calibre)[source]: Use it.
    * gnu/local.mk (dist_patch_DATA): Add it.
    
    Signed-off-by: Danny Milosavljevic <address@hidden>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/ebook.scm                             |  3 ++-
 .../patches/calibre-remove-test-unrar.patch        | 28 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index d7d1a3f..d5b7a2c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -690,6 +690,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/boost-fix-icu-build.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
+  %D%/packages/patches/calibre-remove-test-unrar.patch         \
   %D%/packages/patches/casync-renameat2-declaration.patch      \
   %D%/packages/patches/catdoc-CVE-2017-11110.patch             \
   %D%/packages/patches/cdparanoia-fpic.patch                   \
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index b26eaca..79fa99c 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -96,7 +96,8 @@
           '(begin
             (delete-file "src/odf/thumbnail.py")
             #t))
-        (patches (search-patches "calibre-no-updates-dialog.patch"))))
+        (patches (search-patches "calibre-no-updates-dialog.patch"
+                                 "calibre-remove-test-unrar.patch"))))
     (build-system python-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/patches/calibre-remove-test-unrar.patch 
b/gnu/packages/patches/calibre-remove-test-unrar.patch
new file mode 100644
index 0000000..4e5572d
--- /dev/null
+++ b/gnu/packages/patches/calibre-remove-test-unrar.patch
@@ -0,0 +1,28 @@
+Unrar contains security vulnerabilities and has thus been removed from Guix.
+From a16f97b02bd8afd0ec05c471e156f631f2cc6eec Mon Sep 17 00:00:00 2001
+From: Brendan Tildesley <address@hidden>
+Date: Tue, 26 Mar 2019 22:17:03 +1100
+Subject: [PATCH] Remove test_unrar.
+
+---
+ src/calibre/test_build.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
+index d67afd20a6..709132ef17 100644
+--- a/src/calibre/test_build.py
++++ b/src/calibre/test_build.py
+@@ -220,10 +220,6 @@ class BuildTest(unittest.TestCase):
+         from calibre.gui2.win_file_dialogs import test
+         test()
+ 
+-    def test_unrar(self):
+-        from calibre.utils.unrar import test_basic
+-        test_basic()
+-
+     @unittest.skipUnless(iswindows, 'WPD is windows only')
+     def test_wpd(self):
+         wpd = plugins['wpd'][0]
+-- 
+2.21.0
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]