Commit Graph

728 Commits

Author SHA1 Message Date
Ben Woodcroft ec2a67de88
gnu: Add python-dendropy.
* gnu/packages/bioinformatics.scm (python-dendropy, python2-dendropy): New
variables.
* gnu/packages/patches/python-dendropy-exclude-failing-tests.patch: New
file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-07-09 08:00:34 +10:00
Efraim Flashner 6baa83d283
gnu: sudo: Update to 1.8.17p1.
* gnu/packages/admin.scm (sudo): Update to 1.8.17p1.
[source]: Remove patch.
* gnu/packages/patches/sudo-CVE-2015-5602.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2016-07-06 07:28:09 +03:00
Efraim Flashner 6a628e8ba7
gnu: openimageio: Update to 1.6.15.
* gnu/packages/graphics.scm (openimageio): Update to 1.6.15.
[source]: Remove patch.
* gnu/packages/patches/openimageio-boost-1.60.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2016-07-03 06:44:49 +03:00
Leo Famulari 9996ab16e6
gnu: gimp: Fix CVE-2016-4994.
* gnu/packages/patches/gimp-CVE-2016-4994.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gimp.scm (gimp): Use it.
2016-07-02 10:13:55 -04:00
Ricardo Wurmus b0069a6777
gnu: avrdude: Use libusb-compat.
* gnu/packages/patches/avrdude-fix-libusb.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/flashing-tools.scm (avrdude)[source]: Remove patch.
[inputs]: Replace "libusb" with "libusb-compat".
2016-06-29 07:15:33 +02:00
Matthew Jordan 7a2941a83e
gnu: Add Go 1.4.
* gnu/local.mk: Modified file.
* gnu/packages/golang.scm: New file.

Co-authored-by: Efraim Flashner <efraim@flashner.co.il>
Co-authored-by: Andy Wingo <wingo@igalia.com>
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2016-06-27 14:09:10 +02:00
Ben Woodcroft 94ff31572d
gnu: Add khmer.
* gnu/packages/bioinformatics.scm (khmer): New variable.
* gnu/packages/patches/khmer-use-libraries.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-06-27 21:35:16 +10:00
Ludovic Courtès 01497dfe6c
Merge branch 'master' into core-updates 2016-06-27 09:30:01 +02:00
Steve Sprang 3c6e42b3bc
gnu: Add erlang.
* gnu/packages/erlang.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Co-authored by: Leo Famulari <leo@famulari.name>
Co-authored by: Pjotr Prins <pjotr.public12@thebird.nl>
2016-06-24 10:45:26 -04:00
Ludovic Courtès c311089b0b
services: Add 'mcron-service'.
* gnu/services/mcron.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/tests/base.scm (%mcron-os, %test-mcron): New variables.
(run-mcron-test): New procedure.
* doc/guix.texi (Scheduled Job Execution): New node.
2016-06-22 22:56:06 +02:00
Alex Kost c283b22e93
gnu: lightning: Move to (gnu packages assembly).
* gnu/packages/lightning.scm: Remove.  Move 'lightning' to...
* gnu/packages/assembly.scm (lightning): ... here.  New variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
2016-06-22 11:16:05 +03:00
Leo Famulari 88c8d72f3c
gnu: beets: Update to 1.3.18.
* gnu/packages/patches/beets-image-test-failure.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/music.scm (beets): Update to 1.3.18.
[source]: Use patch.
2016-06-22 02:38:46 -04:00
Jan Nieuwenhuizen a837997cab
gnu: nasm: Make build bit-reproducible.
* gnu/packages/patches/nasm-no-ps-pdf.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/assembly.scm (nasm): Use it.  Remove ghostscript, do not
build PS or PDF docs.  Makes build bit-reproducible.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2016-06-21 23:14:05 +02:00
Ben Woodcroft 9270298f75
gnu: Add ruby-puma.
gnu/packages/ruby.scm (ruby-puma): New variable.
gnu/packages/patches/ruby-puma-ignore-broken-test.patch: New file.
gnu/local.mk (dist_patch_DATA): Add it.
2016-06-21 21:46:45 +10:00
Ludovic Courtès 15a3fffc59
gnu: yasm: Move to (gnu packages assembly).
* gnu/packages/yasm.scm: Remove.  Move 'yasm' to...
* gnu/packages/assembly.scm (yasm): ... here.  New variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
2016-06-21 12:25:56 +02:00
Jan Nieuwenhuizen 8472bdecb6
gnu: Add nasm.
* gnu/packages/assembly.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2016-06-21 12:23:34 +02:00
Ludovic Courtès 94b4274d0d
tests: Add system installation test.
* gnu/tests.scm (define-os-with-source): New macro.
* gnu/tests/install.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* build-aux/run-system-tests.scm (%system-tests): Likewise.
2016-06-20 23:50:46 +02:00
Ludovic Courtès c0eeccbc24
Merge branch 'master' into core-updates 2016-06-17 15:48:27 +02:00
Carlo Zancanaro 3d1240aa25
gnu: Add awesome.
* gnu/packages/wm.scm (awesome): New variable.
* gnu/packages/patches/awesome-reproducible-png.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2016-06-16 14:29:43 +02:00
Leo Famulari 03c1662e38
gnu: Add gnome-maps.
* gnu/packages/geo.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
2016-06-15 13:18:32 -04:00
Leo Famulari 9c4a8514d6
gnu: openssl: Fix CVE-2016-2177 and CVE-2016-2178.
* gnu/packages/patches/openssl-CVE-2016-2177.patch,
gnu/packages/patches/openssl-CVE-2016-2178.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/tls.scm (openssl/fixed): Use them.
2016-06-15 10:48:13 -04:00
Ricardo Wurmus ce9cf64b78
gnu: Add log4cpp.
* gnu/packages/logging.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
2016-06-15 15:35:02 +02:00
Hartmut Goebel d3a858cb32
gnu: Add teensy-loader-cli.
* gnu/packages/flashing-tools.scm (teensy-loader-cli): New variable.
* gnu/packages/patches/teensy-loader-cli-help.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2016-06-15 15:27:48 +02:00
Ludovic Courtès 0fb9a15bb5
gnu: grue-hunter: Move to (gnu packages games).
* gnu/packages/grue-hunter.scm: Remove.  Move contents to...
* gnu/packages/games.scm (grue-hunter): ... here.  New variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.
2016-06-15 15:26:30 +02:00
Ludovic Courtès 65efa9ba9c
gnu: mit-krb5: Update to 1.14.2.
* gnu/packages/mit-krb5.scm (mit-krb5): Update to 1.14.2.
[source]: Remove 'patches'.
* gnu/packages/patches/mit-krb5-CVE-2015-8629.patch,
gnu/packages/patches/mit-krb5-CVE-2015-8630.patch,
gnu/packages/patches/mit-krb5-CVE-2015-8631.patch,
gnu/packages/patches/mit-krb5-init-context-null-spnego.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2016-06-14 21:29:02 +02:00
Ludovic Courtès 28206a8ebf
gnu: automake: Adjust test to ignore new gzip warnings.
* gnu/packages/patches/automake-test-gzip-warning.patch: New file.
* gnu/packages/autotools.scm (automake)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-06-14 09:41:38 +02:00
Ludovic Courtès 9f44dfc077
build: Update list of libxslt patches.
* gnu/local.mk (dist_patch_DATA): Remove libxslt-CVE-2015-7995.patch,
unneeded since 28b33172c9.
Re-add libxslt-generated-ids.patch.
2016-06-13 13:33:32 +02:00
Leo Famulari ee86e7e148
Merge branch 'master' into core-updates 2016-06-12 22:09:26 -04:00
Leo Famulari 436dd04636
gnu: expat: Fix CVE-2012-6702 and CVE-2016-5300.
* gnu/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5300.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xml.scm (expat/fixed): Use it.
2016-06-10 20:33:45 -04:00
Taylan Ulrich Bayırlı/Kammer 7c6058c082 gnu: higan: Various improvements.
* gnu/packages/games.scm (higan): Use semi-official repository at GitLab
(using hotfix tag 098b which is equivalent to official release 098).
Add a patch to remove the build flag -march=native.  Set profile to
balanced.
* gnu/packages/patches/higan-remove-march-native-flag.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-06-10 17:40:27 +03:00
Mark H Weaver 993b400acb
Revert "gnu: libxml2: Add fix for CVE-2016-1762."
This reverts commit 6e4f18cfdd.
2016-06-08 18:17:13 -04:00
Mark H Weaver 6e4f18cfdd
gnu: libxml2: Add fix for CVE-2016-1762.
* gnu/packages/patches/libxml2-CVE-2016-1762.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xml.scm (libxml2/fixed)[source]: Add patch.
2016-06-08 14:26:54 -04:00
Mark H Weaver 98d9182205
gnu: icecat: Add fixes for CVE-2016-{2818,2819,2821,2824,2828,2831}.
* gnu/packages/patches/icecat-CVE-2016-2818-pt1.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt2.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt3.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt4.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt5.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt6.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt7.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt8.patch,
gnu/packages/patches/icecat-CVE-2016-2818-pt9.patch,
gnu/packages/patches/icecat-CVE-2016-2819.patch,
gnu/packages/patches/icecat-CVE-2016-2821.patch,
gnu/packages/patches/icecat-CVE-2016-2824.patch,
gnu/packages/patches/icecat-CVE-2016-2828.patch,
gnu/packages/patches/icecat-CVE-2016-2831.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add patches.
2016-06-08 14:26:54 -04:00
Mark H Weaver c7c49446eb
gnu: libvpx: Add fix for CVE-2016-2818.
* gnu/packages/patches/libvpx-CVE-2016-2818.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/video.scm (libvpx)[source]: Add patch.
2016-06-08 14:26:54 -04:00
Ben Woodcroft dae620b8fe
gnu: Add ruby-concurrent.
* gnu/packages/ruby.scm (ruby-concurrent): New variable.
* gnu/packages/patches/ruby-concurrent-ignore-broken-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-06-08 21:36:02 +10:00
Ben Woodcroft 1e12924ae5
gnu: Add ruby-tzinfo-data.
* gnu/packages/ruby.scm (ruby-tzinfo-data): New variable.
* gnu/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-06-08 21:28:20 +10:00
Ludovic Courtès aeafff536f
Merge branch 'master' into core-updates 2016-06-07 11:54:03 +02:00
Ludovic Courtès 9dee9e8ffe
Revert "gnu: Default to GCC 5."
This reverts commit e3d0fcbf7e.
This is a temporary measure until GCC 5 builds on ARM, see:

  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71399
2016-06-07 10:52:04 +02:00
Manolis Ragkousis 5d4d7a9aa9
gnu: glibc-hurd: Update to 20160518.
* gnu/packages/base.scm (glibc/hurd)[version]: Update to version 20160518.
  [propagated-inputs]: Use hurd-core-headers.
  [native-inputs]: Remove libpthread's source and "patch/libpthread-patch".
  [arguments]: Add augment-libc.so and pre-configure-set-pwd phases.
  Remove prepare-libpthread phase.  Stop removing "--with-headers="
  from original-configure-flags.
* gnu/packages/patches/glibc-hurd-extern-inline.patch: Remove patch.
* gnu/packages/patches/libpthread-glibc-preparation.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Remove them.
2016-06-06 14:42:45 +03:00
宋文武 c3d38b2b9d
gnu: services: Add dicod-service.
* gnu/services/dict.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (Various Services): Document it.
2016-06-05 13:48:15 +08:00
Matthew Jordan 90322fdbe3
gnu: Add ruby-debug-inspector.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/rails.scm: New file.
2016-06-04 09:15:57 +10:00
Leo Famulari 1c5ee417f4
gnu: imagemagick: Update to 6.9.4-7.
* gnu/packages/patches/imagemagick-CVE-2016-5118.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.4-7.
[source]: Remove patch.
2016-06-03 16:45:13 -04:00
Leo Famulari 1c6303fae0
gnu: icedtea: Update to 1.13.11.
Fixes CVE-2016-{0686, 0687, 0695, 3425, 3427}.

* gnu/packages/patches/icedtea-remove-overrides.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/java.scm (icedtea): Update to 1.13.11.
[source]: Use the patch.
[inputs]: Add libxcomposite.
2016-06-01 02:29:01 -04:00
Leo Famulari e88eb07110
gnu: imagemagick: Fix CVE-2016-5118.
* gnu/packages/patches/imagemagick-CVE-2016-5118.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/imagemagick.scm (imagemagick): Use it.
2016-05-31 13:38:40 -04:00
Leo Famulari 4d93a76138
gnu: graphicsmagick: Update to 1.3.24 [security update].
Fixes CVE-2016-{2317, 2318, 5118} and many other security issues
described in 'NEWS.txt'.

* gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.24.
[source]: Remove patch.
2016-05-31 13:33:09 -04:00
Leo Famulari df2dd07b88
gnu: libxml2: Update replacement to 2.9.4 [security fixes].
This fixes CVE-2016-{1762, 1833, 1834, 1835, 1836, 1837, 1838, 1839,
1840, 3627, 3705, 4483}.

* gnu/packages/patches/libxml2-CVE-2016-3627.patch,
gnu/packages/patches/libxml2-CVE-2016-3705.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/xml.scm (libxml2/fixed): Update to 2.9.4.
[source]: Remove patches.
2016-05-30 21:47:40 -04:00
Efraim Flashner fd1461879c
gnu: mcrypt: Fix CVE-2012-4409, CVE-2012-4426, CVE-2012-4527.
* gnu/packages/mcrypt.scm (mcrypt)[source]: Add patches.
* gnu/packages/patches/mcrypt-CVE-2012-4409.patch,
gnu/packages/patches/mcrypt-CVE-2012-4426.patch,
gnu/packages/patches/mcrypt-CVE-2012-4527.patch: New variables.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-05-30 21:57:36 +03:00
Efraim Flashner c1dbd3a870
gnu: wordnet: Fix CVE-2008-2149, CVE-2008-3908.
* gnu/packages/wordnet.scm (wordnet)[source]: Add patches.
* gnu/packages/patches/wordnet-CVE-2008-2149.patch,
gnu/packages/patches/wordnet-CVE-2008-3908-pt1.patch,
gnu/packages/patches/wordnet-CVE-2008-3908-pt2.patch: New variables.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-05-30 20:14:06 +03:00
Efraim Flashner 1f521b7055
gnu: id3lib: Fix CVE-2007-4460.
* gnu/packages/mp3.scm (id3lib)[source]: Add patch.
* gnu/packages/patches/id3lib-CVE-2007-4460.patch: New variable.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-05-30 20:13:24 +03:00
Leo Famulari 726f088884
gnu: devil: Fix CVE-2009-3994.
* gnu/packages/patches/devil-CVE-2009-3994.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (devil): Use it.
2016-05-30 12:36:26 -04:00
Alex Kost 4509ec72a4
gnu: emacs: Fix indentation of scheme keyword lists.
* gnu/packages/patches/emacs-fix-scheme-indent-function.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/emacs.scm (emacs)[source]: Use it.
2016-05-30 13:09:43 +03:00
Efraim Flashner 5f1ba08953
gnu: gegl: Fix CVE-2012-4433.
* gnu/packages/gimp.scm (gegl)[source]: Add patch.
* gnu/packages/patches/gegl-CVE-2012-4433.patch: New variable.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-05-30 12:09:17 +03:00
Efraim Flashner 7d48938a59
gnu: vte-0.28: Fix CVE-2012-2738.
* gnu/packages/gnome.scm (vte-0.28)[source]: Add patches.
* gnu/packages/patches/vte-CVE-2012-2738-pt1.patch,
gnu/packages/patches/vte-CVE-2012-2738-pt2.patch: New variables.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-05-30 12:09:15 +03:00
Efraim Flashner 4f3e02f198
gnu: t1lib: Fix CVE-2010-2642, CVE-2011-{0764, 1552, 1553, 1554}.
* gnu/packages/fontutils.scm (t1lib)[source]: Add patches.
* gnu/packages/patches/t1lib-CVE-2010-2642.patch,
gnu/packages/patches/t1lib-CVE-2011-0764.patch,
gnu/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch: New variables.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-05-30 12:09:14 +03:00
Efraim Flashner 538884ccef
gnu: jansson: Fix CVE-2016-4425.
* gnu/packages/web.scm (jansson)[source]: Add patch.
* gnu/packages/patches/jansson-CVE-2016-4425.patch: New variable.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-05-30 09:57:16 +03:00
Efraim Flashner 9116f12690
gnu: antiword: Fix CVE-2014-8123.
* gnu/packages/textutils.scm (antiword)[source]: Add patch.
* gnu/packages/patches/antiword-CVE-2014-8123: New variable.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-05-30 09:57:09 +03:00
Efraim Flashner 6447e19108
gnu: a2ps: Fix CVE-2001-1593, CVE-2014-0466.
* gnu/packages/pretty-print.scm (a2ps)[source]: Add patches.
* gnu/packages/patches/a2ps-CVE-2001-1593.patch,
gnu/packages/patches/a2ps-CVE-2014-0466.patch: New variables.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-05-30 07:44:29 +03:00
Leo Famulari ccda7c8317
gnu: pcre2: Fix CVE-2016-3191.
* gnu/packages/patches/pcre2-CVE-2016-3191.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/pcre.scm (pcre2): Use it.
2016-05-29 23:57:31 -04:00
Leo Famulari 0d567b5531
gnu: libyaml: Fix CVE-2014-9130.
* gnu/packages/patches/libyaml-CVE-2014-9130.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/web.scm (libyaml): Use it.
2016-05-29 23:48:28 -04:00
Leo Famulari d8862778c1
gnu: graphicsmagick: Fix CVE-2016-5118.
* gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/imagemagick.scm (graphicsmagick): Use it.
2016-05-29 23:46:21 -04:00
Efraim Flashner b3d20b8280
gnu: vorbis-tools: Fix CVE-2014-9638, CVE-2014-9639, CVE-2014-9640.
* gnu/packages/xiph.scm (vorbis-tools)[source]: Add patches.
* gnu/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch,
gnu/packages/patches/vorbis-tools-CVE-2014-9640.patch: New variables.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-05-30 06:42:02 +03:00
Efraim Flashner e99dd67ad8
gnu: libtar: Fix CVE-2013-4420.
* gnu/packages/compression.scm (libtar)[source]: Add patch.
* gnu/packages/patches/libtar-CVE-2013-4420.patch: New variable.
* gnu/local.mk (dist_patch_DATA): Add it.

This is a follow-up to 89d80159b1.
2016-05-30 06:04:46 +03:00
Leo Famulari 65da8dd01e
gnu: rpm: Fix CVE-2014-8118.
* gnu/packages/patches/rpm-CVE-2014-8118.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/package-management.scm (rpm): Use it.
2016-05-29 14:02:08 -04:00
Leo Famulari 1d982d787d
gnu: procmail: Fix CVE-2014-3618.
* gnu/packages/patches/procmail-CVE-2014-3618.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/mail.scm (procmail): Use it.
2016-05-29 13:12:16 -04:00
Efraim Flashner 32fddd8e29
gnu: lua-5.1: Fix CVE-2014-5461.
* gnu/packages/lua.scm (lua-5.1)[source]: Add patch.
* gnu/packages/patches/lua-CVE-2014-5461: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-05-29 09:47:46 +03:00
Leo Famulari b5d08d7c28
gnu: gd: Update to 2.2.1 [fixes CVE-2015-{8874, 8877}].
* gnu/packages/patches/gd-CVE-2016-3074.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/gd.scm (gd): Update to 2.2.1.
[source]: Remove patch. Update source URL.
2016-05-27 12:33:42 -04:00
Ludovic Courtès 2ca55f939c
gnu: rush: Fix CVE-2013-6889.
* gnu/packages/patches/rush-CVE-2013-6889.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/rush.scm (rush): Use it.
2016-05-26 22:51:12 +02:00
David Thompson 9698f4b74b gnu: Add mitlm.
* gnu/packages/speech.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
2016-05-26 08:50:09 -04:00
Roel Janssen 8f9ac90182
gnu: Rename texlive module to tex.
* gnu/local.mk (GNU_SYSTEM_MODULES): Rename texlive.scm to tex.scm.
* gnu/packages/texlive.scm: Rename file to tex.scm.
* gnu/packages/tex.scm: Renamed from texlive.scm.
* gnu/packages/algebra.scm: Adjust accordingly.
* gnu/packages/docbook.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/gettext.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/lisp.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/ocaml.scm: Likewise.
* gnu/packages/photo.scm: Likewise.
* gnu/packages/plotutils.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/scheme.scm: Likewise.
2016-05-26 10:22:05 +02:00
Ludovic Courtès 493e9a5a8f
gnu: libxml2: Fix CVE-2016-3627 and CVE-2016-3705.
* gnu/packages/patches/libxml2-CVE-2016-3627.patch,
gnu/packages/patches/libxml2-CVE-2016-3705.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/xml.scm (libxml2)[replacement]: New field.
(libxml2/fixed): New variable.
2016-05-24 14:15:18 +02:00
Mathieu Lirzin c0d2e7b197
build: Use "%D%" in Makefile fragments.
* doc/local.mk: Use "%D%" for the directory of the fragment relative to
the base 'Makefile.am'.
* emacs/local.mk: Likewise.
* gnu/local.mk: Likewise.
* nix/local.mk: Likewise.
2016-05-24 13:07:19 +02:00
Ludovic Courtès bc73a84398
Merge branch 'master' into core-updates 2016-05-23 15:02:26 +02:00
Matthew Jordan 548994142f
gnu: Add envstore.
* gnu/package/shellutils.scm: New file.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2016-05-21 23:30:37 +02:00
Leo Famulari 119b83989d
gnu: expat: Fix CVE-2016-0718. Improve fix for CVE-2015-1283.
* gnu/packages/patches/expat-CVE-2015-1283-refix.patch,
gnu/packages/patches/expat-CVE-2016-0718.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/xml.scm (expat)[replacement]: New field.
(expat/fixed): New variable.
[source]: Use new patches.
2016-05-19 10:27:18 -04:00
Kei Kebreau 21f05134fc
Update name for Kei Kebreau.
* .mailmap: Add Kei Kebreau.
* gnu/local.mk: Replace "Kei Yamashita" with "Kei Kebreau".
* gnu/packages/calendar.scm: Likewise.
* gnu/packages/dillo.scm: Likewise.
* gnu/packages/fltk.scm: Likewise.
* gnu/packages/game-development.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/xfce.scm: Likewise.

Signed-off-by: Alex Kost <alezost@gmail.com>
2016-05-19 11:42:03 +03:00
Leo Famulari fb2b0f5c87
gnu: gd: Fix-CVE-2016-3074.
* gnu/packages/patches/gd-CVE-2016-3074.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gd.scm (gd)[source]: Use it.
2016-05-17 13:18:15 -04:00
Federico Beffa 1c29f3ef84 gnu: emacs-constants: Remove old patch.
* gnu/packages/patches/emacs-constants-lisp-like.patch: Remove it.
* gnu/local.mk (dist_patch_DATA): Remove entry for above patch.
2016-05-17 14:17:38 +02:00
Ludovic Courtès 74d637397b
gnu: tar: Update to 1.29.
* gnu/packages/base.scm (tar): Update to 1.29.
[source]: Remove 'tar-d_ino_in_dirent-fix.patch'.
[arguments]: New field.
* gnu/packages/patches/tar-d_ino_in_dirent-fix.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
2016-05-17 10:46:26 +02:00
Efraim Flashner 7d0c3c8d01
gnu: python-pandas: Update to 0.18.1.
* gnu/packages/python.scm (python-pandas): Update to 0.18.1.
[native-inputs]: Remove python-setuptools.
[properties]: Define python2-pandas.
(python2-pandas)[native-inputs]: Add python2-setuptools.
* gnu/packages/patches/python-pandas-fix-tslib-test-failure.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2016-05-16 17:39:42 +03:00
Efraim Flashner 30897c60a4
gnu: mdadm: Update to 3.4.
* gnu/packages/linux.scm (mdadm): Update to 3.4.
[source]: Remove patch.
* gnu/packages/patches/mdadm-gcc-4.9-fix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2016-05-16 06:10:06 +03:00
Leo Famulari b7ab191ddd
gnu: Add libbsd.
* gnu/packages/libbsd.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
2016-05-15 22:05:44 -04:00
Jan Nieuwenhuizen 9365ee1c46
gnu: Add gnome-tweak-tool.
* gnu/packages/patches/gnome-tweak-tool-search-paths.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gnome.scm (gnome-tweak-tool): New variable.

Signed-off-by: Leo Famulari <leo@famulari.name>
2016-05-15 13:03:15 -04:00
Leo Famulari 4fa05a8198
gnu: libarchive: Update to 3.2.0.
* gnu/packages/patches/libarchive-CVE-2013-0211.patch,
gnu/packages/patches/libarchive-CVE-2016-1541.patch,
gnu/packages/patches/libarchive-bsdtar-test.patch,
gnu/packages/patches/libarchive-fix-lzo-test-case.patch,
gnu/packages/patches/libarchive-mtree-filename-length-fix.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/backup.scm (libarchive): Update to 3.2.0.
[source]: Remove deleted patches.
[replacement]: Remove.
(libarchive/fixed): Remove variable.
2016-05-13 02:23:38 -04:00
Leo Famulari eb74eb4199
Merge branch 'master' into core-updates 2016-05-13 02:08:11 -04:00
Mark H Weaver 207c604637
Merge branch 'gnome-updates' 2016-05-12 18:48:36 -04:00
Mark H Weaver ef06d54a9b
gnu: icecat: Update to 38.8.0-gnu1.
* gnu/packages/patches/icecat-CVE-2016-2805.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt2.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt3.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt4.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt5.patch,
gnu/packages/patches/icecat-CVE-2016-2808.patch,
gnu/packages/patches/icecat-CVE-2016-2814.patch,
gnu/packages/patches/icecat-re-enable-DHE-cipher-suites.patch,
gnu/packages/patches/icecat-update-bundled-graphite2.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm (icecat): Update to 38.8.0-gnu1.
[source] Remove deleted patches.
2016-05-12 18:15:07 -04:00
Eric Bavier 889187a464 gnu: Add NetCDF.
* gnu/packages/maths.scm (netcdf, netcdf-parallel-openmpi): New variables.
2016-05-12 19:59:53 +00:00
Eric Bavier b8d9c93bde gnu: hdf5: Have configure honor SOURCE_DATE_EPOCH.
* gnu/packages/patches/hdf5-config-date.patch: New patch.
* gnu/packages/maths.scm (hdf5)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
2016-05-12 19:59:52 +00:00
Eric Bavier 528bb46436 gnu: Add HYPRE.
* gnu/packages/maths.scm (hypre, hypre-openmpi): New variables.
* gnu/packages/patches/hypre-doc-tables.patch,
gnu/packages/patches/hypre-ldflags.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
2016-05-12 19:59:52 +00:00
Eric Bavier b4e655e5f1 gnu: Add doc++.
* gnu/packages/documentation.scm (doc++): New variable.
* gnu/packages/patches/doc++-include-directives.patch,
  gnu/packages/patches/doc++-segfault-fix.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
2016-05-12 19:59:52 +00:00
Eric Bavier 0573a923de gnu: Move asciidoc and doxygen to new module.
* gnu/packages/asciidoc.scm (asciidoc): Move this...
* gnu/packages/doxygen.scm (doxygen): ...and this...
* gnu/packages/documentation.scm: ...to here.  New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add accordingly.
2016-05-12 19:04:31 +00:00
Leo Famulari e7806e6caa
gnu: libarchive: Fix CVE-2016-1541.
* gnu/packages/backup.scm (libarchive)[replacement]: New field.
(libarchive/fixed): New variable.
* gnu/packages/patches/libarchive-CVE-2016-1541.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-05-11 21:35:35 -04:00
Mark H Weaver 9f5e796753
Merge branch 'master' into gnome-updates 2016-05-11 13:37:47 -04:00
Matthew Jordan 5d38aa0826
gnu: Add entr.
* gnu/packages/entr.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2016-05-11 18:16:11 +02:00
Mark H Weaver e2b89203db
gnu: totem: Fix build on i686.
* gnu/packages/patches/totem-debug-format-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gnome.scm (totem)[source]: Add patch.
2016-05-11 10:22:00 -04:00
Efraim Flashner cc6561e6a1
gnu: qemu: Update to 2.5.1.
* gnu/packages/qemu.scm (qemu): Update to 2.5.1.
[source]: Remove patches.
* gnu/packages/patches/qemu-usb-ehci-oob-read.patch,
gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch,
gnu/packages/patches/qemu-CVE-2015-8558.patch,
gnu/packages/patches/qemu-CVE-2015-8567.patch,
gnu/packages/patches/qemu-CVE-2015-8613.patch,
gnu/packages/patches/qemu-CVE-2015-8619.patch,
gnu/packages/patches/qemu-CVE-2015-8701.patch,
gnu/packages/patches/qemu-CVE-2015-8743.patch,
gnu/packages/patches/qemu-CVE-2016-1568.patch,
gnu/packages/patches/qemu-CVE-2016-1922.patch,
gnu/packages/patches/qemu-CVE-2016-1981.patch,
gnu/packages/patches/qemu-CVE-2016-2197.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2016-05-09 20:43:35 +03:00
宋文武 f8cf897582 gnu: Unregister poppler-CVE-2015-8868.patch.
* gnu/local.mk (dist_patch_DATA): Unregister poppler-CVE-2015-8868.patch.
2016-05-08 18:13:13 +08:00
宋文武 6655a74326 Merge branch 'master' into gnome-updates 2016-05-08 17:54:46 +08:00
Efraim Flashner 9478c9d834
gnu: Add connman.
* gnu/packages/connman.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
2016-05-05 23:07:09 +03:00
Ludovic Courtès e9f693d06f
tests: Add whole-system test.
* gnu/system/vm.scm (virtualized-operating-system): Export.
* gnu/tests/base.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* Makefile.am (check-system): New target.
2016-05-04 23:35:55 +02:00
Ludovic Courtès 957afcae3c
Add (gnu tests) and (gnu build marionette).
* gnu/build/marionette.scm, gnu/tests.scm: New files.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add them.
* gnu/system/vm.scm (common-qemu-options): Remove '-serial stdio'.
2016-05-04 23:35:55 +02:00
Alex Kost af5640d1dd gnu: tvtime: Update to 1.0.10.
* gnu/packages/tv.scm (tvtime): Update to 1.0.10.
[source]: Remove patches.
[inputs]: Add 'alsa-lib'.
* gnu/packages/patches/tvtime-gcc41.patch,
gnu/packages/patches/tvtime-pngoutput.patch,
gnu/packages/patches/tvtime-videodev2.patch,
gnu/packages/patches/tvtime-xmltv.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2016-05-04 23:08:39 +03:00
Efraim Flashner 8c3e9a6a8d
gnu: gnupg: Update to 2.1.12.
* gnu/packages/gnupg.scm (gnupg): Update to 2.1.12.
[source]: Remove patch.
* gnu/packages/patches/gnupg-simple-query-ignore-status-messages.patch:
Remove file.
* gnu/local.mk (dist_patch_DATA): Remove reference.
2016-05-04 22:20:45 +03:00
Mark H Weaver 8c15e084fe gnu: imlib2: Update to 1.4.9 [fixes CVE-2011-5326, CVE-2016-{3993,3994}].
* gnu/packages/image.scm (imlib2): Update to 1.4.9.
[source]: Remove patch.
* gnu/packages/patches/imlib2-CVE-2016-4024.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2016-05-04 13:51:48 -04:00
David Thompson d663e5e600
gnu: imagemagick: Update to 6.9.3-10.
Fixes CVE-2016–3714.

* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.3-10.
[source]: Remove patch.
* gnu/packages/patches/imagemagick-test-segv.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Remove patch file from distribution.
2016-05-04 13:22:52 -04:00
Mark H Weaver 4e9d04a80b Merge branch 'master' into gnome-updates 2016-05-04 11:43:50 -04:00
Manolis Ragkousis d46123aade gnu: procps: Make procps build on non Linux systems.
* gnu/packages/patches/procps-non-linux.patch.patch: New patch.
* gnu/packages/linux.scm (procps)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-05-04 17:18:57 +03:00
Mark H Weaver 0a17fd7c0b gnu: wpa-supplicant: Add fixes for CVE-2016-{4476,4477}.
* gnu/packages/patches/wpa-supplicant-CVE-2016-4476.patch,
gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt1.patch,
gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt2.patch,
gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt3.patch,
gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt4.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/admin.scm (wpa-supplicant-minimal)[source]: Add patches.
2016-05-03 09:39:59 -04:00
Roel Janssen 4c6aa73b8f
gnu: Add 4store.
* gnu/packages/databases.scm (4store): New variable.
* gnu/packages/patches/4store-fix-buildsystem.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add patch file entry.

Signed-off-by: Leo Famulari <leo@famulari.name>
2016-05-02 14:45:57 -04:00
Leo Famulari 3854f3d7e4
gnu: ocaml: Fix CVE-2015-8869.
* gnu/packages/patches/ocaml-CVE-2015-8869.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ocaml.scm (ocaml): Use it.
2016-05-02 14:30:49 -04:00
Ricardo Wurmus aacb52fb0f gnu: Add portmidi.
* gnu/packages/music.scm (portmidi): New variable.
* gnu/packages/patches/portmidi-modular-build.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2016-05-02 20:02:20 +02:00
Mathieu Lirzin c74c7c1317 gnu: libxslt: Make generated documentation reproducible.
* gnu/packages/patches/libxslt-generated-ids.patch: New file.
* gnu/packages/patches/libxslt-remove-date-timestamps.patch: Likewise.
* gnu/packages/xml.scm (libxslt)[source]: Use them.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-05-02 17:54:01 +02:00
Mathieu Lirzin c3052d6bcd Merge branch 'master' into core-updates 2016-05-02 17:53:40 +02:00
宋文武 8e3593353e Revert "Revert "gnu: inkscape: Fix build with glibmm-2.48.""
This reverts commit 267061ba0b.
2016-05-02 22:06:39 +08:00
宋文武 6983ba5660 Revert "Revert "Merge branch 'gnome-updates'""
This reverts commit e969b140a4.
2016-05-02 22:06:36 +08:00
Nicolas Goaziou d20708b6c5 gnu: asymptote: Update to 2.37.
* gnu/packages/plotutils.scm (asymptote): Update to 2.37.
* gnu/packages/patches/asymptote-gsl2.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove reference.
2016-05-02 22:05:54 +08:00
Nicolas Goaziou acb31b5dcd
gnu: asymptote: Update to 2.37.
* gnu/packages/plotutils.scm (asymptote): Update to 2.37.
* gnu/packages/patches/asymptote-gsl2.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove reference.
2016-05-01 17:58:39 -04:00
Leo Famulari e411ce1860
gnu: poppler: Fix CVE-2015-8868.
* gnu/packages/pdf.scm (poppler)[replacement]: New field.
(poppler/fixed): New variable.
* gnu/packages/patches/poppler-CVE-2015-8868.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-04-30 16:14:38 -04:00
Rob Syme b0e52f52b7 gnu: ruby: Update to 2.3.1.
* gnu/packages/ruby.scm (ruby): Update to 2.3.1.
[origin] Add symlink patch.
* gnu/packages/patches/ruby-symlinkfix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add patch.
2016-04-30 08:39:27 +10:00
Eric Bavier f36a1ebaab gnu: Add Fossil.
* gnu/packages/version-control.scm (fossil): New variable.
* gnu/packages/patches/fossil-test-fixes.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-04-29 16:42:10 -05:00
Mark H Weaver dde2a94c09 gnu: icecat: Add fixes for CVE-2016-{2805,2807,2808,2814} etc.
* gnu/packages/patches/icecat-CVE-2016-2805.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt2.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt3.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt4.patch,
gnu/packages/patches/icecat-CVE-2016-2807-pt5.patch,
gnu/packages/patches/icecat-CVE-2016-2808.patch,
gnu/packages/patches/icecat-CVE-2016-2814.patch,
gnu/packages/patches/icecat-update-bundled-graphite2: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add patches.

icecat fixup
2016-04-28 10:25:19 -04:00
宋文武 6fdc73e099 gnu: fltk: Fix undefined symbol `Fl_XFont_On_Demand::value'.
* gnu/packages/patches/fltk-xfont-on-demand.patch: New patch.
* gnu/packages/fltk.scm (fltk)[source]: Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-04-28 12:23:51 +08:00
Mark H Weaver e969b140a4 Revert "Merge branch 'gnome-updates'"
This reverts commit 63655d459e, reversing
changes made to 80627f51f0.
2016-04-23 13:13:53 -04:00
Mark H Weaver 267061ba0b Revert "gnu: inkscape: Fix build with glibmm-2.48."
This reverts commit 0118c6ab62.
2016-04-23 13:12:53 -04:00
Mark H Weaver 0118c6ab62 gnu: inkscape: Fix build with glibmm-2.48.
* gnu/packages/patches/inkscape-drop-wait-for-targets.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/inkscape.scm (inkscape)[source]: Add patch.
2016-04-23 05:05:18 -04:00
Leo Famulari e993fb8493 gnu: imlib2: Fix CVE-2016-4024.
* gnu/packages/patches/imlib2-CVE-2016-4024.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (imlib2): Use it.
2016-04-22 23:59:37 -04:00
宋文武 63655d459e Merge branch 'gnome-updates' 2016-04-23 10:19:32 +08:00
Mathieu Lirzin 03d0e2d2b9 build: Move 'Makefile' fragments to subdirectories.
This follows a convention used by some other GNU packages like Autoconf,
Bison, Coreutils, and Gnulib.

* doc.am: Rename to ...
* doc/local.mk: ... this.
* emacs.am: Rename to ...
* emacs/local.mk: ... this.
* gnu-system.am: Rename to ...
* gnu/local.mk: ... this.
* daemon.am: Rename to ...
* nix/local.mk: ... this.
* Makefile.am: Adapt to them.
* doc/guix.texi (Porting to a New Platform): Adapt documentation.
* guix/config.scm.in (%state-directory, %config-directory): Adapt comments.
* emacs/guix-config.el.in (guix-config-state-directory): Likewise.
2016-04-21 18:47:50 +02:00