diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-03-26 11:17:56 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-03-26 11:19:22 +0200 |
commit | 551a46a19cefaf4502e7f80823fe4cae7a56cdac (patch) | |
tree | bf5970cce88e2e1ff847c4eb6397a933a831380f /www-servers | |
parent | net-analyzer/wireshark: Old. (diff) | |
download | gentoo-551a46a19cefaf4502e7f80823fe4cae7a56cdac.tar.gz gentoo-551a46a19cefaf4502e7f80823fe4cae7a56cdac.tar.bz2 gentoo-551a46a19cefaf4502e7f80823fe4cae7a56cdac.zip |
www-servers/apache: Bye bye apache-2.2
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/apache/Manifest | 2 | ||||
-rw-r--r-- | www-servers/apache/apache-2.2.34.ebuild | 114 | ||||
-rw-r--r-- | www-servers/apache/files/apache2.2.service | 19 |
3 files changed, 0 insertions, 135 deletions
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 93c910dd7178..2c8bcbc430aa 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,8 +1,6 @@ -DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a DIST gentoo-apache-2.4.18-r1-20160303.tar.bz2 24505 BLAKE2B 504deabe5ee9e2b32f44e8ea6cde6f01e7f26643ca05eb0aaf860ab6440d821566f83b5c9aacb2201382f9326974c7dddea4f4289d9da5857762611f424f0395 SHA512 68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d DIST gentoo-apache-2.4.27-20170918.tar.bz2 24850 BLAKE2B a832c2c7a575e167b72214f325cb85922c49969ea8cc4b5821ce97b1d4028ab56852bf416cb32c99f2b2b356545b6fea0af0fa4f6e13bf001393b468357cbcfb SHA512 c58a9a0b171188ff163f6b45c47f243797d4050cf461ba1a642115350285879005be6496cee2031bffaccc0d8beda4c27de87afa2ded17cbe559f792eb7c00e8 DIST gentoo-apache-2.4.33-20180323.tar.bz2 24804 BLAKE2B 42636b36a917d59a016c1143014292d1d34080f295dbfff54c39b82898f37cf280a0a812c70ebc3544dd93c609a62f098816275f0dea0b94ac4b0fdcabb77c9c SHA512 54bc375908eed2c5f590e4d24eae01b502b366425ddec36113874267a0186f0ee815659f6ed92f91455dfefc16d6a486356694c762fcbe19aed01f8db8da01f7 -DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269 diff --git a/www-servers/apache/apache-2.2.34.ebuild b/www-servers/apache/apache-2.2.34.ebuild deleted file mode 100644 index e17bfb660c57..000000000000 --- a/www-servers/apache/apache-2.2.34.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20170918" -GENTOO_DEVELOPER="whissi" -GENTOO_PATCHNAME="gentoo-apache-2.2.34" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="itk peruser prefork" -IUSE_MPMS_THREAD="event worker" - -IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon -authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default -authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta -charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio -env expires ext_filter file_cache filter headers ident imagemap include info -log_config log_forensic logio mem_cache mime mime_magic negotiation proxy -proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite -reqtimeout setenvif speling status substitute unique_id userdir usertrack -version vhost_alias" -# 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=" - dav_fs:dav - dav_lock:dav - deflate:filter - disk_cache:cache - ext_filter:filter - file_cache:cache - log_forensic:log_config - logio:log_config - mem_cache:cache - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_connect:proxy - proxy_ftp:proxy - proxy_http:proxy - proxy_scgi:proxy - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - disk_cache:CACHE - file_cache:CACHE - info:INFO - ldap:LDAP - mem_cache:CACHE - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_ftp:PROXY - proxy_http:PROXY - ssl:SSL - status:STATUS - suexec:SUEXEC - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authz_host - dir - mime -" - -inherit apache-2 systemd 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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - apache-2_src_configure -} - -src_install() { - apache-2_src_install - - # 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. - local apxs_dir="/usr/bin" - dodir ${apxs_dir} - mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die - ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die - - systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" - systemd_dotmpfilesd "${FILESDIR}/apache.conf" -} diff --git a/www-servers/apache/files/apache2.2.service b/www-servers/apache/files/apache2.2.service deleted file mode 100644 index 76f783a423b9..000000000000 --- a/www-servers/apache/files/apache2.2.service +++ /dev/null @@ -1,19 +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 - -[Install] -WantedBy=multi-user.target |