revbump, add selinux policy and adjust init script to match

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF)

4 files changed, 21 insertions, 10 deletions

diff --git a/media-sound/subsonic-bin/ChangeLog b/media-sound/subsonic-bin/ChangeLog
index 725068c9977a..b3d36d265337 100644
--- a/media-sound/subsonic-bin/ChangeLog
+++ b/media-sound/subsonic-bin/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for media-sound/subsonic-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/subsonic-bin/ChangeLog,v 1.1 2015/04/11 19:51:07 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/subsonic-bin/ChangeLog,v 1.2 2015/08/05 10:03:57 perfinion Exp $
+
+*subsonic-bin-5.2.1-r1 (05 Aug 2015)
+
+  05 Aug 2015; Jason Zaman <perfinion@gentoo.org> +subsonic-bin-5.2.1-r1.ebuild,
+  -subsonic-bin-5.2.1.ebuild, files/subsonic.initd, metadata.xml:
+  revbump, add selinux policy and adjust init script to match
 
 *subsonic-bin-5.2.1 (11 Apr 2015)
 
   11 Apr 2015; <jason@gentoo.org> +subsonic-bin-5.2.1.ebuild,
   +files/subsonic.confd, +files/subsonic.initd, +metadata.xml:
   Initial Commit, modified from hnaparst overlay
-
diff --git a/media-sound/subsonic-bin/files/subsonic.initd b/media-sound/subsonic-bin/files/subsonic.initd
index 9e6aeff2485e..cabd3604ac0f 100644
--- a/media-sound/subsonic-bin/files/subsonic.initd
+++ b/media-sound/subsonic-bin/files/subsonic.initd
@@ -3,19 +3,22 @@
 
 SUBSONIC_HOME=${SUBSONIC_HOME:-/var/lib/${SVCNAME}}
 SUBSONIC_USER=${SUBSONIC_USER:-${SVCNAME}}
-PIDFILE=${PIDFILE:-${SUBSONIC_HOME}/subsonic.pid}
+PIDFILE=/run/subsonic/subsonic.pid
 
 depend() {
 	after net
 }
 
 start() {
+	checkpath -dq -o subsonic:subsonic -m 755 /run/subsonic/
+
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon \
 		--start --user "${SUBSONIC_USER}" --name subsonic \
 		--env HOME="${SUBSONIC_HOME}" --exec /usr/bin/subsonic \
+		--pidfile="${PIDFILE}" \
 		--nicelevel "${NICELEVEL}" \
-		-- --pidfile="${PIDFILE}" \
+		-- \
 		--home="${SUBSONIC_HOME}" \
 		--host="${SUBSONIC_HOST}" \
 		--port="${SUBSONIC_PORT}" \
@@ -25,6 +28,7 @@ start() {
 		--default-music-folder="${SUBSONIC_DEFAULT_MUSIC_FOLDER}" \
 		--default-podcast-folder="${SUBSONIC_DEFAULT_PODCAST_FOLDER}" \
 		--default-playlist-folder="${SUBSONIC_DEFAULT_PLAYLIST_FOLDER}" \
+		--pidfile="${PIDFILE}" --quiet \
 		${SUBSONIC_OPTS}
 	eend $?
 }
@@ -33,7 +37,7 @@ stop() {
 	ebegin "Stopping ${SVCNAME}"
 	start-stop-daemon --stop --user "${SUBSONIC_USER}" \
 		--pidfile "${PIDFILE}" \
-		--wait 30000 \
+		--wait 15000 \
 		--progress
 	eend $?
 }
diff --git a/media-sound/subsonic-bin/metadata.xml b/media-sound/subsonic-bin/metadata.xml
index 9d998ce8f9d2..712a578d0626 100644
--- a/media-sound/subsonic-bin/metadata.xml
+++ b/media-sound/subsonic-bin/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer>
 		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">subsonic</remote-id>
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild
index aad2284526e2..69451f20e900 100644
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1.ebuild
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/subsonic-bin/subsonic-bin-5.2.1.ebuild,v 1.1 2015/04/11 19:51:07 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild,v 1.1 2015/08/05 10:03:57 perfinion Exp $
 
 EAPI=5
 
@@ -14,13 +14,14 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_PN}-${PV}-standalone.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ffmpeg lame"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg lame selinux"
 
 DEPEND=""
 RDEPEND="virtual/jre
 	lame? ( media-sound/lame )
-	ffmpeg? ( virtual/ffmpeg )"
+	ffmpeg? ( virtual/ffmpeg )
+	selinux? ( sec-policy/selinux-subsonic )"
 
 S="${WORKDIR}/"
 SUBSONIC_HOME="/var/lib/${MY_PN}"
@@ -32,7 +33,7 @@ pkg_setup() {
 }
 
 src_install() {
-	local dir="/usr/share/${P}"
+	local dir="/usr/libexec/${MY_PN}"
 
 	dodoc README.TXT "Getting Started.html"