[arch-commits] Commit in dbmail/repos (22 files)
Sergej Pupykin
spupykin at archlinux.org
Tue Aug 26 09:46:31 UTC 2014
Date: Tuesday, August 26, 2014 @ 11:46:31
Author: spupykin
Revision: 117901
archrelease: copy trunk to community-i686, community-x86_64
Added:
dbmail/repos/community-i686/PKGBUILD
(from rev 117900, dbmail/trunk/PKGBUILD)
dbmail/repos/community-i686/dbmail-imapd.xinetd
(from rev 117900, dbmail/trunk/dbmail-imapd.xinetd)
dbmail/repos/community-i686/dbmail-lmtpd.xinetd
(from rev 117900, dbmail/trunk/dbmail-lmtpd.xinetd)
dbmail/repos/community-i686/dbmail-pop3d.xinetd
(from rev 117900, dbmail/trunk/dbmail-pop3d.xinetd)
dbmail/repos/community-i686/dbmail-timsieved.xinetd
(from rev 117900, dbmail/trunk/dbmail-timsieved.xinetd)
dbmail/repos/community-x86_64/PKGBUILD
(from rev 117900, dbmail/trunk/PKGBUILD)
dbmail/repos/community-x86_64/dbmail-imapd.xinetd
(from rev 117900, dbmail/trunk/dbmail-imapd.xinetd)
dbmail/repos/community-x86_64/dbmail-lmtpd.xinetd
(from rev 117900, dbmail/trunk/dbmail-lmtpd.xinetd)
dbmail/repos/community-x86_64/dbmail-pop3d.xinetd
(from rev 117900, dbmail/trunk/dbmail-pop3d.xinetd)
dbmail/repos/community-x86_64/dbmail-timsieved.xinetd
(from rev 117900, dbmail/trunk/dbmail-timsieved.xinetd)
Deleted:
dbmail/repos/community-i686/PKGBUILD
dbmail/repos/community-i686/dbmail-7-systemd.diff
dbmail/repos/community-i686/dbmail-imapd.xinetd
dbmail/repos/community-i686/dbmail-lmtpd.xinetd
dbmail/repos/community-i686/dbmail-pop3d.xinetd
dbmail/repos/community-i686/dbmail-timsieved.xinetd
dbmail/repos/community-x86_64/PKGBUILD
dbmail/repos/community-x86_64/dbmail-7-systemd.diff
dbmail/repos/community-x86_64/dbmail-imapd.xinetd
dbmail/repos/community-x86_64/dbmail-lmtpd.xinetd
dbmail/repos/community-x86_64/dbmail-pop3d.xinetd
dbmail/repos/community-x86_64/dbmail-timsieved.xinetd
------------------------------------------+
/PKGBUILD | 122 ++++++++++++++++++++
/dbmail-imapd.xinetd | 26 ++++
/dbmail-lmtpd.xinetd | 26 ++++
/dbmail-pop3d.xinetd | 26 ++++
/dbmail-timsieved.xinetd | 30 ++++
community-i686/PKGBUILD | 68 -----------
community-i686/dbmail-7-systemd.diff | 176 -----------------------------
community-i686/dbmail-imapd.xinetd | 13 --
community-i686/dbmail-lmtpd.xinetd | 13 --
community-i686/dbmail-pop3d.xinetd | 13 --
community-i686/dbmail-timsieved.xinetd | 15 --
community-x86_64/PKGBUILD | 68 -----------
community-x86_64/dbmail-7-systemd.diff | 176 -----------------------------
community-x86_64/dbmail-imapd.xinetd | 13 --
community-x86_64/dbmail-lmtpd.xinetd | 13 --
community-x86_64/dbmail-pop3d.xinetd | 13 --
community-x86_64/dbmail-timsieved.xinetd | 15 --
17 files changed, 230 insertions(+), 596 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-i686/PKGBUILD 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sebastian Faltoni <sebastian.faltoni at gmail.com>
-
-pkgname=dbmail
-pkgver=3.1.17
-pkgrel=1
-pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
-depends=('gmime' 'libzdb' 'mhash' 'libevent')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
- 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
-optdepends=('libldap: for LDAP authentication'
- 'libsieve: for dbmail-sieve'
- 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
-url="http://www.dbmail.org"
-license=('GPL')
-options=('zipman')
-backup=(etc/xinetd.d/dbmail-imapd
- etc/xinetd.d/dbmail-pop3d
- etc/xinetd.d/dbmail-lmtpd
- etc/xinetd.d/dbmail-timsieved)
-#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1"
-#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz"
-source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz"
- "dbmail-imapd.xinetd"
- "dbmail-lmtpd.xinetd"
- "dbmail-pop3d.xinetd"
- "dbmail-timsieved.xinetd"
- "dbmail-7-systemd.diff")
-md5sums=('f7df17cb984385cadd17b276381b9af6'
- '890de13361afbdf4fed12d6d7eb53e66'
- '961593658cd596297d03d25eb9c9e98f'
- '4cb764894abd3914802e90602bf90a0c'
- 'e78dc86355f9aaf24590bc7c6611162f'
- '225d7ddcc357b4fd65e4b6a2719d0476')
-
-prepare() {
- cd $srcdir/dbmail-${pkgver}/
- patch -Rp1 <$srcdir/dbmail-7-systemd.diff
-}
-
-build() {
- cd $srcdir/dbmail-${pkgver}/
- aclocal
- automake --add-missing
- autoreconf
- [ -f Makefile ] || ./configure \
- --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
- --with-ldap --with-sieve \
- --enable-systemd --enable-manpages
- make
-}
-
-package() {
- cd $srcdir/dbmail-${pkgver}/
- make DESTDIR=$pkgdir install
-
- install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
- mkdir $pkgdir/usr/share/dbmail
- cp -r sql/* $pkgdir/usr/share/dbmail/
- cp -a contrib $pkgdir/usr/share/dbmail/
- cp dbmail.schema $pkgdir/usr/share/dbmail/
-
- for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
- install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
- done
-}
Copied: dbmail/repos/community-i686/PKGBUILD (from rev 117900, dbmail/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sebastian Faltoni <sebastian.faltoni at gmail.com>
+
+pkgname=dbmail
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="Fast and scalable sql based mail services"
+arch=('i686' 'x86_64')
+depends=('gmime' 'libzdb' 'mhash' 'libevent')
+makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
+ 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
+optdepends=('libldap: for LDAP authentication'
+ 'libsieve: for dbmail-sieve'
+ 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
+url="http://www.dbmail.org"
+license=('GPL')
+options=('zipman')
+backup=(etc/xinetd.d/dbmail-imapd
+ etc/xinetd.d/dbmail-pop3d
+ etc/xinetd.d/dbmail-lmtpd
+ etc/xinetd.d/dbmail-timsieved)
+#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1"
+#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz"
+source=("http://www.dbmail.org/download/3.2/dbmail-${pkgver}.tar.gz"
+ "dbmail-imapd.xinetd"
+ "dbmail-lmtpd.xinetd"
+ "dbmail-pop3d.xinetd"
+ "dbmail-timsieved.xinetd")
+md5sums=('6375ea94b62e1752d8ecf3283eff100c'
+ '890de13361afbdf4fed12d6d7eb53e66'
+ '961593658cd596297d03d25eb9c9e98f'
+ '4cb764894abd3914802e90602bf90a0c'
+ 'e78dc86355f9aaf24590bc7c6611162f')
+
+build() {
+ cd $srcdir/dbmail-${pkgver}/
+ aclocal
+ automake --add-missing
+ autoreconf
+ [ -f Makefile ] || ./configure \
+ --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
+ --with-ldap --with-sieve \
+ --enable-systemd --enable-manpages
+ make
+}
+
+package() {
+ cd $srcdir/dbmail-${pkgver}/
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
+ mkdir $pkgdir/usr/share/dbmail
+ cp -r sql/* $pkgdir/usr/share/dbmail/
+ cp -a contrib $pkgdir/usr/share/dbmail/
+ cp dbmail.schema $pkgdir/usr/share/dbmail/
+
+ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
+ install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
+ done
+}
Deleted: community-i686/dbmail-7-systemd.diff
===================================================================
--- community-i686/dbmail-7-systemd.diff 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-i686/dbmail-7-systemd.diff 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,176 +0,0 @@
-diff -wbBurN dbmail.git/configure.ac dbmail-3.1.5/configure.ac
---- dbmail.git/configure.ac 2013-09-05 18:07:48.661707165 +0400
-+++ dbmail-3.1.5/configure.ac 2013-09-09 15:05:17.639600103 +0400
-@@ -44,10 +44,6 @@
- AS_HELP_STRING([--enable-manpages], [Enable building and installation of man pages]))
- AM_CONDITIONAL(MANPAGES, [ test "$enable_manpages" = "yes" ])
-
--AC_ARG_ENABLE([systemd],
-- AS_HELP_STRING([--enable-systemd], [Enable systemd support]))
--AM_CONDITIONAL(SYSTEMD, [ test "$enable_systemd" = "yes" ])
--
- AC_PROG_CC
- AC_COMPILE_WARNINGS
- AC_C_CONST
-@@ -82,8 +78,9 @@
- AC_SUBST(DM_STATEDIR)
- AC_SUBST(DM_PKGLIBDIR)
- AC_SUBST(DM_PWD)
-+
- AC_PROG_LIBTOOL
-
--AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile systemd/Makefile)
-+AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile)
-
- DM_MSG_CONFIGURE_RESULTS
-diff -wbBurN dbmail.git/systemd/dbmail-imapd.service.in dbmail-3.1.5/systemd/dbmail-imapd.service.in
---- dbmail.git/systemd/dbmail-imapd.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-imapd.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail Imap Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-imapd.pid
--ExecStart=@sbindir@/dbmail-imapd -p @piddir@/dbmail-imapd.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail-lmtpd.service.in dbmail-3.1.5/systemd/dbmail-lmtpd.service.in
---- dbmail.git/systemd/dbmail-lmtpd.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-lmtpd.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail LMTP Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-lmtpd.pid
--ExecStart=@sbindir@/dbmail-lmtpd -p @piddir@/dbmail-lmtpd.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail-pop3d.service.in dbmail-3.1.5/systemd/dbmail-pop3d.service.in
---- dbmail.git/systemd/dbmail-pop3d.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-pop3d.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail pop3 Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-pop3d.pid
--ExecStart=@sbindir@/dbmail-pop3d -p @piddir@/dbmail-pop3d.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail-timsieved.service.in dbmail-3.1.5/systemd/dbmail-timsieved.service.in
---- dbmail.git/systemd/dbmail-timsieved.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-timsieved.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail Sieve Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-timsieved.pid
--ExecStart=@sbindir@/dbmail-timsieved -p @piddir@/dbmail-timsieved.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail.tmpfiles.in dbmail-3.1.5/systemd/dbmail.tmpfiles.in
---- dbmail.git/systemd/dbmail.tmpfiles.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail.tmpfiles.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1 +0,0 @@
--d @piddir@ 0755 nobody nobody -
-diff -wbBurN dbmail.git/systemd/Makefile.am dbmail-3.1.5/systemd/Makefile.am
---- dbmail.git/systemd/Makefile.am 2013-09-07 16:12:34.840475834 +0400
-+++ dbmail-3.1.5/systemd/Makefile.am 1970-01-01 03:00:00.000000000 +0300
-@@ -1,68 +0,0 @@
--# Copyright (C) 1999-2004 IC & S dbmail at ic-s.nl
--# Copyright (c) 2004-2011 NFG Net Facilities Group BV support at nfg.nl
--#
--# This program is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License
--# as published by the Free Software Foundation; either
--# version 2 of the License, or (at your option) any later
--# version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--EXTRA_DIST = dbmail-imapd.service.in dbmail-lmtpd.service.in dbmail-pop3d.service.in dbmail-timsieved.service.in
--SYSTEMD_UNIT_DIR = /usr/lib/systemd/system
--SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d
--PID_DIR=/run/dbmail
--
--if SYSTEMD
--install-systemd: dbmail-imapd.service dbmail-lmtpd.service dbmail-pop3d.service dbmail-timsieved.service dbmail.tmpfiles
-- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
-- $(INSTALL_DATA) dbmail-imapd.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service
-- $(INSTALL_DATA) dbmail-lmtpd.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service
-- $(INSTALL_DATA) dbmail-pop3d.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service
-- $(INSTALL_DATA) dbmail-timsieved.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service
-- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)
-- $(INSTALL_DATA) dbmail.tmpfiles \
-- $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.conf
--
--uninstall-systemd:
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service
-- rm -f $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.tmpfiles
--
--SUFFIXES=.service.in .service .tmpfiles.in .tmpfiles
--
--.service.in.service:
-- $(AM_V_GEN)sed \
-- -e 's|[@]sbindir[@]|$(sbindir)|g' \
-- -e 's|[@]piddir[@]|$(PID_DIR)|g' \
-- < $< > $@-t && \
-- mv $@-t $@
--
--.tmpfiles.in.tmpfiles:
-- $(AM_V_GEN)sed \
-- -e 's|[@]piddir[@]|$(PID_DIR)|g' \
-- < $< > $@-t && \
-- mv $@-t $@
--
--else
--install-systemd:
--uninstall-systemd:
--endif
--
--install-data-local: install-systemd
--uninstall-local: uninstall-systemd
-diff -wbBurN dbmail.git/Makefile.am dbmail-3.1.5/Makefile.am
---- dbmail.git/Makefile.am 2013-09-04 19:00:55.000000000 +0400
-+++ dbmail-3.1.5/Makefile.am 2013-09-09 15:14:22.549612297 +0400
-@@ -6,10 +6,6 @@
- SUBDIRS += man
- endif
-
--if SYSTEMD
--SUBDIRS += systemd
--endif
--
- testall:
- CK_FORK=no make check
- imaptest user=testuser1 pass=test port=10143 host=localhost test=test-scripts/imap
Deleted: community-i686/dbmail-imapd.xinetd
===================================================================
--- community-i686/dbmail-imapd.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-i686/dbmail-imapd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,13 +0,0 @@
-service imap
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-imapd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-i686/dbmail-imapd.xinetd (from rev 117900, dbmail/trunk/dbmail-imapd.xinetd)
===================================================================
--- community-i686/dbmail-imapd.xinetd (rev 0)
+++ community-i686/dbmail-imapd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,13 @@
+service imap
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-imapd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-i686/dbmail-lmtpd.xinetd
===================================================================
--- community-i686/dbmail-lmtpd.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-i686/dbmail-lmtpd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,13 +0,0 @@
-service lmtp
-{
- port = 24
- type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-lmtpd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-}
Copied: dbmail/repos/community-i686/dbmail-lmtpd.xinetd (from rev 117900, dbmail/trunk/dbmail-lmtpd.xinetd)
===================================================================
--- community-i686/dbmail-lmtpd.xinetd (rev 0)
+++ community-i686/dbmail-lmtpd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,13 @@
+service lmtp
+{
+ port = 24
+ type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-lmtpd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+}
Deleted: community-i686/dbmail-pop3d.xinetd
===================================================================
--- community-i686/dbmail-pop3d.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-i686/dbmail-pop3d.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,13 +0,0 @@
-service pop3
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-pop3d
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-i686/dbmail-pop3d.xinetd (from rev 117900, dbmail/trunk/dbmail-pop3d.xinetd)
===================================================================
--- community-i686/dbmail-pop3d.xinetd (rev 0)
+++ community-i686/dbmail-pop3d.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,13 @@
+service pop3
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-pop3d
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-i686/dbmail-timsieved.xinetd
===================================================================
--- community-i686/dbmail-timsieved.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-i686/dbmail-timsieved.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,15 +0,0 @@
-service sieve
-{
-# port = 2000
-# type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-timsieved
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-i686/dbmail-timsieved.xinetd (from rev 117900, dbmail/trunk/dbmail-timsieved.xinetd)
===================================================================
--- community-i686/dbmail-timsieved.xinetd (rev 0)
+++ community-i686/dbmail-timsieved.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,15 @@
+service sieve
+{
+# port = 2000
+# type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-timsieved
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-x86_64/PKGBUILD 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sebastian Faltoni <sebastian.faltoni at gmail.com>
-
-pkgname=dbmail
-pkgver=3.1.17
-pkgrel=1
-pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
-depends=('gmime' 'libzdb' 'mhash' 'libevent')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
- 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
-optdepends=('libldap: for LDAP authentication'
- 'libsieve: for dbmail-sieve'
- 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
-url="http://www.dbmail.org"
-license=('GPL')
-options=('zipman')
-backup=(etc/xinetd.d/dbmail-imapd
- etc/xinetd.d/dbmail-pop3d
- etc/xinetd.d/dbmail-lmtpd
- etc/xinetd.d/dbmail-timsieved)
-#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1"
-#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz"
-source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz"
- "dbmail-imapd.xinetd"
- "dbmail-lmtpd.xinetd"
- "dbmail-pop3d.xinetd"
- "dbmail-timsieved.xinetd"
- "dbmail-7-systemd.diff")
-md5sums=('f7df17cb984385cadd17b276381b9af6'
- '890de13361afbdf4fed12d6d7eb53e66'
- '961593658cd596297d03d25eb9c9e98f'
- '4cb764894abd3914802e90602bf90a0c'
- 'e78dc86355f9aaf24590bc7c6611162f'
- '225d7ddcc357b4fd65e4b6a2719d0476')
-
-prepare() {
- cd $srcdir/dbmail-${pkgver}/
- patch -Rp1 <$srcdir/dbmail-7-systemd.diff
-}
-
-build() {
- cd $srcdir/dbmail-${pkgver}/
- aclocal
- automake --add-missing
- autoreconf
- [ -f Makefile ] || ./configure \
- --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
- --with-ldap --with-sieve \
- --enable-systemd --enable-manpages
- make
-}
-
-package() {
- cd $srcdir/dbmail-${pkgver}/
- make DESTDIR=$pkgdir install
-
- install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
- mkdir $pkgdir/usr/share/dbmail
- cp -r sql/* $pkgdir/usr/share/dbmail/
- cp -a contrib $pkgdir/usr/share/dbmail/
- cp dbmail.schema $pkgdir/usr/share/dbmail/
-
- for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
- install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
- done
-}
Copied: dbmail/repos/community-x86_64/PKGBUILD (from rev 117900, dbmail/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sebastian Faltoni <sebastian.faltoni at gmail.com>
+
+pkgname=dbmail
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="Fast and scalable sql based mail services"
+arch=('i686' 'x86_64')
+depends=('gmime' 'libzdb' 'mhash' 'libevent')
+makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
+ 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
+optdepends=('libldap: for LDAP authentication'
+ 'libsieve: for dbmail-sieve'
+ 'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
+url="http://www.dbmail.org"
+license=('GPL')
+options=('zipman')
+backup=(etc/xinetd.d/dbmail-imapd
+ etc/xinetd.d/dbmail-pop3d
+ etc/xinetd.d/dbmail-lmtpd
+ etc/xinetd.d/dbmail-timsieved)
+#source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1"
+#source=("dbmail-$pkgver.tar.gz::http://git.dbmail.eu/paul/dbmail/snapshot/dbmail-$pkgver.tar.gz"
+source=("http://www.dbmail.org/download/3.2/dbmail-${pkgver}.tar.gz"
+ "dbmail-imapd.xinetd"
+ "dbmail-lmtpd.xinetd"
+ "dbmail-pop3d.xinetd"
+ "dbmail-timsieved.xinetd")
+md5sums=('6375ea94b62e1752d8ecf3283eff100c'
+ '890de13361afbdf4fed12d6d7eb53e66'
+ '961593658cd596297d03d25eb9c9e98f'
+ '4cb764894abd3914802e90602bf90a0c'
+ 'e78dc86355f9aaf24590bc7c6611162f')
+
+build() {
+ cd $srcdir/dbmail-${pkgver}/
+ aclocal
+ automake --add-missing
+ autoreconf
+ [ -f Makefile ] || ./configure \
+ --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
+ --with-ldap --with-sieve \
+ --enable-systemd --enable-manpages
+ make
+}
+
+package() {
+ cd $srcdir/dbmail-${pkgver}/
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
+ mkdir $pkgdir/usr/share/dbmail
+ cp -r sql/* $pkgdir/usr/share/dbmail/
+ cp -a contrib $pkgdir/usr/share/dbmail/
+ cp dbmail.schema $pkgdir/usr/share/dbmail/
+
+ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do
+ install -Dm0644 $srcdir/$i.xinetd $pkgdir/etc/xinetd.d/$i
+ done
+}
Deleted: community-x86_64/dbmail-7-systemd.diff
===================================================================
--- community-x86_64/dbmail-7-systemd.diff 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-x86_64/dbmail-7-systemd.diff 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,176 +0,0 @@
-diff -wbBurN dbmail.git/configure.ac dbmail-3.1.5/configure.ac
---- dbmail.git/configure.ac 2013-09-05 18:07:48.661707165 +0400
-+++ dbmail-3.1.5/configure.ac 2013-09-09 15:05:17.639600103 +0400
-@@ -44,10 +44,6 @@
- AS_HELP_STRING([--enable-manpages], [Enable building and installation of man pages]))
- AM_CONDITIONAL(MANPAGES, [ test "$enable_manpages" = "yes" ])
-
--AC_ARG_ENABLE([systemd],
-- AS_HELP_STRING([--enable-systemd], [Enable systemd support]))
--AM_CONDITIONAL(SYSTEMD, [ test "$enable_systemd" = "yes" ])
--
- AC_PROG_CC
- AC_COMPILE_WARNINGS
- AC_C_CONST
-@@ -82,8 +78,9 @@
- AC_SUBST(DM_STATEDIR)
- AC_SUBST(DM_PKGLIBDIR)
- AC_SUBST(DM_PWD)
-+
- AC_PROG_LIBTOOL
-
--AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile systemd/Makefile)
-+AC_OUTPUT(src/dbmail.h Makefile src/Makefile src/modules/Makefile man/Makefile test/Makefile)
-
- DM_MSG_CONFIGURE_RESULTS
-diff -wbBurN dbmail.git/systemd/dbmail-imapd.service.in dbmail-3.1.5/systemd/dbmail-imapd.service.in
---- dbmail.git/systemd/dbmail-imapd.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-imapd.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail Imap Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-imapd.pid
--ExecStart=@sbindir@/dbmail-imapd -p @piddir@/dbmail-imapd.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail-lmtpd.service.in dbmail-3.1.5/systemd/dbmail-lmtpd.service.in
---- dbmail.git/systemd/dbmail-lmtpd.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-lmtpd.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail LMTP Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-lmtpd.pid
--ExecStart=@sbindir@/dbmail-lmtpd -p @piddir@/dbmail-lmtpd.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail-pop3d.service.in dbmail-3.1.5/systemd/dbmail-pop3d.service.in
---- dbmail.git/systemd/dbmail-pop3d.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-pop3d.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail pop3 Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-pop3d.pid
--ExecStart=@sbindir@/dbmail-pop3d -p @piddir@/dbmail-pop3d.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail-timsieved.service.in dbmail-3.1.5/systemd/dbmail-timsieved.service.in
---- dbmail.git/systemd/dbmail-timsieved.service.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail-timsieved.service.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1,11 +0,0 @@
--[Unit]
--Description=DBMail Sieve Server
--After=network.target mysqld.service postgresql.service
--
--[Service]
--Type=forking
--PIDFile=@piddir@/dbmail-timsieved.pid
--ExecStart=@sbindir@/dbmail-timsieved -p @piddir@/dbmail-timsieved.pid
--
--[Install]
--WantedBy=multi-user.target
-diff -wbBurN dbmail.git/systemd/dbmail.tmpfiles.in dbmail-3.1.5/systemd/dbmail.tmpfiles.in
---- dbmail.git/systemd/dbmail.tmpfiles.in 2013-09-05 18:07:48.711707166 +0400
-+++ dbmail-3.1.5/systemd/dbmail.tmpfiles.in 1970-01-01 03:00:00.000000000 +0300
-@@ -1 +0,0 @@
--d @piddir@ 0755 nobody nobody -
-diff -wbBurN dbmail.git/systemd/Makefile.am dbmail-3.1.5/systemd/Makefile.am
---- dbmail.git/systemd/Makefile.am 2013-09-07 16:12:34.840475834 +0400
-+++ dbmail-3.1.5/systemd/Makefile.am 1970-01-01 03:00:00.000000000 +0300
-@@ -1,68 +0,0 @@
--# Copyright (C) 1999-2004 IC & S dbmail at ic-s.nl
--# Copyright (c) 2004-2011 NFG Net Facilities Group BV support at nfg.nl
--#
--# This program is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License
--# as published by the Free Software Foundation; either
--# version 2 of the License, or (at your option) any later
--# version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--
--
--EXTRA_DIST = dbmail-imapd.service.in dbmail-lmtpd.service.in dbmail-pop3d.service.in dbmail-timsieved.service.in
--SYSTEMD_UNIT_DIR = /usr/lib/systemd/system
--SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d
--PID_DIR=/run/dbmail
--
--if SYSTEMD
--install-systemd: dbmail-imapd.service dbmail-lmtpd.service dbmail-pop3d.service dbmail-timsieved.service dbmail.tmpfiles
-- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
-- $(INSTALL_DATA) dbmail-imapd.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service
-- $(INSTALL_DATA) dbmail-lmtpd.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service
-- $(INSTALL_DATA) dbmail-pop3d.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service
-- $(INSTALL_DATA) dbmail-timsieved.service \
-- $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service
-- $(MKDIR_P) $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)
-- $(INSTALL_DATA) dbmail.tmpfiles \
-- $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.conf
--
--uninstall-systemd:
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-imapd.service
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-lmtpd.service
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-pop3d.service
-- rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/dbmail-timsieved.service
-- rm -f $(DESTDIR)$(SYSTEMD_TMPFILES_DIR)/dbmail.tmpfiles
--
--SUFFIXES=.service.in .service .tmpfiles.in .tmpfiles
--
--.service.in.service:
-- $(AM_V_GEN)sed \
-- -e 's|[@]sbindir[@]|$(sbindir)|g' \
-- -e 's|[@]piddir[@]|$(PID_DIR)|g' \
-- < $< > $@-t && \
-- mv $@-t $@
--
--.tmpfiles.in.tmpfiles:
-- $(AM_V_GEN)sed \
-- -e 's|[@]piddir[@]|$(PID_DIR)|g' \
-- < $< > $@-t && \
-- mv $@-t $@
--
--else
--install-systemd:
--uninstall-systemd:
--endif
--
--install-data-local: install-systemd
--uninstall-local: uninstall-systemd
-diff -wbBurN dbmail.git/Makefile.am dbmail-3.1.5/Makefile.am
---- dbmail.git/Makefile.am 2013-09-04 19:00:55.000000000 +0400
-+++ dbmail-3.1.5/Makefile.am 2013-09-09 15:14:22.549612297 +0400
-@@ -6,10 +6,6 @@
- SUBDIRS += man
- endif
-
--if SYSTEMD
--SUBDIRS += systemd
--endif
--
- testall:
- CK_FORK=no make check
- imaptest user=testuser1 pass=test port=10143 host=localhost test=test-scripts/imap
Deleted: community-x86_64/dbmail-imapd.xinetd
===================================================================
--- community-x86_64/dbmail-imapd.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-x86_64/dbmail-imapd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,13 +0,0 @@
-service imap
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-imapd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-x86_64/dbmail-imapd.xinetd (from rev 117900, dbmail/trunk/dbmail-imapd.xinetd)
===================================================================
--- community-x86_64/dbmail-imapd.xinetd (rev 0)
+++ community-x86_64/dbmail-imapd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,13 @@
+service imap
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-imapd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-x86_64/dbmail-lmtpd.xinetd
===================================================================
--- community-x86_64/dbmail-lmtpd.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-x86_64/dbmail-lmtpd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,13 +0,0 @@
-service lmtp
-{
- port = 24
- type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-lmtpd
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-}
Copied: dbmail/repos/community-x86_64/dbmail-lmtpd.xinetd (from rev 117900, dbmail/trunk/dbmail-lmtpd.xinetd)
===================================================================
--- community-x86_64/dbmail-lmtpd.xinetd (rev 0)
+++ community-x86_64/dbmail-lmtpd.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,13 @@
+service lmtp
+{
+ port = 24
+ type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-lmtpd
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+}
Deleted: community-x86_64/dbmail-pop3d.xinetd
===================================================================
--- community-x86_64/dbmail-pop3d.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-x86_64/dbmail-pop3d.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,13 +0,0 @@
-service pop3
-{
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-pop3d
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-x86_64/dbmail-pop3d.xinetd (from rev 117900, dbmail/trunk/dbmail-pop3d.xinetd)
===================================================================
--- community-x86_64/dbmail-pop3d.xinetd (rev 0)
+++ community-x86_64/dbmail-pop3d.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,13 @@
+service pop3
+{
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-pop3d
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
Deleted: community-x86_64/dbmail-timsieved.xinetd
===================================================================
--- community-x86_64/dbmail-timsieved.xinetd 2014-08-26 09:46:04 UTC (rev 117900)
+++ community-x86_64/dbmail-timsieved.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -1,15 +0,0 @@
-service sieve
-{
-# port = 2000
-# type = UNLISTED
- socket_type = stream
- wait = no
- user = nobody
- server = /usr/bin/dbmail-timsieved
- protocol = tcp
- server_args = -n
- log_on_failure += USERID
- disable = yes
-# env = EVENT_NOEPOLL=yes
-# instances = 200
-}
Copied: dbmail/repos/community-x86_64/dbmail-timsieved.xinetd (from rev 117900, dbmail/trunk/dbmail-timsieved.xinetd)
===================================================================
--- community-x86_64/dbmail-timsieved.xinetd (rev 0)
+++ community-x86_64/dbmail-timsieved.xinetd 2014-08-26 09:46:31 UTC (rev 117901)
@@ -0,0 +1,15 @@
+service sieve
+{
+# port = 2000
+# type = UNLISTED
+ socket_type = stream
+ wait = no
+ user = nobody
+ server = /usr/bin/dbmail-timsieved
+ protocol = tcp
+ server_args = -n
+ log_on_failure += USERID
+ disable = yes
+# env = EVENT_NOEPOLL=yes
+# instances = 200
+}
More information about the arch-commits
mailing list