From 596649313ccb8465895afd5e6bc104cd2588ad6f Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 24 May 2017 18:03:01 -0400
Subject: gnu: libtasn1: Incorporate grafted changes.

* gnu/packages/tls.scm (libtasn1)[replacement]: Remove field.
[source]: Use "libtasn1-CVE-2017-6891.patch".
(libtasn1/fixed): Remove variable.
---
 gnu/packages/tls.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 2cbb5c0183..17b1527a83 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -52,13 +52,13 @@
 (define-public libtasn1
   (package
     (name "libtasn1")
-    (replacement libtasn1/fixed)
     (version "4.10")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/libtasn1/libtasn1-"
                           version ".tar.gz"))
+      (patches (search-patches "libtasn1-CVE-2017-6891.patch"))
       (sha256
        (base32
         "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"))))
@@ -73,15 +73,6 @@ networking, allowing for formal validation of data according to some
 specifications.")
     (license license:lgpl2.0+)))
 
-(define libtasn1/fixed
-  (package
-    (inherit libtasn1)
-    (source
-      (origin
-        (inherit (package-source libtasn1))
-        (patches
-          (search-patches "libtasn1-CVE-2017-6891.patch"))))))
-
 (define-public asn1c
   (package
     (name "asn1c")
-- 
cgit v1.2.3