From 6feeb3631adf0a068e4e24f3812500799c3b31e6 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 2 Oct 2026 00:26:47 +0200 Subject: pkgs/fetchmail-common-name: Update patch, so that it applies again --- pkgs/by-name/fe/fetchmail-common-name/package.nix | 9 ++--- ...c-Correctly-check-the-common-name-even-if.patch | 40 ++++++++++++++++++++++ ...c-Correctly-check-the-common-name-even-if.patch | 40 ---------------------- 3 files changed, 43 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/fe/fetchmail-common-name/patches/0001-fix-socket.c-Correctly-check-the-common-name-even-if.patch delete mode 100644 pkgs/by-name/fe/fetchmail-common-name/patches/fix-socket.c-Correctly-check-the-common-name-even-if.patch (limited to 'pkgs/by-name/fe/fetchmail-common-name') diff --git a/pkgs/by-name/fe/fetchmail-common-name/package.nix b/pkgs/by-name/fe/fetchmail-common-name/package.nix index 9e89bed..7c03e2e 100644 --- a/pkgs/by-name/fe/fetchmail-common-name/package.nix +++ b/pkgs/by-name/fe/fetchmail-common-name/package.nix @@ -1,14 +1,11 @@ -{ - pkgs, - callPackage, -}: -pkgs.fetchmail.overrideAttrs (final: prev: { +{fetchmail}: +fetchmail.overrideAttrs (final: prev: { pname = "fetchmail-common-name"; patches = (prev.patches or []) ++ [ - ./patches/fix-socket.c-Correctly-check-the-common-name-even-if.patch + ./patches/0001-fix-socket.c-Correctly-check-the-common-name-even-if.patch ]; meta.mainProgram = prev.meta.mainProgram or "fetchmail"; diff --git a/pkgs/by-name/fe/fetchmail-common-name/patches/0001-fix-socket.c-Correctly-check-the-common-name-even-if.patch b/pkgs/by-name/fe/fetchmail-common-name/patches/0001-fix-socket.c-Correctly-check-the-common-name-even-if.patch new file mode 100644 index 0000000..3c2d59e --- /dev/null +++ b/pkgs/by-name/fe/fetchmail-common-name/patches/0001-fix-socket.c-Correctly-check-the-common-name-even-if.patch @@ -0,0 +1,40 @@ +From 2fcc25966320748ab3cb9bbd709c4499a7e0bffc Mon Sep 17 00:00:00 2001 +From: Benedikt Peetz +Date: Thu, 1 Oct 2026 22:24:51 +0200 +Subject: [PATCH] fix(socket.c): Correctly check the common name, even if not + set (only SAN) + +--- + socket.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/socket.c b/socket.c +index 3f6cc5b..d66ea72 100644 +--- a/socket.c ++++ b/socket.c +@@ -824,7 +824,6 @@ static int SSL_verify_callback(int ok_return, X509_STORE_CTX *ctx, const int str + _depth0ck = 1; + } + +- if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) { + if (_ssl_server_cname != NULL) { + char *p1 = buf; + char *p2 = _ssl_server_cname; +@@ -876,14 +875,6 @@ static int SSL_verify_callback(int ok_return, X509_STORE_CTX *ctx, const int str + report(stderr, GT_("Server name not set, could not verify certificate!\n")); + if (strict) return 0; + } +- } else { +- if (outlevel >= O_VERBOSE) +- report(stdout, GT_("Unknown Server CommonName\n")); +- if (ok_return && strict) { +- report(stderr, GT_("Server name not specified in certificate!\n")); +- return 0; +- } +- } + /* Print the finger print. Note that on errors, we might print it more than once + * normally; we kluge around that by using a global variable. */ + if (_check_fp == 1) { +-- +2.55.0 + diff --git a/pkgs/by-name/fe/fetchmail-common-name/patches/fix-socket.c-Correctly-check-the-common-name-even-if.patch b/pkgs/by-name/fe/fetchmail-common-name/patches/fix-socket.c-Correctly-check-the-common-name-even-if.patch deleted file mode 100644 index aa17799..0000000 --- a/pkgs/by-name/fe/fetchmail-common-name/patches/fix-socket.c-Correctly-check-the-common-name-even-if.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77a13d5625890d6a0dc3ec312b9d237e61791033 Mon Sep 17 00:00:00 2001 -From: Benedikt Peetz -Date: Sat, 1 Mar 2025 18:20:35 +0100 -Subject: [PATCH] fix(socket.c): Correctly check the common name, even if not - set (only SAN) - ---- - socket.c | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/socket.c b/socket.c -index 42b8f1a5..c81bca63 100644 ---- a/socket.c -+++ b/socket.c -@@ -728,7 +728,6 @@ static int SSL_verify_callback(int ok_return, X509_STORE_CTX *ctx, const int str - _depth0ck = 1; - } - -- if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) { - if (_ssl_server_cname != NULL) { - char *p1 = buf; - char *p2 = _ssl_server_cname; -@@ -779,14 +778,6 @@ static int SSL_verify_callback(int ok_return, X509_STORE_CTX *ctx, const int str - report(stderr, GT_("Server name not set, could not verify certificate!\n")); - if (strict) return (0); - } -- } else { -- if (outlevel >= O_VERBOSE) -- report(stdout, GT_("Unknown Server CommonName\n")); -- if (ok_return && strict) { -- report(stderr, GT_("Server name not specified in certificate!\n")); -- return (0); -- } -- } - /* Print the finger print. Note that on errors, we might print it more than once - * normally; we kluge around that by using a global variable. */ - if (_check_fp == 1) { --- -2.47.2 - -- cgit v1.3.1