[Lunar-commits] heimdal: Resolving conflicts

[Stefan Wold]

commit 64e71515dd56275f32d99de7ba44276c04e099ef
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sun Dec 16 11:41:40 2007 +0100

    heimdal: Resolving conflicts
    * Don't install libss
    * Rename su to ksu (including man-page)
    * Fixed heimdal to properly use -lpthread
    * Properly run lunar fix if something _really_ depends on heimdal
    * Added POST_REMOVE to properly remove symlunks that in some cases
      are left behind even after a lrm
---
 crypto/heimdal/BUILD        |   41 +++++++++++++++++++++++------------------
 crypto/heimdal/DETAILS      |   11 ++++++++++-
 crypto/heimdal/POST_INSTALL |    5 ++++-
 crypto/heimdal/POST_REMOVE  |    3 +++
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/crypto/heimdal/BUILD b/crypto/heimdal/BUILD
index 2b9379b..eb5a8e9 100644
--- a/crypto/heimdal/BUILD
+++ b/crypto/heimdal/BUILD
@@ -1,23 +1,28 @@
 (
+
+  OPTS+=" --prefix=/usr \
+          --libexecdir=/usr/sbin \
+          --enable-shared \
+          --enable-readline-dir=/usr \
+          --enable-openssl=/usr \
+          --includedir=/usr/include/heimdal" &&
+
   if [ "$KRB4" == "y" ]; then
-      OPTS="$OPTS --with-krb4"
+    OPTS+=" --with-krb4"
   else
-      OPTS="$OPTS --without-krb4"
-  fi
-  
-  HEIMDALINC=/usr/include/heimdal
-
-  ./configure --prefix=/usr \
-              --libexecdir=/usr/sbin \
-              --enable-shared \
-              --enable-readline-dir=/usr \
-              --enable-openssl=/usr \
-              --includedir=/usr/include/heimdal \
-              $OPTS &&
-  make  &&
-  prepare_install &&
-  make install &&
-  
+    OPTS+=" --without-krb4"
+  fi &&
+
+  HEIMDALINC=/usr/include/heimdal &&
+
+  patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 1 &&
+  patch_it $SOURCE4 1 &&
+
+  sh autogen.sh &&
+
+  default_build &&
+
   # Cleaner symlinks
   ln -sf $HEIMDALINC/gssapi /usr/include/gssapi &&
   ln -sf $HEIMDALINC/krb5-types.h /usr/include/krb5-types.h &&
@@ -29,4 +34,4 @@
   ln -sf $HEIMDALINC/k524_err.h /usr/include/k524_err.h &&
   ln -sf $HEIMDALINC/krb5-protos.h /usr/include/krb5-protos.h
 
-) > $C_FIFO 2>&1 
+) > $C_FIFO 2>&1
diff --git a/crypto/heimdal/DETAILS b/crypto/heimdal/DETAILS
index 3cb226c..cd1b6a9 100644
--- a/crypto/heimdal/DETAILS
+++ b/crypto/heimdal/DETAILS
@@ -1,12 +1,21 @@
           MODULE=heimdal
          VERSION=1.0.1
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=$MODULE-1.0.1-no_libss.patch
+         SOURCE3=$MODULE-1.0.1-lpthreads.patch
+         SOURCE4=$MODULE-1.0.1-rename_su.patch.bz2
       SOURCE_URL=http://www.h5l.org/dist/src/
+     SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
+     SOURCE4_URL=$PATCH_URL
       SOURCE_VFY=sha1:87dd51b8a36bbe6166a8a48cc934af87f4276719
+     SOURCE2_VFY=sha1:147d11ed987fe52352b40360106c6655b7b66b9e
+     SOURCE3_VFY=sha1:f15b38acb56d2abc016a50f6203e4d417fe0f27b
+     SOURCE4_VFY=sha1:325694d36dba7747144313a1cf9d8200d447e671
         WEB_SITE=http://www.h5l.org/
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20041026
-         UPDATED=20070921
+         UPDATED=20071216
           SHORT="Heimdals kerberos 5 implementation"
 cat << EOF
 Heimdal is a free implementation of Kerberos 5.
diff --git a/crypto/heimdal/POST_INSTALL b/crypto/heimdal/POST_INSTALL
index 22d7300..7c95f10 100644
--- a/crypto/heimdal/POST_INSTALL
+++ b/crypto/heimdal/POST_INSTALL
@@ -4,4 +4,7 @@ if [ ! -d /var/heimdal ]; then
    mkdir /var/heimdal
 fi
 
-lunar fix $(lvu depends heimdal)
+DEPS="$(lvu depends heimdal)"
+if [ -n "$DEPS" ]; then
+  lunar fix $DEPS
+fi
diff --git a/crypto/heimdal/POST_REMOVE b/crypto/heimdal/POST_REMOVE
new file mode 100644
index 0000000..58678d0
--- /dev/null
+++ b/crypto/heimdal/POST_REMOVE
@@ -0,0 +1,3 @@
+for i in "gssapi krb5-types.h krb5.h asn1_err.h krb5_asn1.h krb5_err.h heim_err.h k524_err.h krb5-protos.h"; do
+  rm -f /usr/include/${i}
+done