summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--cups-systemd-socket.patch12
3 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ca14c0a3e40..d01edde816f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = cups-git
- pkgver = 2.3b7.r152.gb13a9a963
+ pkgver = 2.3b7.r160.g42f55cadf
pkgrel = 1
url = https://www.cups.org/
arch = x86_64
@@ -41,7 +41,7 @@ pkgbase = cups-git
sha256sums = ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832
sha256sums = b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b
sha256sums = 23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af
- sha256sums = 08b017a08a94eaf46c8ba47a176a5bbd2acacf512de2d4e539f483c310ab5ea9
+ sha256sums = ea5a3d378807d45e1959c0b3893c84e50298b57d7f11943f9ed8ba2166d17cd7
sha256sums = d4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d
pkgname = libcups-git
@@ -52,7 +52,7 @@ pkgname = libcups-git
depends = krb5
depends = avahi
depends = libusb
- provides = libcups=2.3b7.r152.gb13a9a963
+ provides = libcups=2.3b7.r160.g42f55cadf
conflicts = libcups
pkgname = cups-git
diff --git a/PKGBUILD b/PKGBUILD
index 06a41cfd224..bb19a375b3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase="cups-git"
_pkgbase=cups
pkgname=('libcups-git' 'cups-git')
-pkgver=2.3b7.r152.gb13a9a963
+pkgver=2.3b7.r160.g42f55cadf
pkgrel=1
arch=('x86_64')
license=('GPL')
@@ -29,7 +29,7 @@ sha256sums=('SKIP'
'ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832'
'b8fc2e3bc603495f0278410350ea8f0161d9d83719feb64f573b63430cb4800b'
'23349c96f2f7aeb7d48e3bcd35a969f5d5ac8f55a032b0cfaa0a03d7e37ea9af'
- '08b017a08a94eaf46c8ba47a176a5bbd2acacf512de2d4e539f483c310ab5ea9'
+ 'ea5a3d378807d45e1959c0b3893c84e50298b57d7f11943f9ed8ba2166d17cd7'
'd4537526c1e075866ae22ad263da000fc2a592d36c26b79a459a1cfdade2bb2d')
pkgver() {
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index ec8c7076be1..4999ab50742 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -33,16 +33,18 @@ diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler
diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
--- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg 2014-10-21 13:55:01.000000000 +0200
+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in 2015-02-10 13:40:24.296545049 +0100
-@@ -2,10 +2,11 @@
+@@ -1,11 +1,11 @@
+ [Unit]
Description=CUPS Scheduler
Documentation=man:cupsd(8)
- After=sssd.service
-+After=network.taget
-
+-After=sssd.service
++After=network.target sssd.service
+
[Service]
ExecStart=@sbindir@/cupsd -l
-Type=simple
+Type=notify
Restart=on-failure
-
+
[Install]
+