From 677515739e07cf6e99b70fa3cae5955a664566c7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 17 May 2020 05:16:00 +0200
Subject: gnu: cups: Update to 2.3.3 [fixes CVE-2020-3898 & CVE-2019-8842].

* gnu/packages/cups.scm (cups-minimal, cups)[replacement]: New fields.
(cups-minimal-2.3.3, cups-2.3.3): New public variables.
---
 gnu/packages/cups.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

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

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index b253d0604e..f668d6c19b 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -187,6 +187,7 @@ (define-public cups-filters
 ;; satisfy this dependency.
 (define-public cups-minimal
   (package
+    (replacement cups-minimal-2.3.3)
     (name "cups-minimal")
     (version "2.3.1")
     (source
@@ -249,8 +250,22 @@ (define-public cups-minimal
     ;; CUPS is Apache 2.0 with exceptions, see the NOTICE file.
     (license license:asl2.0)))
 
+(define-public cups-minimal-2.3.3
+  (package
+    (inherit cups-minimal)
+    (version "2.3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/apple/cups/releases/download/v"
+                           version "/cups-" version "-source.tar.gz"))
+       (sha256
+        (base32
+         "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6"))))))
+
 (define-public cups
   (package (inherit cups-minimal)
+    (replacement cups-2.3.3)
     (name "cups")
     (arguments
      `(;; Three tests fail:
@@ -392,6 +407,12 @@ (define-public cups
        ("cups-filters" ,cups-filters)
        ("zlib"  ,zlib)))))
 
+(define-public cups-2.3.3
+  (package
+    (inherit cups)
+    (version "2.3.3")
+    (source (package-source cups-minimal-2.3.3))))
+
 (define-public cups-pk-helper
   (package
     (name "cups-pk-helper")
-- 
cgit v1.2.3


From a6ce9e355db6842538b968603c80e2ed1013b739 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 17 May 2020 18:15:20 +0200
Subject: gnu: CUPS: Inherit replacement from cups-minimal.

* gnu/packages/cups.scm (cups): Use PACKAGE/INHERIT.
[replacement]: Remove.
(cups-2.3.3): Remove variable.
---
 gnu/packages/cups.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index f668d6c19b..0250f16db3 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -264,8 +264,7 @@ (define-public cups-minimal-2.3.3
          "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6"))))))
 
 (define-public cups
-  (package (inherit cups-minimal)
-    (replacement cups-2.3.3)
+  (package/inherit cups-minimal
     (name "cups")
     (arguments
      `(;; Three tests fail:
@@ -407,12 +406,6 @@ (define-public cups
        ("cups-filters" ,cups-filters)
        ("zlib"  ,zlib)))))
 
-(define-public cups-2.3.3
-  (package
-    (inherit cups)
-    (version "2.3.3")
-    (source (package-source cups-minimal-2.3.3))))
-
 (define-public cups-pk-helper
   (package
     (name "cups-pk-helper")
-- 
cgit v1.2.3