Date: Tuesday, August 21, 2018 @ 09:29:54
Author: foxxx0
Revision: 373082
archrelease: copy trunk to community-x86_64
Added:
dovecot/repos/community-x86_64/PKGBUILD
(from rev 373081, dovecot/trunk/PKGBUILD)
dovecot/repos/community-x86_64/dovecot.ld.so.conf
(from rev 373081, dovecot/trunk/dovecot.ld.so.conf)
dovecot/repos/community-x86_64/dovecot.sysusersd
(from rev 373081, dovecot/trunk/dovecot.sysusersd)
dovecot/repos/community-x86_64/dovecot.tmpfilesd
(from rev 373081, dovecot/trunk/dovecot.tmpfilesd)
dovecot/repos/community-x86_64/fix-ssl_curve_list-setting.patch
(from rev 373081, dovecot/trunk/fix-ssl_curve_list-setting.patch)
dovecot/repos/community-x86_64/include-crypt-h.patch
(from rev 373081, dovecot/trunk/include-crypt-h.patch)
Deleted:
dovecot/repos/community-x86_64/PKGBUILD
dovecot/repos/community-x86_64/dovecot.ld.so.conf
dovecot/repos/community-x86_64/dovecot.sysusersd
dovecot/repos/community-x86_64/dovecot.tmpfilesd
dovecot/repos/community-x86_64/include-crypt-h.patch
----------------------------------+
PKGBUILD | 238 ++++++++++++++++++-------------------
dovecot.ld.so.conf | 2
dovecot.sysusersd | 4
dovecot.tmpfilesd | 2
fix-ssl_curve_list-setting.patch | 22 +++
include-crypt-h.patch | 22 +--
6 files changed, 157 insertions(+), 133 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-21 09:29:43 UTC (rev 373081)
+++ PKGBUILD 2018-08-21 09:29:54 UTC (rev 373082)
@@ -1,118 +0,0 @@
-# $Id$
-# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
-# Maintainer: Thore Bödecker <fox...@archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Contributor: Andreas Radke <andy...@archlinux.org>
-# Contributor: Paul Mattal <p...@mattal.com>
-# Contributor: Federico Quagliata (quaqo) <qu...@despammed.com>
-# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
-
-# --->>> remember to rebuild/bump pigeonhole in one step <<<---
-
-pkgname=dovecot
-pkgver=2.3.2.1
-pkgrel=2
-
-pkgdesc="An IMAP and POP3 server written with security primarily in mind"
-url="https://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}
- 'include-crypt-h.patch'
- 'dovecot.sysusersd'
- 'dovecot.tmpfilesd'
- 'dovecot.ld.so.conf')
-
-sha256sums=('4a65118508dc7a562e5f90dd7c3f56219fff22367c496f17d77cd0c7e2724e34'
- 'SKIP'
- 'b504276359664b6a9d9a2a923c6bee55b659cd0aeb1261fb92b897744a22ef27'
- 'c5e3a8ffe23e5deb4f7893d9877d972347c2ee45c4ebf713de85c537e47cfcaf'
- '0b0625b1e66ca6a95d506fd00d6a68e70620c8ea28606e2528953ffb1806b08e'
- 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
-
-validpgpkeys=(
- 'E643F0BDFDCD04D9FFCB6279C948525140558AC9' # Timo Sirainen <t...@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-x86_64/PKGBUILD (from rev 373081,
dovecot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-21 09:29:54 UTC (rev 373082)
@@ -0,0 +1,120 @@
+# $Id$
+# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
+# Maintainer: Thore Bödecker <fox...@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Andreas Radke <andy...@archlinux.org>
+# Contributor: Paul Mattal <p...@mattal.com>
+# Contributor: Federico Quagliata (quaqo) <qu...@despammed.com>
+# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
+
+# --->>> remember to rebuild/bump pigeonhole in one step <<<---
+
+pkgname=dovecot
+pkgver=2.3.2.1
+pkgrel=3
+
+pkgdesc="An IMAP and POP3 server written with security primarily in mind"
+url="https://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}
+ 'include-crypt-h.patch'
+ 'fix-ssl_curve_list-setting.patch'
+ 'dovecot.sysusersd'
+ 'dovecot.tmpfilesd'
+ 'dovecot.ld.so.conf')
+
+sha256sums=('4a65118508dc7a562e5f90dd7c3f56219fff22367c496f17d77cd0c7e2724e34'
+ 'SKIP'
+ 'b504276359664b6a9d9a2a923c6bee55b659cd0aeb1261fb92b897744a22ef27'
+ '563339dce0cc5bd3e31491500d83f86323aab1cd98bee189e05c5c8e57f5540e'
+ 'c5e3a8ffe23e5deb4f7893d9877d972347c2ee45c4ebf713de85c537e47cfcaf'
+ '0b0625b1e66ca6a95d506fd00d6a68e70620c8ea28606e2528953ffb1806b08e'
+ 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
+
+validpgpkeys=(
+ 'E643F0BDFDCD04D9FFCB6279C948525140558AC9' # Timo Sirainen <t...@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"
+}
Deleted: dovecot.ld.so.conf
===================================================================
--- dovecot.ld.so.conf 2018-08-21 09:29:43 UTC (rev 373081)
+++ dovecot.ld.so.conf 2018-08-21 09:29:54 UTC (rev 373082)
@@ -1 +0,0 @@
-/usr/lib/dovecot
Copied: dovecot/repos/community-x86_64/dovecot.ld.so.conf (from rev 373081,
dovecot/trunk/dovecot.ld.so.conf)
===================================================================
--- dovecot.ld.so.conf (rev 0)
+++ dovecot.ld.so.conf 2018-08-21 09:29:54 UTC (rev 373082)
@@ -0,0 +1 @@
+/usr/lib/dovecot
Deleted: dovecot.sysusersd
===================================================================
--- dovecot.sysusersd 2018-08-21 09:29:43 UTC (rev 373081)
+++ dovecot.sysusersd 2018-08-21 09:29:54 UTC (rev 373082)
@@ -1,2 +0,0 @@
-u dovenull 74 "Dovecot user for completely untrustworthy processes" -
-u dovecot 76 "Dovecot user" -
Copied: dovecot/repos/community-x86_64/dovecot.sysusersd (from rev 373081,
dovecot/trunk/dovecot.sysusersd)
===================================================================
--- dovecot.sysusersd (rev 0)
+++ dovecot.sysusersd 2018-08-21 09:29:54 UTC (rev 373082)
@@ -0,0 +1,2 @@
+u dovenull 74 "Dovecot user for completely untrustworthy processes" -
+u dovecot 76 "Dovecot user" -
Deleted: dovecot.tmpfilesd
===================================================================
--- dovecot.tmpfilesd 2018-08-21 09:29:43 UTC (rev 373081)
+++ dovecot.tmpfilesd 2018-08-21 09:29:54 UTC (rev 373082)
@@ -1 +0,0 @@
-d /run/dovecot 0755 root dovecot -
Copied: dovecot/repos/community-x86_64/dovecot.tmpfilesd (from rev 373081,
dovecot/trunk/dovecot.tmpfilesd)
===================================================================
--- dovecot.tmpfilesd (rev 0)
+++ dovecot.tmpfilesd 2018-08-21 09:29:54 UTC (rev 373082)
@@ -0,0 +1 @@
+d /run/dovecot 0755 root dovecot -
Copied: dovecot/repos/community-x86_64/fix-ssl_curve_list-setting.patch (from
rev 373081, dovecot/trunk/fix-ssl_curve_list-setting.patch)
===================================================================
--- fix-ssl_curve_list-setting.patch (rev 0)
+++ fix-ssl_curve_list-setting.patch 2018-08-21 09:29:54 UTC (rev 373082)
@@ -0,0 +1,22 @@
+From 71ceeaaed73af48eb2cdfd2e1d953ee645c2e9b2 Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tu...@dovecot.fi>
+Date: Tue, 31 Jul 2018 08:45:29 +0300
+Subject: [PATCH] lib-master: Copy ssl_curve_list setting
+
+Otherwise it won't get used.
+
+Broken in 30dca95419
+---
+ src/lib-master/master-service-ssl-settings.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib-master/master-service-ssl-settings.c
b/src/lib-master/master-service-ssl-settings.c
+index 2434e3632c..2bc59b0f4d 100644
+--- a/src/lib-master/master-service-ssl-settings.c
++++ b/src/lib-master/master-service-ssl-settings.c
+@@ -213,4 +213,5 @@ void master_service_ssl_settings_to_iostream_set(
+ set_r->prefer_server_ciphers = ssl_set->ssl_prefer_server_ciphers;
+ set_r->compression = ssl_set->parsed_opts.compression;
+ set_r->tickets = ssl_set->parsed_opts.tickets;
++ set_r->curve_list = p_strdup(pool, ssl_set->ssl_curve_list);
+ }
Deleted: include-crypt-h.patch
===================================================================
--- include-crypt-h.patch 2018-08-21 09:29:43 UTC (rev 373081)
+++ include-crypt-h.patch 2018-08-21 09:29:54 UTC (rev 373082)
@@ -1,11 +0,0 @@
-diff -up dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt
dovecot-2.3.0.1/src/auth/mycrypt.c
---- dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt 2018-02-28
15:28:58.000000000 +0100
-+++ dovecot-2.3.0.1/src/auth/mycrypt.c 2018-03-27 10:57:38.447769201 +0200
-@@ -14,6 +14,7 @@
- # define _XPG6 /* Some Solaris versions require this, some break with this */
- #endif
- #include <unistd.h>
-+#include <crypt.h>
-
- #include "mycrypt.h"
-
Copied: dovecot/repos/community-x86_64/include-crypt-h.patch (from rev 373081,
dovecot/trunk/include-crypt-h.patch)
===================================================================
--- include-crypt-h.patch (rev 0)
+++ include-crypt-h.patch 2018-08-21 09:29:54 UTC (rev 373082)
@@ -0,0 +1,11 @@
+diff -up dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt
dovecot-2.3.0.1/src/auth/mycrypt.c
+--- dovecot-2.3.0.1/src/auth/mycrypt.c.libxcrypt 2018-02-28
15:28:58.000000000 +0100
++++ dovecot-2.3.0.1/src/auth/mycrypt.c 2018-03-27 10:57:38.447769201 +0200
+@@ -14,6 +14,7 @@
+ # define _XPG6 /* Some Solaris versions require this, some break with this */
+ #endif
+ #include <unistd.h>
++#include <crypt.h>
+
+ #include "mycrypt.h"
+
