summaryrefslogtreecommitdiff
path: root/www-servers
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/Manifest.gzbin5539 -> 5543 bytes
-rw-r--r--www-servers/apache/Manifest8
-rw-r--r--www-servers/apache/apache-2.4.28.ebuild238
-rw-r--r--www-servers/apache/apache-2.4.29-r1.ebuild2
-rw-r--r--www-servers/apache/apache-2.4.32.ebuild (renamed from www-servers/apache/apache-2.4.29.ebuild)34
-rw-r--r--www-servers/pound/Manifest9
-rw-r--r--www-servers/pound/metadata.xml3
-rw-r--r--www-servers/pound/pound-2.6.ebuild55
-rw-r--r--www-servers/pound/pound-2.7d.ebuild50
-rw-r--r--www-servers/pound/pound-2.7f-r1.ebuild2
-rw-r--r--www-servers/pound/pound-2.7f.ebuild50
-rw-r--r--www-servers/varnish/Manifest2
-rw-r--r--www-servers/varnish/varnish-6.0.0.ebuild102
13 files changed, 132 insertions, 423 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0091131ab71b..d7c14d3ddc05 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
Binary files differ
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 660e2317b2dd..975846193589 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -5,13 +5,13 @@ AUX apache2.2.service 716 BLAKE2B 0006b5f5eee85bf4bae7b1b49944cedb057df974b7ed6e
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.32-20180315.tar.bz2 24833 BLAKE2B fc1c91ee9041b987519d87b93500effd1cb3e074e0ecfea2effed8c6f77792daad2fa4f81a1da3e2795adb7f3d9c62dc84dff103e36812d6c40feed2da3063a3 SHA512 11e82ba086f0eae38fb8f4b7ac4bf052a57cb0215f1758859e471ff22de87eee4d6124641a3db13c2b9c1803267a6cfed1cd11d0da7826b1e4b4e025e422de69
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.28.tar.bz2 6553163 BLAKE2B 27ccb0bda7fae6977a7e44ec220fc6ad8c027bbe14449bb5b7a560a4707c71da7cfd09923b66da9ead1d424c5062cc4a168cb53c6088ac4ff378d1b3617b3186 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a
DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
+DIST httpd-2.4.32.tar.bz2 6932708 BLAKE2B 89c1aa1dec3ddb6194552aa927c5eb7f3c8d7108b5cf90c8c62fa61652212d7f77bd98c44003f2f3b1a33423dafd186b8d8f633d44651d4ab23c61e79be79562 SHA512 36718a7bcc5cd8186874fe2a83c2feb429f703147b2191b0acfe8b18bc432c40b4bf31136e743fc7fab4c35ad87c6fbd3699252f2bc58a713791460adef9cdd0
EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
-EBUILD apache-2.4.28.ebuild 7764 BLAKE2B afc47228dfce6b4fcbf97ef45a46241d0660600873ba0931a5467ed57831146503fe180cf27b97354a57f473662ca4f629cdfc9ceccb33e708aace41b4d63866 SHA512 f7e0c6b1ae0fa522aaebcca2beaa3fc167cc3d29c4e2358f5008dd175ebd5559e20966ed28c0f989193be914616d2315828b46fbd3c658ec0a5277fded6c3e55
-EBUILD apache-2.4.29-r1.ebuild 7885 BLAKE2B 45318cc120a6957f67f4d99d06c0f00873f6a12f62543c21d5668113d07b06ded664930aa56b28e9b8d852067fb3503c7525d94311d854a168acddfdf3387539 SHA512 3cb671c024dc0caca725c0e34f8cc5fcb1d9e4b2aba2b4e0bf2074b488b0b7aa6df1a13aa8545d20ad1ba2e3c3eb935e897aa3e3ee096be219a30ae2d845f196
-EBUILD apache-2.4.29.ebuild 7811 BLAKE2B 925ebfd606a503ab3c6338287f0d2714d47ed9a9a1ed2824228361d4706eead3f5674a1a014198ee00a3f4e4401138d53891e9a12d935d045e7ffbaf1b4e05de SHA512 f58dcac1f4cad7e60b2bc9066723025cc52b2f20a7ec6850cac8c6a342fbc001b785b38e570e4113a00c6ee23e0f8d36983ab60dc3609cfb085eb41c27248b17
+EBUILD apache-2.4.29-r1.ebuild 7882 BLAKE2B e5630a0150c25e1468b042a552ee56084f15f185b11097cd8cfe0ef268493c7c77ab2275dc961a9a31234554e2c3d95af09aa15791a5dfede9df9cc6e953398c SHA512 b2e0248bac1fea9ba7fc18049a63a03b83a62569fc2b337ce066cb2674e1969bc4d6162cbf3c913c6aced78b5fcfe1c7ed78d46ff3398dd93ecbd26e8feeae11
+EBUILD apache-2.4.32.ebuild 8031 BLAKE2B 982ac1a64dce8f475d305fa33b2ae9bad368f33f3cb0da2bbbc7cf37cb903c45622970defc1aec2db8a0d9616684a7c0355d64e02866ecb4841beaa921a982cf SHA512 db8549fbe093e6e70a302190d594fbb2a031db81ad085a365a5c7eaffa97a5ddee49295afc81bb3f52729f36815105d395e3b8d852f67cf2b64b9170cca3b8a8
MISC metadata.xml 3554 BLAKE2B d415eb42fbe1614b63620c8d4f60390ca585d56b10cc7d7ab057b299f3a7046bedb2cf0d0490e36d00e497afa3ebd9a46d61e6afa8716ab55c3c4bf59389b4e2 SHA512 3165c25c9f23548ce0c5efdf5ca6fe563eaf51671c1df0cef8fafeb33c128b224fba921e7edd3ce7c194a980dbd4774889dfd57bf7e21559c659e3163532b902
diff --git a/www-servers/apache/apache-2.4.28.ebuild b/www-servers/apache/apache-2.4.28.ebuild
deleted file mode 100644
index 4b7e114398d3..000000000000
--- a/www-servers/apache/apache-2.4.28.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20160303"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.18-r1"
-
-# 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 asis auth_basic auth_digest
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-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 macro mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
-slotmem_shm speling socache_shmcb status substitute 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="
- 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
- mime_magic:mime
- proxy_ajp:proxy
- proxy_balancer:proxy
- proxy_balancer:slotmem_shm
- proxy_connect:proxy
- proxy_ftp:proxy
- proxy_html:proxy
- proxy_html:xml2enc
- proxy_http:proxy
- proxy_scgi:proxy
- proxy_fcgi:proxy
- proxy_wstunnel:proxy
- 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
- proxy:PROXY
- proxy_ajp:PROXY
- proxy_balancer:PROXY
- proxy_connect:PROXY
- proxy_ftp:PROXY
- proxy_html:PROXY
- proxy_http:PROXY
- proxy_fcgi:PROXY
- proxy_scgi:PROXY
- proxy_wstunnel:PROXY
- socache_shmcb:SSL
- ssl:SSL
- status:STATUS
- suexec:SUEXEC
- userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
- authn_core
- authz_core
- authz_host
- dir
- mime
- unixd
-"
-inherit eutils 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 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-
-DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
-
-REQUIRED_USE="apache2_modules_http2? ( ssl )"
-
-pkg_setup() {
- # dependend 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
- for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
- rm "${ED}"/$i || die "Failed to prune apache-tools bits"
- done
- for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
- rm "${ED}"/$i || die "Failed to prune apache-tools bits"
- done
- for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
- rm "${ED}"/$i || die "Failed to prune apache-tools bits"
- done
- for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; 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.
- local apxs="/usr/bin/apxs"
- cp "${S}"/support/apxs "${ED%/}/${apxs}" || die "Failed to install apxs"
- ln -s ../bin/apxs "${ED%/}/usr/sbin/apxs" || die
- chmod 0755 "${ED%/}${apxs}" || die
-
- # 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.2-hardened.service" "apache2.service"
- systemd_dotmpfilesd "${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
-}
-
-pkg_postinst() {
- apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
- # warnings that default config might not work out of the box
- 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.29-r1.ebuild b/www-servers/apache/apache-2.4.29-r1.ebuild
index 70c346ba852d..348951b22801 100644
--- a/www-servers/apache/apache-2.4.29-r1.ebuild
+++ b/www-servers/apache/apache-2.4.29-r1.ebuild
@@ -128,7 +128,7 @@ 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 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
diff --git a/www-servers/apache/apache-2.4.29.ebuild b/www-servers/apache/apache-2.4.32.ebuild
index 7f4905d82214..643b555af68d 100644
--- a/www-servers/apache/apache-2.4.29.ebuild
+++ b/www-servers/apache/apache-2.4.32.ebuild
@@ -4,9 +4,9 @@
EAPI=6
# latest gentoo apache files
-GENTOO_PATCHSTAMP="20160303"
+GENTOO_PATCHSTAMP="20180315"
GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.18-r1"
+GENTOO_PATCHNAME="gentoo-apache-2.4.32"
# IUSE/USE_EXPAND magic
IUSE_MPMS_FORK="prefork"
@@ -33,7 +33,7 @@ IUSE_MPMS_THREAD="event worker"
IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
+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 macro mime mime_magic negotiation
@@ -49,6 +49,7 @@ unixd version vhost_alias watchdog xml2enc"
# inter-module dependencies
# TODO: this may still be incomplete
MODULE_DEPENDS="
+ brotli:filter
dav_fs:dav
dav_lock:dav
deflate:filter
@@ -128,10 +129,13 @@ HOMEPAGE="https://httpd.apache.org/"
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 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+# Enable http2 by default (bug #563452)
+# FIXME: Move to apache-2.eclass once this has reached stable.
+IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
+
+CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+ apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
-CDEPEND+="
- apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
-"
DEPEND+="${CDEPEND}"
RDEPEND+="${CDEPEND}"
@@ -168,26 +172,25 @@ src_compile() {
src_install() {
apache-2_src_install
+ local i
for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
- rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+ rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
done
for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
- rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+ rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
done
for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
- rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+ rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
done
for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
- rm "${ED}/"$i || die "Failed to prune apache-tools bits"
+ 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.
- local apxs="/usr/bin/apxs"
- cp "${S}"/support/apxs "${ED%/}/${apxs}" || die "Failed to install apxs"
- ln -s ../bin/apxs "${ED%/}/usr/sbin/apxs" || die
- chmod 0755 "${ED%/}${apxs}" || die
+ dobin support/apxs
+ 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
@@ -200,6 +203,9 @@ src_install() {
# 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() {
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index 0ed2fab35322..a9cbe07b4dcb 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -1,10 +1,5 @@
AUX pound-2.2.cfg 906 BLAKE2B 82d6562a64099e11531340853ca49e347eea5b4c2c4b6c93dff89d30725d84045cf24c8add4454375713f2fbd511a581346ebd85dfcd938e64daf1cdf91b7220 SHA512 9471e5abe3e0ee83165ed01a7081a4d14075c6c21b9f9d7c3fb239aa78c38eae74394a7c7e7e7753d218a7ce5cae388823570d19b702a829baa93e949a8946b8
AUX pound.init-1.9 495 BLAKE2B 9489ff9c18d6524dfb5b3b9af1f67898ac32b5e8ff2432b430dd91ea02f37d0e8c3447e0788e781438a93fbb0420d9d079bf7f68d36b092d4c0be56f0f19b853 SHA512 fab1936ce907bdb5b215eada2c05025bd4dd158d0dfb0cdeb9f32ec4284bcdc75625ed7933913d080c3c26edbd8dcbbd197a729fa9c130fbff12d7bfdfd8d41f
-DIST Pound-2.6.tgz 180595 BLAKE2B 614507fb1e5373dd5cb340004dd7ffb7be3f08735168381c0bb2f62e463de3c3a14230f354e5eaa0bc359ba7c5ac531acb4a812af5b1d452055e43727c495e55 SHA512 ec397740672ab3784322136e9e0ab7ac059c888453f2bdaf00cf64795a0ff9985d9d60a77a78491f64f2d0a63cce0b18a5df4f9b74a97ab9065a591ac046ad36
-DIST Pound-2.7d.tgz 184801 BLAKE2B 005383acc65401a29f9d43705f6ca03b62a788b048bb4e031f6da41d7e5410be3573faa7b59420e457897b4dd5114a72c46b9f6f6789c6678a36b1940b98c94c SHA512 3a64a910327c3acbc43daaaca28612fe5f98f89937612844fc2a4de9d638499465783b09782daceda0a10f8cfdf396d233fa231fb967b7889213898078015416
DIST Pound-2.7f.tgz 186719 BLAKE2B 39a31b43c5945db1b5ad008e2f43d3026728ea5bdc3de0fa8c0b68a743d0bea4b86dd61a527ea140e6b0546732f0c66c863e78131432af32ab5b0874a7c1f705 SHA512 292f4f7b4363365829f204b687080eae9e17b9a67ae7eb6021eb5a028321191d97abd9633d5664db5ebca6467795f73a787be4a0bd29360d737865930ff81830
-EBUILD pound-2.6.ebuild 1286 BLAKE2B 017288f682d0838527413816f953b619f1c66b9b8fb3f82f3c55b39cf3379c22eb566b8bd44f2cfec10dbdfa6686c9ce56527775498001ffffc8a354470b93a8 SHA512 79256196c2bf358baedac43f7522be90e734ac4dff8c6c3f41c9d5aff0b355312346959ed2f2987dd7a9f751167eaa0621c510ce30fb5c6fefa033709e508e03
-EBUILD pound-2.7d.ebuild 1222 BLAKE2B 87842fd6e042f7044d171e9eafa5c6b4fe08aeca1a6d6d092abd5088b1fa91a4a5331cc74a46d7131853e6302829ff193c5742437ff9c12a5006075fd5ca2c6d SHA512 b5d3c6f85a75762738bd0e1973d9adec12d560583eb3569a16f68aac68346640def51c74a780aaf8fbee723ff2c115fa822aae8991d0ec9a883eecf01e04523c
-EBUILD pound-2.7f-r1.ebuild 1279 BLAKE2B f1690eb17e0f325448ad881baf53f43397391a0f1302d210eafc39eb6060a875c95a09732d172a7d1dfa260d6e1bec18ad3c683af7f37460d96fcb4c6a86b558 SHA512 6d3665bdca1480da2ec16d8e91475247fcbbbc1457fd5b7b497c31e718869d145f39e72f179c481742d4d610d4e6ba8da0c629c13628761fe45050cdf3e9fd69
-EBUILD pound-2.7f.ebuild 1222 BLAKE2B 87842fd6e042f7044d171e9eafa5c6b4fe08aeca1a6d6d092abd5088b1fa91a4a5331cc74a46d7131853e6302829ff193c5742437ff9c12a5006075fd5ca2c6d SHA512 b5d3c6f85a75762738bd0e1973d9adec12d560583eb3569a16f68aac68346640def51c74a780aaf8fbee723ff2c115fa822aae8991d0ec9a883eecf01e04523c
-MISC metadata.xml 753 BLAKE2B c84f0bfc2b36d53ea3b01197d19ec55b974d6c035ac67988c15ca68880f795727c63abee9765720dc851140d1a35c98c27b6e722bdade2fb4d15c1cd28656fe7 SHA512 0a7342b6953be65891467b273dd33fc150b778ed23f330517c49c28e87daa9aa9dfcf3244e550d168faf181a725ba1b5a343a8406d6e46256f1d7e601fd5d926
+EBUILD pound-2.7f-r1.ebuild 1278 BLAKE2B 70762f8c6cb41a322898fbc64076a4f735595d80a10140f73f9efff0addf49175fbf00a299bec076748ee1bff12471fb41d4e930fba9c1dcad56bfda989fac12 SHA512 8b053fe3105ebbe0b846a8dd1beed12216017dc33b3a8f8f1e68e13d74246dc69e1a3add52d7df7cb4308548fc25e3b5e4af686e7805ac85e7f6d386bf808d51
+MISC metadata.xml 658 BLAKE2B 877fb06accfc516463028171c8d676d8e986eea0e5ff797202e82c47a54c4071d76d09d9254a465a14e40f2ed6845494435914fc7d07ece3168242f9a671c732 SHA512 b612e71ab896e042b83bd9a54478cf6f7467b46aa69ab281455cf5088529209299c332c2c8b2fffa8255c349460d9c78176dca484d8a739658b70f06a7697507
diff --git a/www-servers/pound/metadata.xml b/www-servers/pound/metadata.xml
index 5abcc6461591..7c2ee308598d 100644
--- a/www-servers/pound/metadata.xml
+++ b/www-servers/pound/metadata.xml
@@ -12,7 +12,4 @@
SSL wrapper for those Web servers that do not offer it natively. Pound is
distributed under the GPL - no warranty, it's free to use, copy and give away.
</longdescription>
- <use>
- <flag name="dynscaler">Enable dynamic rescaling of back-end priorities</flag>
- </use>
</pkgmetadata>
diff --git a/www-servers/pound/pound-2.6.ebuild b/www-servers/pound/pound-2.6.ebuild
deleted file mode 100644
index d7d176e63a5e..000000000000
--- a/www-servers/pound/pound-2.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-MY_P=${P/p/P}
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="http://www.apsis.ch/pound/"
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc x86"
-IUSE="dynscaler"
-
-DEPEND="dev-libs/libpcre
- dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- econf \
- $(use_enable dynscaler)
-}
-
-src_install() {
- dodir /usr/sbin
- cp "${S}"/pound "${D}"/usr/sbin/
- cp "${S}"/poundctl "${D}"/usr/sbin/
-
- doman pound.8
- doman poundctl.8
- dodoc README FAQ
-
- dodir /etc/init.d
- newinitd "${FILESDIR}"/pound.init-1.9 pound
-
- insinto /etc
- newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
- elog "No demo-/sample-configfile is included in the distribution -"
- elog "read the man-page for more info."
- elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
- echo
- ewarn "You will have to upgrade you configuration file, if you are"
- ewarn "upgrading from a version <= 2.0."
- echo
- ewarn "The 'WebDAV' config statement is no longer supported!"
- ewarn "Please adjust your configuration, if necessary."
- echo
-}
diff --git a/www-servers/pound/pound-2.7d.ebuild b/www-servers/pound/pound-2.7d.ebuild
deleted file mode 100644
index 79e7d10fc790..000000000000
--- a/www-servers/pound/pound-2.7d.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P=${P/p/P}
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="http://www.apsis.ch/pound/"
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
- dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
- dodir /usr/sbin
- cp "${S}"/pound "${D}"/usr/sbin/
- cp "${S}"/poundctl "${D}"/usr/sbin/
-
- doman pound.8
- doman poundctl.8
- dodoc README FAQ
-
- dodir /etc/init.d
- newinitd "${FILESDIR}"/pound.init-1.9 pound
-
- insinto /etc
- newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
- elog "No demo-/sample-configfile is included in the distribution -"
- elog "read the man-page for more info."
- elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
- echo
- ewarn "You will have to upgrade you configuration file, if you are"
- ewarn "upgrading from a version <= 2.0."
- echo
- ewarn "The 'WebDAV' config statement is no longer supported!"
- ewarn "Please adjust your configuration, if necessary."
- echo
-}
diff --git a/www-servers/pound/pound-2.7f-r1.ebuild b/www-servers/pound/pound-2.7f-r1.ebuild
index 661d6832097c..e87f5a3e4cc2 100644
--- a/www-servers/pound/pound-2.7f-r1.ebuild
+++ b/www-servers/pound/pound-2.7f-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
IUSE="libressl"
DEPEND="dev-libs/libpcre
diff --git a/www-servers/pound/pound-2.7f.ebuild b/www-servers/pound/pound-2.7f.ebuild
deleted file mode 100644
index 79e7d10fc790..000000000000
--- a/www-servers/pound/pound-2.7f.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P=${P/p/P}
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="http://www.apsis.ch/pound/"
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
- dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
- dodir /usr/sbin
- cp "${S}"/pound "${D}"/usr/sbin/
- cp "${S}"/poundctl "${D}"/usr/sbin/
-
- doman pound.8
- doman poundctl.8
- dodoc README FAQ
-
- dodir /etc/init.d
- newinitd "${FILESDIR}"/pound.init-1.9 pound
-
- insinto /etc
- newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
- elog "No demo-/sample-configfile is included in the distribution -"
- elog "read the man-page for more info."
- elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
- echo
- ewarn "You will have to upgrade you configuration file, if you are"
- ewarn "upgrading from a version <= 2.0."
- echo
- ewarn "The 'WebDAV' config statement is no longer supported!"
- ewarn "Please adjust your configuration, if necessary."
- echo
-}
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 63341a4579b0..01f24926833a 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -12,8 +12,10 @@ DIST varnish-4.0.5.tgz 1947888 BLAKE2B d921dc6f2abae7b0bd1816470fd41f8555c02a026
DIST varnish-4.1.8.tgz 2254772 BLAKE2B acadf4079d58bb8f0dc5e24713aba7f2786ca6f06a683465b1564bacd986e209d858f9a3100cfb7586fa5d17f7e5f4d8425ece10c609bb3412d3adafa6ad0d05 SHA512 c642359118d87e8713d2ccf817da317a454a0f9ae6f7a07da1d10b5076aa7e5d7dcc203ef71ae19d56b7592db0c66b4ca96cb43d5fa0e6aa588d1dc8e03e026e
DIST varnish-5.1.3.tgz 2643223 BLAKE2B 85bae87785da1284d7d916b8948a0984eea9cf07e96012255435ba04c28e8078e5dad893946bbc12da6cbe9326699458f0e3af6be55cb5e7bba4e622724ddac2 SHA512 a10c317dc38ddff139ca8153f6388955df449c3abeb4d4f069b632ba2b32064a2827ab05fa8515994b251a68507fc3a7bf4e08eacc991fc03283ab234b9efd0a
DIST varnish-5.2.1.tgz 2827676 BLAKE2B 6f50a55a9b16d137eaec59aea98a0179b808bb67fc3de26c9b0924b9937a3688b7f9db45d2f0a71be2b7c6f77bfd47cd22e7b898348b5236114572b5bb33ff22 SHA512 2e979983c7f2325e289768752cc474dc3032c3420de65ccfd5871098c076aecf18e962b04308ecb1860f542fd6f6418dc79220fdd6cf4a75f7476a733faa589c
+DIST varnish-6.0.0.tgz 3033621 BLAKE2B 8fb3c8bf64527476251500ebf809dcff927c8097811e500172d489dd02828981e92034d8c95b8b6d183381d8f3a0fdba633451e8ab17d40d56f7727376378d68 SHA512 39bae462fe40bda9b7c93114ab8256c838a7d67f1a9f7397c37ad090163a33232676120eb7609d0512684a563d8e02c1c2ff5e1b9da0ddedef2250db51c3cc79
EBUILD varnish-4.0.5.ebuild 2050 BLAKE2B 22e332f95d1138577e37deebee8e0e77f11bb1ead55f672cd67db4765b3d3e8ae5854b940d59a652ec6619c56a5e3a379f425c39780685c0e8fa7a54869a2141 SHA512 b1520598b99b94f29afd63305470e06fc9a8ef4f6d816cc56390b73fb980cbffcd62488e644e4eaa56991445f153ff39661a04726babbb89e574bca3f891a796
EBUILD varnish-4.1.8.ebuild 2208 BLAKE2B 6a0509906c324ead94dc1706dfcb22156d04c2390615acd541277d90c25fe2e0bf4e96d1210d03f8f886711b67b2deb6fa635d14ef4fe249ab7b71bcf350fdf3 SHA512 166fe6d8e1d89fbf4064f2d6995b00156bbca7920b1131a6fbbde45605d26fdfaf54dadff626ed72546fdfd66ccdec20efb31a526c2ff3336261da2f31d6b84e
EBUILD varnish-5.1.3.ebuild 2213 BLAKE2B 33a0b63f322d721c352748ac54b9e78c3df4b1916950bf698960bab57cfabfd39efa1c7a5ca4ea945f77fbebd943cfdf2579eb92e21a98bf24690a8a537b14b6 SHA512 290570d1a668f5ed0a4acda504313d5264c9d0dc7dc2d49a237b4bfa16c5c5b31749c48fa20e79fc06cb54a5ad100231da6fef00cdb75362a926f123ff17320f
EBUILD varnish-5.2.1.ebuild 2267 BLAKE2B 6b6886e00415115a3649eee695bbbd4bbc2a7ab8590edf9cd7951a50cdf6f6e32bd3384514bd3330086dfab18dfc5a39c79db36f40cec76a9c66cdbc4e26ce3b SHA512 d3dec4d67b7e22981ecb643cefdb8729e51cb7545178eee996d96e15875e6373cf9b2956e29b3acc888b5ec6db430164096f0ce9e2bb24b295c01435870d27a3
+EBUILD varnish-6.0.0.ebuild 2242 BLAKE2B 985fa674cd406733137c8e32772044818422431639de32162b8fd1baab8cee6449d601d7ee6ff24428762755407e2275e7a95cb9315e3d2f2ffe18b05dcaa472 SHA512 ff7a0fa8e3beb7731df50d0ff910b224291cd2ff1bdea3623a3a1ccc436b2611d3487681c7273a717db1b387f96699a79ad2e8c56bf5de371ad4dc36c973d582
MISC metadata.xml 1258 BLAKE2B 7022b186f4fcffa296f034811c1bc037c29f6d21b990d2c80771cca9243ed8406341908a2ee32ded7ac97573b6a809798cadbb9aa6c9ad9f100a7b7e251fb720 SHA512 052377552103c4ee337e931cc84d5e86d1381473484bb2f1133143219cb3d9ba9b4a78cdd411f3523c424f7637df51bbd2b9c0c9a22520314152f811644f04b7
diff --git a/www-servers/varnish/varnish-6.0.0.ebuild b/www-servers/varnish/varnish-6.0.0.ebuild
new file mode 100644
index 000000000000..fd1d1a8b7caf
--- /dev/null
+++ b/www-servers/varnish/varnish-6.0.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit user autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+ sys-libs/readline:0=
+ dev-libs/libpcre[jit?]
+ jemalloc? ( dev-libs/jemalloc )
+ sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${CDEPEND}
+ sys-devel/gcc"
+
+DEPEND="
+ ${CDEPEND}
+ dev-python/docutils
+ virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+pkg_setup() {
+ ebegin "Creating varnish user and group"
+ enewgroup varnish
+ enewuser varnish -1 -1 /var/lib/varnish varnish
+ eend $?
+}
+
+src_prepare() {
+ # Remove -Werror bug #528354
+ sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+ # Upstream doesn't put varnish.m4 in the m4/ directory
+ # We link because the Makefiles look for the file in
+ # the original location
+ ln -sf ../varnish.m4 m4/varnish.m4
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable jit pcre-jit ) \
+ $(use_with jemalloc)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+ newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+ newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+ newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+ newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+ newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+ newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+ diropts -m750
+
+ keepdir /var/lib/varnish
+ keepdir /var/log/varnish
+
+ systemd_dounit "${FILESDIR}/${PN}d.service"
+
+ insinto /etc/varnish/
+ doins lib/libvmod_std/vmod.vcc
+ doins etc/example.vcl
+
+ dodoc README.rst
+ dodoc doc/changes.rst
+
+ fowners root:varnish /etc/varnish/
+ fowners varnish:varnish /var/lib/varnish/
+ fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 19:21:30 +0000