Date: Thursday, May 30, 2013 @ 22:19:22 Author: eric Revision: 186726
archrelease: copy trunk to staging-i686, staging-x86_64 Added: libsasl/repos/staging-i686/ libsasl/repos/staging-i686/0010_maintainer_mode.patch (from rev 186725, libsasl/trunk/0010_maintainer_mode.patch) libsasl/repos/staging-i686/0011_saslauthd_ac_prog_libtool.patch (from rev 186725, libsasl/trunk/0011_saslauthd_ac_prog_libtool.patch) libsasl/repos/staging-i686/0025_ld_as_needed.patch (from rev 186725, libsasl/trunk/0025_ld_as_needed.patch) libsasl/repos/staging-i686/0026_drop_krb5support_dependency.patch (from rev 186725, libsasl/trunk/0026_drop_krb5support_dependency.patch) libsasl/repos/staging-i686/0030-dont_use_la_files_for_opening_plugins.patch (from rev 186725, libsasl/trunk/0030-dont_use_la_files_for_opening_plugins.patch) libsasl/repos/staging-i686/PKGBUILD (from rev 186725, libsasl/trunk/PKGBUILD) libsasl/repos/staging-i686/cyrus-sasl-2.1.22-as-needed.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-as-needed.patch) libsasl/repos/staging-i686/cyrus-sasl-2.1.22-qa.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-qa.patch) libsasl/repos/staging-i686/cyrus-sasl-2.1.26-size_t.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.26-size_t.patch) libsasl/repos/staging-i686/saslauthd.conf.d (from rev 186725, libsasl/trunk/saslauthd.conf.d) libsasl/repos/staging-i686/saslauthd.service (from rev 186725, libsasl/trunk/saslauthd.service) libsasl/repos/staging-i686/tmpfiles.conf (from rev 186725, libsasl/trunk/tmpfiles.conf) libsasl/repos/staging-x86_64/ libsasl/repos/staging-x86_64/0010_maintainer_mode.patch (from rev 186725, libsasl/trunk/0010_maintainer_mode.patch) libsasl/repos/staging-x86_64/0011_saslauthd_ac_prog_libtool.patch (from rev 186725, libsasl/trunk/0011_saslauthd_ac_prog_libtool.patch) libsasl/repos/staging-x86_64/0025_ld_as_needed.patch (from rev 186725, libsasl/trunk/0025_ld_as_needed.patch) libsasl/repos/staging-x86_64/0026_drop_krb5support_dependency.patch (from rev 186725, libsasl/trunk/0026_drop_krb5support_dependency.patch) libsasl/repos/staging-x86_64/0030-dont_use_la_files_for_opening_plugins.patch (from rev 186725, libsasl/trunk/0030-dont_use_la_files_for_opening_plugins.patch) libsasl/repos/staging-x86_64/PKGBUILD (from rev 186725, libsasl/trunk/PKGBUILD) libsasl/repos/staging-x86_64/cyrus-sasl-2.1.22-as-needed.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-as-needed.patch) libsasl/repos/staging-x86_64/cyrus-sasl-2.1.22-qa.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-qa.patch) libsasl/repos/staging-x86_64/cyrus-sasl-2.1.26-size_t.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.26-size_t.patch) libsasl/repos/staging-x86_64/saslauthd.conf.d (from rev 186725, libsasl/trunk/saslauthd.conf.d) libsasl/repos/staging-x86_64/saslauthd.service (from rev 186725, libsasl/trunk/saslauthd.service) libsasl/repos/staging-x86_64/tmpfiles.conf (from rev 186725, libsasl/trunk/tmpfiles.conf) -----------------------------------------------------------------+ staging-i686/0010_maintainer_mode.patch | 19 + staging-i686/0011_saslauthd_ac_prog_libtool.patch | 15 staging-i686/0025_ld_as_needed.patch | 27 + staging-i686/0026_drop_krb5support_dependency.patch | 14 staging-i686/0030-dont_use_la_files_for_opening_plugins.patch | 134 +++++++ staging-i686/PKGBUILD | 179 ++++++++++ staging-i686/cyrus-sasl-2.1.22-as-needed.patch | 11 staging-i686/cyrus-sasl-2.1.22-qa.patch | 22 + staging-i686/cyrus-sasl-2.1.26-size_t.patch | 11 staging-i686/saslauthd.conf.d | 1 staging-i686/saslauthd.service | 11 staging-i686/tmpfiles.conf | 1 staging-x86_64/0010_maintainer_mode.patch | 19 + staging-x86_64/0011_saslauthd_ac_prog_libtool.patch | 15 staging-x86_64/0025_ld_as_needed.patch | 27 + staging-x86_64/0026_drop_krb5support_dependency.patch | 14 staging-x86_64/0030-dont_use_la_files_for_opening_plugins.patch | 134 +++++++ staging-x86_64/PKGBUILD | 179 ++++++++++ staging-x86_64/cyrus-sasl-2.1.22-as-needed.patch | 11 staging-x86_64/cyrus-sasl-2.1.22-qa.patch | 22 + staging-x86_64/cyrus-sasl-2.1.26-size_t.patch | 11 staging-x86_64/saslauthd.conf.d | 1 staging-x86_64/saslauthd.service | 11 staging-x86_64/tmpfiles.conf | 1 24 files changed, 890 insertions(+) Copied: libsasl/repos/staging-i686/0010_maintainer_mode.patch (from rev 186725, libsasl/trunk/0010_maintainer_mode.patch) =================================================================== --- staging-i686/0010_maintainer_mode.patch (rev 0) +++ staging-i686/0010_maintainer_mode.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by <fa...@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + Copied: libsasl/repos/staging-i686/0011_saslauthd_ac_prog_libtool.patch (from rev 186725, libsasl/trunk/0011_saslauthd_ac_prog_libtool.patch) =================================================================== --- staging-i686/0011_saslauthd_ac_prog_libtool.patch (rev 0) +++ staging-i686/0011_saslauthd_ac_prog_libtool.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -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__ Copied: libsasl/repos/staging-i686/0025_ld_as_needed.patch (from rev 186725, libsasl/trunk/0025_ld_as_needed.patch) =================================================================== --- staging-i686/0025_ld_as_needed.patch (rev 0) +++ staging-i686/0025_ld_as_needed.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,27 @@ +Author: Matthias Klose <d...@ubuntu.com> +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = Copied: libsasl/repos/staging-i686/0026_drop_krb5support_dependency.patch (from rev 186725, libsasl/trunk/0026_drop_krb5support_dependency.patch) =================================================================== --- staging-i686/0026_drop_krb5support_dependency.patch (rev 0) +++ staging-i686/0026_drop_krb5support_dependency.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez <robe...@connexer.com> +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) Copied: libsasl/repos/staging-i686/0030-dont_use_la_files_for_opening_plugins.patch (from rev 186725, libsasl/trunk/0030-dont_use_la_files_for_opening_plugins.patch) =================================================================== --- staging-i686/0030-dont_use_la_files_for_opening_plugins.patch (rev 0) +++ staging-i686/0030-dont_use_la_files_for_opening_plugins.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); Copied: libsasl/repos/staging-i686/PKGBUILD (from rev 186725, libsasl/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,179 @@ +# $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=4 +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 + tmpfiles.conf) +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f45aa8c42b32e0569ab3d14a83485b37' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + '8e7106f32e495e9ade69014fd1b3352a' + '3499dcd610ad1ad58e0faffde2aa7a23' + '49219af5641150edec288a3fdb65e7c1' + '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 \ + --sbin=/usr/bin \ + --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* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.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 "${srcdir}/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" + 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/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}" 'krb5') + replaces=('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/" + 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/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}" 'libldap') + replaces=('cyrus-sasl-plugins') + + 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() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') + replaces=('cyrus-sasl-plugins') + + 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/" +} Copied: libsasl/repos/staging-i686/cyrus-sasl-2.1.22-as-needed.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-as-needed.patch) =================================================================== --- staging-i686/cyrus-sasl-2.1.22-as-needed.patch (rev 0) +++ staging-i686/cyrus-sasl-2.1.22-as-needed.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], Copied: libsasl/repos/staging-i686/cyrus-sasl-2.1.22-qa.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-qa.patch) =================================================================== --- staging-i686/cyrus-sasl-2.1.22-qa.patch (rev 0) +++ staging-i686/cyrus-sasl-2.1.22-qa.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include <config.h> ++#include <stdio.h> + #include <sasl.h> + #include <prop.h> + #include <ctype.h> +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include <shadow.h> ++#include <string.h> + + extern char *crypt(); + Copied: libsasl/repos/staging-i686/cyrus-sasl-2.1.26-size_t.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.26-size_t.patch) =================================================================== --- staging-i686/cyrus-sasl-2.1.26-size_t.patch (rev 0) +++ staging-i686/cyrus-sasl-2.1.26-size_t.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include <sys/types.h> ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); Copied: libsasl/repos/staging-i686/saslauthd.conf.d (from rev 186725, libsasl/trunk/saslauthd.conf.d) =================================================================== --- staging-i686/saslauthd.conf.d (rev 0) +++ staging-i686/saslauthd.conf.d 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-a pam" Copied: libsasl/repos/staging-i686/saslauthd.service (from rev 186725, libsasl/trunk/saslauthd.service) =================================================================== --- staging-i686/saslauthd.service (rev 0) +++ staging-i686/saslauthd.service 2013-05-30 20:19:22 UTC (rev 186726) @@ -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 Copied: libsasl/repos/staging-i686/tmpfiles.conf (from rev 186725, libsasl/trunk/tmpfiles.conf) =================================================================== --- staging-i686/tmpfiles.conf (rev 0) +++ staging-i686/tmpfiles.conf 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1 @@ +d /run/saslauthd 0755 root root - - Copied: libsasl/repos/staging-x86_64/0010_maintainer_mode.patch (from rev 186725, libsasl/trunk/0010_maintainer_mode.patch) =================================================================== --- staging-x86_64/0010_maintainer_mode.patch (rev 0) +++ staging-x86_64/0010_maintainer_mode.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by <fa...@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + Copied: libsasl/repos/staging-x86_64/0011_saslauthd_ac_prog_libtool.patch (from rev 186725, libsasl/trunk/0011_saslauthd_ac_prog_libtool.patch) =================================================================== --- staging-x86_64/0011_saslauthd_ac_prog_libtool.patch (rev 0) +++ staging-x86_64/0011_saslauthd_ac_prog_libtool.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -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__ Copied: libsasl/repos/staging-x86_64/0025_ld_as_needed.patch (from rev 186725, libsasl/trunk/0025_ld_as_needed.patch) =================================================================== --- staging-x86_64/0025_ld_as_needed.patch (rev 0) +++ staging-x86_64/0025_ld_as_needed.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,27 @@ +Author: Matthias Klose <d...@ubuntu.com> +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = Copied: libsasl/repos/staging-x86_64/0026_drop_krb5support_dependency.patch (from rev 186725, libsasl/trunk/0026_drop_krb5support_dependency.patch) =================================================================== --- staging-x86_64/0026_drop_krb5support_dependency.patch (rev 0) +++ staging-x86_64/0026_drop_krb5support_dependency.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez <robe...@connexer.com> +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) Copied: libsasl/repos/staging-x86_64/0030-dont_use_la_files_for_opening_plugins.patch (from rev 186725, libsasl/trunk/0030-dont_use_la_files_for_opening_plugins.patch) =================================================================== --- staging-x86_64/0030-dont_use_la_files_for_opening_plugins.patch (rev 0) +++ staging-x86_64/0030-dont_use_la_files_for_opening_plugins.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); Copied: libsasl/repos/staging-x86_64/PKGBUILD (from rev 186725, libsasl/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,179 @@ +# $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=4 +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 + tmpfiles.conf) +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f45aa8c42b32e0569ab3d14a83485b37' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + '8e7106f32e495e9ade69014fd1b3352a' + '3499dcd610ad1ad58e0faffde2aa7a23' + '49219af5641150edec288a3fdb65e7c1' + '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 \ + --sbin=/usr/bin \ + --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* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.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 "${srcdir}/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" + 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/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}" 'krb5') + replaces=('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/" + 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/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}" 'libldap') + replaces=('cyrus-sasl-plugins') + + 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() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') + replaces=('cyrus-sasl-plugins') + + 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/" +} Copied: libsasl/repos/staging-x86_64/cyrus-sasl-2.1.22-as-needed.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-as-needed.patch) =================================================================== --- staging-x86_64/cyrus-sasl-2.1.22-as-needed.patch (rev 0) +++ staging-x86_64/cyrus-sasl-2.1.22-as-needed.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], Copied: libsasl/repos/staging-x86_64/cyrus-sasl-2.1.22-qa.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.22-qa.patch) =================================================================== --- staging-x86_64/cyrus-sasl-2.1.22-qa.patch (rev 0) +++ staging-x86_64/cyrus-sasl-2.1.22-qa.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include <config.h> ++#include <stdio.h> + #include <sasl.h> + #include <prop.h> + #include <ctype.h> +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include <shadow.h> ++#include <string.h> + + extern char *crypt(); + Copied: libsasl/repos/staging-x86_64/cyrus-sasl-2.1.26-size_t.patch (from rev 186725, libsasl/trunk/cyrus-sasl-2.1.26-size_t.patch) =================================================================== --- staging-x86_64/cyrus-sasl-2.1.26-size_t.patch (rev 0) +++ staging-x86_64/cyrus-sasl-2.1.26-size_t.patch 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include <sys/types.h> ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); Copied: libsasl/repos/staging-x86_64/saslauthd.conf.d (from rev 186725, libsasl/trunk/saslauthd.conf.d) =================================================================== --- staging-x86_64/saslauthd.conf.d (rev 0) +++ staging-x86_64/saslauthd.conf.d 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-a pam" Copied: libsasl/repos/staging-x86_64/saslauthd.service (from rev 186725, libsasl/trunk/saslauthd.service) =================================================================== --- staging-x86_64/saslauthd.service (rev 0) +++ staging-x86_64/saslauthd.service 2013-05-30 20:19:22 UTC (rev 186726) @@ -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 Copied: libsasl/repos/staging-x86_64/tmpfiles.conf (from rev 186725, libsasl/trunk/tmpfiles.conf) =================================================================== --- staging-x86_64/tmpfiles.conf (rev 0) +++ staging-x86_64/tmpfiles.conf 2013-05-30 20:19:22 UTC (rev 186726) @@ -0,0 +1 @@ +d /run/saslauthd 0755 root root - -