Received: from vikavolt.denkimushi.com (vikavolt.denkimushi.com [212.159.101.34])
	by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 80851781D5D
	for <alpine-aports@lists.alpinelinux.org>; Tue, 25 Feb 2020 08:40:52 +0000 (UTC)
Received: from localhost.localdomain (unknown [192.168.88.3])
	by vikavolt.denkimushi.com (Postfix) with ESMTP id B92831D795;
	Tue, 25 Feb 2020 08:40:45 +0000 (GMT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denkimushi.com;
	s=dkim; t=1582620046;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding;
	bh=/mzh48A9/Y0fDpTbW1oycxWBWTImxghHjhjJGJ4egHk=;
	b=R/m6JEbXTcBjordcxtIhimKFMEkzNDL7c54pyl9PvFdeBDphiE5wbpJtLpPMulcz8zATLH
	aajxSinf0JyEkc8hOYD+iMi2fjggDbXs/gP+GXp8XnfWZHU/5ckq1yfymhyS+MhNYfyIo1
	gRYupeyF1Ik50TweZGUW6mHCFg4rRYM=
From: Duncan Bellamy <dunk@denkimushi.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Duncan Bellamy <dunk@denkimushi.com>
Subject: [PATCH] testing/dcc: arrange files better
Date: Tue, 25 Feb 2020 08:40:22 +0000
Message-Id: <20200225084022.32267-1-dunk@denkimushi.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=denkimushi.com;
	s=dkim; t=1582620046;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding;
	bh=/mzh48A9/Y0fDpTbW1oycxWBWTImxghHjhjJGJ4egHk=;
	b=wHzsiMK3PStoOhArRaH2m+8ahi2wteEzHxEbzfWMDFBOoTChfC81ZOE7/dTXxA/EP8LI6k
	H5t7n5XoWv0CGcokmrmiFTGBJSoas00AyiPNa08QTu/GBjXqbwdx6+86t+gn/GyZqKRAzB
	/xD6Ji8H0YWmRlYhSRkBcp48suTyFZc=
ARC-Authentication-Results: i=1;
	vikavolt.denkimushi.com;
	none
ARC-Seal: i=1; s=dkim; d=denkimushi.com; t=1582620046; a=rsa-sha256;
	cv=none;
	b=Nntr1l/teDrQqdxLt3GIObwjoFVzmKK+Nt6UYmUWXkzQLhAkfDU+mXGLOi1Jhvpik6dXc+
	9b8H/wRJhbi3WPcpBNwuUonYUVl43ouXzk8hKNOeiFbX0hKGtvxlB9qU3jljAwSDcVSQvY
	aPkGlzL9wwGj2uOIkV7AfTISFVlMW0w=

add dcc.post-deinstall to remove crontab entry created during install
remove dcc-openrc from depends as other packages do not do this
add dccif-test to dcc-dccifd package
move dccproc to extras as procmail is depreciated
add extras to subpackages as it was missing
---
 testing/dcc/APKBUILD           | 15 ++++++++-------
 testing/dcc/dcc.post-deinstall |  5 +++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 testing/dcc/dcc.post-deinstall

diff --git a/testing/dcc/APKBUILD b/testing/dcc/APKBUILD
index e9a5bae765..847dd95b32 100644
--- a/testing/dcc/APKBUILD
+++ b/testing/dcc/APKBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Duncan Bellamy <dunk@denkimushi.com>
 pkgname="dcc"
 pkgver="2.3.167"
-pkgrel=1
+pkgrel=2
 pkgdesc="Distributed Checksum Clearinghouses or DCC spam filter"
 url="https://www.dcc-servers.net/dcc/"
 arch="all"
 license="custom"
 pkgusers="dcc"
 pkggroups="dcc"
-depends="dcc-openrc"
+#depends=""
 makedepends="libmilter-dev"
-subpackages="$pkgname-dccd $pkgname-dccifd $pkgname-dccm
+subpackages="$pkgname-dccd $pkgname-dccifd $pkgname-dccm $pkgname-extras
 	$pkgname-openrc $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://www.dcc-servers.net/src/dcc/old/dcc-$pkgver.tar.Z
 	10-$pkgname-alpine.patch
@@ -19,7 +19,8 @@ source="$pkgname-$pkgver.tar.gz::https://www.dcc-servers.net/src/dcc/old/dcc-$pk
 	$pkgname.confd
 	$pkgname.initd
 "
-install="$pkgname.pre-install $pkgname.post-install"
+install="$pkgname.pre-install $pkgname.post-install $pkgname.post-deinstall"
+
 options="!check"
 
 prepare() {
@@ -63,7 +64,7 @@ dccifd() {
 	pkgdesc="$pkgdesc (dccifd server)"
 	depends="dcc"
 	cd "$pkgdir"
-	amove var/dcc/libexec/dccifd var/dcc/libexec/start-dccifd
+	amove var/dcc/libexec/dccifd var/dcc/libexec/start-dccifd usr/bin/dccif-test
 }
 
 dccm() {
@@ -74,10 +75,10 @@ dccm() {
 }
 
 extras() {
-	pkgdesc="$pkgdesc (dcc update and uninstall)"
+	pkgdesc="$pkgdesc (dcc update,uninstall, and dccproc)"
 	depends="dcc"
 	cd "$pkgdir"
-	amove var/dcc/libexec/updatedcc var/dcc/libexec/uninstalldcc
+	amove var/dcc/libexec/updatedcc var/dcc/libexec/uninstalldcc usr/bin/dccproc
 }
 
 doc() {
diff --git a/testing/dcc/dcc.post-deinstall b/testing/dcc/dcc.post-deinstall
new file mode 100644
index 0000000000..90dc15e662
--- /dev/null
+++ b/testing/dcc/dcc.post-deinstall
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -f /etc/crontabs/dcc ] && \
+	crontab -d -u dcc
+
+exit 0
-- 
2.20.1