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

2020-05-06 Thread Allan McRae via arch-commits
Date: Wednesday, May 6, 2020 @ 09:39:14
  Author: allan
Revision: 382375

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

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-05-06 09:38:58 UTC (rev 382374)
+++ PKGBUILD2020-05-06 09:39:14 UTC (rev 382375)
@@ -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=1
+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 cyrus-sasl/trunk (PKGBUILD)

2019-01-16 Thread Evangelos Foutras via arch-commits
Date: Wednesday, January 16, 2019 @ 14:56:19
  Author: foutrelis
Revision: 344249

MariaDB 10.3 rebuild

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 14:51:20 UTC (rev 344248)
+++ PKGBUILD2019-01-16 14:56:19 UTC (rev 344249)
@@ -7,7 +7,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="https://www.cyrusimap.org/sasl/;


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

2019-01-16 Thread Evangelos Foutras via arch-commits
Date: Wednesday, January 16, 2019 @ 14:51:20
  Author: foutrelis
Revision: 344248

Use HTTPS source download

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 14:46:40 UTC (rev 344247)
+++ PKGBUILD2019-01-16 14:51:20 UTC (rev 344248)
@@ -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 cyrus-sasl/trunk (PKGBUILD)

2019-01-05 Thread Jelle van der Waa via arch-commits
Date: Saturday, January 5, 2019 @ 16:48:41
  Author: jelle
Revision: 343020

FS#60540

Fix upstream url

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-01-05 16:48:27 UTC (rev 343019)
+++ PKGBUILD2019-01-05 16:48:41 UTC (rev 343020)
@@ -10,7 +10,7 @@
 pkgrel=12
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
-url="http://cyrusimap.web.cmu.edu/;
+url="https://www.cyrusimap.org/sasl/;
 license=('custom')
 options=('!makeflags')
 makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 
'sqlite')


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

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

2.1.26-12: rebuild against gdbm 1.15

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-06-27 12:55:07 UTC (rev 327683)
+++ PKGBUILD2018-06-27 12:56:04 UTC (rev 327684)
@@ -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 cyrus-sasl/trunk (PKGBUILD)

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

2.1.26-11: rebuild against gdbm 1.14.1

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-01-04 22:41:32 UTC (rev 314045)
+++ PKGBUILD2018-01-04 22:47:20 UTC (rev 314046)
@@ -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=11
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('x86_64')
 url="http://cyrusimap.web.cmu.edu/;


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

2017-05-31 Thread Christian Hesse
Date: Wednesday, May 31, 2017 @ 14:39:51
  Author: eworm
Revision: 296964

fix left over libmariadb dependency

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-05-31 13:07:21 UTC (rev 296963)
+++ PKGBUILD2017-05-31 14:39:51 UTC (rev 296964)
@@ -191,7 +191,7 @@
 
 package_cyrus-sasl-sql() {
   pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadb' 'sqlite')
+  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite')
   replaces=('cyrus-sasl-plugins')
 
   cd cyrus-sasl-$pkgver/plugins


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

2017-05-31 Thread Evangelos Foutras
Date: Wednesday, May 31, 2017 @ 08:20:53
  Author: foutrelis
Revision: 296890

MariaDB 10.2.6 rebuild

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-05-31 08:17:18 UTC (rev 296889)
+++ PKGBUILD2017-05-31 08:20:53 UTC (rev 296890)
@@ -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=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/;


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

2017-05-25 Thread Evangelos Foutras
Date: Thursday, May 25, 2017 @ 23:04:28
  Author: foutrelis
Revision: 296622

MariaDB 10.2.6 rebuild

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-05-25 22:51:58 UTC (rev 296621)
+++ PKGBUILD2017-05-25 23:04:28 UTC (rev 296622)
@@ -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 (cyrus-sasl/trunk/PKGBUILD libsasl/trunk/PKGBUILD)

2017-05-25 Thread Christian Hesse
Date: Thursday, May 25, 2017 @ 15:52:53
  Author: eworm
Revision: 296576

prepare for mariadb 10.2.x

Modified:
  cyrus-sasl/trunk/PKGBUILD
  libsasl/trunk/PKGBUILD

---+
 cyrus-sasl/trunk/PKGBUILD |2 +-
 libsasl/trunk/PKGBUILD|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: cyrus-sasl/trunk/PKGBUILD
===
--- cyrus-sasl/trunk/PKGBUILD   2017-05-25 15:43:07 UTC (rev 296575)
+++ cyrus-sasl/trunk/PKGBUILD   2017-05-25 15:52:53 UTC (rev 296576)
@@ -63,7 +63,7 @@
   patch -Np1 -i ../cyrus-sasl-2.1.27-openssl-1.1.0.patch
   patch -Np1 -i ../fix-pkgconfig.patch
 
-  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 
's/libmysqlclient.a/libmysqlclient.so/' -i configure.in
+  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 
's/libmysqlclient.a/libmariadb.so/' -i configure.in
 }
 
 build() {

Modified: libsasl/trunk/PKGBUILD
===
--- libsasl/trunk/PKGBUILD  2017-05-25 15:43:07 UTC (rev 296575)
+++ libsasl/trunk/PKGBUILD  2017-05-25 15:52:53 UTC (rev 296576)
@@ -63,7 +63,7 @@
   patch -Np1 -i ../cyrus-sasl-2.1.27-openssl-1.1.0.patch
   patch -Np1 -i ../fix-pkgconfig.patch
 
-  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 
's/libmysqlclient.a/libmysqlclient.so/' -i configure.in
+  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 
's/libmysqlclient.a/libmariadb.so/' -i configure.in
 }
 
 build() {


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

2016-07-10 Thread Andreas Radke
Date: Sunday, July 10, 2016 @ 19:57:38
  Author: andyrtr
Revision: 271261

upgpkg: cyrus-sasl 2.1.26-8

rebuild old pkg, apply fix for FS#42789

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

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

Modified: PKGBUILD
===
--- PKGBUILD2016-07-10 19:55:25 UTC (rev 271260)
+++ PKGBUILD2016-07-10 19:57:38 UTC (rev 271261)
@@ -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:57:38 UTC (rev 271261)
@@ -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 cyrus-sasl/trunk (PKGBUILD cyrus-sasl-sql.patch)

2014-02-06 Thread Andreas Radke
Date: Thursday, February 6, 2014 @ 20:29:10
  Author: andyrtr
Revision: 205530

upgpkg: cyrus-sasl 2.1.26-7

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

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

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

Modified: PKGBUILD
===
--- PKGBUILD2014-02-06 18:45:30 UTC (rev 205529)
+++ PKGBUILD2014-02-06 19:29:10 UTC (rev 205530)
@@ -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:29:10 UTC (rev 205530)
@@ -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 cyrus-sasl/trunk (PKGBUILD)

2013-09-30 Thread Jan de Groot
Date: Monday, September 30, 2013 @ 11:19:58
  Author: jgc
Revision: 195304

Only package saslauthd in cyrus-sasl

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-09-30 09:07:21 UTC (rev 195303)
+++ PKGBUILD2013-09-30 09:19:58 UTC (rev 195304)
@@ -135,7 +135,7 @@
   pkgdesc=Cyrus saslauthd SASL authentication daemon
   backup=('etc/conf.d/saslauthd')
 
-  cd cyrus-sasl-$pkgver
+  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



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

2013-08-06 Thread Bartłomiej Piotrowski
Date: Tuesday, August 6, 2013 @ 08:50:46
  Author: bpiotrowski
Revision: 192128

upgpkg: cyrus-sasl 2.1.26-5

- rebuild against db 6.0

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-08-06 06:45:56 UTC (rev 192127)
+++ PKGBUILD2013-08-06 06:50:46 UTC (rev 192128)
@@ -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 cyrus-sasl/trunk (PKGBUILD saslauthd)

2013-05-30 Thread Eric Bélanger
Date: Thursday, May 30, 2013 @ 22:22:12
  Author: eric
Revision: 186727

upgpkg: cyrus-sasl 2.1.26-4

Move files to /usr/bin, Remove initscripts daemon

Modified:
  cyrus-sasl/trunk/PKGBUILD
Deleted:
  cyrus-sasl/trunk/saslauthd

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

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 20:19:22 UTC (rev 186726)
+++ PKGBUILD2013-05-30 20:22:12 UTC (rev 186727)
@@ -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 20:19:22 UTC (rev 186726)
+++ saslauthd   2013-05-30 20:22:12 UTC (rev 186727)
@@ -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 cyrus-sasl/trunk (PKGBUILD)

2013-05-22 Thread Jan de Groot
Date: Wednesday, May 22, 2013 @ 12:53:24
  Author: jgc
Revision: 186230

Move libgs2 plugin to cyrus-sasl-gssapi

Modified:
  cyrus-sasl/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-22 10:37:58 UTC (rev 186229)
+++ PKGBUILD2013-05-22 10:53:24 UTC (rev 186230)
@@ -8,7 +8,7 @@
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=2
+pkgrel=3
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/;
@@ -119,6 +119,7 @@
   rm -f ${pkgdir}/usr/lib/sasl2/libsql.so*
   rm -f ${pkgdir}/usr/lib/sasl2/libgssapiv2.so*
   rm -f ${pkgdir}/usr/lib/sasl2/libldapdb.so*
+  rm -f ${pkgdir}/usr/lib/sasl2/libgs2.so*
   install -m755 -d ${pkgdir}/usr/share/licenses/libsasl
   install -m644 COPYING ${pkgdir}/usr/share/licenses/libsasl/
 }
@@ -147,6 +148,7 @@
   cd ${srcdir}/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/
 
   install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi
   ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/



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

2013-05-11 Thread Bartłomiej Piotrowski
Date: Saturday, May 11, 2013 @ 08:53:51
  Author: bpiotrowski
Revision: 185099

upgpkg: cyrus-sasl 2.1.26-2

- remove unused patches
- add patch including sys/types.h (see FS#35194)

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-05-11 06:49:13 UTC (rev 185098)
+++ PKGBUILD2013-05-11 06:53:51 UTC (rev 185099)
@@ -8,7 +8,7 @@
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=1
+pkgrel=2
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/;



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

2013-05-10 Thread Bartłomiej Piotrowski
Date: Friday, May 10, 2013 @ 20:51:41
  Author: bpiotrowski
Revision: 185062

upgpkg: cyrus-sasl 2.1.26-1

- upstream release
- disable unneeded patches

Modified:
  cyrus-sasl/trunk/PKGBUILD

--+
 PKGBUILD |   37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-10 18:42:07 UTC (rev 185061)
+++ PKGBUILD2013-05-10 18:51:41 UTC (rev 185062)
@@ -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=12
+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
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 
'sqlite2')
+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
@@ -37,7 +37,7 @@
 saslauthd.conf.d
 saslauthd
 tmpfiles.conf)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
  'e27ddff076342e7a3041c4759817d04b'
  'd7e6886e88af04d05f3dec7f0a59ccf7'
  '79b8a5e8689989e2afd4b7bda595a7b1'
@@ -61,25 +61,28 @@
  '45bb0192d2f188066240b9a66ee6365f')
 
 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
@@ -194,7 +197,7 @@
 
 package_cyrus-sasl-sql() {
   pkgdesc=SQL auxprop module for Cyrus SASL
-  depends=(libsasl=${pkgver} 'postgresql-libs' 'libmariadbclient')
+  depends=(libsasl=${pkgver} 'postgresql-libs' 'libmariadbclient' 'sqlite2')
   replaces=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins



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

2013-03-14 Thread Bartłomiej Piotrowski
Date: Thursday, March 14, 2013 @ 20:17:51
  Author: bpiotrowski
Revision: 180019

upgpkg: cyrus-sasl 2.1.23-12

mariadb rebuild

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-03-14 19:17:26 UTC (rev 180018)
+++ PKGBUILD2013-03-14 19:17:51 UTC (rev 180019)
@@ -8,13 +8,13 @@
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.23
-pkgrel=11
+pkgrel=12
 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
@@ -194,7 +194,7 @@
 
 package_cyrus-sasl-sql() {
   pkgdesc=SQL auxprop module for Cyrus SASL
-  depends=(libsasl=${pkgver} 'postgresql-libs' 'libmysqlclient')
+  depends=(libsasl=${pkgver} 'postgresql-libs' 'libmariadbclient')
   replaces=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins



[arch-commits] Commit in cyrus-sasl/trunk (PKGBUILD saslauthd.service tmpfiles.conf)

2012-10-13 Thread Thomas Bächler
Date: Saturday, October 13, 2012 @ 12:34:31
  Author: thomas
Revision: 168630

upgpkg: cyrus-sasl 2.1.23-11: Fix syntax in systemd unit and add necessary 
tmpfiles.d configuration

Added:
  cyrus-sasl/trunk/tmpfiles.conf
Modified:
  cyrus-sasl/trunk/PKGBUILD
  cyrus-sasl/trunk/saslauthd.service

---+
 PKGBUILD  |   13 -
 saslauthd.service |2 +-
 tmpfiles.conf |1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-13 16:16:09 UTC (rev 168629)
+++ PKGBUILD2012-10-13 16:34:31 UTC (rev 168630)
@@ -8,7 +8,7 @@
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.23
-pkgrel=10
+pkgrel=11
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/;
@@ -35,7 +35,8 @@
 0030-dont_use_la_files_for_opening_plugins.patch
 saslauthd.service
 saslauthd.conf.d
-saslauthd)
+saslauthd
+tmpfiles.conf)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
  'e27ddff076342e7a3041c4759817d04b'
  'd7e6886e88af04d05f3dec7f0a59ccf7'
@@ -54,9 +55,10 @@
  'b7848957357e7c02d6490102be496bf9'
  'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
  '8e7106f32e495e9ade69014fd1b3352a'
- '00f6b781549a274630e22173f77bd41d'
+ '3499dcd610ad1ad58e0faffde2aa7a23'
  '49219af5641150edec288a3fdb65e7c1'
- '75542f613185d5a90520ad0d7d926a20')
+ '75542f613185d5a90520ad0d7d926a20'
+ '45bb0192d2f188066240b9a66ee6365f')
 
 build() {
   cd ${srcdir}/cyrus-sasl-${pkgver}
@@ -149,7 +151,7 @@
 }
 
 package_cyrus-sasl() {
-  depends=(libsasl=${pkgver})
+  depends=(libsasl=${pkgver} 'krb5')
   pkgdesc=Cyrus saslauthd SASL authentication daemon
   backup=('etc/conf.d/saslauthd')
 
@@ -158,6 +160,7 @@
   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
 
   install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl
   ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/

Modified: saslauthd.service
===
--- saslauthd.service   2012-10-13 16:16:09 UTC (rev 168629)
+++ saslauthd.service   2012-10-13 16:34:31 UTC (rev 168630)
@@ -5,7 +5,7 @@
 Type=forking
 EnvironmentFile=/etc/conf.d/saslauthd
 ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
-PidFile=/var/run/saslauthd/saslauthd.pid
+PIDFile=/var/run/saslauthd/saslauthd.pid
 
 [Install]
 WantedBy=multi-user.target

Added: tmpfiles.conf
===
--- tmpfiles.conf   (rev 0)
+++ tmpfiles.conf   2012-10-13 16:34:31 UTC (rev 168630)
@@ -0,0 +1 @@
+d /run/saslauthd 0755 root root - -



[arch-commits] Commit in cyrus-sasl/trunk (PKGBUILD saslauthd.service)

2012-08-17 Thread Jan Steffens
Date: Friday, August 17, 2012 @ 19:15:32
  Author: heftig
Revision: 165392

Add systemd service

Added:
  cyrus-sasl/trunk/saslauthd.service
Modified:
  cyrus-sasl/trunk/PKGBUILD

---+
 PKGBUILD  |   19 ++-
 saslauthd.service |   11 +++
 2 files changed, 21 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-17 23:10:03 UTC (rev 165391)
+++ PKGBUILD2012-08-17 23:15:32 UTC (rev 165392)
@@ -8,7 +8,7 @@
 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/;
@@ -33,6 +33,7 @@
 0026_drop_krb5support_dependency.patch
 0027_db5_support.patch
 0030-dont_use_la_files_for_opening_plugins.patch
+saslauthd.service
 saslauthd.conf.d
 saslauthd)
 md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
@@ -53,6 +54,7 @@
  'b7848957357e7c02d6490102be496bf9'
  'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
  '8e7106f32e495e9ade69014fd1b3352a'
+ '00f6b781549a274630e22173f77bd41d'
  '49219af5641150edec288a3fdb65e7c1'
  '75542f613185d5a90520ad0d7d926a20')
 
@@ -147,16 +149,15 @@
 }
 
 package_cyrus-sasl() {
-  depends=(libsasl=${pkgver}-${pkgrel})
+  depends=(libsasl=${pkgver})
   pkgdesc=Cyrus saslauthd SASL authentication daemon
   backup=('etc/conf.d/saslauthd')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
   make DESTDIR=${pkgdir} install
-  install -m755 -d ${pkgdir}/etc/rc.d
-  install -m755 -d ${pkgdir}/etc/conf.d
-  install -m755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/
-  install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+  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 -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl
   ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/
@@ -164,7 +165,7 @@
 
 package_cyrus-sasl-gssapi() {
   pkgdesc=GSSAPI authentication mechanism for Cyrus SASL
-  depends=(libsasl=${pkgver}-${pkgrel} 'krb5')
+  depends=(libsasl=${pkgver} 'krb5')
   replaces=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
@@ -177,7 +178,7 @@
 
 package_cyrus-sasl-ldap() {
   pkgdesc=ldapdb auxprop module for Cyrus SASL
-  depends=(libsasl=${pkgver}-${pkgrel} 'libldap')
+  depends=(libsasl=${pkgver} 'libldap')
   replaces=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
@@ -190,7 +191,7 @@
 
 package_cyrus-sasl-sql() {
   pkgdesc=SQL auxprop module for Cyrus SASL
-  depends=(libsasl=${pkgver}-${pkgrel} 'postgresql-libs' 'libmysqlclient')
+  depends=(libsasl=${pkgver} 'postgresql-libs' 'libmysqlclient')
   replaces=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins

Added: saslauthd.service
===
--- saslauthd.service   (rev 0)
+++ saslauthd.service   2012-08-17 23:15:32 UTC (rev 165392)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Cyrus SASL authentication daemon
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/saslauthd
+ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
+PidFile=/var/run/saslauthd/saslauthd.pid
+
+[Install]
+WantedBy=multi-user.target



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

2012-01-09 Thread Ionut Biru
Date: Monday, January 9, 2012 @ 10:01:29
  Author: ibiru
Revision: 146309

db 5.3.15 rebuild

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-01-09 14:57:36 UTC (rev 146308)
+++ PKGBUILD2012-01-09 15:01:29 UTC (rev 146309)
@@ -8,7 +8,7 @@
 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 cyrus-sasl/trunk (PKGBUILD)

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 10:10:09
  Author: jgc
Revision: 145714

Fix URL (FS#26802)

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-28 15:08:15 UTC (rev 145713)
+++ PKGBUILD2011-12-28 15:10:09 UTC (rev 145714)
@@ -11,7 +11,7 @@
 pkgrel=8
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
-url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
+url=http://cyrusimap.web.cmu.edu/;
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')



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

2011-10-03 Thread Jan de Groot
Date: Monday, October 3, 2011 @ 09:26:40
  Author: jgc
Revision: 139562

Remove provides from libsasl

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-03 13:09:42 UTC (rev 139561)
+++ PKGBUILD2011-10-03 13:26:40 UTC (rev 139562)
@@ -131,7 +131,6 @@
 package_libsasl() {
   pkgdesc=Cyrus Simple Authentication Service Layer (SASL) Library
   depends=('openssl')
-  provides=('cyrus-sasl-plugins')
   conflicts=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}



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

2011-10-03 Thread Jan de Groot
Date: Monday, October 3, 2011 @ 15:50:54
  Author: jgc
Revision: 139620

upgpkg: cyrus-sasl 2.1.23-8

Remember not to break my own rules... libsasl should be built from this 
PKGBUILD and then merged to core

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-10-03 19:47:47 UTC (rev 139619)
+++ PKGBUILD2011-10-03 19:50:54 UTC (rev 139620)
@@ -8,7 +8,7 @@
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.23
-pkgrel=7
+pkgrel=8
 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 cyrus-sasl/trunk (PKGBUILD)

2011-08-03 Thread Jan de Groot
Date: Wednesday, August 3, 2011 @ 11:52:24
  Author: jgc
Revision: 134399

add makedepends, make dependencies on subpackages versioned

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 15:11:31 UTC (rev 134398)
+++ PKGBUILD2011-08-03 15:52:24 UTC (rev 134399)
@@ -12,6 +12,7 @@
 url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
 license=('custom')
 options=('!makeflags' '!libtool')
+makedepends=('postgresql-libs' 'libmysqlclient' '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
@@ -118,7 +119,6 @@
   --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
   --sysconfdir=/etc \
   --with-devrandom=/dev/urandom
-
   make
 }
 
@@ -147,7 +147,7 @@
 }
 
 package_cyrus-sasl() {
-  depends=('libsasl-gssapi')
+  depends=(libsasl-gssapi=${pkgver}-${pkgrel})
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
   make DESTDIR=${pkgdir} install
@@ -157,7 +157,7 @@
 }
 
 package_cyrus-sasl-sql() {
-  depends=('libsasl-gssapi' 'libmysqlclient' 'postgresql-libs')
+  depends=(libsasl-gssapi=${pkgver}-${pkgrel} 'libmysqlclient' 
'postgresql-libs')
   replaces=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins



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

2011-08-03 Thread Jan de Groot
Date: Wednesday, August 3, 2011 @ 16:30:12
  Author: jgc
Revision: 134435

Fix saslauthd configuration file, add license files

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:29:51 UTC (rev 134434)
+++ PKGBUILD2011-08-03 20:30:12 UTC (rev 134435)
@@ -143,10 +143,12 @@
   rm -f ${pkgdir}/usr/lib/sasl2/libsql.so*
   rm -f ${pkgdir}/usr/lib/sasl2/libgssapiv2.so*
   rm -f ${pkgdir}/usr/lib/sasl2/libldapdb.so*
+  install -m755 -d ${pkgdir}/usr/share/licenses/libsasl
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/libsasl/
 }
 
 package_cyrus-sasl() {
-  depends=('libsasl')
+  depends=(libsasl=${pkgver}-${pkgrel})
   pkgdesc=Cyrus saslauthd SASL authentication daemon
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
@@ -154,7 +156,10 @@
   install -m755 -d ${pkgdir}/etc/rc.d
   install -m755 -d ${pkgdir}/etc/conf.d
   install -m755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/
-  install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/
+  install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/
 }
 
 package_cyrus-sasl-gssapi() {
@@ -165,6 +170,10 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
   install -m755 -d ${pkgdir}/usr/lib/sasl2
   cp -a .libs/libgssapiv2.so* ${pkgdir}/usr/lib/sasl2/
+  install -m755 -d ${pkgdir}/usr/share/licenses/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/
 }
 
 package_cyrus-sasl-ldap() {
@@ -175,6 +184,9 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
   install -m755 -d ${pkgdir}/usr/lib/sasl2
   cp -a .libs/libldapdb.so* ${pkgdir}/usr/lib/sasl2/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/
 }
 
 package_cyrus-sasl-sql() {
@@ -185,4 +197,7 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
   install -m755 -d ${pkgdir}/usr/lib/sasl2
   cp -a .libs/libsql.so* ${pkgdir}/usr/lib/sasl2/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-sql
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-sql/
 }



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

2011-08-03 Thread Jan de Groot
Date: Wednesday, August 3, 2011 @ 16:33:18
  Author: jgc
Revision: 134436

Remove invalid and incomplete license installation line

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:30:12 UTC (rev 134435)
+++ PKGBUILD2011-08-03 20:33:18 UTC (rev 134436)
@@ -170,7 +170,6 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
   install -m755 -d ${pkgdir}/usr/lib/sasl2
   cp -a .libs/libgssapiv2.so* ${pkgdir}/usr/lib/sasl2/
-  install -m755 -d ${pkgdir}/usr/share/licenses/
 
   install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi
   ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/



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

2011-08-03 Thread Jan de Groot
Date: Wednesday, August 3, 2011 @ 16:43:28
  Author: jgc
Revision: 134446

Add backup entry for saslauthd config file

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 20:39:25 UTC (rev 134445)
+++ PKGBUILD2011-08-03 20:43:28 UTC (rev 134446)
@@ -150,6 +150,7 @@
 package_cyrus-sasl() {
   depends=(libsasl=${pkgver}-${pkgrel})
   pkgdesc=Cyrus saslauthd SASL authentication daemon
+  backup=('etc/conf.d/saslauthd')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
   make DESTDIR=${pkgdir} install



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

2010-04-01 Thread Allan McRae
Date: Thursday, April 1, 2010 @ 06:43:20
  Author: allan
Revision: 75335

upgpkg: cyrus-sasl 2.1.23-4
heimdal and openssl rebuild

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 10:37:10 UTC (rev 75334)
+++ PKGBUILD2010-04-01 10:43:20 UTC (rev 75335)
@@ -3,7 +3,7 @@
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=3
+pkgrel=4
 pkgdesc=SASL authentication daemon
 arch=('i686' 'x86_64')
 license=('custom')



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

2009-10-31 Thread Allan McRae
Date: Saturday, October 31, 2009 @ 09:24:17
  Author: allan
Revision: 57108

upgpkg: cyrus-sasl 2.1.23-2
FHS man packages

Modified:
  cyrus-sasl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-10-31 13:24:17 UTC (rev 57107)
+++ PKGBUILD2009-10-31 13:24:17 UTC (rev 57108)
@@ -3,9 +3,9 @@
 
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=1
+pkgrel=2
 pkgdesc=SASL authentication daemon
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url=http://asg.web.cmu.edu/cyrus/download/;
 depends=('pam=1.0.1-2' 'heimdal=1.2-1' 'libldap' 
'cyrus-sasl-plugins=2.1.22-7' 'db=4.7')
@@ -21,7 +21,8 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-ldap=/usr 
--with-saslauthd=/var/run/saslauthd
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+--with-ldap=/usr --with-saslauthd=/var/run/saslauthd
   cd saslauthd
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
@@ -31,7 +32,6 @@
   install -dm766 ${pkgdir}/var/run/saslauthd
   install -Dm755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/saslauthd
   install -Dm644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
-  install -Dm644 saslauthd.mdoc ${pkgdir}/usr/man/man8/saslauthd.8
 
   install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING
 }