network/heimdal: Updated for version 7.1.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

1 files changed, 52 insertions, 51 deletions

diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild
index 8a0ebe70b4..0a77e3413a 100644
--- a/network/heimdal/heimdal.SlackBuild
+++ b/network/heimdal/heimdal.SlackBuild
@@ -2,22 +2,35 @@
 
 # Slackware build script for KTH Heimdal Kerberos
 
-# Written by Menno Duursma <druiloor@zonnet.nl>
-# Modified by the SlackBuilds.org project
-# Modified by Thibaut Notteboom <tib@tibux.org>
-
-# This program is free software. It comes without any warranty.
-# Granted WTFPL, Version 2, as published by Sam Hocevar. See
-# http://sam.zoy.org/wtfpl/COPYING for more details.
+# Copyright 2010 Menno Duurma
+# Copyright 2011-2017 Thibaut Notteboom, Paris, FRANCE
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=heimdal
-VERSION=${VERSION:-1.5.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.1.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -28,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,74 +70,62 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix build failure with texinfo-6.1
-# https://github.com/heimdal/heimdal/commits/master/doc
-patch -p1 < $CWD/0e0351776a48a69ec704085e554a0653d8179452.patch
-patch -p1 < $CWD/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch
-patch -p1 < $CWD/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch
-patch -p1 < $CWD/115f88a3e7901541a67964d41bbd2a1866cfc521.patch
+patch -p0 < $CWD/heimdal_disable-check-iprop.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="-lpthread" \
 ./configure \
-  --prefix=/usr/heimdal \
+  --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --infodir=/usr/info \
-  --mandir=/usr/heimdal/man \
+  --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --with-berkeley-db-include=/usr/include/db48 \
   --with-openldap=/usr \
   --with-readline=/usr \
   --with-sqlite3=/usr \
+  --with-berkeley-db-include=/usr/include/db48 \
   --with-x \
-  --without-ipv6 \
+  --with-ipv6 \
   --without-hesiod \
   --enable-kcm \
   --enable-pthread-support \
   --disable-otp \
-  --disable-static
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
-make -j1
+make
 make -j1 check
-make -j1 install-strip DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+
+mkdir -p $PKG/etc/rc.d
+cat $CWD/config/krb5.conf > $PKG/etc/krb5.conf.new
+cat $CWD/config/rc.kdc > $PKG/etc/rc.d/rc.kdc.new
+cat $CWD/config/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new
+cat $CWD/config/rc.kpasswdd > $PKG/etc/rc.d/rc.kpasswdd.new
+cat $CWD/config/rc.ipropd-master > $PKG/etc/rc.d/rc.ipropd-master.new
+cat $CWD/config/rc.ipropd-slave > $PKG/etc/rc.d/rc.ipropd-slave.new
+
+mkdir -p $PKG/var/heimdal
+cat $CWD/config/kdc.conf > $PKG/var/heimdal/kdc.conf.new
+cat $CWD/config/kadmind.acl > $PKG/var/heimdal/kadmind.acl.new
 
-rm -rf $PKG/usr/heimdal/man/cat?
-find $PKG/usr/heimdal/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/heimdal/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+rm -rf $PKG/usr/man/cat?
+find $PKG/usr/man -type f -exec gzip -9f {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 ( cd $PKG/usr/info ; ln -s heimdal.info.gz heimdal )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [A-Z][A-Z]* ChangeLog* etc/services.append $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/{init-creds,layman.asc,mdate-sh} $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/inittab-heimdal.patch > $PKG/usr/doc/$PRGNAM-$VERSION/inittab-heimdal.patch
+cp -a \
+   ChangeLog* NEWS README TODO etc/services.append \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Add sample krb5.conf file (may not be needed)
-mkdir -p $PKG/etc
-cat krb5.conf > $PKG/etc/krb5.conf-sample.new
-
-# Create directory for the KDC to use
-mkdir -p $PKG/var/heimdal
-
-# Add sample kdc.conf file (may not be needed)
-cat $CWD/config/kdc.conf > $PKG/var/heimdal/kdc.conf-sample.new
-
-# Include a KDC rc-file for the admin to consider
-mkdir -p $PKG/etc/rc.d
-cat $CWD/config/rc.heimdal > $PKG/etc/rc.d/rc.heimdal.new
-
-# Add heimdal to INFOPATH, MANPATH, and PATH
-mkdir -p $PKG/etc/profile.d
-install -m 0755 $CWD/config/heimdal.sh $PKG/etc/profile.d/heimdal.sh.new
-install -m 0755 $CWD/config/heimdal.csh $PKG/etc/profile.d/heimdal.csh.new
-
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh