rpms/cups/devel cups.init,1.15,1.16 cups.spec,1.419,1.420

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29533

Modified Files:
	cups.init cups.spec 
Log Message:
* Tue Jul  1 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-11
- Use portreserve.



Index: cups.init
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cups.init	26 Feb 2008 17:46:55 -0000	1.15
+++ cups.init	1 Jul 2008 10:49:59 -0000	1.16
@@ -51,6 +51,9 @@
 start () {
 	echo -n $"Starting $prog: "
 
+	# tell portreserve to release the port
+	[ -x /sbin/portrelease ] && /sbin/portrelease cups &>/dev/null || :
+
 	# start daemon
 	daemon $DAEMON
         RETVAL=$?


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- cups.spec	24 Jun 2008 13:06:06 -0000	1.419
+++ cups.spec	1 Jul 2008 10:49:59 -0000	1.420
@@ -100,6 +100,10 @@
 # Requires tmpwatch for the cron.daily script (bug #218901).
 Requires: tmpwatch
 
+# We use portreserve to prevent our TCP port being stolen.
+# Require the package here so that we know /etc/portreserve/ exists.
+Requires: portreserve
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -269,6 +273,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
 ln -s ../../ppd $RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution
 
+# Tell portreserve which port we want it to protect.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+echo ipp > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/%{name}
+
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -364,6 +372,7 @@
 /etc/cups/pstoraster.convs
 %config(noreplace) /etc/pam.d/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
+%config(noreplace) %{_sysconfdir}/portreserve/%{name}
 %dir %{_datadir}/%{name}/www
 %{_datadir}/%{name}/www/favicon.*
 %{_datadir}/%{name}/www/images
@@ -439,6 +448,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jul  1 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-11
+- Use portreserve.
+
 * Tue Jun 24 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-10
 - Rebuilt for new gnutls.