diff --git a/www-servers/apache/apache-2.4.63.recipe b/www-servers/apache/apache-2.4.66.recipe similarity index 98% rename from www-servers/apache/apache-2.4.63.recipe rename to www-servers/apache/apache-2.4.66.recipe index 58cf3e3fb..59b10bf56 100644 --- a/www-servers/apache/apache-2.4.63.recipe +++ b/www-servers/apache/apache-2.4.66.recipe @@ -5,9 +5,9 @@ and freely-available source code implementation of an HTTP (Web) server" HOMEPAGE="https://httpd.apache.org/" COPYRIGHT="1995-2025 The Apache Software Foundation." LICENSE="Apache v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://archive.apache.org/dist/httpd/httpd-$portVersion.tar.bz2" -CHECKSUM_SHA256="88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab" +CHECKSUM_SHA256="94d7ff2b42acbb828e870ba29e4cbad48e558a79c623ad3596e4116efcfea25a" SOURCE_DIR="httpd-$portVersion" PATCHES="apache-$portVersion.patchset" @@ -176,11 +176,6 @@ REQUIRES=" lib:libpcre$secondaryArchSuffix lib:libssl$secondaryArchSuffix " -if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then -CONFLICTS=" - apache - " -fi BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/www-servers/apache/patches/apache-2.4.63.patchset b/www-servers/apache/patches/apache-2.4.66.patchset similarity index 92% rename from www-servers/apache/patches/apache-2.4.63.patchset rename to www-servers/apache/patches/apache-2.4.66.patchset index 94216b097..147035129 100644 --- a/www-servers/apache/patches/apache-2.4.63.patchset +++ b/www-servers/apache/patches/apache-2.4.66.patchset @@ -1,4 +1,4 @@ -From bcc87a8acfc6638e20812d9dca398c10d630524f Mon Sep 17 00:00:00 2001 +From a82f14e80b6a009e8a92f7afaeb1494f394b260f 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.48.1 +2.51.0 -From d70ac385002a2edb7d154b34a15a8d01e86066e7 Mon Sep 17 00:00:00 2001 +From 0cbab3bc6914342a30ac24ac6e9d6d03cdb3b29a 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.48.1 +2.51.0 -From 166e6383455116ea7d09b65a920a1d1155c5b138 Mon Sep 17 00:00:00 2001 +From d552cd3ef7f3729ccd488567757000ce4ea8ba34 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 14 Sep 2024 16:33:12 +0200 Subject: Fix log directory @@ -105,10 +105,10 @@ index a29351e..b12dc09 100644 -- -2.48.1 +2.51.0 -From f453a1f424106191a4b6881e8a18373402db70c3 Mon Sep 17 00:00:00 2001 +From 4923ddeaf3e0b61e4ae2dac5389bc1401e7581d4 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 @@ -127,5 +127,5 @@ index d2a009d..680f43f 100644 #define PASSWD_0 "Hello world!" #define SALT_0 "\$6\$saltstring" -- -2.48.1 +2.51.0