Thu May 16 01:06:25 PDT 2013

1 files changed, 12 insertions, 39 deletions

diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index a95f373b8..a9b159b17 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180675 2013-03-25 19:13:43Z bpiotrowski $
+# $Id: PKGBUILD 185567 2013-05-15 08:03:34Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories.
@@ -7,75 +7,48 @@
 #pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
-pkgver=2.1.23
-pkgrel=10
+pkgver=2.1.26
+pkgrel=2
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl')
-source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-        cyrus-sasl-2.1.19-checkpw.c.patch
-        cyrus-sasl-2.1.22-crypt.patch
+source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-qa.patch
-        cyrus-sasl-2.1.22-automake-1.10.patch
-        cyrus-sasl-2.1.23-authd-fix.patch
-        0003_saslauthd_mdoc.patch
+        cyrus-sasl-2.1.26-size_t.patch
         0010_maintainer_mode.patch
         0011_saslauthd_ac_prog_libtool.patch
-        0012_xopen_crypt_prototype.patch
-        0016_pid_file_lock_creation_mask.patch
-        0018_auth_rimap_quotes.patch
-        0019_ldap_deprecated.patch
-        0022_gcc4.4_preprocessor_syntax.patch
         0025_ld_as_needed.patch
         0026_drop_krb5support_dependency.patch
-        0027_db5_support.patch
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.conf.d
         saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         'e27ddff076342e7a3041c4759817d04b'
-         'd7e6886e88af04d05f3dec7f0a59ccf7'
+md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
-         'f4131b077ddb5240b375d749162f1b7a'
-         'c7ad2c70c1ef814eb4b119f316c064f2'
-         'caeeac3feba19cbbd36e7345cc805600'
+         'f45aa8c42b32e0569ab3d14a83485b37'
          'f45d8b60e8f74dd7f7c2ec1665fa602a'
          '9d93880514cb5ff5da969f1ceb64a661'
-         'dfdc052a7e678db9f687482c5d52f34e'
-         '4a09f6b24b91f8450892a78e378860da'
-         '213abe7c5dfe0d7f446992787da1e780'
-         '5a0321177ad30cb5518c8b6812e3961a'
-         '0c965748970eea29fa295524821d43f0'
          '62bf892fe4d1df41ff748e91a1afaf67'
          'b7848957357e7c02d6490102be496bf9'
-         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
          '8e7106f32e495e9ade69014fd1b3352a'
          '49219af5641150edec288a3fdb65e7c1'
          '75542f613185d5a90520ad0d7d926a20')
 
 build() {
+  export CFLAGS="$CFLAGS -fPIC"
+ 
   cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
   patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
-  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
-  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
+  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch"
   patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
   patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
-  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
-  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
-  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
-  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
   patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
   patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
   patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
 
+  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
   rm -f config/config.guess config/config.sub 
   rm -f config/ltconfig config/ltmain.sh config/libtool.m4
   rm -fr autom4te.cache
@@ -130,7 +103,7 @@ build() {
 
 package_libsasl() {
   pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
-  depends=('openssl')
+  depends=('openssl' 'krb5')
   conflicts=('cyrus-sasl-plugins')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}"