Tue Oct 8 02:32:53 PDT 2013

1 files changed, 26 insertions, 19 deletions

diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 49976813d..c00711749 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $
+# $Id: PKGBUILD 195995 2013-10-07 10:32:45Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=4
+pkgrel=6
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
@@ -25,7 +25,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         0030-dont_use_la_files_for_opening_plugins.patch
         saslauthd.service
         saslauthd.conf.d
-        tmpfiles.conf)
+        tmpfiles.conf
+        CVE-2013-4122.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -36,21 +37,27 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '8e7106f32e495e9ade69014fd1b3352a'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
-         '45bb0192d2f188066240b9a66ee6365f')
+         '45bb0192d2f188066240b9a66ee6365f'
+         'c5f0ec88c584a75c14d7f402eaeed7ef')
+
+prepare() {
+  cd cyrus-sasl-$pkgver
+  patch -Np1 -i ../cyrus-sasl-2.1.22-qa.patch
+  patch -Np1 -i ../cyrus-sasl-2.1.26-size_t.patch
+  patch -Np1 -i ../0010_maintainer_mode.patch
+  patch -Np1 -i ../0011_saslauthd_ac_prog_libtool.patch
+  patch -Np1 -i ../0025_ld_as_needed.patch
+  patch -Np1 -i ../0026_drop_krb5support_dependency.patch
+  patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
+  patch -Np1 -i ../CVE-2013-4122.patch
+
+  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
+}
 
 build() {
   export CFLAGS="$CFLAGS -fPIC"
+  cd cyrus-sasl-$pkgver
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.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}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.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
@@ -109,7 +116,7 @@ package_libsasl() {
   depends=('openssl')
   conflicts=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  cd cyrus-sasl-$pkgver
   for dir in include lib sasldb plugins utils; do
     pushd ${dir}
     make DESTDIR="${pkgdir}" install
@@ -128,7 +135,7 @@ package_cyrus-sasl() {
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
   backup=('etc/conf.d/saslauthd')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
+  cd cyrus-sasl-$pkgver/saslauthd
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
   install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
@@ -143,7 +150,7 @@ package_cyrus-sasl-gssapi() {
   depends=("libsasl=${pkgver}" 'krb5')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
   cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/"
@@ -157,7 +164,7 @@ package_cyrus-sasl-ldap() {
   depends=("libsasl=${pkgver}" 'libldap')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
 
@@ -170,7 +177,7 @@ package_cyrus-sasl-sql() {
   depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
   replaces=('cyrus-sasl-plugins')
 
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
+  cd cyrus-sasl-$pkgver/plugins
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"