From: Patrice Clement <monsieurp@gentoo.org>
Date: Sun, 14 Dec 2014 18:56:19 +0000 (+0000)
Subject: Revision bump: add {init,conf}.d files as requested by user. Fix #462920.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92408cbe5779a3fe66b7204a500c41323eb5435d;p=gentoo.git

Revision bump: add {init,conf}.d files as requested by user. Fix #462920.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
---

diff --git a/dev-perl/Mail-SRS/ChangeLog b/dev-perl/Mail-SRS/ChangeLog
index 9859cf6fe48c..3a7c8685b528 100644
--- a/dev-perl/Mail-SRS/ChangeLog
+++ b/dev-perl/Mail-SRS/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/Mail-SRS
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SRS/ChangeLog,v 1.16 2014/08/24 01:14:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SRS/ChangeLog,v 1.17 2014/12/14 18:56:07 monsieurp Exp $
+
+*Mail-SRS-0.310.0-r2 (14 Dec 2014)
+
+  14 Dec 2014; Patrice Clement <monsieurp@gentoo.org>
+  +Mail-SRS-0.310.0-r2.ebuild, +files/srsd.conf, +files/srsd.init:
+  Revision bump: add {init,conf}.d files as requested by user. Fix #462920.
 
 *Mail-SRS-0.310.0-r1 (24 Aug 2014)
 
diff --git a/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild b/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild
new file mode 100644
index 000000000000..6c60ad6ac7e8
--- /dev/null
+++ b/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SRS/Mail-SRS-0.310.0-r2.ebuild,v 1.1 2014/12/14 18:56:07 monsieurp Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=SHEVEK
+MODULE_VERSION=0.31
+inherit perl-module
+
+DESCRIPTION="Interface to Sender Rewriting Scheme"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Digest-HMAC-1.01-r1
+	>=dev-perl/MLDBM-2.01
+	>=virtual/perl-DB_File-1.807
+	>=virtual/perl-Digest-MD5-2.33
+	>=virtual/perl-Storable-2.04-r1"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/Test-Pod-1.00
+		>=dev-perl/Test-Pod-Coverage-0.02
+	)"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+
+	newinitd "${FILESDIR}/srsd.init" srsd
+	newconfd "${FILESDIR}/srsd.conf" srsd
+}
+
+pkg_postinst() {
+	einfo 'NOTE: srsd default configuration is to use a secret string.'
+	einfo 'You can configure this value in /etc/conf.d/srsd.'
+	einfo ''
+	einfo 'You cannot use both --secret and --secretfile options combined.'
+	einfo 'The former will override the latter.'
+	einfo ''
+	einfo 'If you want to use a secret file, make sure the file'
+	einfo 'is NOT empty and contains characters.'
+}
diff --git a/dev-perl/Mail-SRS/Manifest b/dev-perl/Mail-SRS/Manifest
index 2aa18d0e51ea..6797ac0698f0 100644
--- a/dev-perl/Mail-SRS/Manifest
+++ b/dev-perl/Mail-SRS/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX srsd.conf 1842 SHA256 710b169a4405239c37d240a6cf05844984cbc42a02fc9ff3f0968fcfd38c5057 SHA512 7f9eeef5ecaff4a7f4bb964d2b8ce3221a03aace39b469629f2f15588e9df21728a955e27d5457f6b0baa372fd04d30905297467a6ed77a909e4737f9cad6beb WHIRLPOOL 7e67cf49bc8ea1052208c5d560fb6775c9d876e4f903880776b8c321fd454f53f754f0c3c2b8022d59313f15ae3f95f1a91c2290c9b6b296ce3a175ba1db42c1
+AUX srsd.init 1295 SHA256 72db2bf957c0789da74f9397372ab6225c8aec655cbbdf941209d26b02b0064f SHA512 d709f9749e0e28a1c071c3cd71db2855141965e68b8e92f2402353f5356a321a9e8e852baa567c2320aa6d3254b63d5a6efaf0cec1ce2ee97205e14ab8ae6e3f WHIRLPOOL d13863fa04517b13d714bb3948186dc24684d5dcbb760b2d98ba371d1b9b385c036bf6ac51511c03440a64bde5e6a6215212791131d636bb0f481bfbb05434a6
 DIST Mail-SRS-0.31.tar.gz 26605 SHA256 e791844f6152e503a92c2ac6f223f166769316fa768d8ef09378e5470d6b0028 SHA512 d9810563cb512ba2e5441895c5ceac61bbfa44d1308a5f8521a2e9c49d35f22d77a8f03878c7016823ad996f061071ca82486f4e0dd21a98cdb8398a9208915d WHIRLPOOL 10d5f473d807af872e55bfe96bae0cce4f2c97bfe3a430bd091e35adb5b179209e6ff5839b11fbcbe340d205b7db6a9970e1d91bacf8ec7bd9481e56509d7e20
 EBUILD Mail-SRS-0.310.0-r1.ebuild 660 SHA256 69598e4e4b0a0ce5f0d921ce8b3164a416e27bd927173e0b3b209723e95fd18f SHA512 0da53fe26888fce7416a8c39214157bdba430ac28a49f5b2f1430e44de078eb2157c2536a8a5d18702cfd4a335e8655dab19bc68393587a71f9d127c02261f99 WHIRLPOOL 17cae42847ba2cc9d65ce09fdd51a822501ce9fe4e6daafb55528eea26302a763edff85878837f42b582cd6f428e3aab3e859e8de2049fca5b34cb74acfa4acc
-MISC ChangeLog 1882 SHA256 978c7a3ab2f4e46d672659f52d9744e9d9cb018db8db1c92fa790cd6276b5f42 SHA512 0ee0e0b6f71ac0bc8ead02ab168fb21c5d28ee5c2a8e85011e6581aa04c30220c7f51c43045932d2c66ca40d703b7ad8f878ccccf98f78dc8f1bc328908edc00 WHIRLPOOL e2b86a9352c670211f66b839422afed007ce3202f22a1a6134f764d5fb6892b18b16677e9cae7e54ab3388c4d3a6b149f752fdf1b5e10efb45a81f27996b604c
+EBUILD Mail-SRS-0.310.0-r2.ebuild 1187 SHA256 2c919e3ad4a7daf5f63a2c2c699dd5cee17e28cb14906e1dd3f25ed6a974fe20 SHA512 ab9e3036e740f7aa9995332bf8aed07ad07d8574e693572c1172be57375e7de108771a1b7bd5726c116933f48a16f6fa72f71f77b695e859a84330b1201e708e WHIRLPOOL 2162de6694bf3d29804605f03f62eb59ab0892ab3848c5f70bdd54590697215f1dfbeae0b89ebb0c5eab4839503b8b81fed320e65a8f7fa1b0af58dc87bdf80f
+MISC ChangeLog 2122 SHA256 49491debda1657e2f2e8f68a2e8a0684322075640f129b44c3b5042035d02873 SHA512 72cc5880a7c470f616f535d5c11b1b025845cf6534b1a308b1efec14d5216a229bebb7395448e5de25af3a72ec3d810f619a369f8b582ebf267d4e796855d1f2 WHIRLPOOL c23f69fbfeeb2692d4c6bb62f8ade518c7cd71264885dde936de2b26581a4ded6af827e6fe5ee4198fa4ad769b68d87af88110c157ef813a86c366bf96512724
 MISC metadata.xml 681 SHA256 fefb303f6f5c2be744fa237275714f114ad6bfbe7454ef9f5a31f8efd9d512ca SHA512 c2f47e93390408298411888eccbfc31f426d52e7bb2ebbeea05855422b9bdbd1355cae001ca5048bd82a02d45e2ce51ae9b5dbc8a06cd99efc381d9087e809d4 WHIRLPOOL 10143e3b39eed71224cd7be2972a8af3b2afd7d48e2b4672e903f4c9549958c2b9200a80865dd2aa235d0c06de2a5d570dc1382e2b3c85637c0e9a38043b6f7e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlP5PGcACgkQ2ugaI38ACPCotgD9GLdXt+Vd7DdSLbzNN4wgXcrs
-K/LhX/YGD3muoTr/xAwBAJ300azF35UiVUabHVeNyIR8OPUSv7xCW92eg+FnaIBe
-=npd3
------END PGP SIGNATURE-----
diff --git a/dev-perl/Mail-SRS/files/srsd.conf b/dev-perl/Mail-SRS/files/srsd.conf
new file mode 100644
index 000000000000..116fa4675feb
--- /dev/null
+++ b/dev-perl/Mail-SRS/files/srsd.conf
@@ -0,0 +1,57 @@
+# conf.d file for srsd
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SRS/files/srsd.conf,v 1.1 2014/12/14 18:56:07 monsieurp Exp $
+
+# Options available (copied from the man page):
+#
+# --separator
+# String, specified at most once. Defaults to $SRSSEP ("=").
+# Specify the initial separator for the SRS address. See Mail::SRS for
+# details.
+#
+SRSD_SEPARATOR='='
+
+# 
+# --secret
+# String, may be specified multiple times, at least one of --secret or
+# --secretfile must be specified.
+#
+# --secret will specify a primary secret and override --secretfile if both are
+# specified. However, secrets read from --secretfile will still be used for
+# decoding if both are specified.
+#
+# Specify an SRS secret. The first specified secret is used for encoding. All
+# secrets are used for decoding.
+#
+# This is a dummy value. Change it to something more relevant.
+SRSD_SECRET_STRING='mysecretstring'
+
+# 
+# --secretfile
+# String, specified at most once, at least one of --secret or --secretfile must
+# be specified.
+# 
+# A file to read for secrets. Secrets are specified once per line. The first
+# specified secret is used for encoding.  Secrets are written one per line. Blank
+# lines and lines starting with a # are ignored.  If --secret is not given, then
+# the secret file must be nonempty.
+#
+# This is a dummy value. Change the value as you see fit.
+# SRSD_SECRET_FILE='/etc/mysecretfile'
+
+# 
+# --hashlength 
+# Integer, may be specified at most once, defaults to 4.
+SRSD_HASHLENGHT=4
+
+#
+# Note: You cannot use both --secret and --secretfile options. 
+# The former will override the latter.
+
+# Stick options you wish to use in SRSD_OPTS
+SRSD_OPTS="
+--secret=${SRSD_SECRET_STRING}
+--separator=${SRSD_SEPARATOR}
+--hashlength=${SRSD_HASHLENGHT}
+"
diff --git a/dev-perl/Mail-SRS/files/srsd.init b/dev-perl/Mail-SRS/files/srsd.init
new file mode 100644
index 000000000000..4b5313edbc0a
--- /dev/null
+++ b/dev-perl/Mail-SRS/files/srsd.init
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SRS/files/srsd.init,v 1.1 2014/12/14 18:56:07 monsieurp Exp $
+
+pidfile="/var/run/srsd.pid"
+command="/usr/bin/srsd"
+command_args="${SRSD_OPTS}"
+
+depend() {
+    use logger
+}
+
+start_pre() {
+    if [[ ! -z ${SRSD_SECRET_FILE} ]]; then
+        # check for secret file
+        checkpath --file --owner root:root --mode 0644 ${SRSD_SECRET_FILE}
+        
+        # srsd complains if the secret file is empty
+        # check for characters in it 
+        grep -q '.' ${SRSD_SECRET_FILE}
+
+        # grep returns 0 if a match has been found
+        # 1 otherwise
+        local retval=$?
+        if [[ $retval -ne 0 ]]; then
+            eerror "Secret file \"${SRSD_SECRET_FILE}\" must NOT be empty."
+            return 1
+        fi
+    fi
+
+    return 0
+}
+
+start() {
+    ebegin 'Starting srsd'
+    start-stop-daemon \
+        --start \
+        --background \
+        --pidfile ${pidfile} \
+        --make-pidfile \
+        --exec ${command} \
+        -- ${command_args}
+    eend $?
+}
+
+stop() {
+    ebegin 'Stopping srsd'
+    start-stop-daemon \
+        --stop \
+        --pidfile ${pidfile} \
+        --exec ${command}
+    eend $?
+}