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

[Allan McRae]

    Date: Wednesday, November 25, 2009 @ 03:16:41
  Author: allan
Revision: 59610

Merged revisions 59608 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/heimdal/trunk

........
  r59608 | allan | 2009-11-25 18:11:05 +1000 (Wed, 25 Nov 2009) | 2 lines
  
  upgpkg: heimdal 1.3.1-2
      add temporary patch for samba build issue, remove conflicting man page (FS#17263)
........

Added:
  heimdal/repos/testing-x86_64/heimdal-locate_plugin-header.patch
    (from rev 59608, heimdal/trunk/heimdal-locate_plugin-header.patch)
Modified:
  heimdal/repos/testing-x86_64/	(properties)
  heimdal/repos/testing-x86_64/PKGBUILD

------------------------------------+
 PKGBUILD                           |    8 +++++++-
 heimdal-locate_plugin-header.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)


Property changes on: heimdal/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /heimdal/trunk:1-59459
   + /heimdal/trunk:1-59609

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-11-25 08:12:02 UTC (rev 59609)
+++ testing-x86_64/PKGBUILD	2009-11-25 08:16:41 UTC (rev 59610)
@@ -8,7 +8,7 @@
 
 pkgname=heimdal
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="http://www.h5l.org/"
@@ -27,6 +27,7 @@
 	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)
@@ -39,6 +40,7 @@
          '1b8665b771c4eb6b56ea8582c96e56e3'
          '8208ae8c0b6ff5ab4f64af1693e9e396'
          '522b08ae209126737413699b0c069c20'
+         '248ab80b44568171e432a23524f4fe39'
          'e59650992b9541a30dfce727a194f6e0'
          '1f2f86a67bbfddb7af581d35fdca9627'
          'f8f1eca95b9d3f2b4ebf2417b71b81cf')
@@ -53,6 +55,9 @@
   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 \
@@ -104,6 +109,7 @@
   rm ${pkgdir}/usr/lib/libcom_err.{a,so}                          # e2fsprogs
   rm ${pkgdir}/usr/bin/compile_et                                 # e2fsprogs
   rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}*  # openssl (a bit overzealous...)
+  rm ${pkgdir}/usr/share/man/man3/os.3*                           # erlang
 
   # Install the license
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \

Copied: heimdal/repos/testing-x86_64/heimdal-locate_plugin-header.patch (from rev 59608, heimdal/trunk/heimdal-locate_plugin-header.patch)
===================================================================
--- testing-x86_64/heimdal-locate_plugin-header.patch	                        (rev 0)
+++ testing-x86_64/heimdal-locate_plugin-header.patch	2009-11-25 08:16:41 UTC (rev 59610)
@@ -0,0 +1,12 @@
+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 {