lbailly/config-perso
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

fix(nixpkgs): betamail

Browse source
This commit is contained in:
catvayor 2024-12-20 12:01:44 +01:00
parent 999a16501d
commit 9bae1b1d34
Signed by: lbailly
GPG key ID: CE3E645251AC63F3
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
machines/kat-betamail/procmail_322.patch → machines/kat-betamail/0001-revert-procmail-to-3.22.patch
View file

@ -1,20 +1,19 @@
From f4fb2d56f2d1cd4e0f1062358e436bfb34c6a1c9 Mon Sep 17 00:00:00 2001
From f4ddc59778ebaa1bd58ba89aaee44a56049eec3f Mon Sep 17 00:00:00 2001
From: catvayor <catvayor@katvayor.net>
Date: Fri, 26 Jul 2024 20:59:03 +0200
Subject: [PATCH] revert update of procmail
Date: Fri, 20 Dec 2024 11:49:04 +0100
Subject: [PATCH] revert: procmail to 3.22
---
.../misc/procmail/CVE-2014-3618.patch | 18 ++++++++++++++++++
pkgs/applications/misc/procmail/default.nix | 19 +++++++++----------
pkgs/by-name/pr/procmail/CVE-2014-3618.patch | 18 ++++++++++++++++++
pkgs/by-name/pr/procmail/package.nix | 19 +++++++++----------
2 files changed, 27 insertions(+), 10 deletions(-)
create mode 100644 pkgs/applications/misc/procmail/CVE-2014-3618.patch
create mode 100644 pkgs/by-name/pr/procmail/CVE-2014-3618.patch
diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch
diff --git a/pkgs/by-name/pr/procmail/CVE-2014-3618.patch b/pkgs/by-name/pr/procmail/CVE-2014-3618.patch
new file mode 100644
index 000000000000..e3aa5600e40e
--- /dev/null
+++ b/pkgs/applications/misc/procmail/CVE-2014-3618.patch
+++ b/pkgs/by-name/pr/procmail/CVE-2014-3618.patch
@@ -0,0 +1,18 @@
+From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected).
+
@ -34,11 +33,11 @@ index 000000000000..e3aa5600e40e
+ }
+ hitspc=2;
+ }
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index 3bd280766b16..865904f75d46 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -2,20 +2,19 @@
diff --git a/pkgs/by-name/pr/procmail/package.nix b/pkgs/by-name/pr/procmail/package.nix
index dfb4bdb5a895..be9187234c12 100644
--- a/pkgs/by-name/pr/procmail/package.nix
+++ b/pkgs/by-name/pr/procmail/package.nix
@@ -8,20 +8,19 @@
stdenv.mkDerivation rec {
pname = "procmail";
@ -67,7 +66,7 @@ index 3bd280766b16..865904f75d46 100644
})
];
@@ -45,7 +44,7 @@ stdenv.mkDerivation rec {
@@ -55,7 +54,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Mail processing and filtering utility";
@ -77,4 +76,5 @@ index 3bd280766b16..865904f75d46 100644
platforms = platforms.unix;
maintainers = with maintainers; [ gebner ];
--
2.45.1
2.47.0

2
machines/kat-betamail/default.nix
View file

@ -1,7 +1,7 @@
{
meta = {
version = "unstable";
patches = [ ./procmail_322.patch ];
patches = [ ./0001-revert-procmail-to-3.22.patch ];
};
config = import ./configuration.nix;
}