From 71c562fdd5d6de8c9aaf2fecc1521f771766fb6b Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Wed, 21 Nov 2012 16:55:59 +0900
Subject: [PATCH] fix permissions of ghc-doc-index and only run when root

cronjob no longer checks /etc/sysconfig/ghc-doc-index
---
 ghc-doc-index      |  5 +++++
 ghc-doc-index.cron | 12 ++++--------
 ghc.spec           | 10 +++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 ghc-doc-index

diff --git a/ghc-doc-index b/ghc-doc-index
old mode 100644
new mode 100755
index eca75f1..6105d7e
--- a/ghc-doc-index
+++ b/ghc-doc-index
@@ -10,6 +10,11 @@ if [ -f $LOCKFILE ]; then
   exit 0
 fi
 
+if [ "$(id -u)" != "0" ]; then
+  echo Need to be root!
+  exit 1
+fi
+
 trap "{ rm -f $LOCKFILE ; exit 255; }" EXIT
 touch $LOCKFILE
 
diff --git a/ghc-doc-index.cron b/ghc-doc-index.cron
index e353689..4efe2ff 100755
--- a/ghc-doc-index.cron
+++ b/ghc-doc-index.cron
@@ -1,13 +1,9 @@
 #! /bin/bash
+# updates the library documentation index after updates
 
-if [ -e /etc/sysconfig/ghc-doc-index ]; then
-    . /etc/sysconfig/ghc-doc-index
-fi
+# This can be disabled by uninstalling ghc-doc-index
+# or adding ghc-doc-index to "./jobs-deny".
 
-if [ "$CRON" = "no" ]; then
-   exit 0
-fi
-
-/usr/bin/ghc-doc-index >/dev/null
+/usr/bin/ghc-doc-index
 
 exit 0
diff --git a/ghc.spec b/ghc.spec
index 76fd1c4..0e85aa6 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -29,7 +29,7 @@ Version: 7.4.2
 # - release can only be reset if all library versions get bumped simultaneously
 #   (eg for a major release)
 # - minor release numbers should be incremented monotonically
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Glasgow Haskell Compiler
 # fedora ghc has been bootstrapped on
 # %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel s390 s390x
@@ -309,9 +309,9 @@ done
 
 %if %{undefined without_haddock}
 mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly
-install -p --mode=755 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/ghc-doc-index
+install -p --mode=0755 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/ghc-doc-index
 mkdir -p %{buildroot}%{_localstatedir}/lib/ghc
-install -p -m 0644 %SOURCE4 %{buildroot}%{_bindir}/ghc-doc-index
+install -p --mode=0755 %SOURCE4 %{buildroot}%{_bindir}/ghc-doc-index
 %endif
 
 %check
@@ -434,6 +434,10 @@ fi
 %files libraries
 
 %changelog
+* Wed Nov 21 2012 Jens Petersen <petersen@redhat.com> - 7.4.2-9
+- fix permissions of ghc-doc-index and only run when root
+- ghc-doc-index cronjob no longer looks at /etc/sysconfig/ghc-doc-index
+
 * Sat Nov 17 2012 Jens Petersen <petersen@redhat.com> - 7.4.2-8
 - production 7.4.2 build
   http://www.haskell.org/ghc/docs/7.4.2/html/users_guide/release-7-4-2.html