From 310081e27ec5f9422f7d48a9b466af9d155747c4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 13 Nov 2014 17:51:27 +0100
Subject: gnu: file: Remove replacement; add separate file-5.20 package.

* gnu/packages/file.scm (file)[replacement]: Remove.
  (file/fixed): Remove.
  (file-5.20): New variable.
---
 gnu/packages/file.scm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm
index 0b4cae98ba..a90ab9c98e 100644
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@ -26,7 +26,6 @@
 
 (define-public file
   (package
-   (replacement file/fixed)
    (name "file")
    (version "5.19")
    (source (origin
@@ -46,14 +45,13 @@ of the file.")
    (license bsd-2)
    (home-page "http://www.darwinsys.com/file/")))
 
-(define file/fixed                                ;fix for CVE-2014-3710
-  (let ((real-version "5.20"))
-    (package (inherit file)
-      (source (origin
-                (method url-fetch)
-                (uri (string-append "ftp://ftp.astron.com/pub/file/file-"
-                                    real-version ".tar.gz"))
-                (sha256
-                 (base32
-                  "0iyjs9z8kp43gz7gva4j67h4p0n53f7q8x3ibai9s01sp3xnphsv"))))
-      (replacement #f))))
+(define-public file-5.20                          ;fix for CVE-2014-3710
+  (package (inherit file)
+    (version "5.20")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "ftp://ftp.astron.com/pub/file/file-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0iyjs9z8kp43gz7gva4j67h4p0n53f7q8x3ibai9s01sp3xnphsv"))))))
-- 
cgit 1.4.1