[Lunar-commits] <moonbase> heimdal: Version bump to 1.3.1

[Stefan Wold]

commit 787dfd024082d609dd2cbabf7a478d2b618bbdb9
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Mon Mar 8 12:22:16 2010 +0100

    heimdal: Version bump to 1.3.1
    
    [FIX] Resolved conflicts with e2fsprogs and netkit
---
 crypto/heimdal/BUILD     |   34 ++++++++++++++++++++++++++++++----
 crypto/heimdal/CONFIGURE |    3 ++-
 crypto/heimdal/DEPENDS   |    2 ++
 crypto/heimdal/DETAILS   |   14 +++++++-------
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/crypto/heimdal/BUILD b/crypto/heimdal/BUILD
index b5e5aca..2a5ade6 100644
--- a/crypto/heimdal/BUILD
+++ b/crypto/heimdal/BUILD
@@ -1,20 +1,23 @@
 (
+  export CFLAGS="$CFLAGS -I/usr/include/et" &&
+  export CXXFLAGS="$CXXFLAGS -I/usr/include/et" &&
 
   OPTS+=" --prefix=/usr \
+          --without-x \
           --libexecdir=/usr/sbin \
           --datadir=/var/lib/heimdal \
           --localstatedir=/var/lib/heimdal \
           --sysconfdir=/etc \
           --enable-shared \
-          --enable-readline-dir=/usr \
-          --enable-openssl=/usr" &&
+          --with-readline=/usr \
+          --with-openssl=/usr" &&
 
   # Migration code, remove symlinks
   REMOVE_KRB="gssapi krb5-types.h krb5.h asn1_err.h krb5_asn1.h \
               krb5_err.h heim_err.h k524_err.h krb5-protos.h" &&
 
   for i in $REMOVE_KRB; do
-    rm -f /usr/include/${i}
+    [ ! -L $i ] || rm -f /usr/include/${i}
   done &&
 
   if [ -d /usr/include/heimdal ]; then
@@ -37,8 +40,31 @@
   patch_it $SOURCE3 1 &&
   patch_it $SOURCE4 1 &&
 
+  mkdir -p $SOURCE_DIRECTORY/__heimdest/ &&
+
   sh autogen.sh &&
+  default_config &&
+  make &&
+  INSTALL_CATPAGES="no" make DESTDIR=$SOURCE_DIRECTORY/__heimdest/ install &&
+
+  # Rename files that otherwise would conflict
+  for i in rshd telnetd ftpd; do
+    mv $SOURCE_DIRECTORY/__heimdest/usr/sbin/{,k}${i} || exit 1
+    mv $SOURCE_DIRECTORY/__heimdest/usr/share/man/man8/{,k}${i}.8 || exit 1
+  done &&
+
+  for i in rsh su telnet ftp login rcp; do
+    if [ -f $SOURCE_DIRECTORY/__heimdest/usr/share/man/man1/${i}.1 ]; then
+      mv $SOURCE_DIRECTORY/__heimdest/usr/share/man/man1/{,k}${i}.1 || exit 1
+    fi
+    mv $SOURCE_DIRECTORY/__heimdest/usr/bin/{,k}${i} || exit 1
+  done &&
+
+  prepare_install &&
+  cp -r $SOURCE_DIRECTORY/__heimdest/usr / &&
 
-  default_build
+  for i in ksu otp; do
+    [ ! -f /usr/bin/${i} ] || chmod 4711 /usr/bin/${i}
+  done
 
 ) > $C_FIFO 2>&1
diff --git a/crypto/heimdal/CONFIGURE b/crypto/heimdal/CONFIGURE
index 89bb4e9..5f77026 100644
--- a/crypto/heimdal/CONFIGURE
+++ b/crypto/heimdal/CONFIGURE
@@ -1 +1,2 @@
-mquery KRB4 "Compile with krb4 support (NOT recommended) ?" n "--with-krb4" "--without-krb4"
+mquery OTP "Enable OTP support?" n "--enable-otp" "--disable-otp"
+mquery AFS "Enable AFS support?" n "--enable-afs-support" "--disable-afs-support"
diff --git a/crypto/heimdal/DEPENDS b/crypto/heimdal/DEPENDS
index fedd4d0..c42389a 100644
--- a/crypto/heimdal/DEPENDS
+++ b/crypto/heimdal/DEPENDS
@@ -1,3 +1,5 @@
+depends e2fsprogs
 depends openssl
 depends db
 depends readline
+optional_depends sqlite "--with-sqlite3=/usr" "--without-sqlite3" "for sqlite CC backend support"
diff --git a/crypto/heimdal/DETAILS b/crypto/heimdal/DETAILS
index c5e730e..1c51969 100644
--- a/crypto/heimdal/DETAILS
+++ b/crypto/heimdal/DETAILS
@@ -1,21 +1,21 @@
           MODULE=heimdal
-         VERSION=1.2.1
+         VERSION=1.3.1
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-1.0.1-lpthreads.patch
-         SOURCE3=$MODULE-1.2.1-rename_su.patch.bz2
-         SOURCE4=$MODULE-1.2.1-autoconf-2.64-fix.patch
+         SOURCE3=$MODULE-1.3.1-k-prefixes.patch
+         SOURCE4=$MODULE-1.3.1-suid_fix.patch
       SOURCE_URL=http://www.h5l.org/dist/src/
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
-      SOURCE_VFY=sha1:68b013a68bca7d544d29af0f890b9c668ec16936
+      SOURCE_VFY=sha1:ca62b825c35689562d5fdc373e200ff49056d37b
      SOURCE2_VFY=sha1:f15b38acb56d2abc016a50f6203e4d417fe0f27b
-     SOURCE3_VFY=sha1:069bc8d28148f37034f3cb8939e1e248486ed2e0
-     SOURCE4_VFY=sha1:4b88852fae2d6432776b374a3d1d8490e85ba4e8
+     SOURCE3_VFY=sha1:1a15fbee5de1027babcd151ce23fb5fbeea1c763
+     SOURCE4_VFY=sha1:fd4c5204c27c31adf347d6b43bc9c771b81b04dc
         WEB_SITE=http://www.h5l.org/
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20041026
-         UPDATED=20090531
+         UPDATED=20100308
           SHORT="Heimdals kerberos 5 implementation"
 cat << EOF
 Heimdal is a free implementation of Kerberos 5.