X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 2070CDC07DC for ; Wed, 7 Oct 2015 14:59:09 +0000 (UTC) Received: from relay1.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id CF3B3DC07C9 for ; Wed, 7 Oct 2015 14:59:08 +0000 (UTC) Received: from aveo.com.ua ([195.144.25.27] helo=csync2host1) by relay1.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1ZjqBO-0005Xk-KH; Wed, 07 Oct 2015 17:59:06 +0300 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Cc: Valery Kartel Subject: [alpine-aports] [PATCH] testing/exim: move config from /etc/mail to /etc/exim. lsearch used in default config, so compile it builtin. init-script cleanup Date: Wed, 7 Oct 2015 18:02:20 +0300 Message-Id: <1444230140-12189-1-git-send-email-valery.kartel@gmail.com> X-Mailer: git-send-email 2.5.3 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/exim/APKBUILD | 43 +++++++++++++++++++++--------------------- testing/exim/exim.Makefile | 4 ++-- testing/exim/exim.confd | 2 +- testing/exim/exim.initd | 19 ++++++------------- testing/exim/exim.post-upgrade | 5 +++++ testing/exim/exim.pre-install | 4 ++-- 6 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 testing/exim/exim.post-upgrade diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD index e5a72bf..45054a9 100644 --- a/testing/exim/APKBUILD +++ b/testing/exim/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Jesse Young pkgname=exim pkgver=4.86 -pkgrel=0 +pkgrel=1 pkgdesc="A Message Transfer Agent" url="http://www.exim.org/" arch="all" @@ -14,14 +14,15 @@ pkgusers="mail" pkggroups="mail" depends_dev="db-dev pcre-dev openssl-dev libspf2-dev mariadb-dev postgresql-dev sqlite-dev" makedepends="bash gawk perl $depends_dev" -install="exim.pre-install" -subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-dsearch $pkgname-lsearch $pkgname-passwd $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc" +install="exim.pre-install exim.post-upgrade" +subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-dsearch $pkgname-passwd $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc" source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.bz2 exim.Makefile exim.confd exim.initd exim.logrotate - exim.pre-install" + exim.pre-install + exim.post-upgrade" _builddir="$srcdir"/$pkgname-$pkgver @@ -41,6 +42,7 @@ build() { package() { cd "$_builddir" + install -m750 -D -g mail -d "$pkgdir"/etc/mail make DESTDIR="$pkgdir" INSTALL_ARG="-no_symlink -no_chown exim" install || return 1 install -D -m644 doc/exim.8 "$pkgdir"/usr/share/man/man8/exim.8 cd "$pkgdir"/usr/sbin @@ -119,12 +121,6 @@ passwd() { _inst_lookup passwd } -lsearch() { - pkgdesc="lsearch support for exim" - depends="exim" - _inst_lookup lsearch -} - dsearch() { pkgdesc="dsearch support for exim" depends="exim" @@ -135,20 +131,23 @@ _inst_lookup() { install -D -m755 "$_builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/exim/$1.so } md5sums="797f248ef3e0c0e2f178e915f88fc4e9 exim-4.86.tar.bz2 -0be1e158f62e640207434fd5cfabc4cd exim.Makefile -f442b68d435598831bab8536ade071b8 exim.confd -e0fa6d1083540e714842e4b1a55d4ada exim.initd +73b2641c77c2ce07d935afe39ebd0084 exim.Makefile +7fac36b4683fe9e2bd1969ebfded4206 exim.confd +6c7ea5b5d180e398f3fb0dd0c5f3b22f exim.initd 2aeee003b9526472608bdc4194fb95de exim.logrotate -a58ceadf9f3fa8b06bbadb01bc731dc8 exim.pre-install" +5d98a55beab23793dfa503995aa29905 exim.pre-install +038f3285d40f49512fdf178758ccbe5b exim.post-upgrade" sha256sums="f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456 exim-4.86.tar.bz2 -05c4fb0c655a4129340fe7f93cabb6566fc68e1bd8b1f81a3f57ceffcf8276cb exim.Makefile -668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401 exim.confd -d94efedd5b36d40dc7a0b87dcc6acc01ab2886799e8b7d71a86aa81d2e01b02c exim.initd +e522e9fb0753ef4becc32b9f6e476b25643b8232519b1bedaf90034d01fe68e0 exim.Makefile +02ccb013b3f29183969dceb2dc1285cfacc18b1e8a8a052ace7bc85171ea1a27 exim.confd +171171b454d51b861c30c9ce84af8885d79ac0f287799290dfdda53f3a6cbe7e exim.initd 71aa7865eea47bb65737cf65e01a73054f34d2feab23d5905619ca1c079041d6 exim.logrotate -3470a7f2860b0c01549577edf446fc13cdcf3e10e1b52875eee666017227db03 exim.pre-install" +50dc0ed25acce493f87057530de2ca110eaa218b59cc1bba0f08f881d6660a1a exim.pre-install +4426e7962f027bcf4808d96ee37f2de148030e42ada6cabddcc05e765ac7f3ec exim.post-upgrade" sha512sums="0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab exim-4.86.tar.bz2 -ff4aa735c9050a7a848c6eb2be5ec38685d3f4bf4bbc005616bf3321f0d98895071e423bc590a551ffd895315e2e91446f6bc9c665aa78a52d9016ef14b8b13f exim.Makefile -24bae5bba1b41e59247cd7089c3f9ffcc5f4b26c3da1b21f755724a7ee5c99a05e324437c965ae86170056cc63b9bcdc41f624a747ab31b887d69cff620f2155 exim.confd -5a656df7b15f8007114e1788bff15e87d4b113e2b46a46da24b94f8e8d5997f06d921086ea3d75761ca126829159784d3ef859d6b90a6bfcf5ec1fb370a0df11 exim.initd +afd8a7969bcfa7a51fd8012e3f1127b9f00219e09dba4bae95f402083cdc99746a58818cb5943eb601ad5bfbc2ca8e1fd8b8b1bb6015c5b79e02da4bf09c0349 exim.Makefile +dfc5e5e266c8a249728c7924f66223eadadf69e38b7ad3ae41197fcdb545a4c3a835939941dff41a948f7e26cbab9d5f1a8c412d27b87a0596c0f9d4f0e43eec exim.confd +afcd96eab622c02897d9e0d79dc34aa3f67b0153b1019f6338f3574d8bc59093e791208b6d2785299dd2fc86cab2d5226c1cc2e6b4aca7302914f7d2e06eb901 exim.initd b5d197c7da4318d2040395fe7eb9046442604a695530fc861594d0cb38e6ad7f5e56ac1204639c18ac93a005f56ea3d8054ac5c823c54c4cc21fd77266080407 exim.logrotate -6b6e85f392cd338602653b86f88daedf90a735e04f9bbcbac83df357ec881f436a74aedd91db21bd1e2e510eedea39587ae473efa7be9b75c6e2efe0472cf28d exim.pre-install" +37464fb55f58db11799df2b0a95cf5d6ef4ad2ca9951d970a5261d59aa008d0db5d3310d33ff6dacddef885d387f6c8482bd1d6025826d1dc4d9afc21af02731 exim.pre-install +dc79ba01166b0ca7bcb94eb55492daeafc5031ce1901d6908b585fd3b3625cb4ebfcb4b11b12ce204e04bbcffb33ea44c8a93f580e22a8ad812909744d6d67dd exim.post-upgrade" diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile index a91d601..2f90c44 100644 --- a/testing/exim/exim.Makefile +++ b/testing/exim/exim.Makefile @@ -1,5 +1,5 @@ BIN_DIRECTORY=/usr/sbin -CONFIGURE_FILE=/etc/mail/exim.conf +CONFIGURE_FILE=/etc/exim/exim.conf EXIM_USER=ref:mail SPOOL_DIRECTORY=/var/spool/exim ROUTER_ACCEPT=yes @@ -18,7 +18,7 @@ SUPPORT_MAILDIR=yes LOOKUP_MODULE_DIR=/usr/lib/exim/ CFLAGS_DYNAMIC=-shared -rdynamic -fPIC LOOKUP_DBM=2 -LOOKUP_LSEARCH=2 +LOOKUP_LSEARCH=yes LOOKUP_DSEARCH=2 LOOKUP_CDB=2 LOOKUP_DNSDB=2 diff --git a/testing/exim/exim.confd b/testing/exim/exim.confd index a3974d3..692d44a 100644 --- a/testing/exim/exim.confd +++ b/testing/exim/exim.confd @@ -1,2 +1,2 @@ # Command-line options for running exim -EXIM_OPTS="-bd -q15m" +#EXIM_OPTS="-bd -q15m" diff --git a/testing/exim/exim.initd b/testing/exim/exim.initd index 8e28705..15a7489 100644 --- a/testing/exim/exim.initd +++ b/testing/exim/exim.initd @@ -1,5 +1,10 @@ #!/sbin/openrc-run +name="$SVCNAME" +pidfile="/var/run/$SVCNAME.pid" +command="/usr/sbin/$SVCNAME" +command_args="${EXIM_OPTS:--bd -q15m}" +required_files="/etc/exim/${SVCNAME}.conf" extra_started_commands="reload" depend() { @@ -8,20 +13,8 @@ depend() { provide mta } -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --exec /usr/sbin/${SVCNAME} --pidfile /var/run/${SVCNAME}.pid -- ${EXIM_OPTS:--bd -q15m} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid --name ${SVCNAME} - eend $? -} - reload() { ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile /var/run/${SVCNAME}.pid --name ${SVCNAME} + start-stop-daemon --signal HUP --pidfile ${pidfile} --name ${SVCNAME} eend $? } diff --git a/testing/exim/exim.post-upgrade b/testing/exim/exim.post-upgrade new file mode 100644 index 0000000..f198f46 --- /dev/null +++ b/testing/exim/exim.post-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +mv /etc/mail/exim.conf /etc/exim/ >/dev/null 2>&1 + +exit 0 diff --git a/testing/exim/exim.pre-install b/testing/exim/exim.pre-install index 42712e6..c06f297 100644 --- a/testing/exim/exim.pre-install +++ b/testing/exim/exim.pre-install @@ -1,6 +1,6 @@ #!/bin/sh -addgroup -S -g 12 mail 2>/dev/null -adduser -S -u 8 -h /var/spool/mail -s /sbin/nologin -g mail -G mail -D mail 2>/dev/null +addgroup -S -g 12 mail > /dev/null 2>&1 +adduser -S -u 8 -h /var/spool/mail -s /sbin/nologin -g mail -G mail -D mail > /dev/null 2>&1 exit 0 -- 2.5.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---