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

[Anthony G. Basile]

commit:     a44ce6c8337d25b1c94fae74086057d0a77eb675
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 15:19:12 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 15:19:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=a44ce6c8

net-p2p/bitflu: added log dir, minor fixes

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

---
 net-p2p/bitflu/Manifest                       |   14 +++++++-------
 net-p2p/bitflu/bitflu-1.37.ebuild             |   25 +++++++++++++++++++------
 net-p2p/bitflu/files/bitflu-add-pidfile.patch |   10 ++++++----
 net-p2p/bitflu/files/bitflu.config            |    2 +-
 net-p2p/bitflu/files/bitflu.initd             |    2 +-
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/net-p2p/bitflu/Manifest b/net-p2p/bitflu/Manifest
index 2ece6c1..db0405a 100644
--- a/net-p2p/bitflu/Manifest
+++ b/net-p2p/bitflu/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
+AUX bitflu-add-pidfile.patch 905 RMD160 aa91e4a5801710e01f797283042abdf287c5caaf SHA1 44c52124232e38bae227688aa7cb7a8630814893 SHA256 d4e8af440dcbc7947964c0e7394419b52317d423db67f9c16313752f98d46522
+AUX bitflu.config 1685 RMD160 b151a6c30d57fb8cf2a7badc6a2bd83d75c6a34e SHA1 d80f83e88eabf5ade5d090cabd0073ebd9010a29 SHA256 5b35f229b96a1ab91764b9735b65c43dfee2dbe67e6df76bdd9c9e86f0478db2
+AUX bitflu.initd 899 RMD160 96c9c3376ff9be0e7eddfb70ce4d7db745755544 SHA1 0713c040d4b7b5b62ce861433b8f184eb0fc8b3d SHA256 6d3c97b8192a8e4f5a0aa10b9e40662e51ad41fe108a6e42c8a572405bb55280
 DIST bitflu-1.37.tgz 157754 RMD160 0d5d7c2590d5cb07c9998ee0a6028ff860b44162 SHA1 90d0374272696c175debb73ebc06ff588438bc4c SHA256 c5e6b6fae5c797f4281ddafaa5e3ff8286a5c30758dddfbbdc2b75b1c60c437b
-EBUILD bitflu-1.37.ebuild 1393 RMD160 2dea2f3e32d6107664b8f687c34fe4b4a2672790 SHA1 f908549d340bceb3dc01b7f10dffbe6872b998d0 SHA256 20605afbe21f9236a17cab72ec8b4ddfce7237325ca79192d703acc96541316d
+EBUILD bitflu-1.37.ebuild 1926 RMD160 0b7ea87abc40c0f799a4072df6be26a7e3cb6807 SHA1 8ef054e50b93e61c598ffe9b2b66a5ce17c4b2d3 SHA256 7893d1b9e4b05e0c8f0c41e8b97676ae7a96e8294841de7bf8fb736aa3fc780a
 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)
 
-iEYEAREIAAYFAk4MRlMACgkQl5yvQNBFVTVj4QCfaQiA1VTUsWHhvy0vzA+i+X2I
-usYAn2FjucSzaOxm7wAqnJ8o4zmo14nT
-=wK1K
+iEYEAREIAAYFAk4Mk/AACgkQl5yvQNBFVTVrvACfSwziAJDzqkUsR7yMnQKZSOT/
+RAgAoIx5n57XQAgvvGaf6HIv7b/utYzz
+=AOtg
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/bitflu/bitflu-1.37.ebuild b/net-p2p/bitflu/bitflu-1.37.ebuild
index 2d27442..0ffccd4 100644
--- a/net-p2p/bitflu/bitflu-1.37.ebuild
+++ b/net-p2p/bitflu/bitflu-1.37.ebuild
@@ -31,11 +31,12 @@ src_compile() {
 :
 }
 
-PLUGINS=/usr/lib/bitflu
-HOMEDIR=/var/lib/bitflu
-CONFDIR=/etc/bitflu
+PLUGINS="/usr/lib/bitflu"
+HOMEDIR="/var/lib/bitflu"
+CONFDIR="/etc/bitflu"
+LOGDIR="/var/log/bitflu"
 
-src_install () {
+src_install() {
 	# executable daemon
 	exeinto /usr/sbin
 	doexe bitflu.pl
@@ -47,13 +48,11 @@ src_install () {
 
 	# 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}"
@@ -61,9 +60,23 @@ src_install () {
 	fowners bitflu:bitflu "${CONFDIR}"/bitflu.config
 	fperms 664 "${CONFDIR}"/bitflu.config
 
+	# log file
+	dodir "${LOGDIR}"
+	fowners bitflu:bitflu "${LOGDIR}"
+	fperms 775 "${LOGDIR}"
+
 	# docs
 	dodoc bitflu.config.example ChangeLog.txt CONTRIBUTING README_IPv6.txt \
 		README.txt Documentation/bitflu-internals.txt
 
 	newinitd "${FILESDIR}"/bitflu.initd bitflu
 }
+
+pkg_postinst() {
+	ewarn "Note: At startup, or at the user's request, ${PN} (re)reads its"
+	ewarn "configuration file and overwrites it with its own sanitized"
+	ewarn "version.  A backup is created in the configuration directory,"
+	ewarn "/etc/${PN}, but that file will subseqently be overwritten if"
+	ewarn "a further backup is made.  You may want to keep your own backup."
+	ewarn "A prestine example with comments may be found in /usr/share/doc/${P}."
+}

diff --git a/net-p2p/bitflu/files/bitflu-add-pidfile.patch b/net-p2p/bitflu/files/bitflu-add-pidfile.patch
index d62dfe2..23783b2 100644
--- a/net-p2p/bitflu/files/bitflu-add-pidfile.patch
+++ b/net-p2p/bitflu/files/bitflu-add-pidfile.patch
@@ -1,5 +1,5 @@
---- bitflu.pl.orig	2011-06-29 21:32:10.000000000 -0400
-+++ bitflu.pl	2011-06-30 04:15:57.000000000 -0400
+--- bitflu.pl.orig	2011-06-30 10:47:13.000000000 -0400
++++ bitflu.pl	2011-06-30 10:50:21.000000000 -0400
 @@ -442,6 +442,10 @@
  		}
  		elsif($child != 0) {
@@ -11,11 +11,13 @@
  			exit(0);
  		}
  		
-@@ -2816,6 +2820,7 @@
+@@ -2816,7 +2820,8 @@
  		$self->{conf}->{history}         = 1;
  		$self->{conf}->{ipv6}            = 1;
  		$self->{conf}->{storage}         = 'StorageVFS';
+-		foreach my $opt qw(ipv6 renice plugindir pluginexclude workdir logfile storage chdir) {
 +		$self->{conf}->{pidfile}         = '/var/run/bitflu/bitflu.pid';
- 		foreach my $opt qw(ipv6 renice plugindir pluginexclude workdir logfile storage chdir) {
++		foreach my $opt qw(pidfile 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 584f2c0..760a9eb 100644
--- a/net-p2p/bitflu/files/bitflu.config
+++ b/net-p2p/bitflu/files/bitflu.config
@@ -13,7 +13,7 @@ http_maxthreads           = 10
 incomplete_downloads      = /var/lib/bitflu/unfinished
 ipv6                      = 1
 kademlia_idseed           = 0
-logfile                   = 
+logfile                   = /var/log/bitflu/bitflu.log
 loglevel                  = 5
 min_free_mb               = 0
 pidfile                   = /var/run/bitflu/bitflu.pid

diff --git a/net-p2p/bitflu/files/bitflu.initd b/net-p2p/bitflu/files/bitflu.initd
index 7deb7f2..9494ec9 100644
--- a/net-p2p/bitflu/files/bitflu.initd
+++ b/net-p2p/bitflu/files/bitflu.initd
@@ -30,7 +30,7 @@ start() {
 	checkconfig || return 1
 	ebegin "Starting bitflu"
 	start-stop-daemon --start --pidfile "${PIDFILE}" --user bitflu:bitflu \
-		--exec "${DAEMON}" -- --config="${CONFFILE}" --daemon -q
+		--exec "${DAEMON}" -- --config="${CONFFILE}" --daemon -q >/dev/null 2>&1
 	eend $?
 }