dkimproxy initd/confd bump

7 files changed, 25 insertions, 7 deletions

diff --git a/mail-filter/dkimproxy/Manifest b/mail-filter/dkimproxy/Manifest
index 00eeb16..6639a97 100644
--- a/mail-filter/dkimproxy/Manifest
+++ b/mail-filter/dkimproxy/Manifest
@@ -1,6 +1,8 @@
-AUX dkimproxy.in-initd 682 RMD160 2f8750667c36b452e796203bf47d4048c064d6bd SHA1 60ab7e35890f8f366d72e6433226211c1dd5c784 SHA256 9dcb0adc90c129be94a9ed080d8998c63c439f4859e2d80317a7552ec3d6c291
-AUX dkimproxy.out-initd 686 RMD160 78532e609915f3b3f6840055e0288fa3188b7fdc SHA1 8707f5371444673bbb4bb36683995dff5860d14a SHA256 00176265cdce8660da5ad01e5cfa282e525c7ebd609cba5349e142ffe020d659
+AUX dkimproxy.in-confd 238 RMD160 94cccdc715ba801335c06e2068682bc329beeeb3 SHA1 422f49d587fde1aa1335795ed3e4e05dd3556412 SHA256 953ace5f7ef4daae02956ffa162c8b71fdce79166297a981d894e3a78429303e
+AUX dkimproxy.in-initd 703 RMD160 ca75a614a36e4865c7367d4c7ed2fe8d0b56f437 SHA1 8e67dae6fb4b6700ed106c5994129a5fb832c1ab SHA256 8c33a8575004487bdfa503948947c23a2b4e58793fe4625bde5ce188404b4964
+AUX dkimproxy.out-confd 177 RMD160 6ec8cd0b98718f8aa2445ce33ffee277040b41cf SHA1 31902bbd7af77aa22f09c5e20eef989c1c98316d SHA256 46e336adb2858a2e898c0e3c7d31cb11e1f3c48273a4f5cd888139a3a6823b53
+AUX dkimproxy.out-initd 708 RMD160 4016db07277e1c6e5c8b0bf95b02880b9a8889b6 SHA1 8a5fc96c4bf86273e4de7d795ac6d868934a1042 SHA256 c0485d0c2400f5a9fa2810ef92dcbcac99ffe488ffecd4e92c15fdcd890fc83f
 AUX dkimproxy_in.conf.gentoo 256 RMD160 74a36587c20a5e3e32a57c89d11c9441b72d6044 SHA1 f53f6ba805499fdd7e22cc96e2aa5ca5763798b8 SHA256 3b1668d76b5e0d623bfd803d86b0a3f042d51b365c7355ff082502ce537ad07c
-AUX dkimproxy_out.conf.gentoo 623 RMD160 465ebbbf36a4a4dfdf974bfaf1b82dd5e26992cd SHA1 18c961c440d6b4a73418e29c0f805c2969481165 SHA256 2a876723f564f2c6e601f6826cdaefc0560503c8970c69879371bbbc9c0d8d50
+AUX dkimproxy_out.conf.gentoo 733 RMD160 1f5f6320adf042ee2914bcd8ec4fce14dc9c0503 SHA1 5749ee03ca0e6d0919dc5dfd7d101b9dfbaaac1f SHA256 e753ea1daa686d73b4523ac65ccfbd3a3f08d58a139112dfceb06ca5f6f6deff
 DIST dkimproxy-1.2.tar.gz 96971 RMD160 4e4f2ec6f350186000c06d302867626e91c7d0a8 SHA1 470a6cd1f12213f10a6db86ae5340b72940a47f8 SHA256 4ae76367e2cecc85c3bce15513bf110b96251acd3d5e4278fbf6c9c5f9d3b7be
-EBUILD dkimproxy-1.2.ebuild 1321 RMD160 f27aededd38bcdc1a0f2b43f2109dec91ddc499f SHA1 fb963fadd4af6b8fe1a6d616755a3a029f734970 SHA256 e9d866e7048645987e253bfb78298e987eb3a9865d58a408f74b932a246df87a
+EBUILD dkimproxy-1.2.ebuild 1448 RMD160 8e6337b2a042f6e781c4421931824f4ce92745f6 SHA1 853deb1bc6b63bbac8d657a9fcfcad965041c189 SHA256 9e821de5f4d8dec4633d00be75fae1eeb10c43d763652e1a4c2b2ef5b340e759
diff --git a/mail-filter/dkimproxy/dkimproxy-1.2.ebuild b/mail-filter/dkimproxy/dkimproxy-1.2.ebuild
index 9795eba..8d48fc1 100644
--- a/mail-filter/dkimproxy/dkimproxy-1.2.ebuild
+++ b/mail-filter/dkimproxy/dkimproxy-1.2.ebuild
@@ -27,6 +27,8 @@ src_install() {
 	dodoc AUTHORS README || die
 	newinitd "${FILESDIR}/dkimproxy.out-initd" dkimproxy.out || die
 	newinitd "${FILESDIR}/dkimproxy.in-initd" dkimproxy.in || die
+	newconfd "${FILESDIR}/dkimproxy.out-confd" dkimproxy.out || die
+	newconfd "${FILESDIR}/dkimproxy.in-confd" dkimproxy.in || die
 
 	rm -f "${D}/etc/dkimproxy_in.conf.example" || die
 	rm -f "${D}/etc/dkimproxy_out.conf.example" || die
@@ -37,7 +39,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	CONFDIR="/etc/ssl/${PN}/"
+	CONFDIR="/etc/ssl/${PN}"
 	if [[ ! -f "${CONFDIR}/dkimproxy.private.key" ]]; then
 		openssl genrsa -out "${CONFDIR}/dkimproxy.private.key" 1024 &>/dev/null || die
 		openssl rsa -in "${CONFDIR}/dkimproxy.private.key" -out "${CONFDIR}/dkimproxy.public.key" -pubout -outform PEM || die
diff --git a/mail-filter/dkimproxy/files/dkimproxy.in-confd b/mail-filter/dkimproxy/files/dkimproxy.in-confd
new file mode 100644
index 0000000..b9d588e
--- /dev/null
+++ b/mail-filter/dkimproxy/files/dkimproxy.in-confd
@@ -0,0 +1,6 @@
+# Give extra options to dkimproxy.in.
+# Examples:
+# DKIMPROXY_IN_OPTS="--reject-error" # reject email if the verification process fails
+# DKIMPROXY_IN_OPTS="--reject-fail" # reject email if the signature is incorrect
+
+DKIMPROXY_IN_OPTS=""
\ No newline at end of file
diff --git a/mail-filter/dkimproxy/files/dkimproxy.in-initd b/mail-filter/dkimproxy/files/dkimproxy.in-initd
index f948ef4..68c8436 100644
--- a/mail-filter/dkimproxy/files/dkimproxy.in-initd
+++ b/mail-filter/dkimproxy/files/dkimproxy.in-initd
@@ -22,7 +22,7 @@ start() {
 	ebegin "Starting dkimproxy.in"
 	start-stop-daemon --start -q --exec /usr/bin/dkimproxy.out \
 		--pidfile "${PIDFILE}" --make-pidfile --background \
-		-- --conf_file=${CONFIGFILE}
+		-- --conf_file=${CONFIGFILE} ${DKIMPROXY_IN_OPTS}
 	eend $?
 }
 
diff --git a/mail-filter/dkimproxy/files/dkimproxy.out-confd b/mail-filter/dkimproxy/files/dkimproxy.out-confd
new file mode 100644
index 0000000..f02f842
--- /dev/null
+++ b/mail-filter/dkimproxy/files/dkimproxy.out-confd
@@ -0,0 +1,5 @@
+# Give extra options to dkimproxy.out
+# Example to soft bounce emails if an error occurs during the signing process:
+# DKIMPROXY_OUT_OPTS="--reject-error"
+
+DKIMPROXY_OUT_OPTS=""
\ No newline at end of file
diff --git a/mail-filter/dkimproxy/files/dkimproxy.out-initd b/mail-filter/dkimproxy/files/dkimproxy.out-initd
index 65ba6b8..8e3cc59 100644
--- a/mail-filter/dkimproxy/files/dkimproxy.out-initd
+++ b/mail-filter/dkimproxy/files/dkimproxy.out-initd
@@ -22,7 +22,7 @@ start() {
 	ebegin "Starting dkimproxy.out"
 	start-stop-daemon --start -q --exec /usr/bin/dkimproxy.out \
 		--pidfile "${PIDFILE}" --make-pidfile --background \
-		-- --conf_file=${CONFIGFILE}
+		-- --conf_file=${CONFIGFILE} ${DKIMPROXY_OUT_OPTS}
 	eend $?
 }
 
diff --git a/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo b/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo
index f780bd5..3488a36 100644
--- a/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo
+++ b/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo
@@ -22,3 +22,6 @@ min_servers 10
 min_spare_servers 5
 max_spare_servers 20
 max_servers 50
+
+# optionally, you can specify a file to load domain-specific configurations
+# sender_map /path/to/sender_map