[gentoo-commits] dev/blueness:master commit in: net-p2p/bitflu/files/, net-p2p/bitflu/

[Anthony G. Basile]

commit:     f03bc7d35585addab4ae18a187e76a1fef93e164
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 09:48:04 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 09:48:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=f03bc7d3

net-p2p/bitflu: added patch to produce a pid file

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-p2p/bitflu/ChangeLog                      |    4 ++
 net-p2p/bitflu/Manifest                       |   15 +++++----
 net-p2p/bitflu/bitflu-1.37.ebuild             |   40 +++++++++++++-----------
 net-p2p/bitflu/files/bitflu-add-pidfile.patch |   21 +++++++++++++
 net-p2p/bitflu/files/bitflu.config            |    3 +-
 net-p2p/bitflu/files/bitflu.initd             |   18 ++++++++++-
 6 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/net-p2p/bitflu/ChangeLog b/net-p2p/bitflu/ChangeLog
index 7327fe6..b2fa8f1 100644
--- a/net-p2p/bitflu/ChangeLog
+++ b/net-p2p/bitflu/ChangeLog
@@ -1,5 +1,9 @@
 
 
+  30 Jun 2011; Anthony G. Basile <blueness@g.o> bitflu-1.37.ebuild,
+  +files/bitflu-add-pidfile.patch, files/bitflu.config, files/bitflu.initd:
+  Added patch to produce a pid file
+
 *bitflu-1.37 (30 Jun 2011)
 
   30 Jun 2011; Anthony G. Basile <blueness@g.o> +bitflu-1.37.ebuild,

diff --git a/net-p2p/bitflu/Manifest b/net-p2p/bitflu/Manifest
index 1779651..2ece6c1 100644
--- a/net-p2p/bitflu/Manifest
+++ b/net-p2p/bitflu/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX bitflu.config 1561 RMD160 e45bfae0249a6404e7f6b7b1519547845d09baa6 SHA1 0a63f48785b25cf0cae14748771f0051bccd699e SHA256 64481e0863d72c3a5e6983d8b24477d86294487f6c3dca6ba88bda1eea97b08f
-AUX bitflu.initd 592 RMD160 13b838ce0d2e86798c4e573d0f8b3945e1a80a55 SHA1 5a96966b7a5cec64069ec0b7669d3902f00cff1e SHA256 d6de9d2709b2b9f76eb716057bcf5bdf5f5f0f0daeb8be3778afb6656efdaf3f
+AUX bitflu-add-pidfile.patch 802 RMD160 81ad4e8471606106c51864810b081709e86514aa SHA1 e85c358da135f2741451e96eac910c89c5c4173b SHA256 9668c26d0282696fd08a3b77d6378474cc9bc9276dd517872b3b47fb5189b4c4
+AUX bitflu.config 1659 RMD160 c751619f6591797f99333abc73647bd4d91b9af3 SHA1 f3880cdd7bb55b5105667a19eb18334891bf8369 SHA256 90c3c88bfe15d012590f228d6feced246443bee2185e973c116804546bcf842f
+AUX bitflu.initd 883 RMD160 48e5307ddf7ca81242b1b0e208ce833a0b8cf015 SHA1 e8e8b46f6f9b67d813a8cd12019ea67af26de5c1 SHA256 5d3cfd3f1df4279eb262f0e5a7d3a354278b8e44886939c2c92b8a464e1a0605
 DIST bitflu-1.37.tgz 157754 RMD160 0d5d7c2590d5cb07c9998ee0a6028ff860b44162 SHA1 90d0374272696c175debb73ebc06ff588438bc4c SHA256 c5e6b6fae5c797f4281ddafaa5e3ff8286a5c30758dddfbbdc2b75b1c60c437b
-EBUILD bitflu-1.37.ebuild 1289 RMD160 ec9fcc66b0018dfb74a0fefc90c62d41fe059312 SHA1 22d88645e59d1fc4fc4a32614544138659521f34 SHA256 53b151400b1a19b555512b3a85545ffe9ac96ddb166424a3dbc9f3712343022d
-MISC ChangeLog 184 RMD160 e5f500b20f647f7c02b0a0ffa787fcbc4090fc30 SHA1 1563937c969af7f2ec58579f2f08deb6bf408d9a SHA256 3f1e93ec9c21b810d379afde128d744f8f784ea080b6c1acf96ba656963547db
+EBUILD bitflu-1.37.ebuild 1393 RMD160 2dea2f3e32d6107664b8f687c34fe4b4a2672790 SHA1 f908549d340bceb3dc01b7f10dffbe6872b998d0 SHA256 20605afbe21f9236a17cab72ec8b4ddfce7237325ca79192d703acc96541316d
+MISC ChangeLog 372 RMD160 4a4ada59ab508e41677872dd7718685b1a899091 SHA1 f8d9ea0b2850204b5929d462c5163a371ac33098 SHA256 32569b58b493fb512fbd1b1cfac39dd4682ed6de12a193546cbedfad74047ad7
 MISC metadata.xml 474 RMD160 f0bd37c33fb6634d4a14abf124abc66cf8f8032f SHA1 12bd1299ed1ab08cb22bc27f1b4f6e570ed81b6c SHA256 77c98ffeb8d98e75ced9544883d5bace7dc48934881ab3016fc80713fd3bf93e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4L2B4ACgkQl5yvQNBFVTUNDACcDRcC4CGt3t3787oIkmicSlbj
-a84An1cvteSAcoInJhzdEetoR/vgve1e
-=v3YB
+iEYEAREIAAYFAk4MRlMACgkQl5yvQNBFVTVj4QCfaQiA1VTUsWHhvy0vzA+i+X2I
+usYAn2FjucSzaOxm7wAqnJ8o4zmo14nT
+=wK1K
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/bitflu/bitflu-1.37.ebuild b/net-p2p/bitflu/bitflu-1.37.ebuild
index f23db1b..2d27442 100644
--- a/net-p2p/bitflu/bitflu-1.37.ebuild
+++ b/net-p2p/bitflu/bitflu-1.37.ebuild
@@ -23,40 +23,44 @@ pkg_setup() {
 	enewuser bitflu -1 -1 /var/lib/bitflu bitflu
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-add-pidfile.patch"
+}
+
 src_compile() {
 :
 }
 
-HOME=/var/lib/bitflu
-CONF=/etc/bitflu
 PLUGINS=/usr/lib/bitflu
+HOMEDIR=/var/lib/bitflu
+CONFDIR=/etc/bitflu
 
 src_install () {
 	# executable daemon
 	exeinto /usr/sbin
 	doexe bitflu.pl
 
-	# working dir
-	dodir "${HOME}"
-	keepdir "${HOME}"
-	fowners bitflu:bitflu "${HOME}"
-	fperms 775 "${HOME}"
-
-	# config file
-	dodir "${CONF}"
-	keepdir "${CONF}"
-	fowners bitflu:bitflu "${CONF}"
-	fperms 775 "${CONF}"
-	insinto "${CONF}"
-	doins "${FILESDIR}"/bitflu.config
-	fowners bitflu:bitflu "${CONF}"/bitflu.config
-	fperms 775 "${CONF}"/bitflu.config
-
 	# plugins
 	dodir "${PLUGINS}"
 	insinto "${PLUGINS}"
 	doins -r plugins
 
+	# working dir
+	dodir "${HOMEDIR}"
+	keepdir "${HOMEDIR}"
+	fowners bitflu:bitflu "${HOMEDIR}"
+	fperms 775 "${HOMEDIR}"
+
+	# config file
+	dodir "${CONFDIR}"
+	keepdir "${CONFDIR}"
+	fowners bitflu:bitflu "${CONFDIR}"
+	fperms 775 "${CONFDIR}"
+	insinto "${CONFDIR}"
+	doins "${FILESDIR}"/bitflu.config
+	fowners bitflu:bitflu "${CONFDIR}"/bitflu.config
+	fperms 664 "${CONFDIR}"/bitflu.config
+
 	# docs
 	dodoc bitflu.config.example ChangeLog.txt CONTRIBUTING README_IPv6.txt \
 		README.txt Documentation/bitflu-internals.txt

diff --git a/net-p2p/bitflu/files/bitflu-add-pidfile.patch b/net-p2p/bitflu/files/bitflu-add-pidfile.patch
new file mode 100644
index 0000000..d62dfe2
--- /dev/null
+++ b/net-p2p/bitflu/files/bitflu-add-pidfile.patch
@@ -0,0 +1,21 @@
+--- bitflu.pl.orig	2011-06-29 21:32:10.000000000 -0400
++++ bitflu.pl	2011-06-30 04:15:57.000000000 -0400
+@@ -442,6 +442,10 @@
+ 		}
+ 		elsif($child != 0) {
+ 			$self->debug("Bitflu is running with pid $child");
++			open(PIDFILE, ">", $self->Configuration->GetValue('pidfile'))
++				or die("Unable to create $self->Configuration->GetValue('pidfile'): $!\n");
++			print PIDFILE $child ;
++                        close(PIDFILE);
+ 			exit(0);
+ 		}
+ 		
+@@ -2816,6 +2820,7 @@
+ 		$self->{conf}->{history}         = 1;
+ 		$self->{conf}->{ipv6}            = 1;
+ 		$self->{conf}->{storage}         = 'StorageVFS';
++		$self->{conf}->{pidfile}         = '/var/run/bitflu/bitflu.pid';
+ 		foreach my $opt qw(ipv6 renice plugindir pluginexclude workdir logfile storage chdir) {
+ 			$self->RuntimeLockValue($opt);
+ 		}

diff --git a/net-p2p/bitflu/files/bitflu.config b/net-p2p/bitflu/files/bitflu.config
index c071b43..584f2c0 100644
--- a/net-p2p/bitflu/files/bitflu.config
+++ b/net-p2p/bitflu/files/bitflu.config
@@ -1,4 +1,4 @@
-# Written by for portage
+# Written by Bitflu::Configuration@2835 on Thu Jun 30 07:53:38 2011
 autocancel                = 1.5
 autocommit                = 1
 autoload_dir              = /var/lib/bitflu/autoload
@@ -16,6 +16,7 @@ kademlia_idseed           = 0
 logfile                   = 
 loglevel                  = 5
 min_free_mb               = 0
+pidfile                   = /var/run/bitflu/bitflu.pid
 plugindir                 = /usr/lib/bitflu/plugins
 pluginexclude             = 
 renice                    = 8

diff --git a/net-p2p/bitflu/files/bitflu.initd b/net-p2p/bitflu/files/bitflu.initd
index 1464bc3..7deb7f2 100644
--- a/net-p2p/bitflu/files/bitflu.initd
+++ b/net-p2p/bitflu/files/bitflu.initd
@@ -4,14 +4,30 @@
 # $Header: $
 
 DAEMON=/usr/sbin/bitflu.pl
-PIDFILE=/var/run/bitflu.pid
+PIDDIR=/var/run/bitflu
+PIDFILE=${PIDDIR}/bitflu.pid
 CONFFILE=/etc/bitflu/bitflu.config
 
 depend() {
 	need net
 }
 
+checkconfig() {
+	if [ ! -f ${CONFFILE} ]; then
+		eerror "No config file ${CONFFILE}"
+		return 1
+	fi
+
+	if [ ! -d ${PIDDIR} ] && ! mkdir -p ${PIDDIR}; then
+		eerror "Failed to create ${PIDDIR}"
+		return 1
+	fi
+
+	chown bitflu:bitflu ${PIDDIR}
+}
+
 start() {
+	checkconfig || return 1
 	ebegin "Starting bitflu"
 	start-stop-daemon --start --pidfile "${PIDFILE}" --user bitflu:bitflu \
 		--exec "${DAEMON}" -- --config="${CONFFILE}" --daemon -q