From 84fb288f46faa746b0718060f396a875529eae14 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 1 Jun 2023 13:13:30 +0200
Subject: [PATCH 1/2] cups: fix nixos test references

The tests were split up in two, but the references were not updated.
---
 pkgs/misc/cups/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index d9f136f81389..f1ffb1f8e149 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -134,7 +134,12 @@ stdenv.mkDerivation rec {
         --replace "Exec=htmlview" "Exec=xdg-open"
     '';
 
-  passthru.tests.nixos = nixosTests.printing;
+  passthru.tests = {
+    inherit (nixosTests)
+      printing-service
+      printing-socket
+    ;
+  };
 
   meta = with lib; {
     homepage = "https://openprinting.github.io/cups/";

From 2ca22f6b823eb38c8e182e5bae39d40ebbe87c59 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 2 Jun 2023 02:05:30 +0200
Subject: [PATCH 2/2] cups: 2.4.2 -> 2.4.3

Resolves a heap buffer overflow in the log formatter, when the log level
is set to DEBUG.

https://github.com/OpenPrinting/cups/releases/tag/v2.4.3

Fixes: CVE-2023-32234
---
 pkgs/misc/cups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index f1ffb1f8e149..abff4d817975 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cups";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
-    sha256 = "sha256-8DzLQLCH0eMJQKQOAUHcu6Jj85l0wg658lIQZsnGyQg=";
+    sha256 = "sha256-nd65jyDpyfSvEhwrEFPnQgt5vWdw8a3tKGYwPSdSb28=";
   };
 
   outputs = [ "out" "lib" "dev" "man" ];