From e8bdc9fdfcb94d512a58cda8f2833acb119a3a7d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 6 Dec 2010 17:35:44 +0000
Subject: [PATCH] /usr/sbin/cupsd should be mode 0755 (bug #546004).

---
 cups-0755.patch | 18 +++++++++++++++---
 cups.spec       |  5 ++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/cups-0755.patch b/cups-0755.patch
index d81993e..7835592 100644
--- a/cups-0755.patch
+++ b/cups-0755.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.4.2/Makedefs.in.0755 cups-1.4.2/Makedefs.in
---- cups-1.4.2/Makedefs.in.0755	2010-01-13 17:06:48.507913044 +0000
-+++ cups-1.4.2/Makedefs.in	2010-01-13 17:07:10.049912905 +0000
+diff -up cups-1.4.5/Makedefs.in.0755 cups-1.4.5/Makedefs.in
+--- cups-1.4.5/Makedefs.in.0755	2010-12-06 17:19:03.335315249 +0000
++++ cups-1.4.5/Makedefs.in	2010-12-06 17:19:03.416307263 +0000
 @@ -41,13 +41,13 @@ SHELL		=	/bin/sh
  # Installation programs...
  #
@@ -18,3 +18,15 @@ diff -up cups-1.4.2/Makedefs.in.0755 cups-1.4.2/Makedefs.in
  
  #
  # Default user, group, and system groups for the scheduler...
+diff -up cups-1.4.5/scheduler/Makefile.0755 cups-1.4.5/scheduler/Makefile
+--- cups-1.4.5/scheduler/Makefile.0755	2010-12-06 17:28:58.562552167 +0000
++++ cups-1.4.5/scheduler/Makefile	2010-12-06 17:29:07.087756415 +0000
+@@ -174,7 +174,7 @@ install-data:
+ install-exec:
+ 	echo Installing programs in $(SBINDIR)...
+ 	$(INSTALL_DIR) -m 755 $(SBINDIR)
+-	$(INSTALL_BIN) -m 500 cupsd $(SBINDIR)
++	$(INSTALL_BIN) -m 755 cupsd $(SBINDIR)
+ 	$(INSTALL_BIN) cupsfilter $(SBINDIR)
+ 	-if test "x`uname`" = xDarwin; then \
+ 		$(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \
diff --git a/cups.spec b/cups.spec
index 2354508..ffe863b 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -584,6 +584,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Dec  6 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.5-5
+- /usr/sbin/cupsd should be mode 0755 (bug #546004).
+
 * Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.5-4
 - Changed subsystem lock file name in initscript
   so the service is correctly stopped on reboot or halt (bug #659391).