From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 18 Apr 2010 12:37:48 +0000 (+0000)
Subject: [packages] cups: change user:group from root:root to nobody:nogroup (closes: #7180... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d85fbefe4cb8fd4ec4b4617cd1fd5077207aac49;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] cups: change user:group from root:root to nobody:nogroup (closes: #7180), disable dns-sd, launchd, ldap & tiff support explicitly, bumb release number


SVN-Revision: 20981
---

diff --git a/net/cups/Makefile b/net/cups/Makefile
index 1a2b969a2c..f453fa32f3 100644
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 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.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2
 PKG_SOURCE_URL:= \
@@ -46,14 +46,17 @@ endef
 
 define Build/Configure
 	$(call Build/Configure/Default, \
-		--with-cups-user=root \
-		--with-cups-group=root \
+		--with-cups-user="nobody" \
+		--with-cups-group="nogroup" \
 		--without-perl \
 		--without-python \
 		--without-php \
 		--enable-shared \
 		--enable-image \
 		--disable-dbus \
+		--disable-dnssd \
+		--disable-launchd \
+		--disable-ldap \
 		--disable-pam \
 		--disable-slp \
 		--disable-gnutls \
@@ -61,7 +64,7 @@ define Build/Configure
 		--disable-cdsassl \
 		--disable-ssl \
 		--disable-gssapi \
-		--disable-slp, \
+		--disable-tiff, \
 		UNAME="Linux" \
 		LIBS="$(TARGET_LDFLAGS) -lz -lpng -ljpeg" \
 	)
diff --git a/net/cups/files/etc/cups/cupsd.conf b/net/cups/files/etc/cups/cupsd.conf
index 0bef5d97a4..79ad9449b1 100644
--- a/net/cups/files/etc/cups/cupsd.conf
+++ b/net/cups/files/etc/cups/cupsd.conf
@@ -23,8 +23,8 @@ MaxPrinterHistory 10
 #PrintcapFormat BSD
 RequestRoot /var/cups
 #RemoteRoot remroot
-User root
-Group root
+User nobody
+Group nogroup
 RIPCache 512k
 TempDir /var/cups
 Port 631