From de61fdcc01ea8819ec63b6f761a51cf3fbe92bcd Mon Sep 17 00:00:00 2001 From: kenmays Date: Wed, 16 Sep 2020 07:15:03 -0700 Subject: [PATCH] apache: bump version (#5255) * apache: disabled build --- .../{apache-2.4.41.recipe => apache-2.4.46.recipe} | 10 +++++----- .../{apache-2.4.41.patchset => apache-2.4.46.patchset} | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename www-servers/apache/{apache-2.4.41.recipe => apache-2.4.46.recipe} (98%) rename www-servers/apache/patches/{apache-2.4.41.patchset => apache-2.4.46.patchset} (89%) diff --git a/www-servers/apache/apache-2.4.41.recipe b/www-servers/apache/apache-2.4.46.recipe similarity index 98% rename from www-servers/apache/apache-2.4.41.recipe rename to www-servers/apache/apache-2.4.46.recipe index ccdc07b22..35ba30362 100644 --- a/www-servers/apache/apache-2.4.41.recipe +++ b/www-servers/apache/apache-2.4.46.recipe @@ -3,16 +3,16 @@ 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-2018 The Apache Software Foundation." +COPYRIGHT="1995-2020 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="133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40" +CHECKSUM_SHA256="740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea" SOURCE_DIR="httpd-$portVersion" PATCHES="apache-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="?x86_gcc2 ?x86_64" +SECONDARY_ARCHITECTURES="?x86" commandBinDir=$binDir commandSuffix=$secondaryArchSuffix diff --git a/www-servers/apache/patches/apache-2.4.41.patchset b/www-servers/apache/patches/apache-2.4.46.patchset similarity index 89% rename from www-servers/apache/patches/apache-2.4.41.patchset rename to www-servers/apache/patches/apache-2.4.46.patchset index 30004ad2d..7dfe13338 100644 --- a/www-servers/apache/patches/apache-2.4.41.patchset +++ b/www-servers/apache/patches/apache-2.4.46.patchset @@ -1,4 +1,4 @@ -From d6536335557d4d5397edf1575881fd980b91ed5a Mon Sep 17 00:00:00 2001 +From e3275c90c55224962fa0fc37e4db882412398023 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:39:31 +0000 Subject: Fixed redefinition error @@ -18,5 +18,5 @@ index 1fa3344..d13b564 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.19.0 +2.28.0