[arch-commits] Commit in exim/trunk (8 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Sun May 12 06:04:48 UTC 2013
Date: Sunday, May 12, 2013 @ 08:04:48
Author: bpiotrowski
Revision: 90376
upgpkg: exim 4.80.1-2
- remove deprecated rc.d script
- move binaries to /usr/bin
Modified:
exim/trunk/PKGBUILD
exim/trunk/exim-submission at .service
exim/trunk/exim.Makefile
exim/trunk/exim.install
exim/trunk/exim.service
exim/trunk/exim at .service
Deleted:
exim/trunk/exim
exim/trunk/exim.conf.d
--------------------------+
PKGBUILD | 26 ++++++++++----------------
exim | 42 ------------------------------------------
exim-submission at .service | 2 +-
exim.Makefile | 2 +-
exim.conf.d | 1 -
exim.install | 2 +-
exim.service | 2 +-
exim at .service | 2 +-
8 files changed, 15 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-12 06:04:31 UTC (rev 90375)
+++ PKGBUILD 2013-05-12 06:04:48 UTC (rev 90376)
@@ -5,12 +5,12 @@
pkgname=exim
pkgver=4.80.1
-pkgrel=1
+pkgrel=2
pkgdesc="Message Transfer Agent"
arch=('x86_64' 'i686')
url='http://www.exim.org/'
license=('GPL')
-backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim etc/conf.d/exim)
+backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
install=exim.install
depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
provides=('smtp-server')
@@ -18,9 +18,7 @@
options=('!makeflags')
source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
aliases
- exim
exim.logrotate
- exim.conf.d
exim.Makefile
exim-submission at .service
exim.service
@@ -29,13 +27,11 @@
exim-submission.socket)
sha256sums=('9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f'
'932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
- '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
'7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
- '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
- '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55'
- '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324'
- '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445'
- '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4'
+ 'd33b8595e92ec812c9f6961f98e50b6a3986d5bd966ed4efec2c52c1fce47636'
+ '55719e8b823702b0054584326ca28349b7487e5be9e567ddc7a6e6259767e05b'
+ '652250d99479b58b7127ff60c29f28ca09ebac09cab7e54771d62ce38407012d'
+ 'faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73'
'3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26'
'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee')
@@ -50,19 +46,17 @@
cd "$srcdir/$pkgname-$pkgver"
install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
- install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim"
install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
- install -Dm0755 $srcdir/exim "${pkgdir}/etc/rc.d/exim"
mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \
- "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,sbin}
+ "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,bin}
chmod 770 "${pkgdir}/var/spool/exim" "${pkgdir}/var/spool/exim/db" "${pkgdir}/var/log/exim"
cd build-Linux-*
for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \
exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do
- install -m0755 "$i" "$pkgdir/usr/sbin"
+ install -m0755 "$i" "$pkgdir/usr/bin"
done
cd "$srcdir/exim-$pkgver/src"
@@ -71,12 +65,12 @@
cp "$srcdir/aliases" "$pkgdir/etc/mail"
- cd "$pkgdir/usr/sbin"
+ cd "$pkgdir/usr/bin"
for i in mailq rmail rsmtp runq sendmail; do
ln -s exim "$i"
done
# fhs compliancy
- ln -s ../sbin/exim ../lib/sendmail
+ ln -s ../bin/exim ../lib/sendmail
install -Dm0644 "$srcdir/exim-submission at .service" \
"${pkgdir}/usr/lib/systemd/system/exim-submission at .service"
Deleted: exim
===================================================================
--- exim 2013-05-12 06:04:31 UTC (rev 90375)
+++ exim 2013-05-12 06:04:48 UTC (rev 90376)
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/exim`
-
-case "$1" in
- start)
- stat_busy "Starting Exim"
- [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon exim
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Exim"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/exim.pid
- rm_daemon exim
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Modified: exim-submission at .service
===================================================================
--- exim-submission at .service 2013-05-12 06:04:31 UTC (rev 90375)
+++ exim-submission at .service 2013-05-12 06:04:48 UTC (rev 90376)
@@ -6,6 +6,6 @@
Description=Exim Mail Daemon per-connection server (message submission)
[Service]
-ExecStart=-/usr/sbin/exim -bs
+ExecStart=-/usr/bin/exim -bs
StandardInput=socket
StandardError=syslog
Modified: exim.Makefile
===================================================================
--- exim.Makefile 2013-05-12 06:04:31 UTC (rev 90375)
+++ exim.Makefile 2013-05-12 06:04:48 UTC (rev 90376)
@@ -100,7 +100,7 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
-BIN_DIRECTORY=/usr/sbin
+BIN_DIRECTORY=/usr/bin
#------------------------------------------------------------------------------
Deleted: exim.conf.d
===================================================================
--- exim.conf.d 2013-05-12 06:04:31 UTC (rev 90375)
+++ exim.conf.d 2013-05-12 06:04:48 UTC (rev 90376)
@@ -1 +0,0 @@
-EXIM_ARGS="-bd -q15m"
Modified: exim.install
===================================================================
--- exim.install 2013-05-12 06:04:31 UTC (rev 90375)
+++ exim.install 2013-05-12 06:04:48 UTC (rev 90376)
@@ -9,7 +9,7 @@
passwd -l exim > /dev/null
chown root.exim /var/spool/exim /var/log/exim
chown exim.exim /var/spool/exim/db
- chmod u+s /usr/sbin/exim
+ chmod u+s /usr/bin/exim
}
# arg 1: the new package version
Modified: exim.service
===================================================================
--- exim.service 2013-05-12 06:04:31 UTC (rev 90375)
+++ exim.service 2013-05-12 06:04:48 UTC (rev 90376)
@@ -3,7 +3,7 @@
[Service]
PIDFile=/var/run/exim.pid
-ExecStart=/usr/sbin/exim -bdf -q30m
+ExecStart=/usr/bin/exim -bdf -q30m
ExecReload=/bin/kill -HUP $MAINPID
[Install]
Modified: exim at .service
===================================================================
--- exim at .service 2013-05-12 06:04:31 UTC (rev 90375)
+++ exim at .service 2013-05-12 06:04:48 UTC (rev 90376)
@@ -2,6 +2,6 @@
Description=Exim Mail Daemon per-connection server
[Service]
-ExecStart=-/usr/sbin/exim -bs
+ExecStart=-/usr/bin/exim -bs
StandardInput=socket
StandardError=syslog
More information about the arch-commits
mailing list