From 01d35ca97568d05369513a00f7d6b6a81267417b Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 15:06:44 +0000
Subject: [PATCH] [packages_10.03.2] cups: merge r28910

SVN-Revision: 30200
---
 net/cups/Makefile         |  4 ++--
 net/cups/files/cupsd.init | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/net/cups/Makefile b/net/cups/Makefile
index fad3994195..309f12497b 100644
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cups
 PKG_VERSION:=1.4.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2
 PKG_SOURCE_URL:= \
diff --git a/net/cups/files/cupsd.init b/net/cups/files/cupsd.init
index ebbda23d8f..e5f00da9a4 100644
--- a/net/cups/files/cupsd.init
+++ b/net/cups/files/cupsd.init
@@ -1,14 +1,19 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
 start() {
-	mkdir -p /var/cache/cups
-	mkdir -p /var/cups
-	mkdir -p /var/spool/cups/tmp
-	/usr/sbin/cupsd
+	mkdir -m 0755 -p /var/cache/cups
+	mkdir -m 0755 -p /var/cups
+	mkdir -m 0755 -p /var/spool/cups/tmp
+	service_start /usr/sbin/cupsd
 }
 
 stop() {
-	killall cupsd
+	service_stop /usr/sbin/cupsd
+}
+
+reload() {
+	service_reload /usr/sbin/cupsd
 }
-- 
2.30.2