[arch-commits] Commit in libsasl/trunk (PKGBUILD)
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)
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)
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 (22 files)
Date: Sunday, February 3, 2019 @ 15:35:26 Author: jgc Revision: 345182 upgpkg: cyrus-sasl 2.1.27-1 Added: libsasl/trunk/0003-Update-saslauthd.conf-location-in-documentation.patch (from rev 345181, cyrus-sasl/trunk/0003-Update-saslauthd.conf-location-in-documentation.patch) libsasl/trunk/0006-Enable-autoconf-maintainer-mode.patch (from rev 345181, cyrus-sasl/trunk/0006-Enable-autoconf-maintainer-mode.patch) libsasl/trunk/0010-Update-required-libraries-when-ld-as-needed-is-used.patch (from rev 345181, cyrus-sasl/trunk/0010-Update-required-libraries-when-ld-as-needed-is-used.patch) libsasl/trunk/0013-Don-t-use-la-files-for-opening-plugins.patch (from rev 345181, cyrus-sasl/trunk/0013-Don-t-use-la-files-for-opening-plugins.patch) libsasl/trunk/0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch (from rev 345181, cyrus-sasl/trunk/0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch) libsasl/trunk/0022-Fix-keytab-option-for-MIT-Kerberos.patch (from rev 345181, cyrus-sasl/trunk/0022-Fix-keytab-option-for-MIT-Kerberos.patch) libsasl/trunk/0032-Add-with_pgsql-include-postgresql-to-include-path.patch (from rev 345181, cyrus-sasl/trunk/0032-Add-with_pgsql-include-postgresql-to-include-path.patch) libsasl/trunk/gdbm-errno.patch (from rev 345181, cyrus-sasl/trunk/gdbm-errno.patch) Modified: libsasl/trunk/PKGBUILD Deleted: libsasl/trunk/0010_maintainer_mode.patch libsasl/trunk/0011_saslauthd_ac_prog_libtool.patch libsasl/trunk/0025_ld_as_needed.patch libsasl/trunk/0026_drop_krb5support_dependency.patch libsasl/trunk/0030-dont_use_la_files_for_opening_plugins.patch libsasl/trunk/CVE-2013-4122.patch libsasl/trunk/cyrus-sasl-2.1.22-as-needed.patch libsasl/trunk/cyrus-sasl-2.1.22-qa.patch libsasl/trunk/cyrus-sasl-2.1.26-size_t.patch libsasl/trunk/cyrus-sasl-2.1.27-openssl-1.1.0.patch libsasl/trunk/cyrus-sasl-gssapi.patch libsasl/trunk/cyrus-sasl-sql.patch libsasl/trunk/fix-pkgconfig.patch -+ 0003-Update-saslauthd.conf-location-in-documentation.patch | 41 0006-Enable-autoconf-maintainer-mode.patch | 22 0010-Update-required-libraries-when-ld-as-needed-is-used.patch | 37 0010_maintainer_mode.patch | 19 0011_saslauthd_ac_prog_libtool.patch| 15 0013-Don-t-use-la-files-for-opening-plugins.patch | 153 +++ 0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch | 26 0022-Fix-keytab-option-for-MIT-Kerberos.patch | 66 + 0025_ld_as_needed.patch | 27 0026_drop_krb5support_dependency.patch | 14 0030-dont_use_la_files_for_opening_plugins.patch| 134 --- 0032-Add-with_pgsql-include-postgresql-to-include-path.patch| 23 CVE-2013-4122.patch | 116 -- PKGBUILD| 97 -- cyrus-sasl-2.1.22-as-needed.patch | 11 cyrus-sasl-2.1.22-qa.patch | 22 cyrus-sasl-2.1.26-size_t.patch | 11 cyrus-sasl-2.1.27-openssl-1.1.0.patch | 435 -- cyrus-sasl-gssapi.patch | 16 cyrus-sasl-sql.patch| 39 fix-pkgconfig.patch | 27 gdbm-errno.patch| 29 22 files changed, 434 insertions(+), 946 deletions(-) Copied: libsasl/trunk/0003-Update-saslauthd.conf-location-in-documentation.patch (from rev 345181, cyrus-sasl/trunk/0003-Update-saslauthd.conf-location-in-documentation.patch) === --- 0003-Update-saslauthd.conf-location-in-documentation.patch (rev 0) +++ 0003-Update-saslauthd.conf-location-in-documentation.patch 2019-02-03 15:35:26 UTC (rev 345182) @@ -0,0 +1,41 @@ +From: Debian Cyrus SASL Team + +Date: Thu, 24 Mar 2016 11:35:03 +0100 +Subject: Update saslauthd.conf location in documentation + +date format (cosmetic). +--- + saslauthd/saslauthd.mdoc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/saslauthd/saslauthd.mdoc b/saslauthd/saslauthd.mdoc +index 0c2209e..17c9284 100644 +--- a/saslauthd/saslauthd.mdoc b/saslauthd/saslauthd.mdoc +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 12 12 2005 ++.Dd December 12 2005 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -245,7 +245,7 @@ instead. + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an
[arch-commits] Commit in libsasl/trunk (PKGBUILD)
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)
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)
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)
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)
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)
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)
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)
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 (2 files)
Date: Saturday, February 11, 2017 @ 11:14:23
Author: pierre
Revision: 288651
upgpkg: libsasl 2.1.26-9
OpenSSL 1,1 rebuild
Added:
libsasl/trunk/cyrus-sasl-2.1.27-openssl-1.1.0.patch
Modified:
libsasl/trunk/PKGBUILD
---+
PKGBUILD |9
cyrus-sasl-2.1.27-openssl-1.1.0.patch | 435
2 files changed, 441 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-02-11 11:06:23 UTC (rev 288650)
+++ PKGBUILD2017-02-11 11:14:23 UTC (rev 288651)
@@ -8,7 +8,7 @@
#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
pkgname=libsasl
pkgver=2.1.26
-pkgrel=8
+pkgrel=9
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=('i686' 'x86_64')
url="http://cyrusimap.web.cmu.edu/;
@@ -28,7 +28,8 @@
tmpfiles.conf
CVE-2013-4122.patch
cyrus-sasl-sql.patch
-cyrus-sasl-gssapi.patch)
+cyrus-sasl-gssapi.patch
+cyrus-sasl-2.1.27-openssl-1.1.0.patch)
md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
'79b8a5e8689989e2afd4b7bda595a7b1'
'f45aa8c42b32e0569ab3d14a83485b37'
@@ -42,7 +43,8 @@
'45bb0192d2f188066240b9a66ee6365f'
'c5f0ec88c584a75c14d7f402eaeed7ef'
'82c0f66fdc5c1145eb48ea9116c27931'
- '0363b1a0337474a57b1f75f72fe88fa3')
+ '0363b1a0337474a57b1f75f72fe88fa3'
+ 'c8a385bbca9bd79910c6bda3dd02845c')
prepare() {
cd cyrus-sasl-$pkgver
@@ -56,6 +58,7 @@
patch -Np1 -i ../CVE-2013-4122.patch
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
sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
}
Added: cyrus-sasl-2.1.27-openssl-1.1.0.patch
===
--- cyrus-sasl-2.1.27-openssl-1.1.0.patch (rev 0)
+++ cyrus-sasl-2.1.27-openssl-1.1.0.patch 2017-02-11 11:14:23 UTC (rev
288651)
@@ -0,0 +1,435 @@
+diff -up cyrus-sasl-2.1.26/plugins/ntlm.c.openssl110
cyrus-sasl-2.1.26/plugins/ntlm.c
+--- cyrus-sasl-2.1.26/plugins/ntlm.c.openssl1102012-01-28
00:31:36.0 +0100
cyrus-sasl-2.1.26/plugins/ntlm.c 2016-11-07 16:15:57.498259304 +0100
+@@ -417,6 +417,29 @@ static unsigned char *P24(unsigned char
+ return P24;
+ }
+
++static HMAC_CTX *_plug_HMAC_CTX_new(const sasl_utils_t *utils)
++{
++utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_new()");
++
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
++return HMAC_CTX_new();
++#else
++return utils->malloc(sizeof(HMAC_CTX));
++#endif
++}
++
++static void _plug_HMAC_CTX_free(HMAC_CTX *ctx, const sasl_utils_t *utils)
++{
++utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_free()");
++
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
++HMAC_CTX_free(ctx);
++#else
++HMAC_cleanup(ctx);
++utils->free(ctx);
++#endif
++}
++
+ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
+const char *authid, const char *target,
+const unsigned char *challenge,
+@@ -424,7 +447,7 @@ static unsigned char *V2(unsigned char *
+const sasl_utils_t *utils,
+char **buf, unsigned *buflen, int *result)
+ {
+-HMAC_CTX ctx;
++HMAC_CTX *ctx = NULL;
+ unsigned char hash[EVP_MAX_MD_SIZE];
+ char *upper;
+ unsigned int len;
+@@ -435,6 +458,10 @@ static unsigned char *V2(unsigned char *
+ SETERROR(utils, "cannot allocate NTLMv2 hash");
+ *result = SASL_NOMEM;
+ }
++else if ((ctx = _plug_HMAC_CTX_new(utils)) == NULL) {
++SETERROR(utils, "cannot allocate HMAC CTX");
++*result = SASL_NOMEM;
++}
+ else {
+ /* NTLMv2hash = HMAC-MD5(NTLMhash, unicode(ucase(authid + domain))) */
+ P16_nt(hash, passwd, utils, buf, buflen, result);
+@@ -449,17 +476,18 @@ static unsigned char *V2(unsigned char *
+ HMAC(EVP_md5(), hash, MD4_DIGEST_LENGTH, *buf, 2 * len, hash, );
+
+ /* V2 = HMAC-MD5(NTLMv2hash, challenge + blob) + blob */
+- HMAC_Init(, hash, len, EVP_md5());
+- HMAC_Update(, challenge, NTLM_NONCE_LENGTH);
+- HMAC_Update(, blob, bloblen);
+- HMAC_Final(, V2, );
+- HMAC_cleanup();
++ HMAC_Init_ex(ctx, hash, len, EVP_md5(), NULL);
++ HMAC_Update(ctx, challenge, NTLM_NONCE_LENGTH);
++ HMAC_Update(ctx, blob, bloblen);
++ HMAC_Final(ctx, V2, );
+
+ /* the blob is concatenated outside of this function */
+
+ *result = SASL_OK;
+ }
+
++if (ctx) _plug_HMAC_CTX_free(ctx, utils);
++
+ return V2;
+ }
+
+diff -up cyrus-sasl-2.1.26/plugins/otp.c.openssl110
cyrus-sasl-2.1.26/plugins/otp.c
+--- cyrus-sasl-2.1.26/plugins/otp.c.openssl110 2012-10-12 16:05:48.0
+0200
[arch-commits] Commit in libsasl/trunk (PKGBUILD cyrus-sasl-gssapi.patch)
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)
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 trunk/CVE-2013-4122.patch trunk/PKGBUILD)
Date: Monday, September 30, 2013 @ 11:30:49
Author: jgc
Revision: 195308
upgpkg: libsasl 2.1.26-6
Added:
libsasl/trunk/CVE-2013-4122.patch
(from rev 195303, cyrus-sasl/trunk/CVE-2013-4122.patch)
Modified:
libsasl/trunk/(properties)
libsasl/trunk/PKGBUILD
---+
trunk |1
trunk/CVE-2013-4122.patch | 116
trunk/PKGBUILD| 43 +---
3 files changed, 142 insertions(+), 18 deletions(-)
Index: libsasl/trunk
===
--- trunk 2013-09-30 09:25:39 UTC (rev 195307)
+++ trunk 2013-09-30 09:30:49 UTC (rev 195308)
Property changes on: libsasl/trunk
___
Added: svn:mergeinfo
## -0,0 +1 ##
+/cyrus-sasl/trunk:195303-195304
\ No newline at end of property
Copied: libsasl/trunk/CVE-2013-4122.patch (from rev 195303,
cyrus-sasl/trunk/CVE-2013-4122.patch)
===
--- trunk/CVE-2013-4122.patch (rev 0)
+++ trunk/CVE-2013-4122.patch 2013-09-30 09:30:49 UTC (rev 195308)
@@ -0,0 +1,116 @@
+From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
+From: mancha manc...@hush.com
+Date: Thu, 11 Jul 2013 09:08:07 +
+Subject: Handle NULL returns from glibc 2.17+ crypt()
+
+Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
+(w/ NULL return) if the salt violates specifications. Additionally,
+on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
+passed to crypt() fail with EPERM (w/ NULL return).
+
+When using glibc's crypt(), check return value to avoid a possible
+NULL pointer dereference.
+
+Patch by manc...@hush.com.
+---
+diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
+index 4b34222..400289c 100644
+--- a/pwcheck/pwcheck_getpwnam.c
b/pwcheck/pwcheck_getpwnam.c
+@@ -32,6 +32,7 @@ char *userid;
+ char *password;
+ {
+ char* r;
++char* crpt_passwd;
+ struct passwd *pwd;
+
+ pwd = getpwnam(userid);
+@@ -41,7 +42,7 @@ char *password;
+ else if (pwd-pw_passwd[0] == '*') {
+ r = Account disabled;
+ }
+-else if (strcmp(pwd-pw_passwd, crypt(password, pwd-pw_passwd)) != 0) {
++else if (!(crpt_passwd = crypt(password, pwd-pw_passwd)) ||
strcmp(pwd-pw_passwd, (const char *)crpt_passwd) != 0) {
+ r = Incorrect password;
+ }
+ else {
+diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
+index 2b11286..6d607bb 100644
+--- a/pwcheck/pwcheck_getspnam.c
b/pwcheck/pwcheck_getspnam.c
+@@ -32,13 +32,15 @@ char *userid;
+ char *password;
+ {
+ struct spwd *pwd;
++char *crpt_passwd;
+
+ pwd = getspnam(userid);
+ if (!pwd) {
+ return Userid not found;
+ }
+
+-if (strcmp(pwd-sp_pwdp, crypt(password, pwd-sp_pwdp)) != 0) {
++crpt_passwd = crypt(password, pwd-sp_pwdp);
++if (!crpt_passwd || strcmp(pwd-sp_pwdp, (const char *)crpt_passwd) != 0)
{
+ return Incorrect password;
+ }
+ else {
+diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
+index fc8029d..d4ebe54 100644
+--- a/saslauthd/auth_getpwent.c
b/saslauthd/auth_getpwent.c
+@@ -77,6 +77,7 @@ auth_getpwent (
+ {
+ /* VARIABLES */
+ struct passwd *pw;/* pointer to passwd file entry
*/
++char *crpt_passwd;/* encrypted password */
+ int errnum;
+ /* END VARIABLES */
+
+@@ -105,7 +106,8 @@ auth_getpwent (
+ }
+ }
+
+-if (strcmp(pw-pw_passwd, (const char *)crypt(password, pw-pw_passwd))) {
++crpt_passwd = crypt(password, pw-pw_passwd);
++if (!crpt_passwd || strcmp(pw-pw_passwd, (const char *)crpt_passwd)) {
+ if (flags VERBOSE) {
+ syslog(LOG_DEBUG, DEBUG: auth_getpwent: %s: invalid password,
login);
+ }
+diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
+index 677131b..1988afd 100644
+--- a/saslauthd/auth_shadow.c
b/saslauthd/auth_shadow.c
+@@ -210,8 +210,8 @@ auth_shadow (
+ RETURN(NO Insufficient permission to access NIS authentication
database (saslauthd));
+ }
+
+-cpw = strdup((const char *)crypt(password, sp-sp_pwdp));
+-if (strcmp(sp-sp_pwdp, cpw)) {
++cpw = crypt(password, sp-sp_pwdp);
++if (!cpw || strcmp(sp-sp_pwdp, (const char *)cpw)) {
+ if (flags VERBOSE) {
+ /*
+* This _should_ reveal the SHADOW_PW_LOCKED prefix to an
+@@ -221,10 +221,8 @@ auth_shadow (
+ syslog(LOG_DEBUG, DEBUG: auth_shadow: pw mismatch: '%s' != '%s',
+ sp-sp_pwdp, cpw);
+ }
+- free(cpw);
+ RETURN(NO Incorrect password);
+ }
+-free(cpw);
+
+ /*
+ * The following fields will be set to -1 if:
+@@ -286,7 +284,7 @@ auth_shadow (
+ RETURN(NO Invalid username);
+ }
+
+-if
[arch-commits] Commit in libsasl/trunk (PKGBUILD)
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)
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)
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)
Date: Wednesday, May 22, 2013 @ 13:02:20 Author: jgc Revision: 186231 When I say merge changes on top of PKGBUILDs, don't make changes in both directories making it impossible to merge Deleted: libsasl/trunk/
[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD trunk/PKGBUILD)
Date: Wednesday, May 22, 2013 @ 13:02:55
Author: jgc
Revision: 186232
Copy from cyrus-sasl... let's start over
Added:
libsasl/trunk/
libsasl/trunk/PKGBUILD
(from rev 186230, cyrus-sasl/trunk/PKGBUILD)
Deleted:
libsasl/trunk/PKGBUILD
+
/PKGBUILD | 181 +++
trunk/PKGBUILD | 179 --
2 files changed, 181 insertions(+), 179 deletions(-)
Deleted: trunk/PKGBUILD
===
--- cyrus-sasl/trunk/PKGBUILD 2013-05-22 10:21:47 UTC (rev 186227)
+++ trunk/PKGBUILD 2013-05-22 11:02:55 UTC (rev 186232)
@@ -1,179 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-# 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.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'
'sqlite2')
-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
-0010_maintainer_mode.patch
-0011_saslauthd_ac_prog_libtool.patch
-0025_ld_as_needed.patch
-0026_drop_krb5support_dependency.patch
-0030-dont_use_la_files_for_opening_plugins.patch
-saslauthd.service
-saslauthd.conf.d
-saslauthd
-tmpfiles.conf)
-md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
- '79b8a5e8689989e2afd4b7bda595a7b1'
- 'f45aa8c42b32e0569ab3d14a83485b37'
- 'f45d8b60e8f74dd7f7c2ec1665fa602a'
- '9d93880514cb5ff5da969f1ceb64a661'
- '62bf892fe4d1df41ff748e91a1afaf67'
- 'b7848957357e7c02d6490102be496bf9'
- '8e7106f32e495e9ade69014fd1b3352a'
- '3499dcd610ad1ad58e0faffde2aa7a23'
- '49219af5641150edec288a3fdb65e7c1'
- '75542f613185d5a90520ad0d7d926a20'
- '45bb0192d2f188066240b9a66ee6365f')
-
-build() {
- export CFLAGS=$CFLAGS -fPIC
-
- 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
- libtoolize -c
- aclocal -I config -I cmulocal
- automake -a -c
- autoheader
- autoconf
-
- pushd saslauthd
- rm -f config/config.guess config/config.sub
- rm -f config/ltconfig config/ltmain.sh config/libtool.m4
- rm -fr autom4te.cache
- libtoolize -c
- aclocal -I config -I ../cmulocal -I ../config
- automake -a -c
- autoheader
- autoconf
- popd
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --disable-static \
- --enable-shared \
- --enable-alwaystrue \
- --enable-checkapop \
- --enable-cram \
- --enable-digest \
- --disable-otp \
- --disable-srp \
- --disable-srp-setpass \
- --disable-krb4 \
- --enable-gssapi \
- --enable-auth-sasldb \
- --enable-plain \
- --enable-anon \
- --enable-login \
- --enable-ntlm \
- --disable-passdss \
- --enable-sql \
- --enable-ldapdb \
- --disable-macos-framework \
- --with-pam \
- --with-saslauthd=/var/run/saslauthd \
- --with-ldap \
- --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
- --sysconfdir=/etc \
- --with-devrandom=/dev/urandom
- make
-}
-
-package_libsasl() {
- pkgdesc=Cyrus Simple Authentication Service Layer (SASL) Library
- depends=('openssl')
- conflicts=('cyrus-sasl-plugins')
-
- cd ${srcdir}/cyrus-sasl-${pkgver}
- for dir in include lib sasldb plugins utils; do
-pushd ${dir}
-make DESTDIR=${pkgdir} install
-popd
- done
- 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=${pkgver} 'krb5')
- pkgdesc=Cyrus saslauthd SASL authentication daemon
- backup=('etc/conf.d/saslauthd')
-
- cd
[arch-commits] Commit in libsasl/trunk (PKGBUILD)
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 (13 files)
Date: Saturday, May 11, 2013 @ 08:38:11 Author: bpiotrowski Revision: 185095 upgpkg: libsasl 2.1.26-2 - remove old patches - add patch including sys/types.h (see FS#35194) Added: libsasl/trunk/cyrus-sasl-2.1.26-size_t.patch Modified: libsasl/trunk/PKGBUILD Deleted: libsasl/trunk/0003_saslauthd_mdoc.patch libsasl/trunk/0012_xopen_crypt_prototype.patch libsasl/trunk/0016_pid_file_lock_creation_mask.patch libsasl/trunk/0018_auth_rimap_quotes.patch libsasl/trunk/0019_ldap_deprecated.patch libsasl/trunk/0022_gcc4.4_preprocessor_syntax.patch libsasl/trunk/0027_db5_support.patch libsasl/trunk/cyrus-sasl-2.1.19-checkpw.c.patch libsasl/trunk/cyrus-sasl-2.1.22-automake-1.10.patch libsasl/trunk/cyrus-sasl-2.1.22-crypt.patch libsasl/trunk/cyrus-sasl-2.1.23-authd-fix.patch + 0003_saslauthd_mdoc.patch | 35 -- 0012_xopen_crypt_prototype.patch | 20 --- 0016_pid_file_lock_creation_mask.patch | 27 0018_auth_rimap_quotes.patch | 35 -- 0019_ldap_deprecated.patch | 22 0022_gcc4.4_preprocessor_syntax.patch | 26 0027_db5_support.patch | 24 PKGBUILD | 38 -- cyrus-sasl-2.1.19-checkpw.c.patch | 170 --- cyrus-sasl-2.1.22-automake-1.10.patch | 94 - cyrus-sasl-2.1.22-crypt.patch | 71 cyrus-sasl-2.1.23-authd-fix.patch | 28 - cyrus-sasl-2.1.26-size_t.patch | 11 ++ 13 files changed, 15 insertions(+), 586 deletions(-) Deleted: 0003_saslauthd_mdoc.patch === --- 0003_saslauthd_mdoc.patch 2013-05-11 04:02:37 UTC (rev 185094) +++ 0003_saslauthd_mdoc.patch 2013-05-11 06:38:11 UTC (rev 185095) @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by fa...@debian.org - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc trunk~/saslauthd/saslauthd.mdoc2006-05-29 22:52:42.0 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.0 +0300 -@@ -10,7 +10,7 @@ - .\ manpage in saslauthd.8 whenever you change this source - .\ version. Only the pre-formatted manpage is installed. - .\ --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os CMU-SASL - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width /var/run/saslauthd/mux - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO Deleted: 0012_xopen_crypt_prototype.patch === --- 0012_xopen_crypt_prototype.patch2013-05-11 04:02:37 UTC (rev 185094) +++ 0012_xopen_crypt_prototype.patch2013-05-11 06:38:11 UTC (rev 185095) @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by da...@debian.org - -When _XOPEN_SOURCE is defined, the subsequent #include unistd.h -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.0 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.0 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ Deleted: 0016_pid_file_lock_creation_mask.patch === --- 0016_pid_file_lock_creation_mask.patch 2013-05-11 04:02:37 UTC (rev 185094) +++ 0016_pid_file_lock_creation_mask.patch 2013-05-11 06:38:11 UTC (rev 185095) @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar s...@zoy.org - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c
[arch-commits] Commit in libsasl/trunk (PKGBUILD)
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)
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)
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 trunk/PKGBUILD)
Date: Wednesday, December 28, 2011 @ 10:11:22
Author: jgc
Revision: 145715
Merge changes from cyrus-sasl
Modified:
libsasl/trunk/(properties)
libsasl/trunk/PKGBUILD
+
trunk |2 +-
trunk/PKGBUILD |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: libsasl/trunk
===
--- trunk 2011-12-28 15:10:09 UTC (rev 145714)
+++ trunk 2011-12-28 15:11:22 UTC (rev 145715)
Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
## -1 +1 ##
-/cyrus-sasl/trunk:134435-134446,139562
+/cyrus-sasl/trunk:134435-134446,139562,145714
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD 2011-12-28 15:10:09 UTC (rev 145714)
+++ trunk/PKGBUILD 2011-12-28 15:11:22 UTC (rev 145715)
@@ -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 libsasl (trunk trunk/PKGBUILD)
Date: Monday, October 3, 2011 @ 09:31:31
Author: jgc
Revision: 139565
upgpkg: libsasl 2.1.23-8
Remove cyrus-sasl-plugins provide
Modified:
libsasl/trunk/(properties)
libsasl/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
- /cyrus-sasl/trunk:134435-134446
+ /cyrus-sasl/trunk:134435-134446,139562
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD 2011-10-03 13:29:22 UTC (rev 139564)
+++ trunk/PKGBUILD 2011-10-03 13:31:31 UTC (rev 139565)
@@ -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;
@@ -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 libsasl (trunk)
Date: Wednesday, August 3, 2011 @ 16:18:25 Author: jgc Revision: 134428 Delete trunk to prepare for copying from cyrus-sasl Deleted: libsasl/trunk/
[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD)
Date: Wednesday, August 3, 2011 @ 16:35:03
Author: jgc
Revision: 134437
Merge changes from cyrus-sasl
Modified:
libsasl/trunk/(properties)
libsasl/trunk/PKGBUILD
--+
PKGBUILD | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
Property changes on: libsasl/trunk
___
Added: svn:mergeinfo
+ /cyrus-sasl/trunk:134435-134436
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD 2011-08-03 20:33:18 UTC (rev 134436)
+++ trunk/PKGBUILD 2011-08-03 20:35:03 UTC (rev 134437)
@@ -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,9 @@
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/cyrus-sasl-gssapi
+ ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/
}
package_cyrus-sasl-ldap() {
@@ -175,6 +183,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 +196,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 libsasl (trunk trunk/PKGBUILD)
Date: Wednesday, August 3, 2011 @ 16:49:15
Author: jgc
Revision: 134451
Sync with cyrus-sasl
Modified:
libsasl/trunk/(properties)
libsasl/trunk/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
- /cyrus-sasl/trunk:134435-134436
+ /cyrus-sasl/trunk:134435-134446
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD 2011-08-03 20:47:17 UTC (rev 134450)
+++ trunk/PKGBUILD 2011-08-03 20:49:15 UTC (rev 134451)
@@ -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 libsasl/trunk (PKGBUILD)
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)
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)
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')
