[arch-commits] Commit in dovecot/repos (6 files)
Eli Schwartz
eschwartz at archlinux.org
Wed Mar 28 22:01:50 UTC 2018
Date: Wednesday, March 28, 2018 @ 22:01:50
Author: eschwartz
Revision: 313185
archrelease: copy trunk to community-testing-x86_64
Added:
dovecot/repos/community-testing-x86_64/
dovecot/repos/community-testing-x86_64/PKGBUILD
(from rev 313184, dovecot/trunk/PKGBUILD)
dovecot/repos/community-testing-x86_64/dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch
(from rev 313184, dovecot/trunk/dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch)
dovecot/repos/community-testing-x86_64/dovecot.ld.so.conf
(from rev 313184, dovecot/trunk/dovecot.ld.so.conf)
dovecot/repos/community-testing-x86_64/dovecot.sysusersd
(from rev 313184, dovecot/trunk/dovecot.sysusersd)
dovecot/repos/community-testing-x86_64/dovecot.tmpfilesd
(from rev 313184, dovecot/trunk/dovecot.tmpfilesd)
---------------------------------------------------------------+
PKGBUILD | 118 ++++++++++
dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch | 44 +++
dovecot.ld.so.conf | 1
dovecot.sysusersd | 2
dovecot.tmpfilesd | 1
5 files changed, 166 insertions(+)
Copied: dovecot/repos/community-testing-x86_64/PKGBUILD (from rev 313184, dovecot/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2018-03-28 22:01:50 UTC (rev 313185)
@@ -0,0 +1,118 @@
+# $Id$
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Paul Mattal <paul at mattal.com>
+# Contributor: Federico Quagliata (quaqo) <quaqo at despammed.com>
+# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
+
+# --->>> remember to rebuild/bump pigeonhole in one step <<<---
+
+pkgname=dovecot
+pkgver=2.3.1
+pkgrel=2
+
+pkgdesc="An IMAP and POP3 server written with security primarily in mind"
+url="http://dovecot.org/"
+arch=('x86_64')
+license=("LGPL")
+
+depends=('krb5' 'openssl' 'sqlite' 'libmariadbclient' 'libsodium'
+ 'postgresql-libs' 'bzip2' 'lz4' 'expat' 'curl' 'pam')
+makedepends=('libcap' 'libldap' 'clucene' 'libsodium')
+optdepends=('libldap: ldap plugin'
+ 'xz: imap zlib plugin'
+ 'clucene: alternative FTS indexer')
+
+provides=('imap-server' 'pop3-server')
+
+source=("https://dovecot.org/releases/2.3/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ 'dovecot.sysusersd'
+ 'dovecot.tmpfilesd'
+ 'dovecot.ld.so.conf'
+ # needs "proper" fix according to upstream. might be fixed in 2.3.2
+ 'dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch')
+
+sha256sums=('0883821b97fd02a084a84b9469a681f7e6edc56541d854b5419d98891c51fb93'
+ 'SKIP'
+ 'c5e3a8ffe23e5deb4f7893d9877d972347c2ee45c4ebf713de85c537e47cfcaf'
+ 'bb7620be7fc0217d77fcac940441c2abbd9efc6ef660153288d09ba412e27e06'
+ 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858'
+ '95c33d502936cd108a50001e1dbb0b6f885f8b9bfe2e53eaecc6c5ecf8a973d2')
+validpgpkeys=(
+ 'E643F0BDFDCD04D9FFCB6279C948525140558AC9' # Timo Sirainen <tss at iki.fi>
+ '2BE74AAB3EE754DFB9C80D3318A348AEED409DA1' # Dovecot Community Edition
+)
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch ${filename##*/}"
+ patch -p1 -N -l -i "$srcdir/${filename##*/}"
+ fi
+ done
+
+ # fix path in helper script
+ sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --with-moduledir=/usr/lib/dovecot/modules \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --disable-static \
+ --with-nss \
+ --with-pam \
+ --with-mysql \
+ --with-pgsql \
+ --with-sqlite \
+ --with-ssl=openssl \
+ --with-ssldir=/etc/ssl \
+ --with-gssapi \
+ --with-ldap=plugin \
+ --with-zlib \
+ --with-bzlib \
+ --with-lzma \
+ --with-lz4 \
+ --with-libcap \
+ --with-solr \
+ --with-lucene \
+ --with-sodium \
+ --with-docs
+
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
+
+package() {
+ # system user/group dovenull - 74
+ # system user/group dovecot - 76
+
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 "${srcdir}/dovecot.sysusersd" \
+ "${pkgdir}/usr/lib/sysusers.d/dovecot.conf"
+ install -Dm644 "${srcdir}/dovecot.tmpfilesd" \
+ "${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf"
+ install -d -m755 "${pkgdir}/etc/dovecot/conf.d"
+ rm -f "${pkgdir}/etc/dovecot/README"
+
+ # install mkcert helper script
+ install -m 755 doc/mkcert.sh "${pkgdir}/usr/lib/dovecot/mkcert.sh"
+
+ # add dovecot libdir
+ install -Dm644 "${srcdir}/dovecot.ld.so.conf" "${pkgdir}/etc/ld.so.conf.d/dovecot.conf"
+}
Copied: dovecot/repos/community-testing-x86_64/dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch (from rev 313184, dovecot/trunk/dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch)
===================================================================
--- community-testing-x86_64/dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch (rev 0)
+++ community-testing-x86_64/dovecot-0003-dsync-Revert-to-tmp-if-home-does-not-exist.patch 2018-03-28 22:01:50 UTC (rev 313185)
@@ -0,0 +1,44 @@
+commit 890883f12e8d8dd3309743eb95cf0b04f6e39ea0
+Author: Aki Tuomi <aki.tuomi at dovecot.fi>
+Date: Mon Mar 19 18:39:27 2018 +0200
+
+ dsync: Revert to /tmp if home does not exist
+
+ Fixes doveadm: Error: Couldn't lock .dovecot-sync.lock: safe_mkstemp(.dovecot-sync.lock) failed: No such file or directory
+
+diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
+index c2b8169..1e84182 100644
+--- a/src/doveadm/dsync/dsync-brain.c
++++ b/src/doveadm/dsync/dsync-brain.c
+@@ -401,6 +401,7 @@ dsync_brain_lock(struct dsync_brain *brain, const char *remote_hostname)
+ .lock_method = FILE_LOCK_METHOD_FCNTL,
+ };
+ const char *home, *error, *local_hostname = my_hostdomain();
++ struct stat st;
+ bool created;
+ int ret;
+
+@@ -437,8 +438,21 @@ dsync_brain_lock(struct dsync_brain *brain, const char *remote_hostname)
+
+ if (brain->verbose_proctitle)
+ process_title_set(dsync_brain_get_proctitle_full(brain, DSYNC_BRAIN_TITLE_LOCKING));
+- brain->lock_path = p_strconcat(brain->pool, home,
+- "/"DSYNC_LOCK_FILENAME, NULL);
++
++ /* if homedir does not yet exist, create lock under tmpdir */
++ if (stat(home, &st) < 0) {
++ if (errno != ENOENT) {
++ i_error("stat(%s) failed: %m", home);
++ return -1;
++ }
++ brain->lock_path = p_strdup_printf(brain->pool, "%s/%s-%s",
++ brain->user->set->mail_temp_dir,
++ brain->user->username,
++ "/"DSYNC_LOCK_FILENAME);
++ } else {
++ brain->lock_path = p_strconcat(brain->pool, home,
++ "/"DSYNC_LOCK_FILENAME, NULL);
++ }
+ brain->lock_fd = file_create_locked(brain->lock_path, &lock_set,
+ &brain->lock, &created, &error);
+ if (brain->lock_fd == -1)
Copied: dovecot/repos/community-testing-x86_64/dovecot.ld.so.conf (from rev 313184, dovecot/trunk/dovecot.ld.so.conf)
===================================================================
--- community-testing-x86_64/dovecot.ld.so.conf (rev 0)
+++ community-testing-x86_64/dovecot.ld.so.conf 2018-03-28 22:01:50 UTC (rev 313185)
@@ -0,0 +1 @@
+/usr/lib/dovecot
Copied: dovecot/repos/community-testing-x86_64/dovecot.sysusersd (from rev 313184, dovecot/trunk/dovecot.sysusersd)
===================================================================
--- community-testing-x86_64/dovecot.sysusersd (rev 0)
+++ community-testing-x86_64/dovecot.sysusersd 2018-03-28 22:01:50 UTC (rev 313185)
@@ -0,0 +1,2 @@
+u dovenull 74 "Dovecot user for completely untrustworthy processes" -
+u dovecot 76 "Dovecot user" -
Copied: dovecot/repos/community-testing-x86_64/dovecot.tmpfilesd (from rev 313184, dovecot/trunk/dovecot.tmpfilesd)
===================================================================
--- community-testing-x86_64/dovecot.tmpfilesd (rev 0)
+++ community-testing-x86_64/dovecot.tmpfilesd 2018-03-28 22:01:50 UTC (rev 313185)
@@ -0,0 +1 @@
+d /var/run/dovecot 0755 root dovecot -
More information about the arch-commits
mailing list