Commit Graph

1479 Commits (b5a927b3baa10d4eade7e7194db6c2b5b7d8c6b6)

Author SHA1 Message Date
Marius Bakke a55ebe2e3a
gnu: python2: Add upstream security fixes.
This addresses CVE-2018-{1060,1061,14647,1000802}.

* gnu/packages/patches/python2-CVE-2018-1000802.patch,
gnu/packages/patches/python2-CVE-2018-1060.patch,
gnu/packages/patches/python2-CVE-2018-1061.patch,
gnu/packages/patches/python2-CVE-2018-14647.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/python.scm (python-2/fixed): New variable.
(python-2.7)[replacement]: New field.
(python2-minimal): Use PACKAGE/INHERIT.
2018-10-17 20:34:37 +02:00
Marius Bakke 90aeaee861
gnu: python: Fix CVE-2018-14647.
* gnu/packages/patches/python-CVE-2018-14647.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/python.scm (python-3/fixed): New variable.
(python-3.6)[replacement]: New field.
(python-minimal, python-debug, wrap-python3): Use PACKAGE/INHERIT instead of
standard inheritance.
2018-10-17 20:34:37 +02:00
Clément Lassieur f1376bfabe
gnu: emacs-exwm: Update to 0.20.
* gnu/packages/emacs.scm (emacs-exwm): Update to 0.20.
[source]: Remove emacs-exwm-fix-fullscreen-issue.patch.
* gnu/local.mk (dist_patch_DATA): Remove patch.
* gnu/packages/patches/emacs-exwm-fix-fullscreen-issue.patch: Remove patch.
2018-10-16 11:10:04 +02:00
Efraim Flashner b7028a16e6
gnu: x265: Fix building on armhf-linux and aarch64-linux.
* gnu/packages/video.scm (x265)[source]: Update list of patches.
[arguments]: Change configure flag to ensure PIC for all architectures.
* gnu/packages/patches/x265-arm-asm-primitives.patch: Remove file.
* gnu/packages/patches/x265-detect512-all-arches.patch: New file.
* gnu/local.mk (dist_patch_DATA): Update patch registry.
2018-10-15 11:40:34 +03:00
Tobias Geerinckx-Rice dfe05297f3
gnu: x265: Update to 2.9.
* gnu/packages/video.scm (x265): Update to 2.9.
[source]: Remove x265-fix-ppc64le-build.patch.
* gnu/packages/patches/x265-fix-ppc64le-build.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-10-15 06:19:37 +02:00
Efraim Flashner e4c399fe15
gnu: clisp: Update to 2.49.92.
* gnu/packages/lisp.scm (clisp): Update to 2.49.92.
[source]: Switch to git-fetch. Remove unneeded patch.
[arguments]: Remove '--enable-portability' flag, add CFLAGS for
armhf-linux. Update list of files needing substitutions in custom
'patch-sh-and-pwd phase.
[home-page]: Update to new home-page.
* gnu/packages/patches/clisp-glibc-2.26.patch: Remove file.
& gnu/local.mk (dist_patch_DATA): Remove it.
2018-10-10 10:41:37 +03:00
Tobias Geerinckx-Rice de68ad095d
gnu: zstd: Update to 1.3.6.
* gnu/packages/compression.scm (zstd): Update to 1.3.6.
[source]: Remove merged patches.
* gnu/packages/patches/zstd-fix-stdin-list-test.patch,
gnu/packages/patches/zstd-fix-stdin-list-without-tty.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2018-10-09 05:42:14 +02:00
Leo Famulari 247537da81
gnu: borg: The backup client cannot override the server-side storage quota.
* gnu/packages/patches/borg-respect-storage-quota.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/backup.scm (borg)[source]: Use it.
2018-10-07 13:57:32 -04:00
Jan Nieuwenhuizen 236fadf528
gnu: mes: Update to 0.18.
* gnu/packages/patches/mes-nyacc-0.86.0.patch: Removef file.
* gnu/local.mk (dist_patch_DATA): Remove entry.
* gnu/packages/mes.scm (mes): Update to 0.18.
2018-10-07 16:30:50 +02:00
Danny Milosavljevic 2c4be1add0
gnu: Add java-w3c-smil.
* gnu/packages/batik.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
2018-10-07 14:14:13 +02:00
Kei Kebreau 73ca145a7e
gnu: gnucash: Update to 3.3.
* gnu/packages/patches/gnucash-disable-failing-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gnucash.scm (gnucash): Update to 3.3.
[source]: Add patch.
[arguments]: Add 'set-env-vars', 'glib-or-gtk-compile-schemas', and
'glib-or-gtk-wrap' phases.
2018-10-05 13:41:08 -04:00
Tobias Geerinckx-Rice fc4738149f
gnu: Add bastet.
* gnu/packages/games.scm (bastet): New public variable.
* gnu/packages/patches/bastet-change-source-of-unordered_set.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-10-05 19:32:45 +02:00
Eric Bavier 43eb42ef01
quilt: Remove test workarounds.
* gnu/packages/patches/quilt-compat-getopt-fix-second-separator.patch,
gnu/packages/patches/quilt-compat-getopt-fix-option-with-nondigit-param.patch:
New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/patchutils.scm (quilt)[source]: Use them.
[arguments]: Remove workarounds in 'patch-tests' phase.
2018-10-03 10:45:02 -05:00
Eric Bavier 68faa20e2d
quilt: Upgrade to 0.65.
* gnu/packages/patches/quilt-test-fix-regex.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/patchutils.scm (quilt)[version]: Upgrade to 0.65.
[source]: Use patch.
[arguments]: Adjust 'patch-tests' phase for new tests.  Re-enable "mail"
test.
2018-10-02 22:34:39 -05:00
Mark H Weaver 94e96f7f68
gnu: icecat: Unbundle libevent, libogg, and libvorbis.
* gnu/packages/patches/icecat-use-system-media-libs.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Add
another hunk to enable removal of libevent.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add patch.  In the snippet, add
libevent, libogg, libvorbis, and libtremor to the list of bundled libraries to
remove.  Add a comment regarding theora.  Remove comments regarding unbundling
cairo, which is no longer supported.
[inputs]: Add libevent, libogg, and libvorbis.
[arguments]: Add --with-system-{libevent,ogg,vorbis} to configure flags.
Add custom bootstrap phase.  Add comments.
2018-09-25 19:59:06 -04:00
Mark H Weaver 257e324791
gnu: icecat: Unbundle graphite2 and harfbuzz.
* gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch: New file.
* gnu/packages/patches/icecat-use-system-graphite2.patch,
gnu/packages/patches/icecat-use-system-harfbuzz.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add new patch.  Delete
bundled graphite2 and harfbuzz in snippet.
[inputs]: Add graphite2 and harfbuzz.
[arguments]: Add --with-system-{graphite2,harfbuzz} to configure flags.
2018-09-25 19:58:58 -04:00
Mark H Weaver ae71cd8ac9
gnu: icecat: Add fixes from upstream mozilla-esr60 [security fixes].
Includes fixes for CVE-2018-12383 and CVE-2018-12385.

* gnu/packages/patches/icecat-CVE-2018-12383.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Adapt to apply
cleanly to IceCat 60.
* gnu/packages/gnuzilla.scm (mozilla-patch): Update to fetch from
mozilla-esr60.
(icecat): Add selected changesets from upstream mozilla-esr60.
2018-09-22 13:48:32 -04:00
Ben Woodcroft 05fb1e0017
gnu: hmmer: Update to 3.2.1.
* gnu/packages/bioinformatics.scm (hmmer): Update to 3.2.1.
[origin]: Remove patch.
[license]: Change to BSD-3.
[supported-systems]: New field.
* gnu/packages/patches/hmmer-remove-cpu-specificity.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-09-22 09:16:47 +10:00
Mark H Weaver e67ad5532f
gnu: icecat: Update to 60.2.0-gnu1 (pre-release).
* gnu/packages/gnuzilla.scm (icecat): Update to 60.2.0-gnu1.
[source]: Download pre-release from alpha.gnu.org.  Remove obsolete patches.
Comment out the code to delete the bundled copies of libevent, cairo,
harfbuzz, and graphite2.
[inputs]: Use the latest ffmpeg.  Comment out libevent, cairo, harfbuzz, and
graphite2.
[native-inputs]: Add rust and cargo.
[arguments]: Remove --enable-gio and --disable-gnomeui.  Add --disable-stylo.
Comment out --with-system-{libevent,harfbuzz,graphite2}, --enable-system-cairo.
Import %cargo-build-system-modules.  Add 'patch-cargo-checksums' phase.
* gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch,
gnu/packages/patches/icecat-bug-1413868-pt1.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2018-09-21 07:16:02 -04:00
Mark H Weaver c5327efb97
gnu: libvpx: Add upstream security fix.
* gnu/packages/patches/libvpx-use-after-free-in-postproc.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/video.scm (libvpx)[source]: Add patch.
2018-09-21 07:15:59 -04:00
Ricardo Wurmus 89ee8a6edf
gnu: rsem: Update to 1.3.1.
* gnu/packages/bioinformatics.scm (rsem): Update to 1.3.1.
[source]: Fetch from git; remove patch; delete bundled samtools.
[arguments]: Pass make flags; adjust phases.
[inputs]: Remove ncurses and samtools-0.1; add htslib-1.3.
* gnu/packages/patches/rsem-makefile.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-09-20 17:55:26 +02:00
Marius Bakke c5c1e410cf
gnu: Reinstate xf86-video-ast.
* gnu/packages/patches/xf86-video-ast-remove-mibstore.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/xorg.scm (xf86-video-ast): New public variable.
2018-09-19 15:20:21 +02:00
Leo Famulari 9e9e5d5a26
gnu: OpenSSL 1.1: Update to 1.1.1.
* gnu/packages/tls.scm (openssl-next): Update to 1.1.1.
[arguments]: Patch a `/usr/bin/env` invocation in the 'config' script.
Adjust the documentation output.
* gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch: Rename and ...
* gnu/packages/patches/openssl-1.1-c-rehash-in.patch: ... adjust patch.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2018-09-14 16:51:49 -04:00
Danny Milosavljevic 6fe73b487b
gnu: rust: Accept more detailed gdb responses.
* gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch: New
file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/rust.scm (rust-1.25): Use it.
(rust-1.26): Use it.
(rust): Use it.
2018-09-13 17:17:15 +02:00
Eric Bavier 50b3b83143
netsurf: Register patch.
Follow-up to f9e140a243.

* gnu/local.mk (dist_patch_DATA): Add netsurf-message-timestamp.patch.
2018-09-11 20:29:04 -05:00
Tobias Geerinckx-Rice 7c8b1bf664
gnu: python-genshi: Update to 0.7.1.
* gnu/packages/python-web.scm (python-genshi): Update to 0.7.1.
[source]: Use GIT-FETCH and GIT-FILE-NAME. Remove patches.
* gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch,
gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch,
gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch,
gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch,
gnu/packages/patches/python-genshi-isstring-helper.patch,
gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch:
Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2018-09-10 18:21:59 +02:00
Pjotr Prins 98d6543f86
gnu: Rename ldc.scm to dlang.scm.
* gnu/packages/ldc.scm: Rename to...
* gnu/packages/dlang.scm: ... this.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
2018-09-10 17:47:52 +02:00
Pjotr Prins 633e8aab69
gnu: ldc: Update to 1.10.0.
* gnu/packages/ldc.scm (ldc): Update to 1.10.0.
[native-inputs]: Switch to LLVM and CLANG.
(ldc-bootstrap)[synopsis, description]: Tweak.
* gnu/packages/patches/ldc-disable-phobos-tests.patch: New file.
* gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-09-10 17:47:52 +02:00
Ludovic Courtès 19de8273ee
services: tailon: Move to (gnu services web).
This allows (gnu services admin) to remain deeper in the module graph
and to be used by (gnu services web).

* gnu/services/admin.scm (<tailon-configuration-file>)
(tailon-configuration-files-string)
(tailon-configuration-file-compiler, <tailon-configuration>)
(tailon-shepherd-service, %tailon-accounts)
(tailon-service-type): Move to...
* gnu/services/web.scm: ... here.
* gnu/tests/admin.scm: Remove.  Move test to...
* gnu/tests/web.scm (%tailon-os)
(run-tailon-test, %test-tailon): ... here.
2018-09-10 12:12:50 +02:00
Leo Famulari ced98c7e89
gnu: libgd: Fix CVE-2018-{5711,1000222}.
* gnu/packages/patches/gd-CVE-2018-1000222.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gd.scm (gd/fixed): New variable.
* gnu/packages/php.scm (gd-for-php)[source]: Use 'gd-CVE-2018-1000222.patch'.
2018-09-09 18:13:19 -04:00
Marius Bakke 0084744b3a
gnu: ghostscript: Update replacement to 9.24 [security fixes].
The following CVEs are fixed with this release: CVE-2018-15908,
CVE-2018-15909, CVE-2018-15910, CVE-2018-15911, CVE-2018-16509,
CVE-2018-16510, CVE-2018-16511, CVE-2018-16513, CVE-2018-16539,
CVE-2018-16540, CVE-2018-16541, CVE-2018-16542, CVE-2018-16543.

* gnu/packages/patches/ghostscript-CVE-2018-10194.patch: Delete file.
* gnu/packages/patches/ghostscript-CVE-2018-16509.patch,
gnu/packages/patches/ghostscript-bug-699708.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/ghostscript.scm (ghostscript/fixed): Update to 9.24.
[source](patches): Remove 'ghostscript-CVE-2018-10194.patch' and
'ghostscript-runpath.patch'.  Add 'ghostscript-CVE-2018-16509.patch' and
'ghostscript-bug-699708.patch'.
[arguments]: Add LDFLAGS to #:configure-flags, and a phase to create output
directory.
2018-09-09 16:43:11 +02:00
Jan Nieuwenhuizen c665774a1c
gnu: mes: Update to 0.17.1.
* gnu/packages/patches/mes-nyacc-0.86.0.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/mes.scm (mes): Update to 0.17.1, depend on latest Nyacc 0.86.0.
(nyacc-for-mes): Remove.
2018-09-08 20:36:30 +02:00
Jan Nieuwenhuizen 445ecce923
gnu: nyacc: Update to 0.86.0.
* gnu/packages/patches/nyacc-binary-literals.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/mes.scm (nyacc): Update to 0.86.0, add patch.
2018-09-08 20:36:30 +02:00
Marius Bakke fcde1d27bb
gnu: openexr: Update to 2.3.0.
* gnu/packages/graphics.scm (openexr): Update to 2.3.0.
[source](uri): Change to new download location.
[source](snippet): Remove workaround.
[source](patches): Remove.
* gnu/packages/patches/openexr-missing-samples.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-09-03 18:58:47 +02:00
Alex Vong 2bd6ed9e4c
gnu: haskell-mode: Fix test failure.
Fixes <https://bugs.gnu.org/31726>.

Thanks to Jack Hill <jackhill@jackhill.us> for exploring different solutions
at <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31726>.

* gnu/packages/patches/haskell-mode-unused-variables.patch,
gnu/packages/patches/haskell-mode-make-check.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/emacs.scm (haskell-mode)[source]: Use them.
[arguments]: Adjust 'pre-build' phase to embed file name.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2018-09-02 17:06:43 +02:00
Danny Milosavljevic 3159ef7c99
gnu: rust: Bootstrap (only) Rust 1.19.0 by mrustc.
* gnu/packages/patches/rust-1.19-mrustc.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/rust.scm (rust-1.19)[source]: Add patch
"rust-1.19-mrustc.patch".
[arguments]<#:modules>: New field.
<#:phases>[patch-cargo-tomls]: New phase.
<#:phases>[build]: Modify.
<#:phases>[install]: Modify.
[native-inputs]: Replace rust-bootstrap by mrustc.
(rust-1.23)[native-inputs]: New field.
[arguments]<#:phases>: Delete phase "patch-cargo-tomls".
2018-09-02 00:09:34 +02:00
Tobias Geerinckx-Rice aadd1d241c
gnu: Add ddcutil.
* gnu/packages/hardware.scm: New file.
(ddcutil): New public variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add the new file.
2018-08-30 19:28:10 +02:00
Marius Bakke 9e17757ff5
Revert "gnu: snappy: Optimise."
This causes too many rebuilds for the master branch.

This reverts commit f96ed06805.
2018-08-29 16:58:54 +02:00
Tobias Geerinckx-Rice f96ed06805
gnu: snappy: Optimise.
* gnu/packages/compression.scm (snappy)[source]: Build with ‘-O2’.
* gnu/package/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-08-28 22:30:59 +02:00
Leo Famulari 8a5a1eff42
gnu: dropbear: Fix CVE-2018-15599.
* gnu/packages/patches/dropbear-CVE-2018-15599.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ssh.scm (dropbear)[source]: Use it.
2018-08-28 14:44:11 -04:00
Marius Bakke 526ce41930
gnu: GRUB: Check for errors from efibootmgr.
* gnu/packages/patches/grub-check-error-efibootmgr.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/bootloaders.scm (grub)[source](patches): New field.
2018-08-28 01:19:28 +02:00
Leo Famulari 6635a3cc7f
gnu: python-pygit2: Update to 0.26.4.
* gnu/packages/python.scm (python-pygit2, python2-pygit2): Update to 0.26.4.
[source]: Remove 'python-pygit2-disable-network-tests.patch'.
* gnu/packages/patches/python-pygit2-disable-network-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-08-27 15:13:46 -04:00
Kei Kebreau 7d01ee66d4
gnu: Add avogadro.
* gnu/packages/chemistry.scm (avogadro): New variable.
* gnu/packages/patches/avogadro-boost148.patch,
gnu/packages/patches/avogadro-eigen3-update.patch,
gnu/packages/patches/avogadro-python-eigen-lib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
2018-08-25 17:05:30 -04:00
Leo Famulari 36a8d5cdf4
gnu: OpenSSH: Update to 7.8p1.
* gnu/packages/ssh.scm (openssh): Update to 7.8p1.
[source]: Remove 'openssh-CVE-2018-15473.patch'.
* gnu/packages/patches/openssh-CVE-2018-15473.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-08-24 17:04:58 -04:00
Leo Famulari 58927996d9
gnu: perl-dbd-mysql: Update to 4.046.
* gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.046.
[source]: Update URL. Remove 'perl-dbd-mysql-CVE-2017-10788.patch'.
* gnu/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-08-22 15:40:08 -04:00
Leo Famulari 373a9fd4db
gnu: soundtouch: Fix CVE-2018-{1000223,14044,14045}.
* gnu/packages/patches/soundtouch-CVE-2018-14044-14045.patch,
gnu/packages/patches/soundtouch-CVE-2018-1000223.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/audio.scm (soundtouch)[source]: Use them.
2018-08-22 13:38:39 -04:00
Leo Famulari 6cd2c4a83c
gnu: openssh: Don't allow remote username enumeration [fixes CVE-2018-15473].
* gnu/packages/patches/openssh-CVE-2018-15473.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ssh.scm (openssh)[source]: Use it.
2018-08-21 11:16:30 -04:00
Ludovic Courtès 0b93d04ac5
gnu: gcc@4.8: Fix libsanitizer build issue.
Fixes <https://bugs.gnu.org/32397>.
Reported by fis trivial <ybbs.daans@hotmail.com>.

* gnu/packages/patches/gcc-4.8-libsanitizer-fix.patch: New file.
* gnu/packages/gcc.scm (gcc-4.8)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-08-19 18:21:24 +02:00
Marius Bakke a7bc1588e6
Merge branch 'staging' 2018-08-19 15:24:59 +02:00
Tobias Geerinckx-Rice 8cd80a4b61
gnu: eigen: Update to 3.3.5.
* gnu/packages/algebra.scm (eigen): Update to 3.3.5.
[source]: Remove upstreamed ARM patch and obsolete substitutions.
* gnu/packages/patches/eigen-arm-neon-fixes.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2018-08-18 16:40:31 +02:00