From 7206fe8df0629f0326d830566622c675dba99add Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Jun 2015 09:41:47 +0200 Subject: [PATCH] postfix: move to usr/bin; remove systemd support. --- srcpkgs/postfix/files/postfix.service | 14 -------------- srcpkgs/postfix/template | 14 +++----------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/postfix/files/postfix.service diff --git a/srcpkgs/postfix/files/postfix.service b/srcpkgs/postfix/files/postfix.service deleted file mode 100644 index a7cdc537921..00000000000 --- a/srcpkgs/postfix/files/postfix.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Postfix Mail Transport Agent -After=network.target - -[Service] -Type=forking -PIDFile=/var/spool/postfix/pid/master.pid -ExecStart=/usr/bin/postfix start -ExecStop=/usr/bin/postfix stop -ExecReload=/usr/bin/postfix reload -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index b2b8730cb25..30113214719 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,7 +1,7 @@ # Template file for 'postfix' pkgname=postfix version=3.0.1 -revision=1 +revision=2 short_desc="High-performance mail transport agent" maintainer="Juan RP " license="IBM Public License 1.0, BSD-alike" @@ -10,9 +10,8 @@ distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/$pkgname-$ve checksum=cd2bd6447fe3368bb1a39f482f8dd1eec87c63067a0eb75f9aec8e4eadd21328 hostmakedepends="perl" -makedepends="libressl-devel db-devel pcre-devel libsasl-devel - libldap-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel - icu-devel" +makedepends="icu-devel libressl-devel db-devel pcre-devel libsasl-devel + libldap-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel" if [ "$CROSS_BUILD" ]; then # XXX postfix-install needs native binaries. @@ -20,7 +19,6 @@ if [ "$CROSS_BUILD" ]; then fi build_pie=yes -build_options="systemd" system_accounts="postfix" postfix_homedir="/var/spool/postfix" system_groups="postdrop" @@ -89,8 +87,6 @@ pre_install() { } do_install() { sh postfix-install -non-interactive install_root=${DESTDIR} - vmkdir usr/sbin - ln -s /usr/bin/sendmail ${DESTDIR}/usr/sbin/sendmail vinstall LICENSE 644 usr/share/licenses/${pkgname} vinstall TLS_LICENSE 644 usr/share/licenses/${pkgname} @@ -98,9 +94,5 @@ do_install() { cd $DESTDIR patch -p0 -i ${FILESDIR}/aliases.patch - # systemd - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/postfix.service 644 usr/lib/systemd/system - fi vsv postfix }