summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/nginx/Makefile5
-rw-r--r--www/nginx/distinfo76
-rw-r--r--www/nginx/options.mk40
-rw-r--r--www/nginx/patches/patch-ab12
-rw-r--r--www/nginx/patches/patch-src_os_unix_ngx__files.c17
5 files changed, 61 insertions, 89 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index fa2a0931ea2..33359783d95 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2016/06/08 19:24:53 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2016/06/15 14:49:11 fhajny Exp $
-DISTNAME= nginx-1.8.1
+DISTNAME= nginx-1.10.1
MAINTAINER= joerg@NetBSD.org
-PKGREVISION= 3
.include "../../www/nginx/Makefile.common"
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 9d18fe431fc..78d0ad74152 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,48 +1,48 @@
-$NetBSD: distinfo,v 1.51 2016/01/26 17:54:19 joerg Exp $
+$NetBSD: distinfo,v 1.52 2016/06/15 14:49:11 fhajny Exp $
SHA1 (array-var-nginx-module-0.04.tar.gz) = 1fd3bdd05c2d1d7667ed6f7baa612ddf7f630df3
RMD160 (array-var-nginx-module-0.04.tar.gz) = a751a2ce87dcfb88d072779097b4df9f42a415e4
SHA512 (array-var-nginx-module-0.04.tar.gz) = a45905338d2fdac002eaa43f7bff1fa48edcdcf9299de5c47725c2f6d86830f390fbdefc0ebe7492222e53de113439ea754ce63e20dc0245cf82e3247bb855f2
Size (array-var-nginx-module-0.04.tar.gz) = 10777 bytes
-SHA1 (echo-nginx-module-0.58.tar.gz) = 823fb32be19bde5eb07cb4e3aae8d8f4bb46e1a4
-RMD160 (echo-nginx-module-0.58.tar.gz) = 36d8aa8cd01ef492b119a322932c5b5841df4e35
-SHA512 (echo-nginx-module-0.58.tar.gz) = 03bca117b2a7f9fa78450d24b2a25fcf19528a37d842dbd740e9ccf0f3ad6652d9927757f1317441438ec1e474211e2b4c84829015a51c5e25ca9f2dbd3809a0
-Size (echo-nginx-module-0.58.tar.gz) = 64779 bytes
-SHA1 (encrypted-session-nginx-module-0.04.tar.gz) = 59b4b52b1090ad396ea7402a9f047d4609e5e6fe
-RMD160 (encrypted-session-nginx-module-0.04.tar.gz) = f1f2b2b3cddd438010958371384256b071ff8f43
-SHA512 (encrypted-session-nginx-module-0.04.tar.gz) = e75139592d10fde5bf406f02ef69cf3d399854d07f69009779572b0b02afe62f130ceae734324cea526936e19096ad9acf645057c142aa6179aa294a3bf4c4e4
-Size (encrypted-session-nginx-module-0.04.tar.gz) = 10006 bytes
-SHA1 (form-input-nginx-module-0.11.tar.gz) = fcb2fe7a4229e9e36151bdf3cfae2dd72435adb9
-RMD160 (form-input-nginx-module-0.11.tar.gz) = 74da6550482c7a2b0c6f9fdc31b55be658e65bc8
-SHA512 (form-input-nginx-module-0.11.tar.gz) = 914565f96598cd5bade24385ae711f63d01a80565c9f69f91d836f11e46bfa0ba3ca14bdf873b3f69125570c0d3783073591b40d7e6800fa74f5f8f892d3c7bd
-Size (form-input-nginx-module-0.11.tar.gz) = 10699 bytes
-SHA1 (headers-more-nginx-module-0.261.tar.gz) = e17f85b4e21633919a789d34aee8518d54147f1e
-RMD160 (headers-more-nginx-module-0.261.tar.gz) = d71f5b201712e10b937ec6f4f1ccad47052d0582
-SHA512 (headers-more-nginx-module-0.261.tar.gz) = 252b5adc86f114460a956b38cca448917124523730e95ffc822a953232da9835e5ee663c65077413d655a8887ac692872b5de115e3cf4123463df7a84f759c3f
-Size (headers-more-nginx-module-0.261.tar.gz) = 28022 bytes
-SHA1 (lua-nginx-module-0.9.16.tar.gz) = 5c1e147c6f680bf43899650a37c81a1f67b65b0d
-RMD160 (lua-nginx-module-0.9.16.tar.gz) = 6d72a6f7ba1742ed477a0f146d44fd1c48d19bb3
-SHA512 (lua-nginx-module-0.9.16.tar.gz) = 01be7dca10c1c1f25d2b8e65c9944662d5ba0235ecccba1143f7c30dcb76fad847a4a2fa7a34055906a33d50ecf8fb463aac9f76581390035a88e48c9b9f5319
-Size (lua-nginx-module-0.9.16.tar.gz) = 523900 bytes
+SHA1 (echo-nginx-module-0.59.tar.gz) = 83cedd03405e86dde573d5c90a24ac6d7bf25ad5
+RMD160 (echo-nginx-module-0.59.tar.gz) = 2caa40d531c0e19f0cdaa93c854e169f8f9375a2
+SHA512 (echo-nginx-module-0.59.tar.gz) = 803c431da00160f62ee98e126d244fb97b2d9dca08137daabf55504f012598f8e2c689841c2e8bfced5f07ce24c46933c49b3feffc09ca0b5f07dc10e34546ee
+Size (echo-nginx-module-0.59.tar.gz) = 52703 bytes
+SHA1 (encrypted-session-nginx-module-0.05.tar.gz) = 0d96ec039f98fae95ce315946bd4ad12128a426c
+RMD160 (encrypted-session-nginx-module-0.05.tar.gz) = 2e8f92d1841c9352cf9c2c775565a60cb840d2ff
+SHA512 (encrypted-session-nginx-module-0.05.tar.gz) = eb11560945f614b110034a7fc461a23057cd8fdc50af7abaaec00fb4991c4dfec25ddfc56d3458de5bd601f0d9990dd235605432d46c5a1852be2f69317a5761
+Size (encrypted-session-nginx-module-0.05.tar.gz) = 10462 bytes
+SHA1 (form-input-nginx-module-0.12.tar.gz) = 03d3befb5ecc6aba5f4f871d18c490e206906022
+RMD160 (form-input-nginx-module-0.12.tar.gz) = 954f13e7ef7afe0d859b543a57482c3dbdf33ced
+SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
+Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
+SHA1 (headers-more-nginx-module-0.30.tar.gz) = a188a399f3e365a0831585a9d7aa0e6ed1a75f0d
+RMD160 (headers-more-nginx-module-0.30.tar.gz) = 68fc349ccf41b8755d75a7415d1ae968665f1593
+SHA512 (headers-more-nginx-module-0.30.tar.gz) = 378f2c4b4fbf580e59c8ad3ef5fcb617e4669b7b506a0ae87e4e0bc920d34e16fe55565e48dd57e7b6c37ae8b407646ca64f5d84a2fbbe2d41d719c7643c1a82
+Size (headers-more-nginx-module-0.30.tar.gz) = 27793 bytes
+SHA1 (lua-nginx-module-0.10.5.tar.gz) = a33590654c0624c45eb64a2f1443977ab7fa8ebe
+RMD160 (lua-nginx-module-0.10.5.tar.gz) = 0117c85d034f7424f0fbf29209fb0a39c61fa668
+SHA512 (lua-nginx-module-0.10.5.tar.gz) = a02b8614fdcd063b1087a3114f05402c707343ff3bceabaca1fb98531ba30edea1a525fc45e2f5a49ff155de8d6f9e1155e8870e463476da5703acfd5f8fc3fc
+Size (lua-nginx-module-0.10.5.tar.gz) = 579793 bytes
SHA1 (naxsi-0.54.tar.gz) = d5db25db19a564358af7763d4935e978d05bf6f5
RMD160 (naxsi-0.54.tar.gz) = 094b09c198cf690ec24b3e9d3763647e06ebee64
SHA512 (naxsi-0.54.tar.gz) = 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43
Size (naxsi-0.54.tar.gz) = 163809 bytes
-SHA1 (nginx-1.8.1.tar.gz) = a99dc2ee4c60e3134891cd13c111f42901252c2b
-RMD160 (nginx-1.8.1.tar.gz) = 0bbb05a3d33d4b4a7c8eb626a7bd106a64ef2f81
-SHA512 (nginx-1.8.1.tar.gz) = 546eba1749af0034cb8b924d2432be2f0e82a75c545aa929391ef7234103c3f29376235a2ef1363b120e1825cda15aeb085a05f9ce3596c88466e112e82aa882
-Size (nginx-1.8.1.tar.gz) = 833473 bytes
-SHA1 (nginx_http_push_module-0.692.tar.gz) = 72103084cad8f4d3d9a49a6b04cf780e4541605d
-RMD160 (nginx_http_push_module-0.692.tar.gz) = 9d2be16074cf28115af0f1d8f3646937cda649ad
-SHA512 (nginx_http_push_module-0.692.tar.gz) = 79821cacf5db4b1309e3f1c8d6980f83b1093dd3f291db5298bfdeb0d889fc0629625dcf3135d1cf7554b43308ef7172a4f40596928ab3069426801177ed3c1c
-Size (nginx_http_push_module-0.692.tar.gz) = 29119 bytes
-SHA1 (ngx_devel_kit-0.2.19.tar.gz) = 888635e80a8a0e6242b8e9b684ff60ffa70845a2
-RMD160 (ngx_devel_kit-0.2.19.tar.gz) = 64d3737bc4cc948c1363cce80d70e5260878811e
-SHA512 (ngx_devel_kit-0.2.19.tar.gz) = 915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657
-Size (ngx_devel_kit-0.2.19.tar.gz) = 65029 bytes
-SHA1 (set-misc-nginx-module-0.29.tar.gz) = 83c9ae27f3ea148023edc5c7611d6a0a48405082
-RMD160 (set-misc-nginx-module-0.29.tar.gz) = c6b403fa9f422bf666d079b84dc2f3ce9ae740f3
-SHA512 (set-misc-nginx-module-0.29.tar.gz) = 8dd2e1bf29e04e21b2aa4e7e72d07094b2c55105958643cf63b4a9ef149b508e3c80a90864a4ed5f2f1b495056f29eeda67fc79a392b240ed71437e3bbb6adf9
-Size (set-misc-nginx-module-0.29.tar.gz) = 35495 bytes
+SHA1 (nginx-1.10.1.tar.gz) = 9c5d4e06d309bbe2efa41f09dd53912e3c3d3a75
+RMD160 (nginx-1.10.1.tar.gz) = fc5c35bf54166c5ff2a58af19a36882cd64b1dd5
+SHA512 (nginx-1.10.1.tar.gz) = fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1
+Size (nginx-1.10.1.tar.gz) = 909077 bytes
+SHA1 (nginx_http_push_module-0.731.tar.gz) = 353f3ef3d013edfcc78ddba0237a9ce7dca633b4
+RMD160 (nginx_http_push_module-0.731.tar.gz) = d35d7138d3b4dd20076b1026c420f03c68177f99
+SHA512 (nginx_http_push_module-0.731.tar.gz) = b95e6e88236d920e18c927a5bdf7d84210ba34b234e7c20ba09d114337a4494535c94c7e84926e5479b23d4eba4e2f1db0a3e7d8b017c9907a4a824cd25098d8
+Size (nginx_http_push_module-0.731.tar.gz) = 50346 bytes
+SHA1 (ngx_devel_kit-0.3.0.tar.gz) = b556d068db23037be30436af559795f45dd93c67
+RMD160 (ngx_devel_kit-0.3.0.tar.gz) = beb2736eb06e8e26f60643623553789346f653da
+SHA512 (ngx_devel_kit-0.3.0.tar.gz) = 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
+Size (ngx_devel_kit-0.3.0.tar.gz) = 66455 bytes
+SHA1 (set-misc-nginx-module-0.30.tar.gz) = a56b4d9bd33df2117803c93e1edde8b8bcd6e507
+RMD160 (set-misc-nginx-module-0.30.tar.gz) = 6eec9e0828e4ef6339ecc5e53bf4580cf1e18fc3
+SHA512 (set-misc-nginx-module-0.30.tar.gz) = f081fc7e8e03f1a61b665d8798999f14d6516c317a039e35635f6368188f73a583c3320a5d41f000868b87e5c78e4796168e9d3d3a68325f3c642bf5b3458e2e
+Size (set-misc-nginx-module-0.30.tar.gz) = 28584 bytes
SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
-SHA1 (patch-ab) = 0925a163db1ec36142fc3c32545f0abc1c5545c8
+SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 64c5c29ac0f..c7e3d37a47e 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,17 +1,11 @@
-# $NetBSD: options.mk,v 1.35 2015/12/10 19:33:41 shattered Exp $
+# $NetBSD: options.mk,v 1.36 2016/06/15 14:49:11 fhajny Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
pcre push realip ssl sub uwsgi image-filter \
debug status nginx-autodetect-cflags echo \
set-misc headers-more array-var encrypted-session \
- form-input perl gzip
-.if !empty(NGINX_HTTP_V2)
-# nginx 1.9.5+ renamed spdy to v2
-PKG_SUPPORTED_OPTIONS+= v2
-.else
-PKG_SUPPORTED_OPTIONS+= spdy
-.endif
+ form-input perl gzip v2
PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
@@ -51,11 +45,7 @@ CONFIGURE_ARGS+= --with-http_dav_module
CONFIGURE_ARGS+= --with-http_flv_module
.endif
-.if !empty(PKG_OPTIONS:Mspdy) && empty(NGINX_HTTP_V2)
-CONFIGURE_ARGS+= --with-http_spdy_module
-.endif
-
-.if !empty(PKG_OPTIONS:Mv2) && !empty(NGINX_HTTP_V2)
+.if !empty(PKG_OPTIONS:Mv2)
CONFIGURE_ARGS+= --with-http_v2_module
.endif
@@ -100,7 +90,7 @@ NEED_NDK= yes
. endif
.endfor
.if defined(NEED_NDK) || make(makesum)
-NDK_VERSION= 0.2.19
+NDK_VERSION= 0.3.0
NDK_DISTNAME= ngx_devel_kit-${NDK_VERSION}
NDK_DISTFILE= ${NDK_DISTNAME}.tar.gz
SITES.${NDK_DISTFILE}= -https://github.com/simpl/ngx_devel_kit/archive/v${NDK_VERSION}.tar.gz
@@ -114,7 +104,7 @@ CONFIGURE_ENV+= LUAJIT_INC=${PREFIX}/include/luajit-2.0
CONFIGURE_ARGS+= --add-module=../${LUA_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
-LUA_VERSION= 0.9.16
+LUA_VERSION= 0.10.5
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz
@@ -125,7 +115,7 @@ DISTFILES+= ${LUA_DISTFILE}
CONFIGURE_ARGS+= --add-module=../${ECHOMOD_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mecho) || make(makesum)
-ECHOMOD_VERSION= 0.58
+ECHOMOD_VERSION= 0.59
ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION}
ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz
SITES.${ECHOMOD_DISTFILE}= -https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz
@@ -136,7 +126,7 @@ DISTFILES+= ${ECHOMOD_DISTFILE}
CONFIGURE_ARGS+= --add-module=../${SETMISC_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
-SETMISC_VERSION= 0.29
+SETMISC_VERSION= 0.30
SETMISC_DISTNAME= set-misc-nginx-module-${SETMISC_VERSION}
SETMISC_DISTFILE= ${SETMISC_DISTNAME}.tar.gz
SITES.${SETMISC_DISTFILE}= -https://github.com/openresty/set-misc-nginx-module/archive/v${SETMISC_VERSION}.tar.gz
@@ -158,7 +148,7 @@ DISTFILES+= ${ARRAYVAR_DISTFILE}
CONFIGURE_ARGS+= --add-module=../${ENCSESS_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum)
-ENCSESS_VERSION= 0.04
+ENCSESS_VERSION= 0.05
ENCSESS_DISTNAME= encrypted-session-nginx-module-${ENCSESS_VERSION}
ENCSESS_DISTFILE= ${ENCSESS_DISTNAME}.tar.gz
SITES.${ENCSESS_DISTFILE}= -https://github.com/openresty/encrypted-session-nginx-module/archive/v${ENCSESS_VERSION}.tar.gz
@@ -169,7 +159,7 @@ DISTFILES+= ${ENCSESS_DISTFILE}
CONFIGURE_ARGS+= --add-module=../${FORMINPUT_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mform-input) || make(makesum)
-FORMINPUT_VERSION= 0.11
+FORMINPUT_VERSION= 0.12
FORMINPUT_DISTNAME= form-input-nginx-module-${FORMINPUT_VERSION}
FORMINPUT_DISTFILE= ${FORMINPUT_DISTNAME}.tar.gz
SITES.${FORMINPUT_DISTFILE}= -https://github.com/calio/form-input-nginx-module/archive/v${FORMINPUT_VERSION}.tar.gz
@@ -180,7 +170,7 @@ DISTFILES+= ${FORMINPUT_DISTFILE}
CONFIGURE_ARGS+= --add-module=../${HEADMORE_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum)
-HEADMORE_VERSION= 0.261
+HEADMORE_VERSION= 0.30
HEADMORE_DISTNAME= headers-more-nginx-module-${HEADMORE_VERSION}
HEADMORE_DISTFILE= ${HEADMORE_DISTNAME}.tar.gz
SITES.${HEADMORE_DISTFILE}= -https://github.com/openresty/headers-more-nginx-module/archive/v${HEADMORE_VERSION}.tar.gz
@@ -195,13 +185,13 @@ CONFIGURE_ARGS+= --without-http_uwsgi_module
.endif
.if !empty(PKG_OPTIONS:Mpush)
-CONFIGURE_ARGS+= --add-module=../${PUSH}
+CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION}
.endif
.if !empty(PKG_OPTIONS:Mpush) || make(makesum)
-PUSH= nginx_http_push_module-0.692
-PUSH_DISTFILE= ${PUSH}.tar.gz
-SITES.${PUSH_DISTFILE}= http://pushmodule.slact.net/downloads/
-
+PUSH_VERSION= 0.731
+PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION}
+PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz
+SITES.${PUSH_DISTFILE}= -https://github.com/slact/nginx_http_push_module/archive/v${PUSH_VERSION}.tar.gz
DISTFILES+= ${PUSH_DISTFILE}
.endif
diff --git a/www/nginx/patches/patch-ab b/www/nginx/patches/patch-ab
index 5fcb8329597..0b4ce2d2dcf 100644
--- a/www/nginx/patches/patch-ab
+++ b/www/nginx/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2014/04/27 11:05:45 rodent Exp $
+$NetBSD: patch-ab,v 1.3 2016/06/15 14:49:11 fhajny Exp $
Workaround for /bin/sh bug on NetBSD
---- auto/install.orig 2014-04-24 12:52:24.000000000 +0000
+--- auto/install.orig 2016-05-31 13:47:01.000000000 +0000
+++ auto/install
-@@ -141,9 +141,6 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ng
+@@ -148,9 +148,6 @@ install: build $NGX_INSTALL_PERL_MODULES
|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
-- test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
+- test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\
- || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
-
- test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
- mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
+ test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\
+ || mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
diff --git a/www/nginx/patches/patch-src_os_unix_ngx__files.c b/www/nginx/patches/patch-src_os_unix_ngx__files.c
deleted file mode 100644
index 0585c479649..00000000000
--- a/www/nginx/patches/patch-src_os_unix_ngx__files.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_os_unix_ngx__files.c,v 1.1 2016/05/31 19:44:47 joerg Exp $
-
---- src/os/unix/ngx_files.c.orig 2016-01-26 14:39:33.000000000 +0000
-+++ src/os/unix/ngx_files.c
-@@ -292,6 +292,12 @@ ngx_write_chain_to_file(ngx_file_t *file
- /* create the iovec and coalesce the neighbouring bufs */
-
- while (cl && vec.nelts < IOV_MAX) {
-+
-+ if (ngx_buf_special(cl->buf)) {
-+ cl = cl->next;
-+ continue;
-+ }
-+
- if (prev == cl->buf->pos) {
- iov->iov_len += cl->buf->last - cl->buf->pos;
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 04:06:13 +0000