[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Lars Wendler]

commit:     9052d1e4680943e44ac14d039cb91bc740c09e0d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 22:55:25 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 22:55:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9052d1e4

www-servers/apache: Added "h2c" directive to http2 config.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 www-servers/apache/files/41_mod_http2.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/apache/files/41_mod_http2.conf b/www-servers/apache/files/41_mod_http2.conf
index 68b4838..e4c9454 100644
--- a/www-servers/apache/files/41_mod_http2.conf
+++ b/www-servers/apache/files/41_mod_http2.conf
@@ -4,6 +4,6 @@
     #LogLevel http2:info
 
     #Enable HTTP/2 support
-    Protocols h2 http/1.1
+    Protocols h2 h2c http/1.1
   </IfModule>
 </IfDefine>

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Lars Wendler]

commit:     67e5cb7735dd26e2e9771f2051649b8fd7fa9fb3
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec  3 08:43:14 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 12:40:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e5cb77

www-server/apache: remove unused patch

 www-servers/apache/files/apache-asf-httpoxy.patch | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/www-servers/apache/files/apache-asf-httpoxy.patch b/www-servers/apache/files/apache-asf-httpoxy.patch
deleted file mode 100644
index 68e3d869a77..00000000000
--- a/www-servers/apache/files/apache-asf-httpoxy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/589226
-https://www.apache.org/security/asf-httpoxy-response.txt
-
---- server/util_script.c	(revision 1752426)
-+++ server/util_script.c	(working copy)
-@@ -186,6 +186,14 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r
-         else if (!strcasecmp(hdrs[i].key, "Content-length")) {
-             apr_table_addn(e, "CONTENT_LENGTH", hdrs[i].val);
-         }
-+        /* HTTP_PROXY collides with a popular envvar used to configure
-+         * proxies, don't let clients set/override it.  But, if you must...
-+         */
-+#ifndef SECURITY_HOLE_PASS_PROXY
-+        else if (!strcasecmp(hdrs[i].key, "Proxy")) {
-+            ;
-+        }
-+#endif
-         /*
-          * You really don't want to disable this check, since it leaves you
-          * wide open to CGIs stealing passwords and people viewing them

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Aaron Bauman]

commit:     d0299098e25329e93dd847e3dbc1ad4a23a3f224
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 04:09:19 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 04:09:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0299098

www-servers/apache: add missing parenthese in LibreSSL patch

Closes: https://bugs.gentoo.org/653830
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch b/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
index 97d33468e19..a326cc698ee 100644
--- a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
+++ b/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
@@ -20,7 +20,7 @@ index 66682eaf4d..8f0def2805 100644
  }
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
  
  #ifndef NID_tlsfeature
  #define NID_tlsfeature          1020

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Lars Wendler]

commit:     51f811298e55ea65b00fedeaf9983807ab40da4c
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 29 10:09:03 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 09:32:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f81129

www-servers/apache: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../apache-2.4.33-libressl-compatibility.patch     | 97 ----------------------
 1 file changed, 97 deletions(-)

diff --git a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch b/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
deleted file mode 100644
index a326cc698ee..00000000000
--- a/www-servers/apache/files/apache-2.4.33-libressl-compatibility.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-# based on upstream commit from:
-# https://github.com/apache/httpd/commit/8134addfabf2685e08da6d51167775b628fda0dc
-# this should be included in the next release (2.4.34?)
-
-diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c
-index 66682eaf4d..8f0def2805 100644
---- a/modules/md/md_crypt.c
-+++ b/modules/md/md_crypt.c
-@@ -190,7 +190,7 @@ static int pem_passwd(char *buf, int size, int rwflag, void *baton)
-  */
- static apr_time_t md_asn1_time_get(const ASN1_TIME* time)
- {
--#ifdef LIBRESSL_VERSION_NUMBER
-+#ifdef LIBRESSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-     /* courtesy: https://stackoverflow.com/questions/10975542/asn1-time-to-time-t-conversion#11263731
-      * all bugs are mine */
-     apr_time_exp_t t;
-@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppkey, apr_pool_t *p, md_pkey_spec_t *spec)
-     }
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
- 
- #ifndef NID_tlsfeature
- #define NID_tlsfeature          1020
-diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
-index 48d64cb624..2392019aed 100644
---- a/modules/ssl/mod_ssl.c
-+++ b/modules/ssl/mod_ssl.c
-@@ -398,7 +398,7 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
-     /* We must register the library in full, to ensure our configuration
-      * code can successfully test the SSL environment.
-      */
--#if MODSSL_USE_OPENSSL_PRE_1_1_API
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API || defined(LIBRESSL_VERSION_NUMBER)
-     (void)CRYPTO_malloc_init();
- #else
-     OPENSSL_malloc_init();
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index a3a74f474c..88c0939cab 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -546,7 +546,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
-     char *cp;
-     int protocol = mctx->protocol;
-     SSLSrvConfigRec *sc = mySrvConfig(s);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \
-+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L)
-     int prot;
- #endif
- 
-@@ -616,7 +617,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
- 
-     SSL_CTX_set_options(ctx, SSL_OP_ALL);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20800000L)
-     /* always disable SSLv2, as per RFC 6176 */
-     SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
- 
-diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
-index a39569cbf7..e0e1b37087 100644
---- a/modules/ssl/ssl_private.h
-+++ b/modules/ssl/ssl_private.h
-@@ -132,13 +132,14 @@
-         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
- #define SSL_CTX_set_max_proto_version(ctx, version) \
-         SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
--#endif
--/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
-- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...), so
-- * we have to work around this...
-+#elif LIBRESSL_VERSION_NUMBER < 0x2070000f
-+/* LibreSSL before 2.7 declares OPENSSL_VERSION_NUMBER == 2.0 but does not
-+ * include most changes from OpenSSL >= 1.1 (new functions, macros, 
-+ * deprecations, ...), so we have to work around this...
-  */
- #define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
--#else
-+#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */
-+#else /* defined(LIBRESSL_VERSION_NUMBER) */
- #define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
- #endif
- 
-@@ -238,7 +239,8 @@ void init_bio_methods(void);
- void free_bio_methods(void);
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || \
-+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f)
- #define X509_STORE_CTX_get0_store(x) (x->ctx)
- #endif
- 

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Conrad Kostecki]

commit:     49b84e124ee3e7ef349e79dd0fa233fb5f6e305e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 27 11:47:02 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 22:07:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b84e12

www-servers/apache: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24776
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../apache/files/apache-2.4.51-mpm-itk.patch       | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch b/www-servers/apache/files/apache-2.4.51-mpm-itk.patch
deleted file mode 100644
index 4d36fe03dffb..000000000000
--- a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Backport of upstream r1894171 to fix segfaults with mpm-itk.
-
-https://bugs.gentoo.org/816258
-https://bz.apache.org/bugzilla/show_bug.cgi?id=65627
-
---- a/server/connection.c	2021/09/21 20:03:52	1893497
-+++ b/server/connection.c	2021/10/12 16:48:18	1894171
-@@ -145,9 +145,7 @@
- {
-     apr_socket_t *csd = ap_get_conn_socket(c);
- 
--    if (!csd) {
--        return 1;
--    }
-+    ap_assert(csd != NULL);
- 
-     if (ap_prep_lingering_close(c)) {
-         return 1;
-@@ -178,6 +176,15 @@
-     apr_time_t now, timeup = 0;
-     apr_socket_t *csd = ap_get_conn_socket(c);
- 
-+    if (!csd) {
-+        /* Be safe with third-party modules that:
-+         *   ap_set_core_module_config(c->conn_config, NULL)
-+         * to no-op ap_lingering_close().
-+         */
-+        c->aborted = 1;
-+        return;
-+    }
-+
-     if (ap_start_lingering_close(c)) {
-         apr_socket_close(csd);
-         return;

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Conrad Kostecki]

commit:     1ed4f7979633bb9d0a74eb6057ef4e7362180c2f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jan 21 11:39:19 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 01:13:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed4f797

www-servers/apache: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29205
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../apache/files/apache2.2-hardened.service        | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/www-servers/apache/files/apache2.2-hardened.service b/www-servers/apache/files/apache2.2-hardened.service
deleted file mode 100644
index 7a512a733e72..000000000000
--- a/www-servers/apache/files/apache2.2-hardened.service
+++ /dev/null
@@ -1,27 +0,0 @@
-[Unit]
-Description=The Apache HTTP Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/apache2
-ExecStart=/usr/sbin/apache2 $APACHE2_OPTS -DFOREGROUND
-ExecReload=/usr/sbin/apache2 $APACHE2_OPTS -k graceful
-ExecStop=/usr/sbin/apache2 $APACHE2_OPTS -k graceful-stop
-# We want systemd to give httpd some time to finish gracefully, but still want
-# it to kill httpd after TimeoutStopSec if something went wrong during the
-# graceful stop. Normally, Systemd sends SIGTERM signal right after the
-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
-# httpd time to finish.
-KillSignal=SIGCONT
-PrivateTmp=true
-#Hardening
-PrivateTmp=true
-CapabilityBoundingSet=CAP_CHOWN CAP_SETGID CAP_SETUID CAP_DAC_OVERRIDE CAP_KILL CAP_NET_BIND_SERVICE CAP_IPC_LOCK
-SecureBits=noroot-locked
-ProtectSystem=full
-NoNewPrivileges=true
-PrivateDevices=true
-MemoryDenyWriteExecute=true
-
-[Install]
-WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Sam James]

commit:     67517ca5b17345678008b70e4363678c37d04f1c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 03:18:58 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 03:24:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67517ca5

www-servers/apache: add upstream ref to libxml2 patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/apache/files/libxmlv212.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www-servers/apache/files/libxmlv212.patch b/www-servers/apache/files/libxmlv212.patch
index 0ec544d04c13..281633b27ca7 100644
--- a/www-servers/apache/files/libxmlv212.patch
+++ b/www-servers/apache/files/libxmlv212.patch
@@ -1,3 +1,5 @@
+https://github.com/apache/httpd/pull/393
+
 From bd2c4e466e0949f6f770bbb2569ce5ae9b3965c0 Mon Sep 17 00:00:00 2001
 From: ttachi <tachihara@hotmail.com>
 Date: Fri, 17 Nov 2023 22:24:45 +0900

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Maciej Barć]

commit:     80bf1768d6e5bb3dd4a44ff6e91e56ba4450930d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 18 14:01:19 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 01:05:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bf1768

www-servers/apache: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/35410
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../apache/files/apache-2.4.54-libtool.patch       | 21 ---------
 .../apache/files/apache-2.4.54-no-which.patch      | 54 ----------------------
 .../files/apache-2.4.57-rustls-ffi-0.10.0.patch    | 51 --------------------
 3 files changed, 126 deletions(-)

diff --git a/www-servers/apache/files/apache-2.4.54-libtool.patch b/www-servers/apache/files/apache-2.4.54-libtool.patch
deleted file mode 100644
index a0d55d885fd8..000000000000
--- a/www-servers/apache/files/apache-2.4.54-libtool.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://bugs.gentoo.org/858836
-
-From: orbea <orbea@riseup.net>
-Date: Tue, 19 Jul 2022 07:46:36 -0700
-Subject: [PATCH] build: Fix the build with slibtool
-
-Adding LT_INIT to configure.in generates the libtool script in the build
-directory which is required by rlibtool to determine if the build is
-shared or static.
-
---- a/configure.in
-+++ b/configure.in
-@@ -398,7 +398,7 @@ AC_PATH_PROG(RSYNC, rsync)
- AC_PATH_PROG(SVN, svn)
- AC_PROG_AWK
- AC_PROG_LN_S
--AC_CHECK_TOOL(RANLIB, ranlib, true)
-+LT_INIT
- dnl AC_PATH_PROG(PERL_PATH, perl)
- AC_CHECK_PROGS(LYNX_PATH,[lynx links elinks], [lynx])
- 

diff --git a/www-servers/apache/files/apache-2.4.54-no-which.patch b/www-servers/apache/files/apache-2.4.54-no-which.patch
deleted file mode 100644
index 65764dfe022a..000000000000
--- a/www-servers/apache/files/apache-2.4.54-no-which.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/844868
-https://bz.apache.org/bugzilla/show_bug.cgi?id=66130
---- a/build/aix/buildaix.ksh
-+++ b/build/aix/buildaix.ksh
-@@ -26,14 +26,14 @@ export CFLAGS='-O2 -qlanglvl=extc99'
- lslpp -L bos.adt.insttools >/dev/null
-  [[ $? -ne 0 ]] && echo "must have bos.adt.insttools installed" && exit -1
- 
--apr_config=`which apr-1-config`
--apu_config=`which apu-1-config`
-+apr_config=`command -v apr-1-config 2>/dev/null`
-+apu_config=`command -v apu-1-config 2>/dev/null`
- 
- if [[ -z ${apr_config} && -z ${apu_config} ]]
- then
- 	export PATH=/opt/bin:${PATH}
--	apr_config=`which apr-1-config`
--	apu_config=`which apu-1-config`
-+	apr_config=`command -v apr-1-config 2>/dev/null`
-+	apu_config=`command -v apu-1-config 2>/dev/null`
- fi
- 
- while test $# -gt 0
---- a/build/pkg/buildpkg.sh
-+++ b/build/pkg/buildpkg.sh
-@@ -24,8 +24,8 @@ PREFIX=/usr/local/apache2
- TEMPDIR=/var/tmp/$USER/httpd-root
- rm -rf $TEMPDIR
- 
--apr_config=`which apr-1-config`
--apu_config=`which apu-1-config`
-+apr_config=`command -v apr-1-config 2>/dev/null`
-+apu_config=`command -v apu-1-config 2>/dev/null`
- 
- while test $# -gt 0 
- do
---- a/configure.in
-+++ b/configure.in
-@@ -216,13 +216,13 @@ AC_ARG_WITH(pcre,
- APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
- if test "x$with_pcre" = "x" || test "$with_pcre" = "yes"; then
-   with_pcre="$PATH"
--else if which $with_pcre 2>/dev/null; then :; else
-+else if command -v $with_pcre 2>/dev/null; then :; else
-   with_pcre="$with_pcre/bin:$with_pcre"
- fi
- fi
- 
- AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config],
--                      [`which $with_pcre 2>/dev/null`], $with_pcre)
-+                      [`command -v $with_pcre 2>/dev/null`], $with_pcre)
- 
- if test "x$PCRE_CONFIG" != "x"; then
-   if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else

diff --git a/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch b/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch
deleted file mode 100644
index 81869f7bbf00..000000000000
--- a/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/apache/httpd/commit/0495a95f511c0bc7f34dc1b706d6d8276865743b
-https://bugs.gentoo.org/906523
-
-From 0495a95f511c0bc7f34dc1b706d6d8276865743b Mon Sep 17 00:00:00 2001
-From: Stefan Eissing <icing@apache.org>
-Date: Tue, 2 May 2023 09:21:07 +0000
-Subject: [PATCH] Backport of r1909558 from trunk:
-
-  *) mod_tls: updating to rustls-ffi version 0.9.2 or higher.
-     Checking in configure for proper version installed. Code
-     fixes for changed clienthello member name.
-
-
-
-git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909561 13f79535-47bb-0310-9956-ffa450edef68
---- /dev/null
-+++ b/changes-entries/tls-rustls-update.txt
-@@ -0,0 +1,4 @@
-+  *) mod_tls: updating to rustls-ffi version 0.9.2 or higher.
-+     Checking in configure for proper version installed. Code
-+     fixes for changed clienthello member name.
-+     [Stefan Eissing]
-\ No newline at end of file
---- a/modules/tls/config2.m4
-+++ b/modules/tls/config2.m4
-@@ -109,9 +109,10 @@ AC_DEFUN([APACHE_CHECK_RUSTLS],[
-       fi
-     fi
- 
--    AC_MSG_CHECKING([for rustls version >= 0.8.2])
-+    AC_MSG_CHECKING([for rustls version >= 0.9.2])
-     AC_TRY_COMPILE([#include <rustls.h>],[
- rustls_version();
-+rustls_acceptor_new();
- ],
-       [AC_MSG_RESULT(OK)
-        ac_cv_rustls=yes],
---- a/modules/tls/tls_core.c
-+++ b/modules/tls/tls_core.c
-@@ -507,8 +507,8 @@ static const rustls_certified_key *extract_client_hello_values(
-     ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, "extract client hello values");
-     if (!cc) goto cleanup;
-     cc->client_hello_seen = 1;
--    if (hello->sni_name.len > 0) {
--        cc->sni_hostname = apr_pstrndup(c->pool, hello->sni_name.data, hello->sni_name.len);
-+    if (hello->server_name.len > 0) {
-+        cc->sni_hostname = apr_pstrndup(c->pool, hello->server_name.data, hello->server_name.len);
-         ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "sni detected: %s", cc->sni_hostname);
-     }
-     else {
-

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Joonas Niilola]

commit:     444b8ec76ff3dd207aff10c2070567c003afbdce
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 22 16:49:43 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 08:01:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444b8ec7

www-servers/apache: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/37674
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-servers/apache/files/libxmlv212.patch | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/www-servers/apache/files/libxmlv212.patch b/www-servers/apache/files/libxmlv212.patch
deleted file mode 100644
index 281633b27ca7..000000000000
--- a/www-servers/apache/files/libxmlv212.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/apache/httpd/pull/393
-
-From bd2c4e466e0949f6f770bbb2569ce5ae9b3965c0 Mon Sep 17 00:00:00 2001
-From: ttachi <tachihara@hotmail.com>
-Date: Fri, 17 Nov 2023 22:24:45 +0900
-Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header
-
----
- modules/filters/mod_xml2enc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
-index 34f8e8ee090..0d3d13c1239 100644
---- a/modules/filters/mod_xml2enc.c
-+++ b/modules/filters/mod_xml2enc.c
-@@ -209,7 +209,7 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
-   
-     /* to sniff, first we look for BOM */
-     if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
--        ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
-+        ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
-                                              ctx->bytes); 
-         if (HAVE_ENCODING(ctx->xml2enc)) {
-             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)

[gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/

[Conrad Kostecki]

commit:     287849413f51b54c4ad7b11791fe0eef69029da3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 14 15:38:04 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 21:45:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28784941

www-servers/apache: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../apache/files/apache-2.4.59-dh-regression.patch | 81 ----------------------
 1 file changed, 81 deletions(-)

diff --git a/www-servers/apache/files/apache-2.4.59-dh-regression.patch b/www-servers/apache/files/apache-2.4.59-dh-regression.patch
deleted file mode 100644
index 63cb606a2630..000000000000
--- a/www-servers/apache/files/apache-2.4.59-dh-regression.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From dee1eb37d787d34cb37df7eab535240e1774293a Mon Sep 17 00:00:00 2001
-From: Ruediger Pluem <rpluem@apache.org>
-Date: Mon, 8 Apr 2024 13:18:28 +0000
-Subject: [PATCH] * Ensure that we set the default DH parameters for the key
-
-Replace else with an if as the if branch no longer ensures that
-custome DH parameters have been loaded.
-This fixes a regression that causes the default DH parameters for a key
-no longer set and thus effectively disabling DH ciphers when no explicit
-DH parameters are set.
-
-PR: 68863
-
-
-git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916863 13f79535-47bb-0310-9956-ffa450edef68
----
- changes-entries/pr68863.txt   |  3 +++
- modules/ssl/ssl_engine_init.c | 11 ++++++-----
- 2 files changed, 9 insertions(+), 5 deletions(-)
- create mode 100644 changes-entries/pr68863.txt
-
-diff --git a/changes-entries/pr68863.txt b/changes-entries/pr68863.txt
-new file mode 100644
-index 00000000000..d45ffc708cc
---- /dev/null
-+++ b/changes-entries/pr68863.txt
-@@ -0,0 +1,3 @@
-+  *) mod_ssl: Fix a regression that causes the default DH parameters for a key
-+     no longer set and thus effectively disabling DH ciphers when no explicit
-+     DH parameters are set. PR 68863 [Ruediger Pluem]
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index 64e4aaf1dcd..f657026d137 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -1416,6 +1416,7 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
-     const char *vhost_id = mctx->sc->vhost_id, *key_id, *certfile, *keyfile;
-     int i;
-     EVP_PKEY *pkey;
-+    int custom_dh_done = 0;
- #ifdef HAVE_ECC
-     EC_GROUP *ecgroup = NULL;
-     int curve_nid = 0;
-@@ -1591,14 +1592,14 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
-      */
-     certfile = APR_ARRAY_IDX(mctx->pks->cert_files, 0, const char *);
-     if (certfile && !modssl_is_engine_id(certfile)) {
--        int done = 0, num_bits = 0;
-+        int num_bits = 0;
- #if OPENSSL_VERSION_NUMBER < 0x30000000L
-         DH *dh = modssl_dh_from_file(certfile);
-         if (dh) {
-             num_bits = DH_bits(dh);
-             SSL_CTX_set_tmp_dh(mctx->ssl_ctx, dh);
-             DH_free(dh);
--            done = 1;
-+            custom_dh_done = 1;
-         }
- #else
-         pkey = modssl_dh_pkey_from_file(certfile);
-@@ -1608,18 +1609,18 @@ static apr_status_t ssl_init_server_certs(server_rec *s,
-                 EVP_PKEY_free(pkey);
-             }
-             else {
--                done = 1;
-+                custom_dh_done = 1;
-             }
-         }
- #endif
--        if (done) {
-+        if (custom_dh_done) {
-             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02540)
-                          "Custom DH parameters (%d bits) for %s loaded from %s",
-                          num_bits, vhost_id, certfile);
-         }
-     }
- #if !MODSSL_USE_OPENSSL_PRE_1_1_API
--    else {
-+    if (!custom_dh_done) {
-         /* If no parameter is manually configured, enable auto
-          * selection. */
-         SSL_CTX_set_dh_auto(mctx->ssl_ctx, 1);