From 3f11f01fa88f2fbdf46e05117b82909b1b224d28 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 6 Feb 2015 13:48:57 +0100
Subject: gnu: patch: Add 2.7.4 and make it a replacement for the default one.

* gnu/packages/base.scm (patch-2.7.4, patch-CVE-2015-1196): New
  variables.
  (patch): Add 'replacement' field.
---
 gnu/packages/base.scm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/base.scm')

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1f479ccbbe..be33cb2caf 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
@@ -167,8 +167,27 @@ (define-public patch
 different diff formats.  It may also be used to revert previously applied
 differences.")
    (license gpl3+)
+   (replacement patch-CVE-2015-1196)
    (home-page "http://savannah.gnu.org/projects/patch/")))
 
+(define-public patch-2.7.4
+  (package
+    (inherit patch)
+    (version "2.7.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/patch/patch-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "02gikxjvcxysr4l65c8vivgz62xmalp0av5ypzff8vqhrq3vpb0f"))))
+    (replacement #f)))
+
+(define patch-CVE-2015-1196
+  (package (inherit patch-2.7.4)
+    ;; Keep the old version number so it can be used as a 'replacement'.
+    (version (package-version patch))))
+
 (define-public diffutils
   (package
    (name "diffutils")
-- 
cgit v1.2.3