diff options
| -rw-r--r-- | network/heimdal/doinst.sh | 39 | ||||
| -rw-r--r-- | network/heimdal/heimdal.SlackBuild | 4 | ||||
| -rw-r--r-- | network/heimdal/heimdal.info | 8 |
3 files changed, 22 insertions, 29 deletions
diff --git a/network/heimdal/doinst.sh b/network/heimdal/doinst.sh index 8920e52c25..804678c3b8 100644 --- a/network/heimdal/doinst.sh +++ b/network/heimdal/doinst.sh @@ -1,8 +1,3 @@ -# 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 -fi - config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -16,27 +11,23 @@ config() { # 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 +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW fi - config $file -done + config $NEW +} +preserve_perms etc/rc.d/rc.heimdal.new config etc/krb5.conf-sample.new config var/heimdal/kdc.conf-sample.new +# 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 +fi + diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild index 62f02ff77b..ef5042fb16 100644 --- a/network/heimdal/heimdal.SlackBuild +++ b/network/heimdal/heimdal.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh # Slackware build script for KTH Heimdal Kerberos + # Written by Menno Duursma <druiloor@zonnet.nl> # Modified by the SlackBuilds.org project @@ -9,7 +10,7 @@ # http://sam.zoy.org/wtfpl/COPYING for more details. PRGNAM=heimdal -VERSION=${VERSION:-1.3.3} +VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,6 +75,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ --enable-shared=yes \ + --disable-otp \ --without-openldap \ --without-hesiod \ --without-ipv6 \ diff --git a/network/heimdal/heimdal.info b/network/heimdal/heimdal.info index 33ae56c65d..1c0357b689 100644 --- a/network/heimdal/heimdal.info +++ b/network/heimdal/heimdal.info @@ -1,10 +1,10 @@ PRGNAM="heimdal" -VERSION="1.3.3" +VERSION="1.4" HOMEPAGE="http://www.h5l.org" -DOWNLOAD="ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/heimdal-1.3.3.tar.gz" -MD5SUM="963c09f1b14c41660be70b55fae9f163" +DOWNLOAD="http://www.h5l.org/dist/src/heimdal-1.4.tar.gz" +MD5SUM="31d08bbf47a77827fe97ef3f52b4c9c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Menno Duursma" EMAIL="druiloor@zonnet.nl" -APPROVED="rworkman" +APPROVED="michiel" |