Andreas Wacknitz
2021-05-04 ad3fb42012577e8fe79fad41a29052b6e3f9ae78
apache-24: update to 2.4.47 and switch to openssl-1.1

1 files deleted
4 files modified
57 ■■■■■ changed files
components/web/apache24/Makefile 25 ●●●●● patch | view | raw | blame | history
components/web/apache24/documentation.p5m 3 ●●●● patch | view | raw | blame | history
components/web/apache24/manifests/sample-manifest.p5m 5 ●●●●● patch | view | raw | blame | history
components/web/apache24/patches/use-lua5.3.patch 19 ●●●●● patch | view | raw | blame | history
components/web/apache24/pkg5 5 ●●●●● patch | view | raw | blame | history
components/web/apache24/Makefile
@@ -24,23 +24,23 @@
# Copyright (c) 2019, Michal Nowak
#
BUILD_BITS= 64
USE_OPENSSL11= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        apache2
COMPONENT_VERSION=    2.4.46
COMPONENT_PROJECT_URL=    http://httpd.apache.org/
COMPONENT_VERSION=    2.4.47
COMPONENT_PROJECT_URL=    https://httpd.apache.org/
COMPONENT_SRC_NAME=    httpd
COMPONENT_SRC=        $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
   sha256:44b759ce932dc090c0e75c0210b4485ebf6983466fb8ca1b446c8168e1a1aec2
COMPONENT_ARCHIVE_URL=    http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH= sha256:567d5ac72ea643e3828e8e54f32e06f1fad10095d33ae4071eeaec3c78b70a34
COMPONENT_ARCHIVE_URL=    https://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
CONFIGURE_DEFAULT_DIRS=no
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
TEST_TARGET=    $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
PATCH_LEVEL=0
@@ -85,14 +85,10 @@
CONFIGURE_OPTIONS.64 +=    --with-apr=/usr/apr/bin/$(MACH64)/apr-1-config
CONFIGURE_OPTIONS.64 +=    --with-apr-util=/usr/apr-util/bin/$(MACH64)/apu-1-config
build: $(BUILD_64)
install: $(INSTALL_64)
    # Some files installed in proto area need to be fixed.
    $(KSH93) Solaris/customization.sh $(PROTO_DIR)
    $(TOUCH) $(BUILD_DIR)
test: $(NO_TESTS)
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
@@ -106,11 +102,12 @@
REQUIRED_PACKAGES += library/nghttp2
REQUIRED_PACKAGES += library/openldap
REQUIRED_PACKAGES += library/pcre
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/lua-53
REQUIRED_PACKAGES += runtime/lua
REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += runtime/perl-524
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/gss
components/web/apache24/documentation.p5m
@@ -145,6 +145,7 @@
file path=usr/apache2/2.4/manual/getting-started.html
file path=usr/apache2/2.4/manual/getting-started.html.en
file path=usr/apache2/2.4/manual/getting-started.html.fr.utf8
file path=usr/apache2/2.4/manual/getting-started.html.ru.utf8
file path=usr/apache2/2.4/manual/glossary.html
file path=usr/apache2/2.4/manual/glossary.html.de
file path=usr/apache2/2.4/manual/glossary.html.en
@@ -266,6 +267,7 @@
file path=usr/apache2/2.4/manual/index.html.ja.utf8
file path=usr/apache2/2.4/manual/index.html.ko.euc-kr
file path=usr/apache2/2.4/manual/index.html.pt-br
file path=usr/apache2/2.4/manual/index.html.ru.utf8
file path=usr/apache2/2.4/manual/index.html.tr.utf8
file path=usr/apache2/2.4/manual/index.html.zh-cn.utf8
file path=usr/apache2/2.4/manual/install.html
@@ -894,7 +896,6 @@
file path=usr/apache2/2.4/manual/new_features_2_0.html.ja.utf8
file path=usr/apache2/2.4/manual/new_features_2_0.html.ko.euc-kr
file path=usr/apache2/2.4/manual/new_features_2_0.html.pt-br
file path=usr/apache2/2.4/manual/new_features_2_0.html.ru.koi8-r
file path=usr/apache2/2.4/manual/new_features_2_0.html.tr.utf8
file path=usr/apache2/2.4/manual/new_features_2_2.html
file path=usr/apache2/2.4/manual/new_features_2_2.html.en
components/web/apache24/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2020 <contributor>
# Copyright 2021 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -366,6 +366,7 @@
file path=usr/apache2/2.4/manual/getting-started.html
file path=usr/apache2/2.4/manual/getting-started.html.en
file path=usr/apache2/2.4/manual/getting-started.html.fr.utf8
file path=usr/apache2/2.4/manual/getting-started.html.ru.utf8
file path=usr/apache2/2.4/manual/glossary.html
file path=usr/apache2/2.4/manual/glossary.html.de
file path=usr/apache2/2.4/manual/glossary.html.en
@@ -487,6 +488,7 @@
file path=usr/apache2/2.4/manual/index.html.ja.utf8
file path=usr/apache2/2.4/manual/index.html.ko.euc-kr
file path=usr/apache2/2.4/manual/index.html.pt-br
file path=usr/apache2/2.4/manual/index.html.ru.utf8
file path=usr/apache2/2.4/manual/index.html.tr.utf8
file path=usr/apache2/2.4/manual/index.html.zh-cn.utf8
file path=usr/apache2/2.4/manual/install.html
@@ -1115,7 +1117,6 @@
file path=usr/apache2/2.4/manual/new_features_2_0.html.ja.utf8
file path=usr/apache2/2.4/manual/new_features_2_0.html.ko.euc-kr
file path=usr/apache2/2.4/manual/new_features_2_0.html.pt-br
file path=usr/apache2/2.4/manual/new_features_2_0.html.ru.koi8-r
file path=usr/apache2/2.4/manual/new_features_2_0.html.tr.utf8
file path=usr/apache2/2.4/manual/new_features_2_2.html
file path=usr/apache2/2.4/manual/new_features_2_2.html.en
components/web/apache24/patches/use-lua5.3.patch
File was deleted
components/web/apache24/pkg5
@@ -11,11 +11,12 @@
        "library/nghttp2",
        "library/openldap",
        "library/pcre",
        "library/security/openssl",
        "library/security/openssl-11",
        "library/zlib",
        "runtime/lua-53",
        "runtime/lua",
        "runtime/perl-522",
        "runtime/perl-524",
        "shell/ksh93",
        "system/library",
        "system/library/math",
        "system/library/security/gss"