[Lunar-commits] <moonbase> Revert "heimdal: Version bump to 1.2.1"

[Dennis `stumbles` Veatch]

commit b2ffe3cf9d2efeebc61dacd43844e2472001e8ad
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Mon Feb 15 20:26:06 2010 -0500

    Revert "heimdal: Version bump to 1.2.1"
    
    This reverts commit 4c2e4760624e1108cb9c8e13d384cf9b25f1390a.
    
    Conflicts:
    
    	crypto/heimdal/BUILD
    	crypto/heimdal/DETAILS
---
 crypto/heimdal/BUILD        |    7 +++++++
 crypto/heimdal/DETAILS      |   20 ++++++++++++++++++++
 crypto/heimdal/POST_INSTALL |    4 ++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/crypto/heimdal/BUILD b/crypto/heimdal/BUILD
index 696bb9a..c7855d1 100644
--- a/crypto/heimdal/BUILD
+++ b/crypto/heimdal/BUILD
@@ -28,10 +28,17 @@
     mv -f /var/heimdal /var/lib/heimdal
   fi &&
 
+<<<<<<< HEAD
   # 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 &&
+>>>>>>> 4c2e476... heimdal: Version bump to 1.2.1
 
   sh autogen.sh &&
 
diff --git a/crypto/heimdal/DETAILS b/crypto/heimdal/DETAILS
index ba4f5c9..1ed649b 100644
--- a/crypto/heimdal/DETAILS
+++ b/crypto/heimdal/DETAILS
@@ -1,4 +1,5 @@
           MODULE=heimdal
+<<<<<<< HEAD
          VERSION=1.3.1
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://www.h5l.org/dist/src
@@ -7,6 +8,25 @@
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20041026
          UPDATED=20100216
+=======
+         VERSION=1.1
+          SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=$MODULE-1.0.1-no_libss.patch
+         SOURCE3=$MODULE-1.0.1-lpthreads.patch
+         SOURCE4=$MODULE-1.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:64ddb2a2c47f732b2d9bbf2621062eaffa32e10f
+     SOURCE2_VFY=sha1:147d11ed987fe52352b40360106c6655b7b66b9e
+     SOURCE3_VFY=sha1:f15b38acb56d2abc016a50f6203e4d417fe0f27b
+     SOURCE4_VFY=sha1:abc30c0e57fbec6bdf806d610fedd05de9423250
+        WEB_SITE=http://www.h5l.org/
+      MAINTAINER=ratler at lunar-linux.org
+         ENTERED=20041026
+         UPDATED=20080517
+>>>>>>> 4c2e476... heimdal: Version bump to 1.2.1
           SHORT="Heimdals kerberos 5 implementation"
 
 cat << EOF
diff --git a/crypto/heimdal/POST_INSTALL b/crypto/heimdal/POST_INSTALL
index d142fe8..7c95f10 100644
--- a/crypto/heimdal/POST_INSTALL
+++ b/crypto/heimdal/POST_INSTALL
@@ -1,7 +1,7 @@
 # We dont want /var/heimdal tracked
 
-if [ ! -d /var/lib/heimdal ]; then
-   mkdir /var/lib/heimdal
+if [ ! -d /var/heimdal ]; then
+   mkdir /var/heimdal
 fi
 
 DEPS="$(lvu depends heimdal)"