Merge branch 'master' into gnome-updates

gnu: bitlbee: Incorporate upstream pre-release patches.

* gnu/packages/messaging.scm (%bitlbee-buddy-nick-change-patch):
(%bitlbee-always-use-nicks-patch): New variables.
(bitlbee): Add new patches.

gnu: bitlbee: Update to 3.4.2.

* gnu/packages/messaging.scm (bitlbee): Update to 3.4.2.

gnu: edirect: Update to 4.10.

* gnu/packages/bioinformatics.scm (edirect): Update to 4.10.

gnu: Add pinentry-qt.

* gnu/packages/gnupg.scm (pinentry-qt): New variable.

gnu: Add pinentry-tty.

* gnu/packages/gnupg.scm (pinentry-tty): New variable.
[arguments]: Add pinentry-tty flag.
(pinentry-gtk2): Inherit from pinentry-tty.
[inputs]: Use gtk+-2, glib for pinentry-gtk2 only.
[description]: Modify description based on inputs.

gnu: pinentry: Rename to pinentry-gtk2.

* gnu/packages/gnupg.scm (pinentry): Rename to pinentry-gtk2.
Define pinentry as pinentry-gtk2.

gnu: cross: Fix typo.

* gnu/packages/cross-base.scm (cross-gcc-arguments): Remove erroneous
'else' introduced in efc4eb147512fa7a2c6d74d9b296cfc22b1ef198.

gnu: Add nlopt.

* gnu/packages/maths.scm (nlopt): New variable.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>

gnu: redeclipse: Rename to red-eclipse.

* gnu/packages/games.scm (redeclipse): Rename to...
(red-eclipse): ...this.

This is a follow-up to commit 5b8a85431dd746eb975d70fe31aeb05609946d80,
which changed only the name field of the package.

gnu: Rename redeclipse package to red-eclipse.

* gnu/packages/games.scm (redeclipse): Rename to...
(red-eclipse): ...this.

Signed-off-by: Andreas Enge <andreas@enge.fr>

gnu: openssl: Replace with 1.0.2h [security fixes].

Fixes CVE-2016-{2105,2106,2107,2109,2176}.

* gnu/packages/tls.scm (openssl)[replacement]: New field.
(openssl/fixed): New variable.

gnu: gcc: Add 6.1.0.

* gnu/packages/gcc.scm (gcc-6): New variable.
* gnu/packages/commencement.scm (gcc-toolchain-6): New variable.

gnu: cross: Use CROSS_*_INCLUDE_PATH for system headers.

* gnu/packages/patches/gcc-cross-environment-variables.patch: Also use CROSS_
variants: CROSS_C_INCLUDE_PATH, CROSS_CPLUS_INCLUDE_PATH,
CROSS_OBJC_INCLUDE_PATH, CROSS_OBJCPLUS_INCLUDE_PATH to be used for system
libraries, see
https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00620.html.
* gnu/packages/cross-base.scm (cross-gcc, cross-gcc-arguments, cross-libc):
Use CROSS_*_INCLUDE_PATH (WAS: CPATH).

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

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.

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>

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.

gnu: bristol: Do not check for JACK with ldd.

* gnu/packages/music.scm (bristol)[arguments]: Add build phase to
  disable runtime check for JACK.

gnu: frescobaldi: Add MIDI support.

* gnu/packages/music.scm (frescobaldi)[inputs]: Add portmidi and
  python-pyportmidi.

gnu: Add python-pyportmidi.

* gnu/packages/music.scm (python-pyportmidi): New variable.