~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[alpine-aports] [PATCH] testing/exim: remove local_scan, fix config, add clamav subpackage

Details
Message ID
<1454348412-16412-1-git-send-email-valery.kartel@gmail.com>
Sender timestamp
1454348412
DKIM signature
missing
Download raw message
Patch: +33 -23
- remove local_scan feature for rspamd, because latest exim knows how to deal with rspamd
- fix default config line for clamav and add example line for rspamd
- clamav subpackage: have clamav as dependency, adds clamav user to exim group
---
 testing/exim/APKBUILD                 | 48 ++++++++++++++++++++---------------
 testing/exim/exim-clamav.post-install |  6 +++++
 testing/exim/exim.Makefile            |  2 --
 3 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 testing/exim/exim-clamav.post-install

diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index d8aeb19..dd5a68f 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Jesse Young <jlyo@jlyo.org>
pkgname=exim
pkgver=4.86
pkgrel=3
pkgrel=4
pkgdesc="A Message Transfer Agent"
url="http://www.exim.org/"
arch="all"
@@ -14,14 +14,17 @@ depends=
pkgusers="exim"
pkggroups="exim"
depends_dev=""
makedepends="bash gawk perl $depends_dev db-dev pcre-dev openssl-dev libspf2-dev mariadb-dev postgresql-dev sqlite-dev libidn-dev rspamd-contrib"
install="exim.pre-install exim.post-upgrade"
subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts $pkgname-doc"
makedepends="bash gawk perl $depends_dev db-dev pcre-dev openssl-dev libspf2-dev mariadb-dev postgresql-dev sqlite-dev libidn-dev"
install="$pkgname.pre-install $pkgname.post-upgrade $pkgname-clamav.post-install"
subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql
	$pkgname-utils $pkgname-scripts $pkgname-doc $pkgname-clamav
	"
source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.bz2
	exim.Makefile
	exim.confd
	exim.initd
	exim.logrotate"
	$pkgname.Makefile
	$pkgname.confd
	$pkgname.initd
	$pkgname.logrotate
"

_builddir="$srcdir"/$pkgname-$pkgver

@@ -31,7 +34,6 @@ prepare() {
	sed	-e 's/^LIBS = -lnsl/LIBS =/g' \
		-e 's/^HAVE_ICONV=yes/#HAVE_ICONV=yes/' \
		-i OS/Makefile-Linux
	cp /usr/share/rspamd/contrib/exim/local_scan.c Local
}

build() {
@@ -54,14 +56,10 @@ package() {
	install -Dm644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
	install -Dm750 -g $pkggroups -d "$pkgdir"/usr/lib/$pkgname
	install -Dm750 -o $pkgusers -d "$pkgdir"/var/log/$pkgname
	install -Dm750 -o $pkgusers -g mail -d "$pkgdir"/var/spool/$pkgname
	# Add rspamd local_scan config to exim.conf
	sed -i '/# begin local_scan/q' "$pkgdir"/etc/$pkgname/$pkgname.conf > /dev/null
	sed 's/^.*\*     /#/' < /usr/share/rspamd/contrib/exim/local_scan.c.in \
		| sed -n 25,30p >> "$pkgdir"/etc/$pkgname/$pkgname.conf
	echo -e "\n# End of Exim configuration file" >> "$pkgdir"/etc/$pkgname/$pkgname.conf
	sed -i \
		-e 's~# av_scanner = clamd:/tmp/clamd~# av_scanner = clamd:/run/clamav/clamd.sock~' \
		-e '/# spamd_address = 127.0.0.1 783/a# spamd_address = 127.0.0.1 11333 variant=rspamd' \
		"$pkgdir"/etc/$pkgname/$pkgname.conf
}

scripts() {
@@ -122,20 +120,28 @@ dnsdb() {
}

_inst_lookup() {
	install -D -m755 "$_builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/exim/$1.so
	install -D -m755 "$_builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/$pkgname/$1.so
}

clamav() {
	arch="noarch"
	pkgdesc="Allow clamd to scan messages in exim mail spool"
	depends="clamav"
	mkdir -p "$subpkgdir"
}

md5sums="797f248ef3e0c0e2f178e915f88fc4e9  exim-4.86.tar.bz2
26c4da6ee7dc8ee9badce4e395d1c469  exim.Makefile
85348d0fed6b35f5c0b4241023269a19  exim.Makefile
186f4491800be8c56ce39320f24d7264  exim.confd
871a2839c3814412a820b79095cc2a4d  exim.initd
2eff3af519bdf8acf0292fffe89871a5  exim.logrotate"
sha256sums="f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456  exim-4.86.tar.bz2
cc58c4f79052f264c14abe0886605115570ece5e759242c7deca9cf84585e06d  exim.Makefile
9afac834b73fe6cdf3b45efdb89428a790e2a2b68bdbaafecd8d9fcfbe2ef35d  exim.Makefile
db711754c48dfb7e3810009a1c6ffa331625c9d74d00dc8fa8256d9fa2c353f0  exim.confd
6dbdf67ab4dc82142c46901ed7ceed5fca09af037071630809929e1fb545b89e  exim.initd
b5a6d449cb1998beb44d4144ef97e66a98b46d164445989a6d624c80549f24bc  exim.logrotate"
sha512sums="0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab  exim-4.86.tar.bz2
852593762e87ab2aad825d69d9a40dfb1e0b16c6f94ae25f8f72f90e4a459cd75e2c6d53dc354645cc433591b86508cd91a2272e409950af5cdc1bdacf65d16d  exim.Makefile
0a3d5908f397c34c21e8a82c8d5d5e02644f30e7323f1da7acce2ebe74918da5eefe04945a5a0f3edf21881d04d1bf1e470e6bac5b6de930a6b82a4e012ce7a5  exim.Makefile
bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66  exim.confd
cd7a27922d6cce59cf2dbedaab6f90159614cd6566b5d7ff7e232acf76a42b697709bb85981ffa88b60a7ee326bb88f1892f2405495ca228b4ec025885e65ed6  exim.initd
28e748693a6a72d9943fa9c342ff041fe650fa6977f468dee127e845e6c2a91872ce33fb6f5698838906bde3ed92de7a91cdb0349cedc40b806261867e8c06cb  exim.logrotate"
diff --git a/testing/exim/exim-clamav.post-install b/testing/exim/exim-clamav.post-install
new file mode 100644
index 0000000..5dbe556
--- /dev/null
+++ b/testing/exim/exim-clamav.post-install
@@ -0,0 +1,6 @@
#!/bin/sh

adduser clamav exim 2>/dev/null
echo "Restart clamav before using it with exim"

exit 0
diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile
index 40a9ed4..68d21d8 100644
--- a/testing/exim/exim.Makefile
+++ b/testing/exim/exim.Makefile
@@ -70,5 +70,3 @@ HAVE_IPV6=YES
CONFIGURE_FILE_USE_NODE=yes
CONFIGURE_FILE_USE_EUID=yes
SUPPORT_MOVE_FROZEN_MESSAGES=yes
LOCAL_SCAN_SOURCE=Local/local_scan.c
LOCAL_SCAN_HAS_OPTIONS=yes
-- 
2.7.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)