From 8a413bcaf5dd845c6c5146a4f05e08529ab3e34f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 29 Apr 2015 16:26:34 +0200
Subject: gnu: rename (gnu packages socat) to (gnu packages networking).

* gnu/packages/socat.scm: Rename this ...
* gnu/packages/networking.scm: ... to this.
* gnu-system.am (GNU_SYSTEM_MODULES): Change socat.scm to networking.scm.
---
 gnu-system.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 26228fccfa..95eefdcbf5 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -217,6 +217,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/ncurses.scm			\
   gnu/packages/netpbm.scm			\
   gnu/packages/nettle.scm			\
+  gnu/packages/networking.scm			\
   gnu/packages/ninja.scm			\
   gnu/packages/node.scm				\
   gnu/packages/noweb.scm			\
@@ -273,7 +274,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/slang.scm			\
   gnu/packages/slim.scm				\
   gnu/packages/smalltalk.scm			\
-  gnu/packages/socat.scm			\
   gnu/packages/ssh.scm				\
   gnu/packages/stalonetray.scm			\
   gnu/packages/statistics.scm			\
-- 
cgit v1.2.3


From 167a05aabc229d48d62545ef218d8b0577e6e8f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 4 May 2015 00:23:55 +0200
Subject: gnu: gcc-5.1: Add specific libvtv patch.

* gnu/packages/patches/gcc-5.0-libvtv-runpath.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/gcc.scm (gcc-5.1)[source]: Use it.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 95eefdcbf5..3223dc8afd 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -422,6 +422,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/gcc-arm-link-spec-fix.patch		\
   gnu/packages/patches/gcc-cross-environment-variables.patch	\
   gnu/packages/patches/gcc-libvtv-runpath.patch			\
+  gnu/packages/patches/gcc-5.0-libvtv-runpath.patch		\
   gnu/packages/patches/geoclue-config.patch			\
   gnu/packages/patches/ghostscript-runpath.patch		\
   gnu/packages/patches/gitolite-openssh-6.8-compat.patch	\
-- 
cgit v1.2.3


From a73956baf4d1f103fbb574c5f0880e10de1c027b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@suse.cz>
Date: Wed, 11 Mar 2015 22:00:07 +0100
Subject: gnu: Add taskwarrior.

* gnu/packages/task-management.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 3223dc8afd..c422d19f25 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -280,6 +280,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/swig.scm				\
   gnu/packages/sxiv.scm				\
   gnu/packages/synergy.scm			\
+  gnu/packages/task-management.scm		\
   gnu/packages/tbb.scm				\
   gnu/packages/tcl.scm				\
   gnu/packages/tcsh.scm				\
-- 
cgit v1.2.3


From 80e2072a7506beaa3bf82a8c4e22e888b1b1111f Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sun, 3 May 2015 10:54:30 -0400
Subject: gnu: curl: Update to 7.42.1.

* gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch,
  gnu/packages/patches/curl-support-capath-on-gnutls.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/curl.scm (curl): Update to 7.42.1.  Remove patches.
---
 gnu-system.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index c422d19f25..f6c9947923 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -404,8 +404,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/cssc-missing-include.patch               \
   gnu/packages/patches/clucene-contribs-lib.patch               \
   gnu/packages/patches/cursynth-wave-rand.patch			\
-  gnu/packages/patches/curl-support-capath-on-gnutls.patch	\
-  gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch	\
   gnu/packages/patches/dbus-localstatedir.patch			\
   gnu/packages/patches/diffutils-gets-undeclared.patch		\
   gnu/packages/patches/dfu-programmer-fix-libusb.patch		\
-- 
cgit v1.2.3


From e5326da4f4111e991fa695d7d7b566d384f82895 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sun, 26 Apr 2015 17:46:57 -0400
Subject: gnu: Add libical.

* gnu/packages/calendar.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index f6c9947923..0644a649a3 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -173,6 +173,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/libffcall.scm			\
   gnu/packages/libffi.scm			\
   gnu/packages/libftdi.scm			\
+  gnu/packages/calendar.scm			\
   gnu/packages/libidn.scm			\
   gnu/packages/libphidget.scm			\
   gnu/packages/libreoffice.scm			\
-- 
cgit v1.2.3


From 401f9a8b15b126dc6b8a357474f89ae7cb915601 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 5 May 2015 00:38:59 -0500
Subject: gnu: fltk: Fix undefined symbol errors for shared libraries.

* gnu/packages/patches/fltk-shared-lib-defines.patch: New patch.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/fltk.scm (source)[patches]: New field.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 0644a649a3..798188f7e7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -418,6 +418,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/findutils-absolute-paths.patch		\
   gnu/packages/patches/flashrom-use-libftdi1.patch		\
   gnu/packages/patches/flex-bison-tests.patch			\
+  gnu/packages/patches/fltk-shared-lib-defines.patch		\
   gnu/packages/patches/gawk-shell.patch				\
   gnu/packages/patches/gcc-arm-link-spec-fix.patch		\
   gnu/packages/patches/gcc-cross-environment-variables.patch	\
-- 
cgit v1.2.3


From fe1a39d319258c26fb9bcedc2fd337a9e2f40df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 1 May 2015 19:36:10 +0200
Subject: services: Group desktop services in (gnu services desktop).

* gnu/services/colord.scm, gnu/services/dbus.scm,
  gnu/services/upower.scm: Remove.
* gnu/services/desktop.scm: New file, with contents taken from the above
  files.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* doc/guix.texi (Desktop Services): New section.
  (Various Services): Move colord-service and upower-service from
  here to "Desktop Services".
---
 gnu-system.am | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 798188f7e7..9ffb76ee5d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -329,13 +329,11 @@ GNU_SYSTEM_MODULES =				\
   gnu/services.scm				\
   gnu/services/avahi.scm			\
   gnu/services/base.scm				\
-  gnu/services/colord.scm			\
-  gnu/services/dbus.scm				\
+  gnu/services/desktop.scm			\
   gnu/services/dmd.scm				\
   gnu/services/lirc.scm				\
   gnu/services/networking.scm			\
   gnu/services/ssh.scm				\
-  gnu/services/upower.scm			\
   gnu/services/xorg.scm				\
 						\
   gnu/system.scm				\
-- 
cgit v1.2.3


From 76071c70fc82479b9ceaac7aa4d56ee9282a8a09 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 5 May 2015 20:21:38 -0500
Subject: gnu: hop: Remove use of patchelf.

* gnu/packages/patches/hop-linker-flags.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/scheme.scm (source)[patches]: Use it.
  (arguments)[phases]: Remove patch-rpath phase.
  [modules, imported-modules]: Remove.
  (native-inputs): Remove field.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 9ffb76ee5d..2cbb854b89 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -449,6 +449,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/guix-test-networking.patch		\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
+  gnu/packages/patches/hop-linker-flags.patch			\
   gnu/packages/patches/inetutils-syslogd.patch			\
   gnu/packages/patches/irrlicht-mesa-10.patch			\
   gnu/packages/patches/jbig2dec-ignore-testtest.patch		\
-- 
cgit v1.2.3


From 105369a46b6baf94aec5382cad6c70509e3ce1fc Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sun, 3 May 2015 17:02:59 -0400
Subject: gnu: Add postgresql-service.

* gnu/services/databases.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi ("Database Services"): New subsubsection.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 2cbb854b89..852d558ad3 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -329,6 +329,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/services.scm				\
   gnu/services/avahi.scm			\
   gnu/services/base.scm				\
+  gnu/services/databases.scm			\
   gnu/services/desktop.scm			\
   gnu/services/dmd.scm				\
   gnu/services/lirc.scm				\
-- 
cgit v1.2.3


From 88b6b125baeb41908a40591d403bceb6a9aafb10 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 7 May 2015 12:19:33 -0400
Subject: gnu: serf: Apply upstream fixes.

* gnu/packages/patches/serf-comment-style-fix.patch,
  gnu/packages/patches/serf-deflate-buckets-test-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/web.scm (serf): Add patches.  Remove 'remove-non-c89-comment'
  phase.
---
 gnu-system.am | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 852d558ad3..b5b71abdb0 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -538,6 +538,8 @@ dist_patch_DATA =						\
   gnu/packages/patches/scheme48-tests.patch			\
   gnu/packages/patches/scotch-test-threading.patch		\
   gnu/packages/patches/sdl-libx11-1.6.patch			\
+  gnu/packages/patches/serf-comment-style-fix.patch		\
+  gnu/packages/patches/serf-deflate-buckets-test-fix.patch	\
   gnu/packages/patches/slim-session.patch			\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
-- 
cgit v1.2.3


From 7b05ba9161579004ace734efc42d48c6f1708d5c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 6 May 2015 08:38:06 +0200
Subject: gnu: Add WebkitGTK 2.4.8.

* gnu/packages/webkit.scm (webkitgtk-2.4): New variable.
* gnu/packages/patches/webkitgtk-2.4.8-gmutexlocker.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index b5b71abdb0..75da645039 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -559,6 +559,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/vpnc-script.patch			\
   gnu/packages/patches/vtk-mesa-10.patch			\
   gnu/packages/patches/w3m-fix-compile.patch			\
+  gnu/packages/patches/webkitgtk-2.4.8-gmutexlocker.patch	\
   gnu/packages/patches/weex-vacopy.patch			\
   gnu/packages/patches/wicd-urwid-1.3.patch			\
   gnu/packages/patches/wmctrl-64-fix.patch			\
-- 
cgit v1.2.3


From e55c1b67ead07be673d2b86bf48575db959b885f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 6 May 2015 08:41:40 +0200
Subject: gnu: Add GnuCash.

* gnu/packages/gnucash.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 75da645039..817bad74f0 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -124,6 +124,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/gl.scm				\
   gnu/packages/glib.scm				\
   gnu/packages/gnome.scm			\
+  gnu/packages/gnucash.scm			\
   gnu/packages/gnunet.scm			\
   gnu/packages/gnupg.scm			\
   gnu/packages/gnustep.scm			\
-- 
cgit v1.2.3


From aa2e989e1e6d480e964b08a3395c1d7aa704e392 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 7 May 2015 18:40:15 -0400
Subject: gnu: linux-libre: Update to 4.0.2.

* gnu/packages/patches/linux-libre-libreboot-fix.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/linux.scm (linux-libre): Update to 4.0.2.  Remove patch.
---
 gnu-system.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 817bad74f0..95378a7cb7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -472,7 +472,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/libvpx-fix-armhf-link.patch		\
   gnu/packages/patches/libvpx-fix-ssse3-quantize.patch		\
   gnu/packages/patches/libvpx-vp9-out-of-bounds-access.patch	\
-  gnu/packages/patches/linux-libre-libreboot-fix.patch		\
   gnu/packages/patches/lirc-localstatedir.patch			\
   gnu/packages/patches/lm-sensors-hwmon-attrs.patch		\
   gnu/packages/patches/lua51-liblua-so.patch                    \
-- 
cgit v1.2.3


From cbf71ea25ebf4291ce379003f8df9f2dbcc4f3b9 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 7 May 2015 05:32:47 -0400
Subject: gnu: subversion: Add fix for sqlite-3.8.9.

* gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/version-control.scm (subversion): Add patch.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 95378a7cb7..77c7836671 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -544,6 +544,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
   gnu/packages/patches/soprano-find-clucene.patch		\
+  gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch	\
   gnu/packages/patches/superlu-dist-scotchmetis.patch		\
   gnu/packages/patches/tcsh-fix-autotest.patch			\
   gnu/packages/patches/teckit-cstdio.patch			\
-- 
cgit v1.2.3


From 6f05630ba6848fa666f4ea57aab7f7ffbc15fc72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 9 May 2015 15:40:14 +0200
Subject: gnu: wicd: Add patch to fix template instantiation.

* gnu/packages/patches/wicd-template-instantiation.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/wicd.scm (wicd)[source]: Use it.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 77c7836671..d3e91ed05b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -562,6 +562,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/w3m-fix-compile.patch			\
   gnu/packages/patches/webkitgtk-2.4.8-gmutexlocker.patch	\
   gnu/packages/patches/weex-vacopy.patch			\
+  gnu/packages/patches/wicd-template-instantiation.patch	\
   gnu/packages/patches/wicd-urwid-1.3.patch			\
   gnu/packages/patches/wmctrl-64-fix.patch			\
   gnu/packages/patches/wpa-supplicant-CVE-2015-1863.patch	\
-- 
cgit v1.2.3


From 8fda1b797063af19bda898e41dcf6a8369d8aed5 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <tipecaml@gmail.com>
Date: Fri, 8 May 2015 19:37:05 +0200
Subject: Remove leftover patches.

* gnu/packages/patches/guix-test-networking.patch: Delete it.
* gnu/packages/patches/libtool-skip-tests.patch: Delete it.
* gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch: Delete it.
* gnu/packages/patches/udev-gir-libtool.patch: Delete it.
* gnu-system.am (dist_patch_DATA): Remove them as well.
---
 gnu-system.am | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index d3e91ed05b..f5649f1a0f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -448,7 +448,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/guile-default-utf8.patch			\
   gnu/packages/patches/guile-linux-syscalls.patch		\
   gnu/packages/patches/guile-relocatable.patch			\
-  gnu/packages/patches/guix-test-networking.patch		\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
   gnu/packages/patches/hop-linker-flags.patch			\
@@ -466,7 +465,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/liboop-mips64-deplibs-fix.patch		\
   gnu/packages/patches/libmad-mips-newgcc.patch			\
   gnu/packages/patches/libtheora-config-guess.patch		\
-  gnu/packages/patches/libtool-skip-tests.patch			\
   gnu/packages/patches/libtool-skip-tests2.patch		\
   gnu/packages/patches/libssh-CVE-2014-0017.patch		\
   gnu/packages/patches/libvpx-fix-armhf-link.patch		\
@@ -524,7 +522,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/pyqt-configure.patch			\
   gnu/packages/patches/python-fix-tests.patch			\
   gnu/packages/patches/python-libffi-mips-n32-fix.patch		\
-  gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch	\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
   gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch	\
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
@@ -550,7 +547,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/teckit-cstdio.patch			\
   gnu/packages/patches/texi2html-document-encoding.patch	\
   gnu/packages/patches/texi2html-i18n.patch			\
-  gnu/packages/patches/udev-gir-libtool.patch			\
   gnu/packages/patches/unzip-CVE-2014-8139.patch		\
   gnu/packages/patches/unzip-CVE-2014-8140.patch		\
   gnu/packages/patches/unzip-CVE-2014-8141.patch		\
-- 
cgit v1.2.3


From 6633f86b4941ec35bb4c328ec1e0b2bbfc41ad83 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Tue, 28 Apr 2015 22:21:37 +0300
Subject: gnu: Add tvtime.

* gnu/packages/tv.scm,
  gnu/packages/patches/tvtime-gcc41.patch,
  gnu/packages/patches/tvtime-pngoutput.patch,
  gnu/packages/patches/tvtime-videodev2.patch,
  gnu/packages/patches/tvtime-xmltv.patch: New files.
* gnu-system.am (GNU_SYSTEM_MODULES): Add package.
  (dist_patch_DATA): Add patches.
---
 gnu-system.am | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index f5649f1a0f..0932ef4ad2 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -294,6 +294,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/tmux.scm				\
   gnu/packages/tor.scm				\
   gnu/packages/tre.scm				\
+  gnu/packages/tv.scm				\
   gnu/packages/unrtf.scm			\
   gnu/packages/upnp.scm				\
   gnu/packages/uucp.scm				\
@@ -547,6 +548,10 @@ dist_patch_DATA =						\
   gnu/packages/patches/teckit-cstdio.patch			\
   gnu/packages/patches/texi2html-document-encoding.patch	\
   gnu/packages/patches/texi2html-i18n.patch			\
+  gnu/packages/patches/tvtime-gcc41.patch			\
+  gnu/packages/patches/tvtime-pngoutput.patch			\
+  gnu/packages/patches/tvtime-videodev2.patch			\
+  gnu/packages/patches/tvtime-xmltv.patch			\
   gnu/packages/patches/unzip-CVE-2014-8139.patch		\
   gnu/packages/patches/unzip-CVE-2014-8140.patch		\
   gnu/packages/patches/unzip-CVE-2014-8141.patch		\
-- 
cgit v1.2.3


From d48c8e7b6070a63dc12ead0bb9ea47b790e237f0 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 11 May 2015 12:46:31 -0400
Subject: gnu: wpa-supplicant: Add security fixes.

* gnu/packages/patches/wpa-supplicant-2015-2-fix.patch,
  gnu/packages/patches/wpa-supplicant-2015-3-fix.patch,
  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt1.patch,
  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt2.patch,
  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt3.patch,
  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt4.patch,
  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt5.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/admin.scm (wpa-supplicant-light)[source]: Add patches.
---
 gnu-system.am | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 0932ef4ad2..6804fd3d38 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -567,6 +567,13 @@ dist_patch_DATA =						\
   gnu/packages/patches/wicd-urwid-1.3.patch			\
   gnu/packages/patches/wmctrl-64-fix.patch			\
   gnu/packages/patches/wpa-supplicant-CVE-2015-1863.patch	\
+  gnu/packages/patches/wpa-supplicant-2015-2-fix.patch		\
+  gnu/packages/patches/wpa-supplicant-2015-3-fix.patch		\
+  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt1.patch	\
+  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt2.patch	\
+  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt3.patch	\
+  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt4.patch	\
+  gnu/packages/patches/wpa-supplicant-2015-4-fix-pt5.patch	\
   gnu/packages/patches/xf86-video-ark-remove-mibstore.patch	\
   gnu/packages/patches/xf86-video-ast-remove-mibstore.patch	\
   gnu/packages/patches/xf86-video-geode-glibc-2.20.patch	\
-- 
cgit v1.2.3


From 083b54b7c74a68958fe84b8f627123a030775d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 12 May 2015 18:41:58 +0200
Subject: gnu: inetutils: Update to 1.9.3.

* gnu/packages/patches/inetutils-syslogd.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
* gnu/packages/admin.scm (inetutils): Bump to 1.9.3.
  [source]: Remove patch.
  [native-inputs]: Remove.
---
 gnu-system.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 6804fd3d38..d9053bdb7e 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -452,7 +452,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
   gnu/packages/patches/hop-linker-flags.patch			\
-  gnu/packages/patches/inetutils-syslogd.patch			\
   gnu/packages/patches/irrlicht-mesa-10.patch			\
   gnu/packages/patches/jbig2dec-ignore-testtest.patch		\
   gnu/packages/patches/kmod-module-directory.patch		\
-- 
cgit v1.2.3


From e1820d14439abedb1cb1caa5cd9f68bcfcbbd466 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 12 May 2015 23:18:29 -0400
Subject: gnu: icecat: Apply fixes for CVE-2015-{0797,2708,2710,2713,2716}.

* gnu/packages/patches/icecat-CVE-2015-0797.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt3.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt4.patch,
  gnu/packages/patches/icecat-CVE-2015-2710-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-2710-pt3.patch,
  gnu/packages/patches/icecat-CVE-2015-2713-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-2713-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-2716.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat): Add patches.
---
 gnu-system.am | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index d9053bdb7e..e25eae59fe 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -452,6 +452,17 @@ dist_patch_DATA =						\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
   gnu/packages/patches/hop-linker-flags.patch			\
+  gnu/packages/patches/icecat-CVE-2015-0797.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2708-pt1.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2708-pt2.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2708-pt3.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2708-pt4.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2710-pt1.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2710-pt3.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2713-pt1.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2713-pt2.patch		\
+  gnu/packages/patches/icecat-CVE-2015-2716.patch		\
   gnu/packages/patches/irrlicht-mesa-10.patch			\
   gnu/packages/patches/jbig2dec-ignore-testtest.patch		\
   gnu/packages/patches/kmod-module-directory.patch		\
-- 
cgit v1.2.3


From f6708fcdb2b6977e0a2a7449aa917dc373545455 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 14 May 2015 19:01:26 -0400
Subject: gnu: qemu: Update to 2.3.0; add fix for CVE-2015-3456.

* gnu/packages/patches/qemu-CVE-2015-3456.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/qemu.scm (qemu-headless): Update to 2.3.0.  Add patch.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index e25eae59fe..5ba48d15d2 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -536,6 +536,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
   gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch	\
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
+  gnu/packages/patches/qemu-CVE-2015-3456.patch			\
   gnu/packages/patches/qt4-ldflags.patch			\
   gnu/packages/patches/qt4-tests.patch				\
   gnu/packages/patches/qt5-conflicting-typedefs.patch		\
-- 
cgit v1.2.3


From 3a6fb858ad95dd422b2519d5862d5db61deeb2a5 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 20 May 2015 14:55:26 -0400
Subject: gnu: bitlbee: Update to 3.4.

* gnu/packages/patches/bitlbee-configure-doc-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/messaging.scm (bitlbee): Update to 3.4.  Add patch.
  [inputs]: Remove 'zlib'.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 5ba48d15d2..a26686b81b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -387,6 +387,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/bigloo-gc-shebangs.patch			\
   gnu/packages/patches/binutils-ld-new-dtags.patch		\
   gnu/packages/patches/binutils-loongson-workaround.patch	\
+  gnu/packages/patches/bitlbee-configure-doc-fix.patch		\
   gnu/packages/patches/calibre-drop-unrar.patch			\
   gnu/packages/patches/calibre-no-updates-dialog.patch		\
   gnu/packages/patches/cdparanoia-fpic.patch			\
-- 
cgit v1.2.3


From 9099e881828fd242cc26054c0f33670c46154d96 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 19 May 2015 11:53:47 +0200
Subject: gnu: r: Apply patch to fix linking against R.

* gnu/packages/patches/r-fix-15899.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/statistics.scm (r)[source]: Use it.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index a26686b81b..297c8bcf6a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -542,6 +542,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/qt4-tests.patch				\
   gnu/packages/patches/qt5-conflicting-typedefs.patch		\
   gnu/packages/patches/qt5-runpath.patch			\
+  gnu/packages/patches/r-fix-15899.patch			\
   gnu/packages/patches/ratpoison-shell.patch			\
   gnu/packages/patches/readline-link-ncurses.patch		\
   gnu/packages/patches/ripperx-libm.patch			\
-- 
cgit v1.2.3


From 4de02f36ac00af722c8f693ab5823fc1a870d58f Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Fri, 22 May 2015 00:09:26 -0400
Subject: gnu: fuse: Add fix for CVE-2015-3202.

* gnu/packages/patches/fuse-CVE-2015-3202.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (fuse): Add patch.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 297c8bcf6a..23113bb16c 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -421,6 +421,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/flashrom-use-libftdi1.patch		\
   gnu/packages/patches/flex-bison-tests.patch			\
   gnu/packages/patches/fltk-shared-lib-defines.patch		\
+  gnu/packages/patches/fuse-CVE-2015-3202.patch			\
   gnu/packages/patches/gawk-shell.patch				\
   gnu/packages/patches/gcc-arm-link-spec-fix.patch		\
   gnu/packages/patches/gcc-cross-environment-variables.patch	\
-- 
cgit v1.2.3


From 936715c9f491ddbb943f4665cca1e7ec3c84ac22 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 21 May 2015 14:30:43 -0400
Subject: gnu: gnutls: Update to 3.4.1.

* gnu/packages/patches/gnutls-fix-duplicate-manpages.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/gnutls.scm (gnutls): Update to 3.4.1.  Remove patch.
---
 gnu-system.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 23113bb16c..a79495480a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -439,7 +439,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/glibc-ldd-x86_64.patch			\
   gnu/packages/patches/glibc-locales.patch			\
   gnu/packages/patches/gmp-arm-asm-nothumb.patch		\
-  gnu/packages/patches/gnutls-fix-duplicate-manpages.patch	\
   gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   gnu/packages/patches/gobject-introspection-cc.patch		\
   gnu/packages/patches/gobject-introspection-girepository.patch	\
-- 
cgit v1.2.3


From 77af7b24072c94873a83b4fc53d960b55e4b728a Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 25 May 2015 22:03:39 -0400
Subject: gnu: maxima: Update to 5.36.1.

* gnu/packages/patches/maxima-defsystem-mkdir.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/maths.scm (maxima): Update to 5.36.1.  Add patch.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index a79495480a..43ced1213b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -490,6 +490,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/luit-posix.patch				\
   gnu/packages/patches/m4-gets-undeclared.patch			\
   gnu/packages/patches/make-impure-dirs.patch			\
+  gnu/packages/patches/maxima-defsystem-mkdir.patch		\
   gnu/packages/patches/mc-fix-ncurses-build.patch		\
   gnu/packages/patches/mcron-install.patch			\
   gnu/packages/patches/mhash-keygen-test-segfault.patch		\
-- 
cgit v1.2.3


From e7e8ea069e52052ab35a57284e18d171ab0f2daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Fri, 29 May 2015 15:50:14 +0800
Subject: gnu: webkitgtk-2.4: Update to 2.8.9, build with gtk3.

* gnu/packages/webkit.scm (webkitgtk-2.4): Update to 2.8.9, build with gtk3.
  Move flex and which to 'native-inputs'.  Remove #:configure-flags.
  (webkitgtk/gtk+-2): New variable.
* gnu/packages/gnucash.scm (gnucash): Use webkitgtk/gtk+-2.
* gnu/packages/patches/webkitgtk-2.4.8-gmutexlocker.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.

Co-authored-by: Feng Shu <tumashu@163.com>
---
 gnu-system.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 43ced1213b..2cd4c62cf7 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -575,7 +575,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/vpnc-script.patch			\
   gnu/packages/patches/vtk-mesa-10.patch			\
   gnu/packages/patches/w3m-fix-compile.patch			\
-  gnu/packages/patches/webkitgtk-2.4.8-gmutexlocker.patch	\
   gnu/packages/patches/weex-vacopy.patch			\
   gnu/packages/patches/wicd-template-instantiation.patch	\
   gnu/packages/patches/wicd-urwid-1.3.patch			\
-- 
cgit v1.2.3


From 716e20a2bccbbff71ff1839de2d9f97e7efd5a5f Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Fri, 5 Jun 2015 23:15:25 -0400
Subject: gnu: icecat: Update to 31.7.0-gnu1.

* gnu/packages/patches/icecat-CVE-2015-0797.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt3.patch,
  gnu/packages/patches/icecat-CVE-2015-2708-pt4.patch,
  gnu/packages/patches/icecat-CVE-2015-2710-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-2710-pt3.patch,
  gnu/packages/patches/icecat-CVE-2015-2713-pt1.patch,
  gnu/packages/patches/icecat-CVE-2015-2713-pt2.patch,
  gnu/packages/patches/icecat-CVE-2015-2716.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm (icecat): Update to 31.7.0-gnu1.  Remove patches.
---
 gnu-system.am | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 2cd4c62cf7..3073fef498 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -453,17 +453,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch			\
   gnu/packages/patches/hop-linker-flags.patch			\
-  gnu/packages/patches/icecat-CVE-2015-0797.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2708-pt1.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2708-pt2.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2708-pt3.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2708-pt4.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2710-pt1.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2710-pt3.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2713-pt1.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2713-pt2.patch		\
-  gnu/packages/patches/icecat-CVE-2015-2716.patch		\
   gnu/packages/patches/irrlicht-mesa-10.patch			\
   gnu/packages/patches/jbig2dec-ignore-testtest.patch		\
   gnu/packages/patches/kmod-module-directory.patch		\
-- 
cgit v1.2.3


From 3dbb0e5f8b9e8445818ca31861488666b948ce50 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 10 Jun 2015 15:11:48 -0400
Subject: gnu: qemu: Add fix for CVE-2015-3209.

* gnu/packages/patches/qemu-CVE-2015-3209.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/qemu.scm (qemu): Add patch.
---
 gnu-system.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu-system.am')

diff --git a/gnu-system.am b/gnu-system.am
index 3073fef498..978e839bfa 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -527,6 +527,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
   gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch	\
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
+  gnu/packages/patches/qemu-CVE-2015-3209.patch			\
   gnu/packages/patches/qemu-CVE-2015-3456.patch			\
   gnu/packages/patches/qt4-ldflags.patch			\
   gnu/packages/patches/qt4-tests.patch				\
-- 
cgit v1.2.3