network/heimdal: Noted the optional dependency libcap-ng, cleanups.

Build with ldap support

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

2 files changed, 18 insertions, 19 deletions

diff --git a/network/heimdal/README b/network/heimdal/README
index e13deca10f75..ef3463edf712 100644
--- a/network/heimdal/README
+++ b/network/heimdal/README
@@ -7,4 +7,6 @@ Heimdal is a free implementation of Kerberos 5. The goals are to:
 * have support for Kerberos V5 over GSS-API (RFC1964)
 * include the most important and useful application programs 
   (rsh, telnet, popper, etc.)
-* include enough backwards compatibility with Kerberos V4 
+* include enough backwards compatibility with Kerberos V4
+
+libcap-ng is an optional dependency. 
diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild
index 2df804f49d11..ea8b6e227935 100644
--- a/network/heimdal/heimdal.SlackBuild
+++ b/network/heimdal/heimdal.SlackBuild
@@ -12,7 +12,7 @@
 
 PRGNAM=heimdal
 VERSION=${VERSION:-1.5.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -42,7 +42,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit immediately if a command exits with a non-zero status.
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -57,12 +57,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-# Note about OpenLDAP:
-# The openldap-client package is part of Slackware since the 11.0 release.
-# If you want to store your KDC database in LDAP, you will need to configure
-# Heimdal with support for OpenLDAP:
-# Replace this:  "--without-openldap"  with this:  "--with-openldap=/usr"
-# in the configure lines below
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -74,18 +68,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/heimdal/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --enable-shared=yes \
-  --disable-otp \
-  --without-openldap \
-  --without-hesiod \
+  --with-berkeley-db-include=/usr/include/db48 \
+  --with-openldap=/usr \
+  --with-readline=/usr \
+  --with-sqlite3=/usr \
+  --with-x \
   --without-ipv6 \
+  --without-hesiod \
   --enable-kcm \
-  --with-x
+  --enable-pthread-support \
+  --disable-otp \
+  --disable-static
 
 make
+make check
 make install-strip DESTDIR=$PKG
 
-rm -rf $PKG/usr/heimdal/man/cat?   # We don't want these
+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
 
@@ -98,7 +97,6 @@ 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
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod -x {} \;
 
 # Add sample krb5.conf file (may not be needed)
 mkdir -p $PKG/etc
@@ -116,9 +114,8 @@ 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
-cat $CWD/config/heimdal.sh > $PKG/etc/profile.d/heimdal.sh.new
-cat $CWD/config/heimdal.csh > $PKG/etc/profile.d/heimdal.csh.new
-chmod 0755 $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