network/heimdal: Updated for version 1.2.1

1 files changed, 23 insertions, 12 deletions

diff --git a/network/heimdal/doinst.sh b/network/heimdal/doinst.sh
index 0b5f0905ad3b..8920e52c2546 100644
--- a/network/heimdal/doinst.sh
+++ b/network/heimdal/doinst.sh
@@ -1,31 +1,42 @@
 # Add heimdal libs to the library search path
 if ! grep -q '^/usr/heimdal/lib$' etc/ld.so.conf ; then
   echo "/usr/heimdal/lib" >> etc/ld.so.conf
-  if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
 fi
 
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+# Keep same perms on rc.heimdal:
+if [ -e etc/rc.d/rc.heimdal ]; then
+  cp -a etc/rc.d/rc.heimdal etc/rc.d/rc.heimdal.new.incoming
+  cat etc/rc.d/rc.heimdal.new > etc/rc.d/rc.heimdal.new.incoming
+  mv etc/rc.d/rc.heimdal.new.incoming etc/rc.d/rc.heimdal.new
+fi
+
+# Prepare the new configuration files
+for file in \
+  etc/rc.d/rc.heimdal.new \
+  etc/profile.d/heimdal.sh.new \
+  etc/profile.d/heimdal.csh.new ; 
+ do
+  if [ -e $(dirname $file)/$(basename $file .new) -a -x $(dirname $file)/$(basename $file .new) ]; then
+    chmod 0755 $file
+  else
+    chmod 0644 $file
+  fi
+  config $file
+done
+
 config etc/krb5.conf-sample.new
-config etc/profile.d/heimdal.sh.new
-config etc/profile.d/heimdal.csh.new
-config etc/rc.d/rc.heimdal.new
 config var/heimdal/kdc.conf-sample.new
 
-# Any user should be able to ``kinit'' at least
-if [ ! -x etc/profile.d/heimdal.sh ]; then
-  chmod +x etc/profile.d/heimdal.sh
-  chmod +x etc/profile.d/heimdal.csh
-fi
-