diff --git a/www-servers/apache/apache-2.4.57.recipe b/www-servers/apache/apache-2.4.63.recipe similarity index 98% rename from www-servers/apache/apache-2.4.57.recipe rename to www-servers/apache/apache-2.4.63.recipe index db4042a04..9f879d7b9 100644 --- a/www-servers/apache/apache-2.4.57.recipe +++ b/www-servers/apache/apache-2.4.63.recipe @@ -3,11 +3,11 @@ DESCRIPTION="The Apache HTTP Server Project is a collaborative software \ development effort aimed at creating a robust, commercial-grade, featureful, \ and freely-available source code implementation of an HTTP (Web) server" HOMEPAGE="https://httpd.apache.org/" -COPYRIGHT="1995-2022 The Apache Software Foundation." +COPYRIGHT="1995-2025 The Apache Software Foundation." LICENSE="Apache v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://archive.apache.org/dist/httpd/httpd-$portVersion.tar.bz2" -CHECKSUM_SHA256="dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a" +CHECKSUM_SHA256="88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab" SOURCE_DIR="httpd-$portVersion" PATCHES="apache-$portVersion.patchset" @@ -321,7 +321,10 @@ BUILD() --sysconfdir="$sysconfDir"/apache \ --with-apr=/$relativeBinDir \ --with-apr-util=/$relativeBinDir \ - --enable-asis --enable-cgi + --enable-asis \ + --enable-cgi \ + --with-included-regex # for crashing ./conftest + make $jobArgs } diff --git a/www-servers/apache/patches/apache-2.4.57.patchset b/www-servers/apache/patches/apache-2.4.63.patchset similarity index 80% rename from www-servers/apache/patches/apache-2.4.57.patchset rename to www-servers/apache/patches/apache-2.4.63.patchset index e97d79147..94216b097 100644 --- a/www-servers/apache/patches/apache-2.4.57.patchset +++ b/www-servers/apache/patches/apache-2.4.63.patchset @@ -1,4 +1,4 @@ -From 00d6a023a4b5a20975e2f35aad44e2a93ab71c02 Mon Sep 17 00:00:00 2001 +From bcc87a8acfc6638e20812d9dca398c10d630524f Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:39:31 +0000 Subject: Fixed redefinition error @@ -18,10 +18,10 @@ index 8111877..35323c6 100644 # If export_files is a dependency here, but we remove it during this stage, # when exports.c is generated, make will not detect that export_files is no -- -2.45.2 +2.48.1 -From c6a174d888ae0a5e33e8f0233f9658400882a7e5 Mon Sep 17 00:00:00 2001 +From d70ac385002a2edb7d154b34a15a8d01e86066e7 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 14 Sep 2024 16:12:28 +0200 Subject: Disable uid check on Haiku @@ -42,10 +42,10 @@ index 1baa278..15886e7 100644 return "Error:\tApache has not been designed to serve pages while\n" "\trunning as root. There are known race conditions that\n" -- -2.45.2 +2.48.1 -From 171719a2021b650d2c01a56d3f20a913028d9862 Mon Sep 17 00:00:00 2001 +From 166e6383455116ea7d09b65a920a1d1155c5b138 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 14 Sep 2024 16:33:12 +0200 Subject: Fix log directory @@ -105,5 +105,27 @@ index a29351e..b12dc09 100644 -- -2.45.2 +2.48.1 + + +From f453a1f424106191a4b6881e8a18373402db70c3 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Tue, 15 Apr 2025 08:47:34 +0200 +Subject: Fix conftest program not finding a definition for the crypt function + + +diff --git a/configure.in b/configure.in +index d2a009d..680f43f 100644 +--- a/configure.in ++++ b/configure.in +@@ -496,6 +496,7 @@ if test "$ac_cv_search_crypt" != "no"; then + #include + #include + #include ++#include + + #define PASSWD_0 "Hello world!" + #define SALT_0 "\$6\$saltstring" +-- +2.48.1