[Lunar-commits] <moonbase> heimdal: Added patch to build with autoconf 2.64

[Stefan Wold]

commit 9ce4f33844da1fd9139e5f682c2e42c9a7e99506
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Thu Sep 10 22:20:15 2009 +0200

    heimdal: Added patch to build with autoconf 2.64
    
    Changes:
    * Cleaned up the module a little bit
---
 crypto/heimdal/BUILD     |   20 +++++++-------------
 crypto/heimdal/CONFIGURE |    2 +-
 crypto/heimdal/DETAILS   |    3 +++
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/crypto/heimdal/BUILD b/crypto/heimdal/BUILD
index b8327a9..b5e5aca 100644
--- a/crypto/heimdal/BUILD
+++ b/crypto/heimdal/BUILD
@@ -9,21 +9,9 @@
           --enable-readline-dir=/usr \
           --enable-openssl=/usr" &&
 
-  if [ "$KRB4" == "y" ]; then
-    OPTS+=" --with-krb4"
-  else
-    OPTS+=" --without-krb4"
-  fi &&
-
-  # Change default datadir (hardcoded)
-  sedit "s;var/heimdal;var/lib/heimdal;g" configure.in configure \
-        doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
-        lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
-
-
   # 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"
+              krb5_err.h heim_err.h k524_err.h krb5-protos.h" &&
 
   for i in $REMOVE_KRB; do
     rm -f /usr/include/${i}
@@ -40,8 +28,14 @@
     mv -f /var/heimdal /var/lib/heimdal
   fi &&
 
+  # Change default datadir (hardcoded)
+  sedit "s;var/heimdal;var/lib/heimdal;g" configure.in configure \
+        doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
+        lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5 &&
+
   patch_it $SOURCE2 1 &&
   patch_it $SOURCE3 1 &&
+  patch_it $SOURCE4 1 &&
 
   sh autogen.sh &&
 
diff --git a/crypto/heimdal/CONFIGURE b/crypto/heimdal/CONFIGURE
index 73133ee..a243774 100644
--- a/crypto/heimdal/CONFIGURE
+++ b/crypto/heimdal/CONFIGURE
@@ -1 +1 @@
-mquery KRB4 "Compile with krb4 support (NOT recommended) ?" n
+mquery KRB4 "Compile with krb4 support (NOT recommended) ?" n "--without-krb4" "--without-krb4"
diff --git a/crypto/heimdal/DETAILS b/crypto/heimdal/DETAILS
index 4d8374f..c5e730e 100644
--- a/crypto/heimdal/DETAILS
+++ b/crypto/heimdal/DETAILS
@@ -3,12 +3,15 @@
           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
       SOURCE_URL=http://www.h5l.org/dist/src/
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
+     SOURCE4_URL=$PATCH_URL
       SOURCE_VFY=sha1:68b013a68bca7d544d29af0f890b9c668ec16936
      SOURCE2_VFY=sha1:f15b38acb56d2abc016a50f6203e4d417fe0f27b
      SOURCE3_VFY=sha1:069bc8d28148f37034f3cb8939e1e248486ed2e0
+     SOURCE4_VFY=sha1:4b88852fae2d6432776b374a3d1d8490e85ba4e8
         WEB_SITE=http://www.h5l.org/
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20041026