[arch-commits] Commit in dbmail/trunk (PKGBUILD dbmail-7-systemd.diff)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Mon Sep 9 11:33:48 UTC 2013
Date: Monday, September 9, 2013 @ 13:33:48
Author: spupykin
Revision: 96963
upgpkg: dbmail 3.1.5-1
upd
Added:
dbmail/trunk/dbmail-7-systemd.diff
Modified:
dbmail/trunk/PKGBUILD
-----------------------+
PKGBUILD | 41 ++++++++---
dbmail-7-systemd.diff | 176 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 207 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-09-09 10:42:57 UTC (rev 96962)
+++ PKGBUILD 2013-09-09 11:33:48 UTC (rev 96963)
@@ -24,31 +24,52 @@
dbmail-imapd.xinetd
dbmail-lmtpd.xinetd
dbmail-pop3d.xinetd
- dbmail-timsieved.xinetd)
+ dbmail-timsieved.xinetd
+ "dbmail-1.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=45d83009e2d989e62af384432f2d71b133fecf4c"
+ "dbmail-2.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=d645222c7145127ed7f505e6b8325b5a996d1a74"
+ "dbmail-3.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=f294d43d0aa115e4c4b6c1dbcf72e6cd00badfd1"
+ "dbmail-4.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=10c9cb29ea92030b257937d3c49e0b45d15214c3"
+ "dbmail-5.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=4c23432cc270554557f9e130331214d81164131b"
+ "dbmail-6-sieve.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=92b98094a01eda5efe3ba3080e529482d08945a2"
+ "dbmail-7-systemd.diff")
md5sums=('033e7de6acff49d68beab93632a77761'
- 'c4b5793c5422b62a675d4c66ff7e9300'
- '5a6297cb03c8d0b424f978ea1d7402de'
- '070db88538af9833f003f4cb516d337b'
- '422f0399f97a780b7cab84443e8f429a'
- '15c7d367d4242aebac5f87649a2250aa'
'890de13361afbdf4fed12d6d7eb53e66'
'961593658cd596297d03d25eb9c9e98f'
'4cb764894abd3914802e90602bf90a0c'
- 'e78dc86355f9aaf24590bc7c6611162f')
+ 'e78dc86355f9aaf24590bc7c6611162f'
+ 'ea647952c0a66d36146b6d71c7b459b7'
+ '8dac89125d01885df97847537733d3dc'
+ '027bae99982dfe5ef69c598a24d0cd81'
+ '6a3b8ddbb162894d97d1d9cd3c5b8c4d'
+ '2679407f6290494ccc18b135d50dee6e'
+ 'b1063893dd0e74bc0ddee454bb65bf01'
+ 'a781a4ebe2dd75ed635c9b4a239b38d8')
+prepare() {
+ cd $srcdir/dbmail-${pkgver}/
+ ls -1 $srcdir/*.patch | while read p; do
+ msg "Patch: $p"
+ patch -p1 <$p
+ done
+ patch -Rp1 <$srcdir/dbmail-7-systemd.diff
+ aclocal
+ automake --add-missing
+ autoreconf
+}
+
build() {
cd $srcdir/dbmail-${pkgver}/
+ automake
[ -f Makefile ] || ./configure \
--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
- --with-ldap --with-sieve --enable-systemd
+ --with-ldap --with-sieve \
+ --enable-systemd --enable-manpages
make
- make -C man
}
package() {
cd $srcdir/dbmail-${pkgver}/
make DESTDIR=$pkgdir install
- make DESTDIR=$pkgdir install -C man
install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
mkdir $pkgdir/usr/share/dbmail
Added: dbmail-7-systemd.diff
===================================================================
--- dbmail-7-systemd.diff (rev 0)
+++ dbmail-7-systemd.diff 2013-09-09 11:33:48 UTC (rev 96963)
@@ -0,0 +1,176 @@
+diff -wbBurN dbmail.git/configure.in dbmail-3.1.5/configure.in
+--- dbmail.git/configure.in 2013-09-05 18:07:48.661707165 +0400
++++ dbmail-3.1.5/configure.in 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=syslog.target 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=syslog.target 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=syslog.target 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=syslog.target 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
More information about the arch-commits
mailing list