Date: Wednesday, August 3, 2011 @ 16:15:12 Author: jgc Revision: 134425
Final package layout. Add forgotten patch Add back SASL configuration Add correct provides/conflicts/replaces lines, this should be a clean upgrade for everyone Add information about libsasl/cyrus-sasl packaging Added: cyrus-sasl/trunk/0011_saslauthd_ac_prog_libtool.patch Modified: cyrus-sasl/trunk/PKGBUILD --------------------------------------+ 0011_saslauthd_ac_prog_libtool.patch | 15 ++++++++ PKGBUILD | 58 ++++++++++++++++++++++----------- 2 files changed, 55 insertions(+), 18 deletions(-) Added: 0011_saslauthd_ac_prog_libtool.patch =================================================================== --- 0011_saslauthd_ac_prog_libtool.patch (rev 0) +++ 0011_saslauthd_ac_prog_libtool.patch 2011-08-03 20:15:12 UTC (rev 134425) @@ -0,0 +1,15 @@ +0011_saslauthd_ac_prog_libtool.dpatch by <fa...@debian.org> + +Enable libtool use. + +diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in +--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for build foo + CMU_C___ATTRIBUTE__ Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-03 19:34:48 UTC (rev 134424) +++ PKGBUILD 2011-08-03 20:15:12 UTC (rev 134425) @@ -1,10 +1,12 @@ # $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=('libsasl' 'libsasl-gssapi') -#pkgname=('cyrus-sasl' 'cyrus-sasl-sql') -pkgname=('libsasl' 'libsasl-gssapi' 'cyrus-sasl' 'cyrus-sasl-sql') +pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') +#pkgname=libsasl pkgver=2.1.23 pkgrel=7 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" @@ -21,7 +23,7 @@ cyrus-sasl-2.1.23-authd-fix.patch 0003_saslauthd_mdoc.patch 0010_maintainer_mode.patch - 0011_saslauthd_ac_prog_libtool + 0011_saslauthd_ac_prog_libtool.patch 0012_xopen_crypt_prototype.patch 0016_pid_file_lock_creation_mask.patch 0018_auth_rimap_quotes.patch @@ -30,7 +32,9 @@ 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch 0027_db5_support.patch - 0030-dont_use_la_files_for_opening_plugins.patch) + 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.conf.d + saslauthd) md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' 'e27ddff076342e7a3041c4759817d04b' 'd7e6886e88af04d05f3dec7f0a59ccf7' @@ -48,7 +52,9 @@ '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' - '8e7106f32e495e9ade69014fd1b3352a') + '8e7106f32e495e9ade69014fd1b3352a' + '49219af5641150edec288a3fdb65e7c1' + '75542f613185d5a90520ad0d7d926a20') build() { cd "${srcdir}/cyrus-sasl-${pkgver}" @@ -59,7 +65,7 @@ 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 -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" @@ -99,7 +105,7 @@ --enable-checkapop \ --enable-cram \ --enable-digest \ - --enable-otp \ + --disable-otp \ --disable-srp \ --disable-srp-setpass \ --disable-krb4 \ @@ -114,7 +120,7 @@ --enable-ldapdb \ --disable-macos-framework \ --with-pam \ - --with-saslauthd=/run/saslauthd \ + --with-saslauthd=/var/run/saslauthd \ --with-ldap \ --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ --sysconfdir=/etc \ @@ -123,7 +129,10 @@ } 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}" for dir in include lib sasldb plugins utils; do @@ -136,28 +145,41 @@ rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* } -package_libsasl-gssapi() { - depends=('krb5' "libsasl=${pkgver}-${pkgrel}") +package_cyrus-sasl() { + depends=('libsasl') + pkgdesc="Cyrus saslauthd SASL authentication daemon" + + 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/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') replaces=('cyrus-sasl-plugins') - provides=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" } -package_cyrus-sasl() { - depends=("libsasl-gssapi=${pkgver}-${pkgrel}") +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + replaces=('cyrus-sasl-plugins') - cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" - make DESTDIR="${pkgdir}" install - cd ../plugins + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" } package_cyrus-sasl-sql() { - depends=("libsasl-gssapi=${pkgver}-${pkgrel}" 'libmysqlclient' 'postgresql-libs') + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"