From: Joe Orton <jorton@apache.org>
Date: Fri, 2 Feb 2024 11:48:27 +0000 (+0000)
Subject: Done/vote/propose.
X-Git-Tag: 2.4.59-rc1-candidate~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=756532292c8fe89916e88d35cc111338eea39659;p=thirdparty%2Fapache%2Fhttpd.git

Done/vote/propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915533 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 9b25ba67702..0a78f7dcb69 100644
--- a/STATUS
+++ b/STATUS
@@ -153,15 +153,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-   *) Add support for SHA-2 crypt() algorithm in htpasswd.
-      trunk patch: http://svn.apache.org/r1861793
-                   http://svn.apache.org/r1862612
-                   http://svn.apache.org/r1877251
-                   http://svn.apache.org/r1862724
-                   http://svn.apache.org/r1907672
-      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-htpasswd-SHA-2-crypt-2.patch
-      +1: minfrin, ylavic, jorton
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -254,7 +245,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    *) mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.
       trunk patch: https://svn.apache.org/r1915400
       2.4.x patch: svn merge -c 1915400 ^/httpd/httpd/trunk .
-      +1: jfclere,
+      +1: jfclere, jorton, 
 
    *) mod_ssl: use standard OpenSSL function for assembling CA name lists
       trunk patch: https://svn.apache.org/r1825120
@@ -262,6 +253,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Github PR: https://github.com/apache/httpd/pull/406
       +1: jorton, jfclere,
 
+   *) htpasswd: further fixes for SHA-2 usage/docs
+      trunk patch: https://svn.apache.org/r1862611
+                   https://svn.apache.org/r1878703
+                   https://svn.apache.org/r1884207
+                   https://svn.apache.org/r1877693
+      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/408.patch
+      Github PR: https://github.com/apache/httpd/pull/408
+      +1: jorton, 
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]