X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org 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 B00B8DC0084 for ; Thu, 27 Nov 2014 15:26:31 +0000 (UTC) Received: from aveo.com.ua ([195.144.25.27] helo=localhost) by relay1.infogroup.kiev.ua with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1Xu0xg-0004eS-S3; Thu, 27 Nov 2014 17:26:29 +0200 Received: by localhost (sSMTP sendmail emulation); Thu, 27 Nov 2014 17:27:11 +0200 From: "Valery Kartel" To: alpine-devel@lists.alpinelinux.org Cc: Valery Kartel Subject: [alpine-devel] [PATCH] testing/exim: upgrade to 4.84, add SPF support, made some tidying to work out of box Date: Thu, 27 Nov 2014 17:26:58 +0200 Message-Id: <1417102018-7064-1-git-send-email-valery.kartel@gmail.com> X-Mailer: git-send-email 2.2.0 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/exim/APKBUILD | 40 +++++++++++++++++++++++----------------- testing/exim/exim.Makefile | 8 ++++---- testing/exim/exim.initd | 2 +- testing/exim/exim.logrotate | 2 +- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD index 7aad8b7..fa46dce 100644 --- a/testing/exim/APKBUILD +++ b/testing/exim/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Jesse Young # Maintainer: Jesse Young pkgname=exim -pkgver=4.82 +pkgver=4.84 pkgrel=0 pkgdesc="A Message Transfer Agent" url="http://www.exim.org/" arch="all" license="GPL2" -depends="openssl" -depends_dev="db-dev pcre-dev openssl-dev" +depends="openssl libspf2" +depends_dev="db-dev pcre-dev openssl-dev libspf2-dev" makedepends="$depends_dev" install= subpackages="$pkgname-doc" @@ -48,8 +48,14 @@ package() { install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \ ${pkgdir}/var/log/exim ${pkgdir}/usr/lib \ - ${pkgdir}/var/log/exim ${pkgdir}/usr/sbin - chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim + ${pkgdir}/var/log/exim ${pkgdir}/usr/sbin \ + ${pkgdir}/var/spool/mail + chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db + chmod 750 ${pkgdir}/var/log/exim ${pkgdir}/etc/mail + chmod 03775 ${pkgdir}/var/spool/mail + chown root:mail ${pkgdir}/var/spool/mail ${pkgdir}/etc/mail + chown mail:mail ${pkgdir}/var/log/exim + install -D -m644 src/configure.default ${pkgdir}/etc/mail/exim.conf cd build-Linux-* for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\ exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\ @@ -75,21 +81,21 @@ package() { install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="feb933baa4db773c2ef76b794c60b647 exim-4.82.tar.bz2 -7dfc9ed9307db655c8aec33b9618608d exim.Makefile +md5sums="3d14522e604b687b9e515f5aa739b2c0 exim-4.84.tar.bz2 +90e01a407bfb32c406f5265d06c26ad7 exim.Makefile f442b68d435598831bab8536ade071b8 exim.confd -55923aa95e8445eb9390485435c63084 exim.initd -281ad020d1df8c6ed0f4ecb53c0fce63 exim.logrotate +6ba3c29545484c152df7ac8656943891 exim.initd +8e8003542b9b8cd6300e46c24c302802 exim.logrotate eaec7a2a5f49b768fa168415ef0105fb aliases" -sha256sums="46dedfb6ced2aa4a1eddc5d8ce46a790a961508bd389faa2e215302ae80d91cf exim-4.82.tar.bz2 -3a57b01e89cf0d00b6fff92edfcd31402bd07b569a3a642b323417e0db025727 exim.Makefile +sha256sums="78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c exim-4.84.tar.bz2 +0b6f24deea28bd236139dadef9632deb5255ac082bb9988dfac705d67034c92d exim.Makefile 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401 exim.confd -e9123cd5f4d062931006b2b485479b7f30e07a85f23c19476df243943f296f7b exim.initd -8c8e074b3ba2e99b83e89e8f20105846a19263ad63997def70f41ffb3835bc8e exim.logrotate +46869c47ff928c5628113e4a76ea469e8202339305b781ada0e37dcf6cd5bf76 exim.initd +49b4d81d6823057c89f7734b2d76de389d427af56164faad32ec883f8ca9e804 exim.logrotate f2943990feb2ddfb93e8b0816ef914e7057cb5d48a093901881e970b1002ab8a aliases" -sha512sums="3f65d99e737a524c5ca84bd912193774418134d77f38868258890945c559f3890af470723da7e88a601af3bd4e8055302db59c455381dc26d573d38b64e2f2ca exim-4.82.tar.bz2 -f2fea5d347b1570c664df0a4b298d2eef8efbb23dce91e24fe4ac5929d052f645fe0fdd4032820fdb44f713ef0ef39f96b915179d690b1209801c41f0040f721 exim.Makefile +sha512sums="3cd41af6d57e5f0377fc93367753eae6cb6bf835803e8608c44e1da5acefce1ed8886f4fe7536950de072bfed6e927afe1536c1e6466cf3121dd352b69a68039 exim-4.84.tar.bz2 +e6936db8316fbbd32ea9828137eaeeb2e84053252ce1c180015b99d70a9f8ad5a4dcbad565595e19c06a48498ee2df8e86b22efb6ca2bca64af13a4395a89f23 exim.Makefile 24bae5bba1b41e59247cd7089c3f9ffcc5f4b26c3da1b21f755724a7ee5c99a05e324437c965ae86170056cc63b9bcdc41f624a747ab31b887d69cff620f2155 exim.confd -e6659a9b81d34a80ad2c44594ba9a491f7be5bbdb6968736fb22f314e04e4ac9be9fd3e6541ebdf6a31a287b524f5484124fa19c1a1ddc52d8455d80a6f0f8d8 exim.initd -079986bc315cfcf58de0d321de4b036c8322212ef2e3cc9601d086040ec5c6a29e0073627f5d0ea7673c9efbcc8144457617ec97c47cb64f5ad6157f67eab67d exim.logrotate +aeec8762d1dce4b09049e08d0c275ae475e639c4a3ad667c4208df36eba71c544311f5c175d7f481ea84213cf130da0a77a0e32d3ff7e933a7356deab8c4e850 exim.initd +665bfa5ced8829f8f199bbcd040c1c667193643c6d902e5412679cf138e4c8cda7ffd0eefc8ff3b76d95202ee52d0c372b7c319746ff590dd6b61b93c1a2fedf exim.logrotate 9cc0fe81b2110aecdd3d494650d051f773c2c83611692c4e5d365b89dcddd08b16af5b8f5f4ac3e3f553c36198846a05793d8fd01113f62d2ab761f555409201 aliases" diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile index a7ec877..533b214 100644 --- a/testing/exim/exim.Makefile +++ b/testing/exim/exim.Makefile @@ -133,7 +133,7 @@ CONFIGURE_FILE=/etc/mail/exim.conf # deliveries. (Local deliveries run as various non-root users, typically as the # owner of a local mailbox.) Specifying these values as root is not supported. -EXIM_USER=ref:exim +EXIM_USER=ref:mail # If you specify EXIM_USER as a name, this is looked up at build time, and the # uid number is built into the binary. However, you can specify that this @@ -404,9 +404,9 @@ WITH_OLD_DEMIME=yes # installed on your system (www.libspf2.org). Depending on where it is installed # you may have to edit the CFLAGS and LDFLAGS lines. -# EXPERIMENTAL_SPF=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lspf2 +EXPERIMENTAL_SPF=yes +CFLAGS += -I/usr/local/include +LDFLAGS += -lspf2 # Uncomment the following lines to add SRS (Sender rewriting scheme) support. # You need to have libsrs_alt installed on your system (srs.mirtol.com). diff --git a/testing/exim/exim.initd b/testing/exim/exim.initd index 745d1ab..3662ebe 100644 --- a/testing/exim/exim.initd +++ b/testing/exim/exim.initd @@ -13,7 +13,7 @@ depend() { start() { ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --exec /usr/sbin/exim --pidfile /var/run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m} + start-stop-daemon --start --quiet --exec /usr/sbin/exim --pidfile /var/run/${SVCNAME}.pid -- ${EXIM_OPTS:--bd -q15m} eend $? } diff --git a/testing/exim/exim.logrotate b/testing/exim/exim.logrotate index 7d99b55..c923ed1 100644 --- a/testing/exim/exim.logrotate +++ b/testing/exim/exim.logrotate @@ -1,4 +1,4 @@ -/var/log/exim/exim*.log { +/var/log/exim/*log { daily missingok rotate 28 -- 2.2.0 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---