[arch-commits] Commit in heimdal/trunk (3 files)

[Allan McRae]

    Date: Wednesday, March 31, 2010 @ 19:50:49
  Author: allan
Revision: 75164

upstream update

Modified:
  heimdal/trunk/PKGBUILD
Deleted:
  heimdal/trunk/heimdal-c++-safe-krb5_cccol_cursor.patch
  heimdal/trunk/heimdal-locate_plugin-header.patch

------------------------------------------+
 PKGBUILD                                 |   17 +++++------------
 heimdal-c++-safe-krb5_cccol_cursor.patch |   28 ----------------------------
 heimdal-locate_plugin-header.patch       |   12 ------------
 3 files changed, 5 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-31 23:42:49 UTC (rev 75163)
+++ PKGBUILD	2010-03-31 23:50:49 UTC (rev 75164)
@@ -7,13 +7,14 @@
 #
 
 pkgname=heimdal
-pkgver=1.3.1
-pkgrel=3
+pkgver=1.3.2
+pkgrel=1
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="http://www.h5l.org/"
 license=('custom')
-depends=('db>=4.8' 'openssl' 'sqlite3' 'e2fsprogs')
+depends=('db>=4.8' 'openssl' 'sqlite3')
+# re-add e2fsprogs once its libcom_err is compatible
 backup=(etc/krb5.conf)
 options=('!libtool' '!emptydirs')
 install=heimdal.install
@@ -25,12 +26,10 @@
 	012_all_heimdal-berkdb.patch
 	013_all_heimdal-pthread-lib.patch
 	014_all_heimdal-path.patch
-	heimdal-c++-safe-krb5_cccol_cursor.patch
-	heimdal-locate_plugin-header.patch
 	heimdal-kdc.rc
 	kadmind.rc
 	kpasswd.rc)
-md5sums=('4ce17deae040a3519e542f48fd901f21'
+md5sums=('69d7c4fc1a448f8feda1b478dad48fd0'
          '98e28f11f906c967aac22d6184102c9e'
          '6d5571bdedba2e2423b90bccdbac2c0a'
          '2feec3924ee5230b54175b4d4000c872'
@@ -38,8 +37,6 @@
          '56f5d10d0ec40f2fda82ef144ffac1e0'
          '1b8665b771c4eb6b56ea8582c96e56e3'
          '8208ae8c0b6ff5ab4f64af1693e9e396'
-         '522b08ae209126737413699b0c069c20'
-         '248ab80b44568171e432a23524f4fe39'
          'e59650992b9541a30dfce727a194f6e0'
          '1f2f86a67bbfddb7af581d35fdca9627'
          'f8f1eca95b9d3f2b4ebf2417b71b81cf')
@@ -53,10 +50,6 @@
   patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch || return 1
   patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1
   patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1
-  patch -Np1 -i ${srcdir}/heimdal-c++-safe-krb5_cccol_cursor.patch || return 1
-  
-  # temporary work-around for samba - https://bugzilla.samba.org/show_bug.cgi?id=6929
-  patch -Np1 -i ${srcdir}/heimdal-locate_plugin-header.patch || return 1
 
   sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
 	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \

Deleted: heimdal-c++-safe-krb5_cccol_cursor.patch
===================================================================
--- heimdal-c++-safe-krb5_cccol_cursor.patch	2010-03-31 23:42:49 UTC (rev 75163)
+++ heimdal-c++-safe-krb5_cccol_cursor.patch	2010-03-31 23:50:49 UTC (rev 75164)
@@ -1,28 +0,0 @@
-diff -Naur heimdal-1.3.1-old/lib/krb5/cache.c heimdal-1.3.1/lib/krb5/cache.c
---- heimdal-1.3.1-old/lib/krb5/cache.c	2009-11-22 01:41:51.000000000 +1000
-+++ heimdal-1.3.1/lib/krb5/cache.c	2009-11-23 22:27:15.000000000 +1000
-@@ -1347,10 +1347,11 @@
-  *
-  */
- 
--struct krb5_cccol_cursor {
-+struct krb5_cccol_cursor_data {
-     int idx;
-     krb5_cc_cache_cursor cursor;
- };
-+/* typedef of krb5_cccol_cursor is in krb5.h */
- 
- /**
-  * Get a new cache interation cursor that will interate over all
-diff -Naur heimdal-1.3.1-old/lib/krb5/krb5.h heimdal-1.3.1/lib/krb5/krb5.h
---- heimdal-1.3.1-old/lib/krb5/krb5.h	2009-11-22 01:41:51.000000000 +1000
-+++ heimdal-1.3.1/lib/krb5/krb5.h	2009-11-23 22:28:10.000000000 +1000
-@@ -311,7 +311,7 @@
- 				 NULL)
- 
- typedef void *krb5_cc_cursor;
--typedef struct krb5_cccol_cursor *krb5_cccol_cursor;
-+typedef struct krb5_cccol_cursor_data *krb5_cccol_cursor;
- 
- typedef struct krb5_ccache_data {
-     const struct krb5_cc_ops *ops;

Deleted: heimdal-locate_plugin-header.patch
===================================================================
--- heimdal-locate_plugin-header.patch	2010-03-31 23:42:49 UTC (rev 75163)
+++ heimdal-locate_plugin-header.patch	2010-03-31 23:50:49 UTC (rev 75164)
@@ -1,12 +0,0 @@
-diff -Naur heimdal-1.3.1-old/lib/krb5/locate_plugin.h heimdal-1.3.1/lib/krb5/locate_plugin.h
---- heimdal-1.3.1-old/lib/krb5/locate_plugin.h	2009-11-22 01:41:51.000000000 +1000
-+++ heimdal-1.3.1/lib/krb5/locate_plugin.h	2009-11-25 15:04:30.000000000 +1000
-@@ -36,6 +36,8 @@
- #ifndef HEIMDAL_KRB5_LOCATE_PLUGIN_H
- #define HEIMDAL_KRB5_LOCATE_PLUGIN_H 1
- 
-+#include <krb5.h>
-+
- #define KRB5_PLUGIN_LOCATE "service_locator"
- 
- enum locate_service_type {