From 16e5ecbce1ed997480d2eb6ce42d88f82e8038f2 Mon Sep 17 00:00:00 2001
From: swedebugia <address@hidden>
Date: Fri, 19 Feb 2016 23:11:16 +0100
Subject: [PATCH] gnu: cups: Update to 2.1.3 and add configure flags to enable
 gnutls and writing logs and state to /var

---
 gnu-system.am         |  1 +
 gnu/packages/cups.scm | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index d282be3..2ce7e5b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -441,6 +441,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/cssc-gets-undeclared.patch               \
   gnu/packages/patches/cssc-missing-include.patch               \
   gnu/packages/patches/clucene-contribs-lib.patch               \
+  gnu/packages/patches/cups-dir.patch				\
   gnu/packages/patches/cursynth-wave-rand.patch			\
   gnu/packages/patches/dbus-helper-search-path.patch		\
   gnu/packages/patches/dealii-p4est-interface.patch		\
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index ff3d152..d557951 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -111,21 +111,31 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
 (define-public cups-minimal
   (package
     (name "cups-minimal")
-    (version "2.1.0")
+    (version "2.1.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.cups.org/software/"
                                   version "/cups-" version "-source.tar.bz2"))
               (sha256
                (base32
-                "1jfjqsw9l7jbn5kb9i96k0wj12kjdbgx0rd8157dif22hi0kh0ms"))))
+                "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"))
+              (patches
+               (list
+                ;; Patch to the Makefiles in /notifier and /scheduler
+                ;; to remove calls to mkdir outside the chroot.
+                (search-patch "cups-dir.patch")))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
        '("--disable-launchd"
          "--disable-systemd"
          "--disable-avahi"
-         "--disable-dnssd")
+         "--disable-dnssd"
+         "--enable-gnutls"
+         "--localstatedir=/var"
+         "--with-logdir=/var/log/cups"
+         "--with-rundir=/var/run/cups"
+         "--with-cachedir=/var")
        ;; Seven tests fail, mostly because of files that are provided by the
        ;; cups-filters package.
        #:tests? #f
@@ -174,7 +184,10 @@ device-specific programs to convert and print many types of files.")
        #:tests? #f
        #:configure-flags
        '("--disable-launchd"
-         "--disable-systemd")
+         "--disable-systemd"
+         ;; TODO: when cups-minimal builds succesfully: add flags accordingly
+         ;; below.
+         "--localstatedir=/var")
        #:phases
        (alist-cons-before
         'configure
-- 
2.6.3