[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2020-05-06 Thread Allan McRae via arch-commits 
Date: Wednesday, May 6, 2020 @ 09:38:02
  Author: allan
Revision: 382373

upgpkg: libsasl 2.1.27-3: update source location, add signature checking

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-06 08:06:44 UTC (rev 382372)
+++ PKGBUILD2020-05-06 09:38:02 UTC (rev 382373)
@@ -3,11 +3,11 @@
 # This package spans multiple repositories.
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
-#pkgbase=('cyrus-sasl')
+#pkgbase='cyrus-sasl'
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.27
-pkgrel=2
+pkgrel=3
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="https://www.cyrusimap.org/sasl/;
@@ -14,7 +14,7 @@
 license=('custom')
 options=('!makeflags')
 makedepends=('postgresql-libs' 'mariadb-libs' 'libldap' 'krb5' 'openssl' 
'sqlite')
-source=(https://www.cyrusimap.org/releases/cyrus-sasl-${pkgver}.tar.gz
+source=(https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${pkgver}/cyrus-sasl-${pkgver}.tar.gz{,.sig}
 0003-Update-saslauthd.conf-location-in-documentation.patch
0006-Enable-autoconf-maintainer-mode.patch
 0010-Update-required-libraries-when-ld-as-needed-is-used.patch
@@ -27,6 +27,7 @@
 saslauthd.conf.d
 tmpfiles.conf)
 sha256sums=('26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5'
+'SKIP'
 '9919c81196701d11a3a77e2573a541489ad9ab42a4c50eb7d19edfb37713c604'
 '7bd2b2af36c061e92f69944a18e2c122aea0d2b21773f5ea47bb6209f13d0812'
 '8e22cb6ac58208f191b1eb19aac602c1bf49708f2a3b2e3de5f5b2c1e2467906'
@@ -38,6 +39,7 @@
 '5c6453050a5f594ca1d53baf3a6188d8f3cdc7a28467ad7c844ad51f663dae9a'
 'fa57b4f374ae633633091b1c8b44e1e0be814e4fddbfa75f16eb3dd1f16b8640'
 '16ca1a4185847b0c6c70ef6c7c314cb466f698d3ed02185a5f50e8179822f024')
+validpgpkeys=('829F339F8C296FE80F409D93E3D7C118C7B9F46A')
 
 prepare() {
   cd cyrus-sasl-$pkgver

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2019-11-13 Thread Felix Yan via arch-commits 
Date: Wednesday, November 13, 2019 @ 15:56:07
  Author: felixonmars
Revision: 368132

[core] mass rebuild

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 15:55:33 UTC (rev 368131)
+++ PKGBUILD2019-11-13 15:56:07 UTC (rev 368132)
@@ -7,7 +7,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.27
-pkgrel=1
+pkgrel=2
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="https://www.cyrusimap.org/sasl/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2019-02-03 Thread Jan de Groot via arch-commits 
Date: Sunday, February 3, 2019 @ 15:39:35
  Author: jgc
Revision: 345184

upgpkg: libsasl 2.1.27-1

Use correct pkgbase

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-03 15:35:32 UTC (rev 345183)
+++ PKGBUILD2019-02-03 15:39:35 UTC (rev 345184)
@@ -3,7 +3,7 @@
 # This package spans multiple repositories.
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
-pkgbase=('cyrus-sasl')
+#pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.27

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2019-01-16 Thread Felix Yan via arch-commits 
Date: Wednesday, January 16, 2019 @ 14:13:44
  Author: felixonmars
Revision: 344230

MariaDB 10.3 rebuild

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 14:00:34 UTC (rev 344229)
+++ PKGBUILD2019-01-16 14:13:44 UTC (rev 344230)
@@ -7,7 +7,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=15
+pkgrel=16
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2019-01-16 Thread Felix Yan via arch-commits 
Date: Wednesday, January 16, 2019 @ 14:00:06
  Author: felixonmars
Revision: 344227

MariaDB 10.3 rebuild

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 13:59:21 UTC (rev 344226)
+++ PKGBUILD2019-01-16 14:00:06 UTC (rev 344227)
@@ -7,7 +7,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=14
+pkgrel=15
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2019-01-16 Thread Felix Yan via arch-commits 
Date: Wednesday, January 16, 2019 @ 11:25:23
  Author: felixonmars
Revision: 344218

MariaDB 10.3 rebuild

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 11:23:59 UTC (rev 344217)
+++ PKGBUILD2019-01-16 11:25:23 UTC (rev 344218)
@@ -7,7 +7,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=13
+pkgrel=14
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2019-01-16 Thread Christian Hesse via arch-commits 
Date: Wednesday, January 16, 2019 @ 11:23:59
  Author: eworm
Revision: 344217

download from https

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 10:47:11 UTC (rev 344216)
+++ PKGBUILD2019-01-16 11:23:59 UTC (rev 344217)
@@ -14,7 +14,7 @@
 license=('custom')
 options=('!makeflags')
 makedepends=('postgresql-libs' 'mariadb-libs' 'libldap' 'krb5' 'openssl' 
'sqlite')
-source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
+source=(https://www.cyrusimap.org/releases/cyrus-sasl-${pkgver}.tar.gz
 cyrus-sasl-2.1.22-qa.patch
 cyrus-sasl-2.1.26-size_t.patch
 0010_maintainer_mode.patch

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2018-06-27 Thread Bartłomiej Piotrowski via arch-commits 
Date: Wednesday, June 27, 2018 @ 12:54:54
  Author: bpiotrowski
Revision: 327682

2.1.26-13: rebuild against gdbm 1.15

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-27 10:19:22 UTC (rev 327681)
+++ PKGBUILD2018-06-27 12:54:54 UTC (rev 327682)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=12
+pkgrel=13
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2018-01-04 Thread Bartłomiej Piotrowski via arch-commits 
Date: Thursday, January 4, 2018 @ 22:47:45
  Author: bpiotrowski
Revision: 314048

2.1.26-12: rebuild against gdbm 1.14.1

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-04 22:47:43 UTC (rev 314047)
+++ PKGBUILD2018-01-04 22:47:45 UTC (rev 314048)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=11
+pkgrel=12
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2017-04-05 Thread Jan de Groot 
Date: Wednesday, April 5, 2017 @ 09:02:42
  Author: jgc
Revision: 292094

upgpkg: libsasl 2.1.26-11

Build against OpenSSL 1.1

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-05 08:42:31 UTC (rev 292093)
+++ PKGBUILD2017-04-05 09:02:42 UTC (rev 292094)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=10
+pkgrel=11
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD fix-pkgconfig.patch)

2017-03-03 Thread Jan de Groot 
Date: Friday, March 3, 2017 @ 12:09:41
  Author: jgc
Revision: 289927

upgpkg: libsasl 2.1.26-10

Add pkgconfig file

Added:
  libsasl/trunk/fix-pkgconfig.patch
Modified:
  libsasl/trunk/PKGBUILD

-+
 PKGBUILD|   14 +-
 fix-pkgconfig.patch |   27 +++
 2 files changed, 36 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-03 11:17:05 UTC (rev 289926)
+++ PKGBUILD2017-03-03 12:09:41 UTC (rev 289927)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=9
+pkgrel=10
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/;
@@ -29,7 +29,8 @@
 CVE-2013-4122.patch
 cyrus-sasl-sql.patch
 cyrus-sasl-gssapi.patch
-cyrus-sasl-2.1.27-openssl-1.1.0.patch)
+cyrus-sasl-2.1.27-openssl-1.1.0.patch
+fix-pkgconfig.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
  '79b8a5e8689989e2afd4b7bda595a7b1'
  'f45aa8c42b32e0569ab3d14a83485b37'
@@ -44,7 +45,8 @@
  'c5f0ec88c584a75c14d7f402eaeed7ef'
  '82c0f66fdc5c1145eb48ea9116c27931'
  '0363b1a0337474a57b1f75f72fe88fa3'
- 'c8a385bbca9bd79910c6bda3dd02845c')
+ 'c8a385bbca9bd79910c6bda3dd02845c'
+ '409727695f9f28a3c43e340232462ff6')
 
 prepare() {
   cd cyrus-sasl-$pkgver
@@ -59,8 +61,9 @@
   patch -Np0 -i ../cyrus-sasl-sql.patch
   patch -Np1 -i ../cyrus-sasl-gssapi.patch
   patch -Np1 -i ../cyrus-sasl-2.1.27-openssl-1.1.0.patch
+  patch -Np1 -i ../fix-pkgconfig.patch
 
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
+  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 
's/libmysqlclient.a/libmysqlclient.so/' -i configure.in
 }
 
 build() {
@@ -109,7 +112,7 @@
   --enable-ntlm \
   --disable-passdss \
   --enable-sql \
-  --with-mysql \
+  --with-mysql=/usr \
   --with-pgsql=/usr/lib \
   --with-sqlite3=/usr/lib \
   --enable-ldapdb \
@@ -130,6 +133,7 @@
   conflicts=('cyrus-sasl-plugins')
 
   cd cyrus-sasl-$pkgver
+  make DESTDIR="$pkgdir" install-pkgconfigDATA
   for dir in include lib sasldb plugins utils; do
 pushd ${dir}
 make DESTDIR="${pkgdir}" install

Added: fix-pkgconfig.patch
===
--- fix-pkgconfig.patch (rev 0)
+++ fix-pkgconfig.patch 2017-03-03 12:09:41 UTC (rev 289927)
@@ -0,0 +1,27 @@
+From 3f42b7d7f3ef52056c79b31529d1a5be695c74c1 Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro 
+Date: Fri, 20 Nov 2015 11:16:31 +0100
+Subject: [PATCH] Fix up pkgconfig pc file
+
+---
+ libsasl2.pc.in | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libsasl2.pc.in b/libsasl2.pc.in
+index 40bea37..ddad76d 100644
+--- a/libsasl2.pc.in
 b/libsasl2.pc.in
+@@ -1,8 +1,12 @@
+-libdir = @libdir@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: Cyrus SASL
+ Description: Cyrus SASL implementation
+ URL: http://www.cyrussasl.org/
+ Version: @VERSION@
++Cflags: -I${includedir}
+ Libs: -L${libdir} -lsasl2
+ Libs.private: @LIB_DOOR@ @SASL_DL_LIB@ @LIBS@

[arch-commits] Commit in libsasl/trunk (PKGBUILD cyrus-sasl-gssapi.patch)

2016-07-10 Thread Andreas Radke 
Date: Sunday, July 10, 2016 @ 19:54:55
  Author: andyrtr
Revision: 271259

upgpkg: libsasl 2.1.26-8

rebuild old pkg, apply fix for FS#42789

Added:
  libsasl/trunk/cyrus-sasl-gssapi.patch
Modified:
  libsasl/trunk/PKGBUILD

-+
 PKGBUILD|9 ++---
 cyrus-sasl-gssapi.patch |   16 
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-10 19:38:53 UTC (rev 271258)
+++ PKGBUILD2016-07-10 19:54:55 UTC (rev 271259)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=7
+pkgrel=8
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/;
@@ -27,7 +27,8 @@
 saslauthd.conf.d
 tmpfiles.conf
 CVE-2013-4122.patch
-cyrus-sasl-sql.patch)
+cyrus-sasl-sql.patch
+cyrus-sasl-gssapi.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
  '79b8a5e8689989e2afd4b7bda595a7b1'
  'f45aa8c42b32e0569ab3d14a83485b37'
@@ -40,7 +41,8 @@
  '49219af5641150edec288a3fdb65e7c1'
  '45bb0192d2f188066240b9a66ee6365f'
  'c5f0ec88c584a75c14d7f402eaeed7ef'
- '82c0f66fdc5c1145eb48ea9116c27931')
+ '82c0f66fdc5c1145eb48ea9116c27931'
+ '0363b1a0337474a57b1f75f72fe88fa3')
 
 prepare() {
   cd cyrus-sasl-$pkgver
@@ -53,6 +55,7 @@
   patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
   patch -Np1 -i ../CVE-2013-4122.patch
   patch -Np0 -i ../cyrus-sasl-sql.patch
+  patch -Np1 -i ../cyrus-sasl-gssapi.patch
 
   sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
 }

Added: cyrus-sasl-gssapi.patch
===
--- cyrus-sasl-gssapi.patch (rev 0)
+++ cyrus-sasl-gssapi.patch 2016-07-10 19:54:55 UTC (rev 271259)
@@ -0,0 +1,16 @@
+diff -aur cyrus-sasl-2.1.26.orig/plugins/gssapi.c 
cyrus-sasl-2.1.26/plugins/gssapi.c
+--- cyrus-sasl-2.1.26.orig/plugins/gssapi.c2016-06-10 13:55:25.985676293 
-0700
 cyrus-sasl-2.1.26/plugins/gssapi.c 2016-06-10 13:58:00.687337430 -0700
+@@ -1583,10 +1583,10 @@
+   }
+ 
+   /* Setup req_flags properly */
+-  req_flags = GSS_C_INTEG_FLAG;
++  req_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG;
+   if (params->props.max_ssf > params->external_ssf) {
+   /* We are requesting a security layer */
+-  req_flags |= GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG;
++  req_flags |= GSS_C_INTEG_FLAG;
+   /* Any SSF bigger than 1 is confidentiality. */
+   /* Let's check if the client of the API requires confidentiality,
+  and it wasn't already provided by an external layer */

[arch-commits] Commit in libsasl/trunk (PKGBUILD cyrus-sasl-sql.patch)

2014-02-06 Thread Andreas Radke 
Date: Thursday, February 6, 2014 @ 20:31:43
  Author: andyrtr
Revision: 205532

upgpkg: libsasl 2.1.26-7

switch from BerkeleyDB to GDBM; fix sql linking, use sqlite v3

Added:
  libsasl/trunk/cyrus-sasl-sql.patch
Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |   17 -
 cyrus-sasl-sql.patch |   39 +++
 2 files changed, 51 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-06 19:29:56 UTC (rev 205531)
+++ PKGBUILD2014-02-06 19:31:43 UTC (rev 205532)
@@ -8,13 +8,13 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=6
+pkgrel=7
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/;
 license=('custom')
 options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 
'sqlite2')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 
'sqlite')
 source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
 cyrus-sasl-2.1.22-qa.patch
 cyrus-sasl-2.1.26-size_t.patch
@@ -26,7 +26,8 @@
 saslauthd.service
 saslauthd.conf.d
 tmpfiles.conf
-CVE-2013-4122.patch)
+CVE-2013-4122.patch
+cyrus-sasl-sql.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
  '79b8a5e8689989e2afd4b7bda595a7b1'
  'f45aa8c42b32e0569ab3d14a83485b37'
@@ -38,7 +39,8 @@
  '3499dcd610ad1ad58e0faffde2aa7a23'
  '49219af5641150edec288a3fdb65e7c1'
  '45bb0192d2f188066240b9a66ee6365f'
- 'c5f0ec88c584a75c14d7f402eaeed7ef')
+ 'c5f0ec88c584a75c14d7f402eaeed7ef'
+ '82c0f66fdc5c1145eb48ea9116c27931')
 
 prepare() {
   cd cyrus-sasl-$pkgver
@@ -50,6 +52,7 @@
   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
+  patch -Np0 -i ../cyrus-sasl-sql.patch
 
   sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
 }
@@ -100,11 +103,15 @@
   --enable-ntlm \
   --disable-passdss \
   --enable-sql \
+  --with-mysql \
+  --with-pgsql=/usr/lib \
+  --with-sqlite3=/usr/lib \
   --enable-ldapdb \
   --disable-macos-framework \
   --with-pam \
   --with-saslauthd=/var/run/saslauthd \
   --with-ldap \
+  --with-dblib=gdbm \
   --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
   --sysconfdir=/etc \
   --with-devrandom=/dev/urandom
@@ -174,7 +181,7 @@
 
 package_cyrus-sasl-sql() {
   pkgdesc=SQL auxprop module for Cyrus SASL
-  depends=(libsasl=${pkgver} 'postgresql-libs' 'libmariadbclient' 'sqlite2')
+  depends=(libsasl=${pkgver} 'postgresql-libs' 'libmariadbclient' 'sqlite')
   replaces=('cyrus-sasl-plugins')
 
   cd cyrus-sasl-$pkgver/plugins

Added: cyrus-sasl-sql.patch
===
--- cyrus-sasl-sql.patch(rev 0)
+++ cyrus-sasl-sql.patch2014-02-06 19:31:43 UTC (rev 205532)
@@ -0,0 +1,39 @@
+--- configure.in   2012-10-12 16:05:48.0 +0200
 configure.in   2013-05-11 18:48:59.021848013 +0200
+@@ -861,9 +860,9 @@
+ notfound) AC_WARN([SQLite Library not found]); true;;
+ *)
+  if test -d ${with_sqlite}/lib; then
+- LIB_SQLITE=-L${with_sqlite}/lib -R${with_sqlite}/lib
++ LIB_SQLITE=-L${with_sqlite}/lib
+  else
+- LIB_SQLITE=-L${with_sqlite} -R${with_sqlite}
++ LIB_SQLITE=-L${with_sqlite}
+  fi
+ 
+  LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +912,9 @@
+ notfound) AC_WARN([SQLite3 Library not found]); true;;
+ *)
+  if test -d ${with_sqlite3}/lib; then
+- LIB_SQLITE3=-L${with_sqlite3}/lib -R${with_sqlite3}/lib
++ LIB_SQLITE3=-L${with_sqlite3}/lib
+  else
+- LIB_SQLITE3=-L${with_sqlite3} -R${with_sqlite3}
++ LIB_SQLITE3=-L${with_sqlite3}
+  fi
+ 
+  LIB_SQLITE3_DIR=$LIB_SQLITE3
+--- configure.in
 configure.in
+@@ -674,7 +674,9 @@
+  LIB_PGSQL_DIR=$LIB_PGSQL
+  LIB_PGSQL=$LIB_PGSQL -lpq
+ 
+- if test -d ${with_pgsql}/include/pgsql; then
++ if test -d ${with_pgsql}/include/postgresql/pgsql; then
++ CPPFLAGS=${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql
++ elif test -d ${with_pgsql}/include/pgsql; then
+  CPPFLAGS=${CPPFLAGS} -I${with_pgsql}/include/pgsql
+  elif test -d ${with_pgsql}/pgsql/include; then
+  CPPFLAGS=${CPPFLAGS} -I${with_pgsql}/pgsql/include

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2013-08-06 Thread Bartłomiej Piotrowski 
Date: Tuesday, August 6, 2013 @ 08:44:14
  Author: bpiotrowski
Revision: 192122

upgpkg: libsasl 2.1.26-5

- rebuild against db 6.0

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-06 03:56:39 UTC (rev 192121)
+++ PKGBUILD2013-08-06 06:44:14 UTC (rev 192122)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=4
+pkgrel=5
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD saslauthd)

2013-05-30 Thread Eric Bélanger 
Date: Thursday, May 30, 2013 @ 22:17:52
  Author: eric
Revision: 186725

upgpkg: libsasl 2.1.26-4

Move files to /usr/bin

Modified:
  libsasl/trunk/PKGBUILD
Deleted:
  libsasl/trunk/saslauthd

---+
 PKGBUILD  |6 ++
 saslauthd |   49 -
 2 files changed, 2 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 19:02:49 UTC (rev 186724)
+++ PKGBUILD2013-05-30 20:17:52 UTC (rev 186725)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26
-pkgrel=3
+pkgrel=4
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/;
@@ -25,7 +25,6 @@
 0030-dont_use_la_files_for_opening_plugins.patch
 saslauthd.service
 saslauthd.conf.d
-saslauthd
 tmpfiles.conf)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
  '79b8a5e8689989e2afd4b7bda595a7b1'
@@ -37,7 +36,6 @@
  '8e7106f32e495e9ade69014fd1b3352a'
  '3499dcd610ad1ad58e0faffde2aa7a23'
  '49219af5641150edec288a3fdb65e7c1'
- '75542f613185d5a90520ad0d7d926a20'
  '45bb0192d2f188066240b9a66ee6365f')
 
 build() {
@@ -74,6 +72,7 @@
   popd
 
   ./configure --prefix=/usr \
+  --sbin=/usr/bin \
   --mandir=/usr/share/man \
   --infodir=/usr/share/info \
   --disable-static \
@@ -131,7 +130,6 @@
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
   make DESTDIR=${pkgdir} install
-  install -Dm755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/saslauthd
   install -Dm644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
   install -Dm644 ${srcdir}/saslauthd.service 
${pkgdir}/usr/lib/systemd/system/saslauthd.service
   install -Dm644 ${srcdir}/tmpfiles.conf 
${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf

Deleted: saslauthd
===
--- saslauthd   2013-05-30 19:02:49 UTC (rev 186724)
+++ saslauthd   2013-05-30 20:17:52 UTC (rev 186725)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ]  . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME=saslauthd
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case $1 in
-  start)
-stat_busy Starting $DAEMON_NAME
-[ ! -d /var/run/saslauthd ]  install -d /var/run/saslauthd
-if $SASLAUTHD_BIN $SASLAUTHD_OPTS /dev/null; then
-  add_daemon $DAEMON_NAME
-  stat_done
-else
-  stat_fail
-  exit 1
-fi
-;;
-
-  stop)
-stat_busy Stopping $DAEMON_NAME
-[ -f $SASLAUTHD_PID ]  kill `cat $SASLAUTHD_PID` /dev/null
-if [ $? -gt 0 ]; then
-  stat_fail
-  exit 1
-else
-  rm_daemon $DAEMON_NAME
-  stat_done
-fi
-;;
-
-  restart)
-$0 stop
-sleep 1
-$0 start
-;;
-
-  *)
-echo usage: $0 {start|stop|restart}  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2013-05-24 Thread Jan de Groot 
Date: Friday, May 24, 2013 @ 18:26:57
  Author: jgc
Revision: 186314

upgpkg: libsasl 2.1.26-3

Build without pkgbase

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-24 16:21:51 UTC (rev 186313)
+++ PKGBUILD2013-05-24 16:26:57 UTC (rev 186314)
@@ -4,7 +4,7 @@
 # This package spans multiple repositories. 
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
-pkgbase=('cyrus-sasl')
+#pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.26

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2013-05-22 Thread Jan de Groot 
Date: Wednesday, May 22, 2013 @ 13:03:49
  Author: jgc
Revision: 186233

Set correct pkgname for core

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-22 11:02:55 UTC (rev 186232)
+++ PKGBUILD2013-05-22 11:03:49 UTC (rev 186233)
@@ -5,8 +5,8 @@
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
 pkgbase=('cyrus-sasl')
-pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
-#pkgname=libsasl
+#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
+pkgname=libsasl
 pkgver=2.1.26
 pkgrel=3
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2013-05-10 Thread Bartłomiej Piotrowski 
Date: Friday, May 10, 2013 @ 19:33:51
  Author: bpiotrowski
Revision: 185052

upgpkg: libsasl 2.1.26-1

- upstream release
- disable not required patches

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |   35 +++
 1 file changed, 19 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-10 17:31:59 UTC (rev 185051)
+++ PKGBUILD2013-05-10 17:33:51 UTC (rev 185052)
@@ -7,15 +7,15 @@
 #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=1
 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
+source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
 cyrus-sasl-2.1.19-checkpw.c.patch
 cyrus-sasl-2.1.22-crypt.patch
 cyrus-sasl-2.1.22-qa.patch
@@ -35,7 +35,7 @@
 0030-dont_use_la_files_for_opening_plugins.patch
 saslauthd.conf.d
 saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
  'e27ddff076342e7a3041c4759817d04b'
  'd7e6886e88af04d05f3dec7f0a59ccf7'
  '79b8a5e8689989e2afd4b7bda595a7b1'
@@ -57,25 +57,28 @@
  '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.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.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}/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}/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}/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 +133,7 @@
 
 package_libsasl() {
   pkgdesc=Cyrus Simple Authentication Service Layer (SASL) Library
-  depends=('openssl')
+  depends=('openssl' 'krb5')
   conflicts=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2013-03-14 Thread Bartłomiej Piotrowski 
Date: Thursday, March 14, 2013 @ 20:15:00
  Author: bpiotrowski
Revision: 180017

upgpkg: libsasl 2.1.23-10

mariadb rebuild

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-14 19:01:38 UTC (rev 180016)
+++ PKGBUILD2013-03-14 19:15:00 UTC (rev 180017)
@@ -8,13 +8,13 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=9
+pkgrel=10
 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' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
+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
@@ -190,7 +190,7 @@
 
 package_cyrus-sasl-sql() {
   pkgdesc=SQL auxprop module for Cyrus SASL
-  depends=(libsasl=${pkgver}-${pkgrel} 'postgresql-libs' 'libmysqlclient')
+  depends=(libsasl=${pkgver}-${pkgrel} 'postgresql-libs' 'libmariadbclient')
   replaces=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2012-01-09 Thread Ionut Biru 
Date: Monday, January 9, 2012 @ 09:53:49
  Author: ibiru
Revision: 146307

db 5.3.15 rebuild

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-09 13:55:21 UTC (rev 146306)
+++ PKGBUILD2012-01-09 14:53:49 UTC (rev 146307)
@@ -1,14 +1,14 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 
-# This package spans multiple repositories. 
+# This package spans multiple repositories.
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
 #pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=8
+pkgrel=9
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/;

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2011-06-17 Thread Stéphane Gaudreault 
Date: Friday, June 17, 2011 @ 09:03:28
  Author: stephane
Revision: 127649

upgpkg: libsasl 2.1.23-6
db rebuild

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-17 12:59:24 UTC (rev 127648)
+++ PKGBUILD2011-06-17 13:03:28 UTC (rev 127649)
@@ -3,7 +3,7 @@
 
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=5
+pkgrel=6
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;

[arch-commits] Commit in libsasl/trunk (PKGBUILD cyrus-sasl-db.patch db-4.7.patch)

2010-10-19 Thread Allan McRae 
Date: Tuesday, October 19, 2010 @ 07:41:43
  Author: allan
Revision: 96213

upgpkg: libsasl 2.1.23-5
db-5.1 rebuild

Added:
  libsasl/trunk/cyrus-sasl-db.patch
Modified:
  libsasl/trunk/PKGBUILD
Deleted:
  libsasl/trunk/db-4.7.patch

-+
 PKGBUILD|   21 +++--
 cyrus-sasl-db.patch |   34 ++
 db-4.7.patch|   20 
 3 files changed, 45 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 11:23:31 UTC (rev 96212)
+++ PKGBUILD2010-10-19 11:41:43 UTC (rev 96213)
@@ -3,7 +3,7 @@
 
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=4
+pkgrel=5
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
@@ -12,16 +12,17 @@
 optdepends=('cyrus-sasl: saslauthd'
 'cyrus-sasl-plugins: authentication plugins other than sasldb')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-   cyrus-sasl-2.1.19-checkpw.c.patch db-4.7.patch)
+   cyrus-sasl-2.1.19-checkpw.c.patch
+   cyrus-sasl-db.patch)
 options=('!makeflags')
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
  'e27ddff076342e7a3041c4759817d04b'
- '71a3b7454f4d7cc2966b347bdf03f2fc')
+ '0658201497aad359c0d66b0ab8032859')
 
 build() {
   cd ${srcdir}/cyrus-sasl-${pkgver}
-  patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch || return 1
-  patch -Np0 -i ${srcdir}/db-4.7.patch || return 1
+  patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch
+  patch -Np1 -i ${srcdir}/cyrus-sasl-db.patch
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -32,10 +33,10 @@
--enable-login \
--disable-otp \
--enable-plain \
---mandir=/usr/share/man || return 1
+--mandir=/usr/share/man
   for dir in include lib sasldb plugins utils; do
-pushd ${dir} || return 1
-make || return 1
+pushd ${dir}
+make
 popd
   done
 }
@@ -44,10 +45,10 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}
   for dir in include lib sasldb plugins utils; do
 pushd ${dir} || return 1
-make DESTDIR=${pkgdir} install || return 1
+make DESTDIR=${pkgdir} install
 popd
   done
 
   # install license
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING 
|| return 1
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }

Added: cyrus-sasl-db.patch
===
--- cyrus-sasl-db.patch (rev 0)
+++ cyrus-sasl-db.patch 2010-10-19 11:41:43 UTC (rev 96213)
@@ -0,0 +1,34 @@
+diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 
cyrus-sasl-2.1.22/cmulocal/berkdb.m4
+--- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4   2005-04-26 21:14:07.0 
+0200
 cyrus-sasl-2.1.22/cmulocal/berkdb.m4   2006-10-02 20:36:17.137852392 
+0200
+@@ -213,7 +213,7 @@
+   fi
+ 
+   saved_LIBS=$LIBS
+-for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 
db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 
db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 
db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 
db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+   do
+   LIBS=$saved_LIBS -l$dbname
+   AC_TRY_LINK([#include db.h],
+--- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig2009-04-28 
17:09:18.0 +0200
 cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098 
+0200
+@@ -100,7 +100,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0  *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4  DB_VERSION_MINOR = 1
++#if (DB_VERSION_MAJOR  4) || (DB_VERSION_MAJOR == 4  DB_VERSION_MINOR = 1)
+   ret = (*mbdb)-open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+   ret = (*mbdb)-open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig   2003-02-13 
20:56:17.0 +0100
 cyrus-sasl-2.1.23/utils/dbconverter-2.c2010-05-18 21:11:09.982932556 
+0200
+@@ -214,7 +214,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0  *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4  DB_VERSION_MINOR = 1
++#if (DB_VERSION_MAJOR  4) || (DB_VERSION_MAJOR == 4  DB_VERSION_MINOR = 1)
+   ret = (*mbdb)-open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+   ret = (*mbdb)-open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);

Deleted: db-4.7.patch
===
--- db-4.7.patch2010-10-19 11:23:31 UTC (rev 96212)
+++ db-4.7.patch2010-10-19 11:41:43 UTC (rev 96213)
@@ -1,20 +0,0 @@

[arch-commits] Commit in libsasl/trunk (PKGBUILD)

2010-04-19 Thread Allan McRae 
Date: Monday, April 19, 2010 @ 07:02:50
  Author: allan
Revision: 78109

upgpkg: libsasl 2.1.23-4
Jan can not spell

Modified:
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-19 10:53:54 UTC (rev 78108)
+++ PKGBUILD2010-04-19 11:02:50 UTC (rev 78109)
@@ -3,14 +3,14 @@
 
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=3
+pkgrel=4
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
 license=('custom')
 depends=('db=4.8')
 optdepends=('cyrus-sasl: saslauthd'
-'cyrus-sasl-plugins: authentication plugisn other than sasldb')
+'cyrus-sasl-plugins: authentication plugins other than sasldb')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
cyrus-sasl-2.1.19-checkpw.c.patch db-4.7.patch)
 options=('!makeflags')