nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,900 Commits 1 Branch 0 Tags 104 MiB
Commit Graph

741 Commits

Author SHA1 Message Date
Leo Famulari f0150f8724 gnu: grub: Add fix for CVE-2015-8730. 
* gnu/packages/patches/grub-CVE-2015-8370.patch: New file.
* gnu-system.am (dist_patch_DATA): Register patch.
* gnu/packages/grub.scm: Apply patch.
 2015-12-21 12:33:55 -05:00
Andy Wingo d8c18af834 gnu: Add dovecot service 
* gnu/services/mail.scm: New file.
(&dovecot-configuration-error, dovecot-configuration-error?)
(dovecot-service, dovecot-configuration, dict-configuration)
(passdb-configuration, userdb-configuration)
(unix-listener-configuration, fifo-listener-configuration)
(inet-listener-configuration, service-configuration)
(protocol-configuration, plugin-configuration, mailbox-configuration)
(namespace-configuration, opaque-dovecot-configuration): New public
variables.

* gnu-system.am (GNU_SYSTEM_MODULES): Add (gnu services mail).

* doc/guix.texi (Mail Services): New node.
 2015-12-18 09:24:27 +01:00
Mark H Weaver 3faf214a0b gnu: icecat: Add fixes for several security flaws. 
* gnu/packages/patches/icecat-CVE-2015-7201-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-7201-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-7201-pt3.patch,
  gnu/packages/patches/icecat-CVE-2015-7205.patch,
  gnu/packages/patches/icecat-CVE-2015-7210.patch,
  gnu/packages/patches/icecat-CVE-2015-7212.patch,
  gnu/packages/patches/icecat-CVE-2015-7213-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-7213-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-7214.patch,
  gnu/packages/patches/icecat-CVE-2015-7222-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-7222-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-7222-pt3.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add patches.
 2015-12-17 14:12:06 -05:00
Federico Beffa fceac88039 gnu: python-ipython: Patch 'ctypes' bug. 
* gnu/packages/patches/python-ipython-inputhook-ctype.patch: New patch.
* gnu/packages/python.scm (python-ipython): Use it.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-12-15 18:05:42 +01:00
Efraim Flashner 9c1c2a7f8d gnu: bluez: Update to 5.36. 
* gnu/packages/linux.scm (bluez): Update to 5.36.
[source]: Remove patch.
* gnu/packages/patches/bluez-tests.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
 2015-12-14 11:06:20 +02:00
Ricardo Wurmus f7f55db8f6 gnu: Move sparsehash to datastructures module. 
* gnu/packages/crypto.scm (sparsehash): Move variable to...
* gnu/packages/datastructures.scm: ...new file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-12-11 15:59:20 +01:00
Mark H Weaver 821060f3f6 gnu: libxml2: Update to 2.9.3. 
* gnu/packages/patches/libxml2-CVE-2015-1819.patch,
  gnu/packages/patches/libxml2-CVE-2015-7941-pt1.patch,
  gnu/packages/patches/libxml2-CVE-2015-7941-pt2.patch,
  gnu/packages/patches/libxml2-CVE-2015-7942-pt1.patch,
  gnu/packages/patches/libxml2-CVE-2015-7942-pt2.patch,
  gnu/packages/patches/libxml2-CVE-2015-8035.patch,
  gnu/packages/patches/libxml2-bug-737840.patch,
  gnu/packages/patches/libxml2-bug-738805.patch,
  gnu/packages/patches/libxml2-bug-746048.patch,
  gnu/packages/patches/libxml2-bug-747437.patch,
  gnu/packages/patches/libxml2-bug-751603.patch,
  gnu/packages/patches/libxml2-bug-751631.patch,
  gnu/packages/patches/libxml2-bug-754946.patch,
  gnu/packages/patches/libxml2-bug-754947.patch,
  gnu/packages/patches/libxml2-bug-755857.patch,
  gnu/packages/patches/libxml2-fix-catalog-corruption.patch,
  gnu/packages/patches/libxml2-id-attrs-in-xmlSetTreeDoc.patch,
  gnu/packages/patches/libxml2-node-sort-order-pt1.patch,
  gnu/packages/patches/libxml2-node-sort-order-pt2.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/xml.scm (libxml2): Update to 2.9.3.  Remove patches.
 2015-12-07 09:54:01 -05:00
Leo Famulari 99fffa8ae0 gnu: Add python-configobj. 
* gnu/packages/python.scm (python-configobj, python2-configobj): New
  variables.
* gnu/packages/patches/python-configobj-setuptools.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-12-05 09:44:37 -05:00
Mark H Weaver b9fa245fcd gnu: icecat: Update to 38.4.0-gnu1. 
* gnu/packages/patches/icecat-CVE-2015-4513-pt01.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt02.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt03.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt04.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt05.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt06.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt07.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt08.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt09.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt10.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch,
  gnu/packages/patches/icecat-CVE-2015-7188.patch,
  gnu/packages/patches/icecat-CVE-2015-7189.patch,
  gnu/packages/patches/icecat-CVE-2015-7193.patch,
  gnu/packages/patches/icecat-CVE-2015-7194.patch,
  gnu/packages/patches/icecat-CVE-2015-7196.patch,
  gnu/packages/patches/icecat-CVE-2015-7197.patch,
  gnu/packages/patches/icecat-CVE-2015-7198.patch,
  gnu/packages/patches/icecat-CVE-2015-7199.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm (icecat): Update to 38.4.0-gnu1.  Remove the
  obsolete patches.
 2015-12-04 15:52:16 -05:00
Federico Beffa 1bbc659fd2 gnu: python-matplotlib: Add 'TkAgg' backend and update to version '1.4.3'. 
* gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Do it.
* gnu/packages/patches/matplotlib-setupext-tk.patch: New file.
* gnu-system.am (dist_patch_DATA): Add the new patch.
 2015-12-02 18:21:13 +01:00
Ricardo Wurmus 0149354d21 gnu: Add cereal. 
* gnu/packages/serialization.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-30 14:41:48 +01:00
Ludovic Courtès 9820a6d4a0 gnu: python: Make 'sys.version' deterministic. 
* gnu/packages/patches/python-2-deterministic-build-info.patch,
  gnu/packages/patches/python-3-deterministic-build-info.patch: New
  files.
* gnu/packages/python.scm (python-2, python): Use them.
* gnu-system.am (dist_patch_DATA): Add them.
 2015-11-29 22:59:28 +01:00
Ludovic Courtès dedc832070 gnu: python-2: Honor 'SOURCE_DATE_EPOCH'. 
* gnu/packages/patches/python-2.7-source-date-epoch.patch: New file.
* gnu/packages/python.scm (python-2)[source]: Use it.
  [arguments]: Set SOURCE_DATE_EPOCH in 'patch-lib-shells' phase.
* guix/build/python-build-system.scm (set-SOURCE-DATE-EPOCH): New
  procedure.
  (%standard-phases): Add it.
* gnu-system.am (dist_patch_DATA): Add patch.
 2015-11-29 22:59:28 +01:00
Ludovic Courtès f8e7fdc416 gnu: tcl: Produce 'tclIndex' files deterministically. 
* gnu/packages/patches/tcl-mkindex-deterministic.patch: New patch.
* gnu/packages/tcl.scm (tcl)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-29 22:59:28 +01:00
宋文武 79c8a071e7 tk: Hardcode path to TK_LIBRARY. 
Fixes <http://bugs.gnu.org/20889>.

* gnu/packages/patches/tk-find-library.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/tcl.scm (tk)[source]: Add patch.
 2015-11-29 22:59:28 +01:00
Ludovic Courtès cb7bd0cff5 gnu: weechat: Dynamically link against libpython2.7.so. 
* gnu/packages/patches/weechat-python.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/weechat.scm (weechat)[source]: Use it.
 2015-11-29 19:17:33 +01:00
Ludovic Courtès f79a576e77 gnu: jasper: Patch CVE-2008-3522. 
* gnu/packages/patches/jasper-CVE-2008-3522.patch: New file.
* gnu/packages/image.scm (jasper)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-28 16:29:11 +01:00
David Thompson 34f5618bca gnu: Add kodi. 
* gnu/packages/kodi.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-25 11:44:11 -05:00
David Thompson 33ae9107d8 gnu: Add tinyxml. 
* gnu/packages/xml.scm (tinyxml): New variable.
* gnu/packages/patches/tinyxml-use-stl.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-25 11:44:11 -05:00
Ricardo Wurmus 1c207a7658 gnu: Add Ragel. 
* gnu/packages/ragel.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-25 15:21:47 +01:00
Ludovic Courtès b6094b1f0a gnu: dico: Sort entries in .a files deterministically. 
* gnu/packages/patches/dico-libtool-deterministic.patch: New file.
* gnu/packages/dico.scm (dico)[source]: Use it.
[arguments]: Add #:make-flags.
* gnu-system.am (dist_patch_DATA): Add the patch.
 2015-11-25 11:59:54 +01:00
Ludovic Courtès c9e34a6a77 gnu: Add GNU Dico. 
* gnu/packages/dico.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-24 23:54:30 +01:00
Ludovic Courtès 5ca2b3c245 build: Add rsem patch to the distribution. 
This file was added in commit 66e3eff1.

* gnu-system.am (dist_patch_DATA): Add rsem-makefile.patch.
 2015-11-24 13:15:38 +01:00
Ricardo Wurmus 7775a18690 gnu: Add Synfig. 
* gnu/packages/animation.scm (synfig): New variable.
* gnu/packages/patches/synfig-build-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-20 20:23:03 +01:00
Ricardo Wurmus c1fbc66a77 gnu: Add ETL. 
* gnu/packages/animation.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-20 20:23:03 +01:00
Eric Bavier 2f5b6a1f18 gnu: hwloc: Update to 1.11.1. 
* gnu/packages/mpi.scm (hwloc): Update to 1.11.1.
  [source]: Remove patch.
* gnu/packages/patches/hwloc-gather-topology-lstopo.patch: Delete it.
* gnu-system.am (dist_patch_DATA): Remove it.
 2015-11-20 11:58:40 -06:00
Ricardo Wurmus 0297966495 gnu: guitarix: Update to 0.34.0. 
* gnu/packages/audio.scm (guitarix): Update to 0.34.0.
[source]: Remove patch.
[inputs]: Add webkitgtk/gtk+-2.
* gnu/packages/patches/guitarix-c++11: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
 2015-11-20 18:19:30 +01:00
Ricardo Wurmus b49c5a58dc gnu: preseq: Update to 2.0. 
* gnu/packages/bioinformatics.scm (preseq): Update to 2.0.
[source]: Add file-name field, remove patches.
[arguments]: Remove unused build phases, add make flags.
[inputs]: Add smithlab-cpp.
* gnu/packages/patches/preseq-1.0.2-link-with-libbam.patch: Remove file.
* gnu/packages/patches/preseq-1.0.2-install-to-PREFIX.patch: Remove
  file.
* gnu-system.am (dist_patch_DATA): Remove them.
 2015-11-20 15:22:06 +01:00
Mark H Weaver 3470fe002c gnu: libsndfile: Add fixes for CVE-2014-9496 and CVE-2015-7805. 
* gnu/packages/patches/libsndfile-CVE-2014-9496.patch,
  gnu/packages/patches/libsndfile-CVE-2015-7805.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/pulseaudio.scm (libsndfile)[source]: Add patches.
 2015-11-18 17:47:40 -05:00
Mark H Weaver b4a88dc25f gnu: libxslt: Add fix for CVE-2015-7995. 
* gnu/packages/patches/libxslt-CVE-2015-7995.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xml.scm (libxslt)[source]: Add patch.
 2015-11-18 17:47:40 -05:00
Mark H Weaver ee6bb0cc76 gnu: libxml2: Add fixes for CVE-2015-{1819,7941,7942,8035} and other bugs. 
* gnu/packages/patches/libxml2-CVE-2015-1819.patch,
  gnu/packages/patches/libxml2-CVE-2015-7941-pt1.patch,
  gnu/packages/patches/libxml2-CVE-2015-7941-pt2.patch,
  gnu/packages/patches/libxml2-CVE-2015-7942-pt1.patch,
  gnu/packages/patches/libxml2-CVE-2015-7942-pt2.patch,
  gnu/packages/patches/libxml2-CVE-2015-8035.patch,
  gnu/packages/patches/libxml2-bug-737840.patch,
  gnu/packages/patches/libxml2-bug-738805.patch,
  gnu/packages/patches/libxml2-bug-746048.patch,
  gnu/packages/patches/libxml2-bug-747437.patch,
  gnu/packages/patches/libxml2-bug-751603.patch,
  gnu/packages/patches/libxml2-bug-751631.patch,
  gnu/packages/patches/libxml2-bug-754946.patch,
  gnu/packages/patches/libxml2-bug-754947.patch,
  gnu/packages/patches/libxml2-bug-755857.patch,
  gnu/packages/patches/libxml2-fix-catalog-corruption.patch,
  gnu/packages/patches/libxml2-id-attrs-in-xmlSetTreeDoc.patch,
  gnu/packages/patches/libxml2-node-sort-order-pt1.patch,
  gnu/packages/patches/libxml2-node-sort-order-pt2.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/xml.scm (libxml2)[source]: Add patches.
 2015-11-18 17:47:40 -05:00
Ricardo Wurmus 3279b7ec47 gnu: Add Scribus. 
* gnu/packages/scribus.scm: New file
* gnu/packages/patches/scribus-qobject.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES, dist_patch_DATA): Add them.
 2015-11-17 08:43:32 +01:00
David Thompson 3aab2c839f gnu: Add devil. 
* gnu/packages/image.scm (devil): New variable.
* gnu/packages/patches/devil-fix-libpng.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-16 08:47:23 -05:00
Efraim Flashner 6a7e1a180b gnu: Add tilda. 
* gnu/packages/terminals.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-16 15:22:37 +02:00
Mark H Weaver ff45a00e79 gnu: mit-krb5: Add fixes for CVE-2015-{2695,2696,2697,2698}. 
* gnu/packages/patches/mit-krb5-CVE-2015-2695-pt1.patch,
  gnu/packages/patches/mit-krb5-CVE-2015-2695-pt2.patch,
  gnu/packages/patches/mit-krb5-CVE-2015-2696.patch,
  gnu/packages/patches/mit-krb5-CVE-2015-2697.patch,
  gnu/packages/patches/mit-krb5-CVE-2015-2698-pt1.patch,
  gnu/packages/patches/mit-krb5-CVE-2015-2698-pt2.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/mit-krb5.scm (mit-krb5)[native-inputs]: Add patches.
 2015-11-13 12:42:47 -05:00
Mark H Weaver 9715df7fbe gnu: mit-krb5: Update to 1.13.2. 
* gnu/packages/mit-krb5.scm (mit-krb5): Update to 1.13.2.
  [native-inputs]: Remove "patch/init-fix".
* gnu/packages/patches/mit-krb5-init-fix.patch: Delete file.
* gnu-system.am (dist_patch_DATA): Remove it.
 2015-11-13 12:42:47 -05:00
Roel Janssen 2f1531f008 gnu: Add inklingreader. 
* gnu/packages/inklingreader.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.

Signed-off-by: Mathieu Lirzin <mthl@gnu.org>
 2015-11-12 15:57:02 +01:00
Efraim Flashner 0137992a38 gnu: Add c-ares. 
* gnu/packages/aria2.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-12 16:21:00 +02:00
Efraim Flashner b2e93b9e45 gnu: Add owncloud-client. 
* gnu/packages/owncloud.scm (owncloud-client): New variable.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
 2015-11-12 16:14:42 +02:00
Andreas Enge 8de8cf438a gnu: lua: Register patch. 
* gnu-system.am (dist_patch_DATA): Register lua52-liblua-so.patch.

This is a follow-up to commit 0f9c1f3400.
 2015-11-12 05:12:37 +01:00
Mark H Weaver 419630e0be gnu: wpa-supplicant: Add fixes for CVE-2015-{5310,5314,5315,5316}. 
* gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch,
  gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch,
  gnu/packages/patches/wpa-supplicant-CVE-2015-5315.patch,
  gnu/packages/patches/wpa-supplicant-CVE-2015-5316.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/admin.scm (wpa-supplicant-minimal)[source]: Add patches.
 2015-11-11 07:45:11 -05:00
Ludovic Courtès ba583bd2ce gnu: torsocks: Upgrade to 2.0.0. 
* gnu/packages/tor.scm (torsocks): Update to 2.0.0.
  [source]: Fetch from git.torproject.org.  Use
  'torsocks-dns-test.patch'.
  [arguments, native-inputs]: New fields.
  [license]: Change to GPL2.
* gnu/packages/patches/torsocks-dns-test.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-11 00:37:50 +01:00
Taylan Ulrich Bayırlı/Kammer e6974eae1d gnu: Add mupen64plus-ui-console. 
* gnu/packages/games.scm (mupen64plus-ui-console): New variable.
* gnu/packages/patches/mupen64plus-ui-console-notice.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-10 22:14:44 +01:00
Mark H Weaver 0ca1eb705d gnu: icecat: Add several security fixes. 
* gnu/packages/patches/icecat-CVE-2015-4513-pt01.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt02.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt03.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt04.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt05.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt06.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt07.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt08.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt09.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt10.patch,
  gnu/packages/patches/icecat-CVE-2015-4513-pt11.patch,
  gnu/packages/patches/icecat-CVE-2015-7188.patch,
  gnu/packages/patches/icecat-CVE-2015-7189.patch,
  gnu/packages/patches/icecat-CVE-2015-7193.patch,
  gnu/packages/patches/icecat-CVE-2015-7194.patch,
  gnu/packages/patches/icecat-CVE-2015-7196.patch,
  gnu/packages/patches/icecat-CVE-2015-7197.patch,
  gnu/packages/patches/icecat-CVE-2015-7198.patch,
  gnu/packages/patches/icecat-CVE-2015-7199.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add patches.
 2015-11-07 08:33:16 -05:00
Eric Bavier b95bcb8ae0 gnu: Add byobu. 
* gnu/packages/screen.scm (byobu): New variable.
* gnu/packages/patches/byobu-writable-status.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
 2015-11-03 17:08:41 -06:00
Ludovic Courtès 6e82863463 system: Rename (gnu system linux) to (gnu system pam). 
* gnu/system/linux.scm: Rename to...
* gnu/system/pam.scm: ... this.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu.scm, gnu/services/base.scm, gnu/services/desktop.scm,
  gnu/services/networking.scm, gnu/services/ssh.scm,
  gnu/services/xorg.scm, gnu/system.scm, gnu/system/vm.scm: Likewise.
 2015-11-03 18:11:45 +01:00
Efraim Flashner f133955122 gnu: gsl: Update to 2.0. 
* gnu/packages/maths.scm (gsl): Update to 2.0.
  [source]: Remove patches.
* gnu/packages/patches/gsl-poly-test-fix-pt1.patch,
  gnu/packages/patches/gsl-poly-test-fix-pt2.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove patches.
 2015-11-02 21:04:18 +02:00
Andreas Enge 08859404c0 gnu: Remove aarddict. 
* gnu/packages/aarddict.scm: Remove file.
* gnu-system.am (GNU_SYSTEM_MODULES): Unregister file.
 2015-11-01 13:23:08 +01:00
Ludovic Courtès 3c3e69728c gnu: guitarix: Compile in C++11 mode. 
* gnu/packages/patches/guitarix-c++11.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/audio.scm (guitarix)[source]: Use it.
  [arguments]: Add --cxxflags to #:configure-flags.
 2015-10-31 13:17:23 +01:00
宋文武 eed588d997 Merge branch 'master' into dbus-update 2015-10-30 20:50:26 +08:00