aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2024-08-01 11:31:31 -0700
committerorbea <orbea@riseup.net>2024-08-01 11:31:31 -0700
commit6ca2505ef51adeb7ae10774fd16a14a1d57b48c5 (patch)
tree0635fc0458941c58b742b00dc9a53b02ccdf59f0
parentwww-client/netsurf: stabilize 3.11 for amd64 (diff)
downloadlibressl-6ca2505ef51adeb7ae10774fd16a14a1d57b48c5.tar.gz
libressl-6ca2505ef51adeb7ae10774fd16a14a1d57b48c5.tar.bz2
libressl-6ca2505ef51adeb7ae10774fd16a14a1d57b48c5.zip
www-servers/apache: treeclean
Signed-off-by: orbea <orbea@riseup.net>
-rw-r--r--www-servers/apache/Manifest2
-rw-r--r--www-servers/apache/apache-2.4.58-r2.ebuild257
-rw-r--r--www-servers/apache/apache-2.4.58.ebuild264
-rw-r--r--www-servers/apache/files/41_mod_http2.conf9
-rw-r--r--www-servers/apache/files/apache-2.4.57-libressl.patch40
-rw-r--r--www-servers/apache/files/apache.conf3
-rw-r--r--www-servers/apache/files/apache2.4-hardened.service25
-rw-r--r--www-servers/apache/files/libxmlv212.patch24
-rw-r--r--www-servers/apache/metadata.xml23
9 files changed, 0 insertions, 647 deletions
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
deleted file mode 100644
index 5f16518..0000000
--- a/www-servers/apache/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36
-DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
diff --git a/www-servers/apache/apache-2.4.58-r2.ebuild b/www-servers/apache/apache-2.4.58-r2.ebuild
deleted file mode 100644
index a274143..0000000
--- a/www-servers/apache/apache-2.4.58-r2.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20231019"
-GENTOO_DEVELOPER="graaff"
-GENTOO_PATCHNAME="gentoo-apache-2.4.58"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias allowmethods asis auth_basic auth_digest auth_form
-authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
-session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
-socache_shmcb speling status substitute systemd tls unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
- auth_form:session
- brotli:filter
- dav_fs:dav
- dav_lock:dav
- deflate:filter
- cache_disk:cache
- ext_filter:filter
- file_cache:cache
- lbmethod_byrequests:proxy_balancer
- lbmethod_byrequests:slotmem_shm
- lbmethod_bytraffic:proxy_balancer
- lbmethod_bybusyness:proxy_balancer
- lbmethod_heartbeat:proxy_balancer
- log_forensic:log_config
- logio:log_config
- cache_disk:cache
- cache_socache:cache
- md:watchdog
- mime_magic:mime
- proxy_ajp:proxy
- proxy_balancer:proxy
- proxy_balancer:slotmem_shm
- proxy_connect:proxy
- proxy_ftp:proxy
- proxy_hcheck:proxy
- proxy_hcheck:watchdog
- proxy_html:proxy
- proxy_html:xml2enc
- proxy_http:proxy
- proxy_http2:proxy
- proxy_scgi:proxy
- proxy_uwsgi:proxy
- proxy_fcgi:proxy
- proxy_wstunnel:proxy
- session_cookie:session
- session_dbd:dbd
- session_dbd:session
- socache_memcache:cache
- substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
- auth_digest:AUTH_DIGEST
- authnz_ldap:AUTHNZ_LDAP
- cache:CACHE
- cache_disk:CACHE
- cache_socache:CACHE
- dav:DAV
- dav_fs:DAV
- dav_lock:DAV
- file_cache:CACHE
- http2:HTTP2
- info:INFO
- ldap:LDAP
- lua:LUA
- md:SSL
- proxy:PROXY
- proxy_ajp:PROXY
- proxy_balancer:PROXY
- proxy_connect:PROXY
- proxy_fcgi:PROXY
- proxy_ftp:PROXY
- proxy_hcheck:PROXY
- proxy_html:PROXY
- proxy_http:PROXY
- proxy_http2:PROXY
- proxy_scgi:PROXY
- proxy_uwsgi:PROXY
- proxy_wstunnel:PROXY
- socache_shmcb:SSL
- socache_memcache:CACHE
- ssl:SSL
- status:STATUS
- suexec:SUEXEC
- systemd:SYSTEMD
- userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
- authn_core
- authz_core
- authz_host
- dir
- mime
- unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4.57-libressl.patch
- "${FILESDIR}"/libxmlv212.patch
-)
-
-pkg_setup() {
- # dependent critical modules which are not allowed in global scope due
- # to USE flag conditionals (bug #499260)
- use ssl && MODULE_CRITICAL+=" socache_shmcb"
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
- apache-2_pkg_setup
-}
-
-src_configure() {
- # Brain dead check.
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
- apache-2_src_configure
-}
-
-src_compile() {
- if tc-is-cross-compiler ; then
- # This header is the same across targets, so use the build compiler.
- pushd server >/dev/null
- emake gen_test_char
- tc-export_build_env BUILD_CC
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
- popd >/dev/null
- fi
-
- default
-}
-
-src_install() {
- apache-2_src_install
- local i
- local apache_tools_prune_list=(
- /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
- /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
- /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
- /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
- )
- for i in ${apache_tools_prune_list[@]} ; do
- rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
- done
-
- dobin support/apxs
-
- # Note: wait for mod_systemd to be included in some forthcoming release,
- # Then apache2.4.service can be used and systemd support controlled
- # through --enable-systemd
- systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service"
- dotmpfiles "${FILESDIR}/apache.conf"
- #insinto /etc/apache2/modules.d
- #doins "${FILESDIR}/00_systemd.conf"
-
- # Install http2 module config
- insinto /etc/apache2/modules.d
- doins "${FILESDIR}"/41_mod_http2.conf
-
- # Fix path to apache libdir
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
- tmpfiles_process apache.conf #662544
-
- # warnings that default config might not work out of the box
- local mod cmod
- for mod in ${MODULE_CRITICAL} ; do
- if ! use "apache2_modules_${mod}"; then
- echo
- ewarn "Warning: Critical module not installed!"
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
- ewarn "are highly recomended but might not be in the base profile yet."
- ewarn "Default config for ssl needs module 'socache_shmcb'."
- ewarn "Enabling the following flags is highly recommended:"
- for cmod in ${MODULE_CRITICAL} ; do
- use "apache2_modules_${cmod}" || \
- ewarn "+ apache2_modules_${cmod}"
- done
- echo
- break
- fi
- done
- # warning for proxy_balancer and missing load balancing scheduler
- if use apache2_modules_proxy_balancer; then
- local lbset=
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
- if use "apache2_modules_${mod}"; then
- lbset=1 && break
- fi
- done
- if [[ ! ${lbset} ]] ; then
- echo
- ewarn "Info: Missing load balancing scheduler algorithm module"
- ewarn "(They were split off from proxy_balancer in 2.3)"
- ewarn "In order to get the ability of load balancing, at least"
- ewarn "one of these modules has to be present:"
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
- echo
- fi
- fi
-}
diff --git a/www-servers/apache/apache-2.4.58.ebuild b/www-servers/apache/apache-2.4.58.ebuild
deleted file mode 100644
index 7eddca0..0000000
--- a/www-servers/apache/apache-2.4.58.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20231019"
-GENTOO_DEVELOPER="graaff"
-GENTOO_PATCHNAME="gentoo-apache-2.4.58"
-
-# ancient hack: bug #502384
-IUSE="split-usr"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias allowmethods asis auth_basic auth_digest auth_form
-authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
-session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
-socache_shmcb speling status substitute systemd tls unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
- auth_form:session
- brotli:filter
- dav_fs:dav
- dav_lock:dav
- deflate:filter
- cache_disk:cache
- ext_filter:filter
- file_cache:cache
- lbmethod_byrequests:proxy_balancer
- lbmethod_byrequests:slotmem_shm
- lbmethod_bytraffic:proxy_balancer
- lbmethod_bybusyness:proxy_balancer
- lbmethod_heartbeat:proxy_balancer
- log_forensic:log_config
- logio:log_config
- cache_disk:cache
- cache_socache:cache
- md:watchdog
- mime_magic:mime
- proxy_ajp:proxy
- proxy_balancer:proxy
- proxy_balancer:slotmem_shm
- proxy_connect:proxy
- proxy_ftp:proxy
- proxy_hcheck:proxy
- proxy_hcheck:watchdog
- proxy_html:proxy
- proxy_html:xml2enc
- proxy_http:proxy
- proxy_http2:proxy
- proxy_scgi:proxy
- proxy_uwsgi:proxy
- proxy_fcgi:proxy
- proxy_wstunnel:proxy
- session_cookie:session
- session_dbd:dbd
- session_dbd:session
- socache_memcache:cache
- substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
- auth_digest:AUTH_DIGEST
- authnz_ldap:AUTHNZ_LDAP
- cache:CACHE
- cache_disk:CACHE
- cache_socache:CACHE
- dav:DAV
- dav_fs:DAV
- dav_lock:DAV
- file_cache:CACHE
- http2:HTTP2
- info:INFO
- ldap:LDAP
- lua:LUA
- md:SSL
- proxy:PROXY
- proxy_ajp:PROXY
- proxy_balancer:PROXY
- proxy_connect:PROXY
- proxy_fcgi:PROXY
- proxy_ftp:PROXY
- proxy_hcheck:PROXY
- proxy_html:PROXY
- proxy_http:PROXY
- proxy_http2:PROXY
- proxy_scgi:PROXY
- proxy_uswgi:PROXY
- proxy_wstunnel:PROXY
- socache_shmcb:SSL
- socache_memcache:CACHE
- ssl:SSL
- status:STATUS
- suexec:SUEXEC
- systemd:SYSTEMD
- userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
- authn_core
- authz_core
- authz_host
- dir
- mime
- unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4.57-libressl.patch
- "${FILESDIR}"/libxmlv212.patch
-)
-
-pkg_setup() {
- # dependent critical modules which are not allowed in global scope due
- # to USE flag conditionals (bug #499260)
- use ssl && MODULE_CRITICAL+=" socache_shmcb"
- use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
- apache-2_pkg_setup
-}
-
-src_configure() {
- # Brain dead check.
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
- apache-2_src_configure
-}
-
-src_compile() {
- if tc-is-cross-compiler ; then
- # This header is the same across targets, so use the build compiler.
- pushd server >/dev/null
- emake gen_test_char
- tc-export_build_env BUILD_CC
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
- gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
- popd >/dev/null
- fi
-
- default
-}
-
-src_install() {
- apache-2_src_install
- local i
- local apache_tools_prune_list=(
- /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
- /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
- /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
- /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
- )
- for i in ${apache_tools_prune_list[@]} ; do
- rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
- done
-
- # install apxs in /usr/bin (bug #502384) and put a symlink into the
- # old location until all ebuilds and eclasses have been modified to
- # use the new location.
- dobin support/apxs
- use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
- # Note: wait for mod_systemd to be included in some forthcoming release,
- # Then apache2.4.service can be used and systemd support controlled
- # through --enable-systemd
- systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service"
- dotmpfiles "${FILESDIR}/apache.conf"
- #insinto /etc/apache2/modules.d
- #doins "${FILESDIR}/00_systemd.conf"
-
- # Install http2 module config
- insinto /etc/apache2/modules.d
- doins "${FILESDIR}"/41_mod_http2.conf
-
- # Fix path to apache libdir
- sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
- tmpfiles_process apache.conf #662544
-
- # warnings that default config might not work out of the box
- local mod cmod
- for mod in ${MODULE_CRITICAL} ; do
- if ! use "apache2_modules_${mod}"; then
- echo
- ewarn "Warning: Critical module not installed!"
- ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
- ewarn "are highly recomended but might not be in the base profile yet."
- ewarn "Default config for ssl needs module 'socache_shmcb'."
- ewarn "Enabling the following flags is highly recommended:"
- for cmod in ${MODULE_CRITICAL} ; do
- use "apache2_modules_${cmod}" || \
- ewarn "+ apache2_modules_${cmod}"
- done
- echo
- break
- fi
- done
- # warning for proxy_balancer and missing load balancing scheduler
- if use apache2_modules_proxy_balancer; then
- local lbset=
- for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
- if use "apache2_modules_${mod}"; then
- lbset=1 && break
- fi
- done
- if [[ ! ${lbset} ]] ; then
- echo
- ewarn "Info: Missing load balancing scheduler algorithm module"
- ewarn "(They were split off from proxy_balancer in 2.3)"
- ewarn "In order to get the ability of load balancing, at least"
- ewarn "one of these modules has to be present:"
- ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
- echo
- fi
- fi
-}
diff --git a/www-servers/apache/files/41_mod_http2.conf b/www-servers/apache/files/41_mod_http2.conf
deleted file mode 100644
index e4c9454..0000000
--- a/www-servers/apache/files/41_mod_http2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine SSL>
- <IfModule http2_module>
- # enable debugging for this module
- #LogLevel http2:info
-
- #Enable HTTP/2 support
- Protocols h2 h2c http/1.1
- </IfModule>
-</IfDefine>
diff --git a/www-servers/apache/files/apache-2.4.57-libressl.patch b/www-servers/apache/files/apache-2.4.57-libressl.patch
deleted file mode 100644
index 8be5a55..0000000
--- a/www-servers/apache/files/apache-2.4.57-libressl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/apache/httpd/pull/384
-
-From: orbea <orbea@riseup.net>
-Date: Thu, 7 Sep 2023 12:52:13 -0700
-Subject: [PATCH] acinclude.m4: test for OPENSSL_NO_ENGINE
-
-With >= LibreSSL 3.8.1 the engine code has been removed and
-OPENSSL_NO_ENGINE has been defined, testing for this define during
-configure will prevent implicit function declarations when using an ssl
-implementation with the engine code disabled or removed.
----
- acinclude.m4 | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -587,10 +587,22 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[
-
- dnl Run library and function checks
- liberrors=""
-+ AC_TRY_COMPILE([#include <openssl/opensslconf.h>],[
-+#if defined(OPENSSL_NO_ENGINE)
-+#error "Engine support disabled in <openssl/opensslconf.h>"
-+#endif],
-+ [AC_MSG_RESULT(OK)
-+ ac_cv_openssl_engine=yes],
-+ [AC_MSG_RESULT(FAILED)])
- AC_CHECK_HEADERS([openssl/engine.h])
- AC_CHECK_FUNCS([SSL_CTX_new], [], [liberrors="yes"])
- AC_CHECK_FUNCS([OPENSSL_init_ssl])
-- AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines RAND_egd])
-+ AC_CHECK_FUNCS([ENGINE_load_builtin_engines RAND_egd])
-+ if test "x$ac_cv_openssl_engine" = "xyes"; then
-+ AC_CHECK_FUNCS([ENGINE_init])
-+ else
-+ AC_MSG_WARN([OpenSSL engine support disabled])
-+ fi
- if test "x$liberrors" != "x"; then
- AC_MSG_WARN([OpenSSL libraries are unusable])
- fi
diff --git a/www-servers/apache/files/apache.conf b/www-servers/apache/files/apache.conf
deleted file mode 100644
index 74888d8..0000000
--- a/www-servers/apache/files/apache.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-d /run/apache2 710 root apache
-d /run/apache_ssl_mutex
-d /var/cache/apache2 750 apache apache
diff --git a/www-servers/apache/files/apache2.4-hardened.service b/www-servers/apache/files/apache2.4-hardened.service
deleted file mode 100644
index fe66567..0000000
--- a/www-servers/apache/files/apache2.4-hardened.service
+++ /dev/null
@@ -1,25 +0,0 @@
-[Unit]
-Description=The Apache HTTP Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/apache2
-ExecStart=/usr/sbin/apache2 $APACHE2_OPTS -DFOREGROUND
-ExecReload=/usr/sbin/apache2 $APACHE2_OPTS -k graceful
-ExecStop=/usr/sbin/apache2 $APACHE2_OPTS -k graceful-stop
-# We want systemd to give httpd some time to finish gracefully, but still want
-# it to kill httpd after TimeoutStopSec if something went wrong during the
-# graceful stop. Normally, Systemd sends SIGTERM signal right after the
-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
-# httpd time to finish.
-KillSignal=SIGCONT
-PrivateTmp=true
-#Hardening
-CapabilityBoundingSet=CAP_CHOWN CAP_SETGID CAP_SETUID CAP_DAC_OVERRIDE CAP_KILL CAP_NET_BIND_SERVICE CAP_IPC_LOCK
-SecureBits=noroot-locked
-ProtectSystem=full
-PrivateDevices=true
-MemoryDenyWriteExecute=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-servers/apache/files/libxmlv212.patch b/www-servers/apache/files/libxmlv212.patch
deleted file mode 100644
index 281633b..0000000
--- a/www-servers/apache/files/libxmlv212.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/apache/httpd/pull/393
-
-From bd2c4e466e0949f6f770bbb2569ce5ae9b3965c0 Mon Sep 17 00:00:00 2001
-From: ttachi <tachihara@hotmail.com>
-Date: Fri, 17 Nov 2023 22:24:45 +0900
-Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header
-
----
- modules/filters/mod_xml2enc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
-index 34f8e8ee090..0d3d13c1239 100644
---- a/modules/filters/mod_xml2enc.c
-+++ b/modules/filters/mod_xml2enc.c
-@@ -209,7 +209,7 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
-
- /* to sniff, first we look for BOM */
- if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
-- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
-+ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
- ctx->bytes);
- if (HAVE_ENCODING(ctx->xml2enc)) {
- ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
deleted file mode 100644
index 2c46080..0000000
--- a/www-servers/apache/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>apache-bugs@gentoo.org</email>
- <name>Apache project</name>
- </maintainer>
- <longdescription>
- The Apache HTTP Server Project is an effort to develop and maintain an
- open-source HTTP server for modern operating systems. The goal of this
- project is to provide a secure, efficient and extensible server that
- provides HTTP services in sync with the current HTTP standards.
- </longdescription>
- <use>
- <flag name="suexec">Install suexec with apache</flag>
- <flag name="suexec-caps">Install suexec with capabilities instead of SUID</flag>
- <flag name="suexec-syslog">Log suexec to syslog instead of to a separate file</flag>
- <flag name="static">Link in apache2 modules statically rather then plugins</flag>
- </use>
- <upstream>
- <remote-id type="github">apache/httpd</remote-id>
- </upstream>
-</pkgmetadata>