summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-01-15 20:19:54 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-01-15 20:19:54 +0000
commit0ef54e5be5f5a61fb6017d402f1721b78242cc85 (patch)
tree70721e4e4569a17bf58bbf5c5f42f196c2d83fec
parentAdd Debian patchset from upstream, fix more compile errors, add gcc-4.6 suppo... (diff)
downloadgentoo-2-0ef54e5be5f5a61fb6017d402f1721b78242cc85.tar.gz
gentoo-2-0ef54e5be5f5a61fb6017d402f1721b78242cc85.tar.bz2
gentoo-2-0ef54e5be5f5a61fb6017d402f1721b78242cc85.zip
Create dirs in /var/run in initscript, bug 387893
(Portage version: 2.1.10.44/cvs/Linux x86_64)
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/cups-1.4.8-r23.ebuild4
-rw-r--r--net-print/cups/cups-1.5.0-r3.ebuild4
-rw-r--r--net-print/cups/files/cupsd.init.d2
4 files changed, 11 insertions, 5 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index de6d0cc62134..03cfe56eb458 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.439 2012/01/15 18:50:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.440 2012/01/15 20:19:54 dilfridge Exp $
+
+ 15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r23.ebuild,
+ cups-1.5.0-r3.ebuild, files/cupsd.init.d:
+ Create dirs in /var/run in initscript, bug 387893
*cups-1.5.0-r3 (15 Jan 2012)
*cups-1.4.8-r23 (15 Jan 2012)
diff --git a/net-print/cups/cups-1.4.8-r23.ebuild b/net-print/cups/cups-1.4.8-r23.ebuild
index 88f293a81a96..ac39d3718c27 100644
--- a/net-print/cups/cups-1.4.8-r23.ebuild
+++ b/net-print/cups/cups-1.4.8-r23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.1 2012/01/15 18:50:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.2 2012/01/15 20:19:54 dilfridge Exp $
EAPI=3
@@ -277,7 +277,7 @@ src_install() {
fi
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
+ /var/cache/cups /var/cache/cups/rss /var/log/cups \
/var/spool/cups/tmp
keepdir /etc/cups/{interfaces,ppd,ssl}
diff --git a/net-print/cups/cups-1.5.0-r3.ebuild b/net-print/cups/cups-1.5.0-r3.ebuild
index 1f25dedb1a81..caad1de4e981 100644
--- a/net-print/cups/cups-1.5.0-r3.ebuild
+++ b/net-print/cups/cups-1.5.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.1 2012/01/15 18:50:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.2 2012/01/15 20:19:54 dilfridge Exp $
#
# See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD
@@ -234,7 +234,7 @@ src_install() {
fi
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
+ /var/cache/cups /var/cache/cups/rss /var/log/cups \
/var/spool/cups/tmp
keepdir /etc/cups/{interfaces,ppd,ssl}
diff --git a/net-print/cups/files/cupsd.init.d b/net-print/cups/files/cupsd.init.d
index e5529eecccff..1e9ccf8381c9 100644
--- a/net-print/cups/files/cupsd.init.d
+++ b/net-print/cups/files/cupsd.init.d
@@ -9,6 +9,8 @@ depend() {
start() {
ebegin "Starting cupsd"
+ checkpath -q -d -m 0755 -o root:lp /var/run/cups
+ checkpath -q -d -m 0511 -o lp:lpadmin /var/run/cups/certs
start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
eend $?
}