rpms/fetch-crl/devel edg-fetch-crl-2.8.2-getopts.patch, NONE, 1.1 fetch-crl-2.6.6-selinux.patch, NONE, 1.1 fetch-crl.spec, 1.2, 1.3 fetch-crl-randomwait.patch, 1.1, NONE

[stevetraylen]

Author: stevetraylen

Update of /cvs/pkgs/rpms/fetch-crl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24997/devel

Modified Files:
	fetch-crl.spec 
Added Files:
	edg-fetch-crl-2.8.2-getopts.patch 
	fetch-crl-2.6.6-selinux.patch 
Removed Files:
	fetch-crl-randomwait.patch 
Log Message:
rhbz#577387, rhbz#577403


edg-fetch-crl-2.8.2-getopts.patch:
 edg-fetch-crl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE edg-fetch-crl-2.8.2-getopts.patch ---
diff -urN fetch-crl-2.8.2-dist/edg-fetch-crl fetch-crl-2.8.2/edg-fetch-crl
--- fetch-crl-2.8.2-dist/edg-fetch-crl	2010-03-03 16:38:26.000000000 -0500
+++ fetch-crl-2.8.2/edg-fetch-crl	2010-03-24 10:09:16.000000000 -0400
@@ -545,7 +545,7 @@
 #
 # Parse the command line
 #
-getoptResult=`${getopt} -o hl:o:qva:nfr: -a -l help,loc:,out:,quiet,verbose,agingtolerance,no-check-certificate,syslog-facility,check-server-certificate,randomwait -n ${programName} -- "$@"`
+getoptResult=`${getopt} -o hl:o:qva:nf:r: -a -l help,loc:,out:,quiet,verbose,agingtolerance,no-check-certificate,syslog-facility,check-server-certificate,randomwait -n ${programName} -- "$@"`
 if [ $? != 0 ] ; then
    ShowUsage
    exit 2
@@ -558,7 +558,7 @@
       -l|--loc)   locationDirectory="$2"; shift 2 ;;
       -n|--no-check-certificate)   noServerCertCheck=1; shift 1 ;;
       --check-server-certificate)   noServerCertCheck=0; shift 1 ;;
-      -f|--syslog-facility)   syslogfacility="$2"; shift 1 ;;
+      -f|--syslog-facility)   syslogfacility="$2"; shift 2 ;;
       -o|--out)   outputDirectory="$2"; shift 2 ;;
       -q|--quiet) verboseMode=0; shift ;;
       -v|--verbose) verboseMode=1; shift ;;

fetch-crl-2.6.6-selinux.patch:
 edg-fetch-crl |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE fetch-crl-2.6.6-selinux.patch ---
--- edg-fetch-crl.orig      2009-06-07 17:38:39.000000000 -0700
+++ edg-fetch-crl   2009-06-07 17:43:22.000000000 -0700
@@ -766,6 +766,11 @@
 
 done # for
 
+if /usr/sbin/selinuxenabled ; then
+   PrintMessage "Updating selinux contexts on crl files"
+   /sbin/restorecon -R "${locationDirectory}"
+fi
+
 timeStamp=`${date} +%Y%m%dT%H%M%S%z`
 PrintInformation "Completed CRL retrieval process at ${timeStamp}"


Index: fetch-crl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fetch-crl/devel/fetch-crl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fetch-crl.spec	4 Mar 2010 14:43:45 -0000	1.2
+++ fetch-crl.spec	27 Mar 2010 09:45:36 -0000	1.3
@@ -4,13 +4,20 @@
 
 Name: fetch-crl
 Version: 2.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Downloads Certificate Revocation Lists
 
 Group: Applications/System
 License: EU Datagrid
 URL: https://dist.eugridpma.info/distribution/util/%{name}
 Source: https://dist.eugridpma.info/distribution/util/%{name}/%{name}-%{version}.tar.gz
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=577387
+Patch0: edg-fetch-crl-2.8.2-getopts.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=577403
+Patch1: fetch-crl-2.6.6-selinux.patch
+
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,6 +35,8 @@ It assumes that the installed CA files f
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p0
 
 %build
 
@@ -77,6 +86,10 @@ fi
 
 
 %changelog
+* Sat Mar 27 2010 Steve Traylen <steve.traylen at cern.ch> - 2.8.2-2
+- Add edg-fetch-crl-2.8.2-getopts.patch for rhbz#577387,
+  Jason Smith.
+- Add fetch-crl-2.6.6-selinux.patch for rhbz#577403
 * Thu Mar 4 2010 Steve Traylen <steve.traylen at cern.ch> - 2.8.2-1
 - New upstream source. 2.8.2
 - Remove  randomwait.patch since now incoperated upstream.


--- fetch-crl-randomwait.patch DELETED ---