[arch-commits] Commit in dovecot/repos (10 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Thu Feb 13 16:48:46 UTC 2014
Date: Thursday, February 13, 2014 @ 17:48:46
Author: andyrtr
Revision: 205900
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
dovecot/repos/staging-i686/
dovecot/repos/staging-i686/PKGBUILD
(from rev 205899, dovecot/trunk/PKGBUILD)
dovecot/repos/staging-i686/dovecot.install
(from rev 205899, dovecot/trunk/dovecot.install)
dovecot/repos/staging-i686/dovecot.tmpfilesd
(from rev 205899, dovecot/trunk/dovecot.tmpfilesd)
dovecot/repos/staging-i686/pop3_Access_sequence_numbers_correctly.diff
(from rev 205899, dovecot/trunk/pop3_Access_sequence_numbers_correctly.diff)
dovecot/repos/staging-x86_64/
dovecot/repos/staging-x86_64/PKGBUILD
(from rev 205899, dovecot/trunk/PKGBUILD)
dovecot/repos/staging-x86_64/dovecot.install
(from rev 205899, dovecot/trunk/dovecot.install)
dovecot/repos/staging-x86_64/dovecot.tmpfilesd
(from rev 205899, dovecot/trunk/dovecot.tmpfilesd)
dovecot/repos/staging-x86_64/pop3_Access_sequence_numbers_correctly.diff
(from rev 205899, dovecot/trunk/pop3_Access_sequence_numbers_correctly.diff)
------------------------------------------------------------+
staging-i686/PKGBUILD | 93 +++++++++++
staging-i686/dovecot.install | 58 ++++++
staging-i686/dovecot.tmpfilesd | 1
staging-i686/pop3_Access_sequence_numbers_correctly.diff | 36 ++++
staging-x86_64/PKGBUILD | 93 +++++++++++
staging-x86_64/dovecot.install | 58 ++++++
staging-x86_64/dovecot.tmpfilesd | 1
staging-x86_64/pop3_Access_sequence_numbers_correctly.diff | 36 ++++
8 files changed, 376 insertions(+)
Copied: dovecot/repos/staging-i686/PKGBUILD (from rev 205899, dovecot/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: 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.2.11
+pkgrel=1
+pkgdesc="An IMAP and POP3 server written with security primarily in mind"
+arch=('i686' 'x86_64')
+url="http://dovecot.org/"
+license=("LGPL")
+depends=('krb5' 'openssl' 'sqlite' 'libmariadbclient'
+ 'postgresql-libs' 'bzip2' 'expat' 'curl')
+makedepends=('pam' 'libcap' 'libldap' 'clucene')
+optdepends=('libldap: ldap plugin'
+ 'xz: imap zlib plugin'
+ 'clucene: alternative FTS indexer')
+provides=('imap-server' 'pop3-server')
+install=$pkgname.install
+source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
+ dovecot.tmpfilesd
+ pop3_Access_sequence_numbers_correctly.diff)
+md5sums=('d53d207727df99e4362a3787223c6fa3'
+ 'SKIP'
+ '342a28251d40f983c98c0d1f1bf3d07d'
+ 'c8096d3966651222accd7f6bc678d08d')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # fix path in helper script
+ sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
+
+ # post release segfault fix
+ patch -Np1 -i ${srcdir}/pop3_Access_sequence_numbers_correctly.diff
+}
+
+build() {
+ cd $pkgname-$pkgver
+ # configure with openssl, mysql, and postgresql support
+ ./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-libcap \
+ --with-solr \
+ --with-lucene \
+ --with-docs
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # install example conf files and ssl.conf
+ install -d -m755 ${pkgdir}/etc/dovecot/conf.d
+ install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/dovecot.conf.sample
+ install -d -m755 ${pkgdir}/etc/ssl
+ install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/dovecot-openssl.cnf.sample
+
+ # install mkcert helper script
+ install -m 755 ${srcdir}/$pkgname-$pkgver/doc/mkcert.sh ${pkgdir}/usr/lib/dovecot/mkcert.sh
+
+ rm ${pkgdir}/etc/dovecot/README
+
+ # systemd tmpfile
+ install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
+ install -m 644 ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
+}
Copied: dovecot/repos/staging-i686/dovecot.install (from rev 205899, dovecot/trunk/dovecot.install)
===================================================================
--- staging-i686/dovecot.install (rev 0)
+++ staging-i686/dovecot.install 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1,58 @@
+# arg 1: the new package version
+post_install() {
+
+ # Make sure the group and user "dovecot"+"dovenull exists on this system and have the correct values
+
+ # dovecot
+ if grep -q "^dovecot:" /etc/group &> /dev/null ; then
+ groupmod -g 76 -n dovecot dovecot &> /dev/null
+ else
+ groupadd -g 76 dovecot &> /dev/null
+ fi
+
+ if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then
+ usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null
+ else
+ useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null
+ fi
+
+ # dovenull
+ if grep -q "^dovenull:" /etc/group &> /dev/null ; then
+ groupmod -g 74 -n dovenull dovenull &> /dev/null
+ else
+ groupadd -g 74 dovenull &> /dev/null
+ fi
+
+ if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then
+ usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null
+ else
+ useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null
+ fi
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [ "`vercmp $2 2.0.0`" -lt 0 ]; then
+ # important upgrade notice
+ echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE"
+ echo "> ------------------------------------"
+ echo "> see http://wiki2.dovecot.org/Upgrading/2.0"
+ echo "> make sure, you convert the dovecot.conf file"
+ fi
+ if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then
+ # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later
+ userdel dovecot &> /dev/null
+ userdel dovenull &> /dev/null
+ fi
+ post_install $1
+}
+
+# arg 1: the old package version
+pre_remove() {
+ userdel dovecot &> /dev/null
+ userdel dovenull &> /dev/null
+ groupdel dovecot &> /dev/null || /bin/true
+ groupdel dovenull &> /dev/null || /bin/true
+ rm -rf /var/run/dovecot/ &> /dev/null || /bin/true
+}
Copied: dovecot/repos/staging-i686/dovecot.tmpfilesd (from rev 205899, dovecot/trunk/dovecot.tmpfilesd)
===================================================================
--- staging-i686/dovecot.tmpfilesd (rev 0)
+++ staging-i686/dovecot.tmpfilesd 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1 @@
+d /var/run/dovecot 0755 root dovecot -
Copied: dovecot/repos/staging-i686/pop3_Access_sequence_numbers_correctly.diff (from rev 205899, dovecot/trunk/pop3_Access_sequence_numbers_correctly.diff)
===================================================================
--- staging-i686/pop3_Access_sequence_numbers_correctly.diff (rev 0)
+++ staging-i686/pop3_Access_sequence_numbers_correctly.diff 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1,36 @@
+
+diff -r 59decc957b39 -r d20059f7d3a1 src/pop3/pop3-commands.c
+--- a/src/pop3/pop3-commands.c Fri Feb 07 15:03:33 2014 -0500
++++ b/src/pop3/pop3-commands.c Thu Feb 13 05:33:13 2014 +0200
+@@ -253,7 +253,7 @@
+ for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ bit = 1 << (msgnum % CHAR_BIT);
+ if ((client->deleted_bitmask[msgnum / CHAR_BIT] & bit) != 0)
+- seq_range_array_add(&deleted_msgs, client->msgnum_to_seq_map[msgnum]);
++ seq_range_array_add(&deleted_msgs, msgnum_to_seq(client, msgnum));
+ }
+ }
+ t_array_init(&seen_msgs, 8);
+@@ -261,7 +261,7 @@
+ for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ bit = 1 << (msgnum % CHAR_BIT);
+ if ((client->seen_bitmask[msgnum / CHAR_BIT] & bit) != 0)
+- seq_range_array_add(&seen_msgs, client->msgnum_to_seq_map[msgnum]);
++ seq_range_array_add(&seen_msgs, msgnum_to_seq(client, msgnum));
+ }
+ }
+
+@@ -826,7 +826,7 @@
+ client->messages_count+1);
+ for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ client->message_uidls[msgnum] =
+- seq_uidls[client->msgnum_to_seq_map[msgnum]];
++ seq_uidls[msgnum_to_seq(client, msgnum)];
+ }
+ i_free(seq_uidls);
+ }
+
+
+
+
+
Copied: dovecot/repos/staging-x86_64/PKGBUILD (from rev 205899, dovecot/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1,93 @@
+# $Id$
+# Maintainer: 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.2.11
+pkgrel=1
+pkgdesc="An IMAP and POP3 server written with security primarily in mind"
+arch=('i686' 'x86_64')
+url="http://dovecot.org/"
+license=("LGPL")
+depends=('krb5' 'openssl' 'sqlite' 'libmariadbclient'
+ 'postgresql-libs' 'bzip2' 'expat' 'curl')
+makedepends=('pam' 'libcap' 'libldap' 'clucene')
+optdepends=('libldap: ldap plugin'
+ 'xz: imap zlib plugin'
+ 'clucene: alternative FTS indexer')
+provides=('imap-server' 'pop3-server')
+install=$pkgname.install
+source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
+ dovecot.tmpfilesd
+ pop3_Access_sequence_numbers_correctly.diff)
+md5sums=('d53d207727df99e4362a3787223c6fa3'
+ 'SKIP'
+ '342a28251d40f983c98c0d1f1bf3d07d'
+ 'c8096d3966651222accd7f6bc678d08d')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # fix path in helper script
+ sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
+
+ # post release segfault fix
+ patch -Np1 -i ${srcdir}/pop3_Access_sequence_numbers_correctly.diff
+}
+
+build() {
+ cd $pkgname-$pkgver
+ # configure with openssl, mysql, and postgresql support
+ ./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-libcap \
+ --with-solr \
+ --with-lucene \
+ --with-docs
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # install example conf files and ssl.conf
+ install -d -m755 ${pkgdir}/etc/dovecot/conf.d
+ install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/dovecot.conf.sample
+ install -d -m755 ${pkgdir}/etc/ssl
+ install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/dovecot-openssl.cnf.sample
+
+ # install mkcert helper script
+ install -m 755 ${srcdir}/$pkgname-$pkgver/doc/mkcert.sh ${pkgdir}/usr/lib/dovecot/mkcert.sh
+
+ rm ${pkgdir}/etc/dovecot/README
+
+ # systemd tmpfile
+ install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
+ install -m 644 ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
+}
Copied: dovecot/repos/staging-x86_64/dovecot.install (from rev 205899, dovecot/trunk/dovecot.install)
===================================================================
--- staging-x86_64/dovecot.install (rev 0)
+++ staging-x86_64/dovecot.install 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1,58 @@
+# arg 1: the new package version
+post_install() {
+
+ # Make sure the group and user "dovecot"+"dovenull exists on this system and have the correct values
+
+ # dovecot
+ if grep -q "^dovecot:" /etc/group &> /dev/null ; then
+ groupmod -g 76 -n dovecot dovecot &> /dev/null
+ else
+ groupadd -g 76 dovecot &> /dev/null
+ fi
+
+ if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then
+ usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null
+ else
+ useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null
+ fi
+
+ # dovenull
+ if grep -q "^dovenull:" /etc/group &> /dev/null ; then
+ groupmod -g 74 -n dovenull dovenull &> /dev/null
+ else
+ groupadd -g 74 dovenull &> /dev/null
+ fi
+
+ if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then
+ usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null
+ else
+ useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null
+ fi
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [ "`vercmp $2 2.0.0`" -lt 0 ]; then
+ # important upgrade notice
+ echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE"
+ echo "> ------------------------------------"
+ echo "> see http://wiki2.dovecot.org/Upgrading/2.0"
+ echo "> make sure, you convert the dovecot.conf file"
+ fi
+ if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then
+ # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later
+ userdel dovecot &> /dev/null
+ userdel dovenull &> /dev/null
+ fi
+ post_install $1
+}
+
+# arg 1: the old package version
+pre_remove() {
+ userdel dovecot &> /dev/null
+ userdel dovenull &> /dev/null
+ groupdel dovecot &> /dev/null || /bin/true
+ groupdel dovenull &> /dev/null || /bin/true
+ rm -rf /var/run/dovecot/ &> /dev/null || /bin/true
+}
Copied: dovecot/repos/staging-x86_64/dovecot.tmpfilesd (from rev 205899, dovecot/trunk/dovecot.tmpfilesd)
===================================================================
--- staging-x86_64/dovecot.tmpfilesd (rev 0)
+++ staging-x86_64/dovecot.tmpfilesd 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1 @@
+d /var/run/dovecot 0755 root dovecot -
Copied: dovecot/repos/staging-x86_64/pop3_Access_sequence_numbers_correctly.diff (from rev 205899, dovecot/trunk/pop3_Access_sequence_numbers_correctly.diff)
===================================================================
--- staging-x86_64/pop3_Access_sequence_numbers_correctly.diff (rev 0)
+++ staging-x86_64/pop3_Access_sequence_numbers_correctly.diff 2014-02-13 16:48:46 UTC (rev 205900)
@@ -0,0 +1,36 @@
+
+diff -r 59decc957b39 -r d20059f7d3a1 src/pop3/pop3-commands.c
+--- a/src/pop3/pop3-commands.c Fri Feb 07 15:03:33 2014 -0500
++++ b/src/pop3/pop3-commands.c Thu Feb 13 05:33:13 2014 +0200
+@@ -253,7 +253,7 @@
+ for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ bit = 1 << (msgnum % CHAR_BIT);
+ if ((client->deleted_bitmask[msgnum / CHAR_BIT] & bit) != 0)
+- seq_range_array_add(&deleted_msgs, client->msgnum_to_seq_map[msgnum]);
++ seq_range_array_add(&deleted_msgs, msgnum_to_seq(client, msgnum));
+ }
+ }
+ t_array_init(&seen_msgs, 8);
+@@ -261,7 +261,7 @@
+ for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ bit = 1 << (msgnum % CHAR_BIT);
+ if ((client->seen_bitmask[msgnum / CHAR_BIT] & bit) != 0)
+- seq_range_array_add(&seen_msgs, client->msgnum_to_seq_map[msgnum]);
++ seq_range_array_add(&seen_msgs, msgnum_to_seq(client, msgnum));
+ }
+ }
+
+@@ -826,7 +826,7 @@
+ client->messages_count+1);
+ for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
+ client->message_uidls[msgnum] =
+- seq_uidls[client->msgnum_to_seq_map[msgnum]];
++ seq_uidls[msgnum_to_seq(client, msgnum)];
+ }
+ i_free(seq_uidls);
+ }
+
+
+
+
+
More information about the arch-commits
mailing list