Niklas Poslovski
2023-02-13 a2e023446c0abbf3b8cefbe0744ab3e0aed88bce
apache24: Update to 2.4.55

5 files modified
22 ■■■■■ changed files
components/web/apache24/Makefile 12 ●●●● patch | view | raw | blame | history
components/web/apache24/apache-24.p5m 3 ●●●●● patch | view | raw | blame | history
components/web/apache24/documentation.p5m 1 ●●●● patch | view | raw | blame | history
components/web/apache24/manifests/sample-manifest.p5m 4 ●●● patch | view | raw | blame | history
components/web/apache24/pkg5 2 ●●● patch | view | raw | blame | history
components/web/apache24/Makefile
@@ -22,20 +22,20 @@
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2019, Michal Nowak
# Copyright (c) 2023, Niklas Poslovski
#
BUILD_BITS= 64
USE_OPENSSL11= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        apache2
COMPONENT_VERSION=    2.4.54
COMPONENT_REVISION=    1
COMPONENT_VERSION=    2.4.55
#COMPONENT_REVISION=    1
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:c687b99c446c0ef345e7d86c21a8e15fc074b7d5152c4fe22b0463e2be346ffb
COMPONENT_ARCHIVE_HASH= sha256:5276ea8bc6fff31eed5c82132ae51a0b2ee05f9e6b61a00fa877f6cadab3b638
COMPONENT_ARCHIVE_URL=    https://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
CONFIGURE_DEFAULT_DIRS=no
@@ -92,7 +92,6 @@
    $(TOUCH) $(BUILD_DIR)
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/apr
REQUIRED_PACKAGES += library/apr-util
REQUIRED_PACKAGES += library/apr-util/apr-ldap
@@ -106,8 +105,9 @@
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/lua
REQUIRED_PACKAGES += runtime/perl-534
REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/gss
components/web/apache24/apache-24.p5m
@@ -19,6 +19,7 @@
# CDDL HEADER END
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2023 Niklas Poslovski
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/apache2/2.4/build/.+\.sh -> default mode 0555>
@@ -28,6 +29,7 @@
set name=pkg.fmri \
    value=pkg:/web/server/apache-24@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary \
    value="Apache Web Server V2.4"
set name=pkg.description \
@@ -172,6 +174,7 @@
file path=usr/apache2/2.4/include/mod_core.h
file path=usr/apache2/2.4/include/mod_dav.h
file path=usr/apache2/2.4/include/mod_dbd.h
file path=usr/apache2/2.4/include/mod_http2.h
file path=usr/apache2/2.4/include/mod_include.h
file path=usr/apache2/2.4/include/mod_log_config.h
file path=usr/apache2/2.4/include/mod_proxy.h
components/web/apache24/documentation.p5m
@@ -19,6 +19,7 @@
# CDDL HEADER END
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2023 Niklas Poslovski
#
<transform dir file link hardlink path=usr/apache2/2.4/manual(/.+){0,1}$ -> \
    default facet.doc.html true>
components/web/apache24/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2021 <contributor>
# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -111,6 +112,7 @@
file path=usr/apache2/2.4/include/mod_core.h
file path=usr/apache2/2.4/include/mod_dav.h
file path=usr/apache2/2.4/include/mod_dbd.h
file path=usr/apache2/2.4/include/mod_http2.h
file path=usr/apache2/2.4/include/mod_include.h
file path=usr/apache2/2.4/include/mod_log_config.h
file path=usr/apache2/2.4/include/mod_proxy.h
components/web/apache24/pkg5
@@ -14,7 +14,7 @@
        "library/security/openssl-11",
        "library/zlib",
        "runtime/lua",
        "runtime/perl-534",
        "runtime/perl",
        "shell/ksh93",
        "system/library",
        "system/library/math",