From 511aed14e0d18aa8c3a9a3742d79443912a4d9ff Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 25 Oct 2007 04:42:07 +0000
Subject: [PATCH] macos-installer-crap-20071025

put it back the way it was
---
 src/packaging/MacOS/OpenAFS.Info.plist.in |  2 +-
 src/packaging/MacOS/OpenAFS.info.in       |  2 +-
 src/packaging/MacOS/OpenAFS.post_install  | 12 ++++++++----
 src/packaging/MacOS/OpenAFS.pre_upgrade   |  3 ---
 src/packaging/MacOS/buildpkg.sh           | 22 +++++++++++++++++++++-
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/packaging/MacOS/OpenAFS.Info.plist.in b/src/packaging/MacOS/OpenAFS.Info.plist.in
index bf9751531..2a7867212 100644
--- a/src/packaging/MacOS/OpenAFS.Info.plist.in
+++ b/src/packaging/MacOS/OpenAFS.Info.plist.in
@@ -31,7 +31,7 @@
 	<key>IFPkgFlagRelocatable</key>
 	<false/>
 	<key>IFPkgFlagRestartAction</key>
-	<string>NoRestart</string>
+	<string>RecommendedRestart</string>
 	<key>IFPkgFlagRootVolumeOnly</key>
 	<true/>
 	<key>IFPkgFlagUpdateInstalledLanguages</key>
diff --git a/src/packaging/MacOS/OpenAFS.info.in b/src/packaging/MacOS/OpenAFS.info.in
index 2977252e1..a026c9844 100644
--- a/src/packaging/MacOS/OpenAFS.info.in
+++ b/src/packaging/MacOS/OpenAFS.info.in
@@ -11,6 +11,6 @@ Application NO
 Relocatable NO
 Required NO
 InstallOnly NO
-RequiresReboot NO
+RequiresReboot YES
 InstallFat NO
 rootVolumeOnly YES
diff --git a/src/packaging/MacOS/OpenAFS.post_install b/src/packaging/MacOS/OpenAFS.post_install
index c840b1897..96281e6e5 100644
--- a/src/packaging/MacOS/OpenAFS.post_install
+++ b/src/packaging/MacOS/OpenAFS.post_install
@@ -36,6 +36,14 @@ if [ ! -f ThisCell -a -f ThisCell.sample ]; then
    cp ThisCell.sample ThisCell
 fi
 
+# force reversion of 10.4 memcache mistake
+rm -f config/afsd.options.broken
+echo '-memcache -afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > config/afsd.options.broken
+if cmp -s config/afsd.options.broken config/afsd.options ; then
+   rm -f config/afsd.options
+fi
+rm -f config/afsd.options.broken
+
 if [ ! -f config/afsd.options -a -f config/afsd.options.sample ]; then
    cp config/afsd.options.sample config/afsd.options
 fi
@@ -91,7 +99,3 @@ elif [ -e config/afssettings ]; then
   # turn off execution of afssettings
   chmod a-x config/afssettings
 fi
-
-#here we should run tools which configure the client, and then if it's enabled:
-/Library/StartupItems/OpenAFS/OpenAFS start
-
diff --git a/src/packaging/MacOS/OpenAFS.pre_upgrade b/src/packaging/MacOS/OpenAFS.pre_upgrade
index 9b1f721fb..ae71e03a5 100644
--- a/src/packaging/MacOS/OpenAFS.pre_upgrade
+++ b/src/packaging/MacOS/OpenAFS.pre_upgrade
@@ -23,6 +23,3 @@ if [ -f config/afsd.options -a -f config/afsd.options.sample ]; then
   fi
 fi
 
-if [ -f /Library/StartupItems/OpenAFS/OpenAFS ]; then
-  /Library/StartupItems/OpenAFS/OpenAFS stop
-fi
diff --git a/src/packaging/MacOS/buildpkg.sh b/src/packaging/MacOS/buildpkg.sh
index 2b5405879..4e924939f 100644
--- a/src/packaging/MacOS/buildpkg.sh
+++ b/src/packaging/MacOS/buildpkg.sh
@@ -133,7 +133,7 @@ if [ $firstpass = yes ]; then
     chmod -R og-w $PKGROOT/private
     chmod  og-rx $PKGROOT/private/var/db/openafs/cache
 
-    mkdir -p $PKGROOT/usr/bin $PKGROOT/usr/sbin
+    mkdir -p $PKGROOT/usr/bin $PKGROOT/usr/sbin $PKGROOT/usr/share/man/man1 $PKGROOT/usr/share/man/man5 $PKGROOT/usr/share/man/man8
 
     BINLIST="fs klog klog.krb pagsh pagsh.krb pts sys tokens tokens.krb unlog unlog.krb aklog"
     ETCLIST="vos"
@@ -148,6 +148,18 @@ if [ $firstpass = yes ]; then
     for f in $ETCLIST; do
        ln -s ../../Library/OpenAFS/Tools/etc/$f $PKGROOT/usr/sbin/$f
     done
+    for f in `ls $PKGROOT/Library/OpenAFS/Tools/man/man1`; do
+	gzip -9 $PKGROOT/Library/OpenAFS/Tools/man/man1/$f
+	ln -s ../../../../Library/OpenAFS/Tools/man/man1/$f.gz $PKGROOT/usr/share/man/man1/$f.gz
+    done
+    for f in `ls $PKGROOT/Library/OpenAFS/Tools/man/man5`; do
+	gzip -9 $PKGROOT/Library/OpenAFS/Tools/man/man5/$f
+	ln -s ../../../../Library/OpenAFS/Tools/man/man5/$f.gz $PKGROOT/usr/share/man/man5/$f.gz
+    done
+    for f in `ls $PKGROOT/Library/OpenAFS/Tools/man/man8`; do
+	gzip -9 $PKGROOT/Library/OpenAFS/Tools/man/man8/$f
+	ln -s ../../../../Library/OpenAFS/Tools/man/man8/$f.gz $PKGROOT/usr/share/man/man8/$f.gz
+    done
 
     ln -s ../../Library/OpenAFS/Tools/bin/kpasswd $PKGROOT/usr/bin/kpasswd.afs
 
@@ -188,6 +200,14 @@ if [ $secondpass = yes ]; then
     cp CellServDB.list $PKGRES
     chown -R root${SEP}wheel $PKGRES
     rm -rf $CURDIR/OpenAFS.pkg
+
+    # once we have cm cleanup in 10.4 this can go
+    if [ $majorvers -le 8 ]; then
+	cat $RESSRC/OpenAFS.info|sed 's/RequiresReboot NO/RequiresReboot YES/'>$RESSRC/OpenAFS.info.new
+	rm -f $RESSRC/OpenAFS.info
+	mv $RESSRC/OpenAFS.info.new $RESSRC/OpenAFS.info
+    fi
+
     if [ $majorvers -ge 7 ]; then
 	echo $package -build -p $CURDIR/OpenAFS.pkg -f $PKGROOT -r $PKGRES \
 	    -i OpenAFS.Info.plist -d OpenAFS.Description.plist
-- 
2.39.5