summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2010-03-31 19:19:27 +0000
committerThomas Sachau <tommy@gentoo.org>2010-03-31 19:19:27 +0000
commit7a20d0fd72a17899ec67cc7bbef904a98ed01600 (patch)
tree2cfabf2a0befe2f47751c1ab635e0ba8912d5dc5 /net-p2p/fms
parentVersion bump. (diff)
downloadhistorical-7a20d0fd72a17899ec67cc7bbef904a98ed01600.tar.gz
historical-7a20d0fd72a17899ec67cc7bbef904a98ed01600.tar.bz2
historical-7a20d0fd72a17899ec67cc7bbef904a98ed01600.zip
Apply changes from bug 273138
Package-Manager: portage-2.2_rc67-r3/cvs/Linux x86_64
Diffstat (limited to 'net-p2p/fms')
-rw-r--r--net-p2p/fms/ChangeLog5
-rw-r--r--net-p2p/fms/Manifest14
-rw-r--r--net-p2p/fms/files/fms11
3 files changed, 19 insertions, 11 deletions
diff --git a/net-p2p/fms/ChangeLog b/net-p2p/fms/ChangeLog
index aa97cf7d0d10..b17cb7eb6567 100644
--- a/net-p2p/fms/ChangeLog
+++ b/net-p2p/fms/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-p2p/fms
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.16 2010/03/13 17:51:31 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.17 2010/03/31 19:19:27 tommy Exp $
+
+ 31 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> files/fms:
+ Apply changes from bug 273138
*fms-0.3.51 (13 Mar 2010)
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 63a6dd5137e9..e94089ed29a4 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,20 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX fms 854 RMD160 42c77644bb8e5f61e8cfe640636347a7b52a5161 SHA1 3574f9998e7f4be4e7627339485f147bb321a2e9 SHA256 afa0e223390af1b3e8cf7ec48f24066293fdc39fdd1657e72d657b49ac1130b3
+AUX fms 958 RMD160 b1b85941a8d43897a6f362a4bcd98ef142831ac6 SHA1 315bc2805ca5b2e90910a7ee0a6012bd75ef61a2 SHA256 be34254112e953c0cbf29ff6e0baa6c36b063d72c7acc35ccde7d9cc1ab1b649
AUX fms-use-system-libs.patch 876 RMD160 cf52bd952cafd2286a468c8869e4286aa654e685 SHA1 e7022c9d5a7445ebd10189dfa2a13872e17088e8 SHA256 927c984bab501f5801c26314fff4ae7d8072a6acd4dc8e4c8fd3b548f8e0c471
DIST fms-src-0.3.43.zip 1731699 RMD160 6f811a31589f04aa3137a3f0021ad557ab1398f2 SHA1 d8b42bd59b2e7063d27121cc238a8fe8dd7995ed SHA256 38d1997df3bbd349728bb10b927d5facbaba19b868c7582cf36b4a107ccd3b92
DIST fms-src-0.3.51.zip 1840216 RMD160 244a33b84be81775820c78f6ce59384e45d664bb SHA1 0bb8b594480b4aed0699a5ab868c6ec7b52a9056 SHA256 56a77402fde9ac23d15a2ab1b55140163270bb0b07139db4a41c00d1eab1448b
EBUILD fms-0.3.43.ebuild 2340 RMD160 879b549f9f3ca3cbbd0a27b1ed70535f978284be SHA1 169940f24bc066e8bd13d60c2d42c646ad0d788b SHA256 66c1304b15204cc7a626d47a45b9231709df34b3ee1da71b5ccb06d7007b7792
EBUILD fms-0.3.51.ebuild 2243 RMD160 88420adc91b9993104cd59b15c239ef1e38bd70f SHA1 d6079634e4d8672ae6994bf5ea6c41880fc1ca29 SHA256 866399265b8dbcbdd83a02272a13caa9eed5dbf698ae812ff82a70700ada3580
-MISC ChangeLog 2964 RMD160 7de5292728ec2a448b2ac67691862da42ba92051 SHA1 789cb17fce59121d09ae9edac8433cb246f8eba2 SHA256 1dbd169759c4ddf3edb87ceccb9db814a50d13df80e469fe9e7dc75ff0247649
+MISC ChangeLog 3067 RMD160 f51d43192e1520fe682926064c1e72e2d80c9abf SHA1 c17aad8ec81a2250534db9b99065d63dcb444108 SHA256 cfa305f574df7f45738cc7676747deaf7a241e8fafa0cb8dafcc4ee4f96b70c0
MISC metadata.xml 337 RMD160 59566d1f3d1ea7a7b6edf83370ba568efa134f2a SHA1 f86cdbfd008e059a7bba5e1377de985293a87224 SHA256 fb5fcbc27def922252dcaedaf932f8c49d37d24245f552be3ecf32571b7abfd1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iJwEAQECAAYFAkub0K8ACgkQG7kqcTWJkGfnHQQAo1w5P9lpEwxx8MXF615PBALn
-fbc2xQ+vAo2VKLV10UUECNBDyzVa1LEZ2yeZV/Qm1uMD+VLJVphPnsBiF8sbPVzj
-twG2cy9flDOPbXpkgL0tRli5UswuD9IN/NSWQw3IPqAf+x4QSVmnwASq0xdCJyg4
-20x/BjfQ5Y+AjAJFI9U=
-=h7+4
+iJwEAQECAAYFAkuzoEoACgkQG7kqcTWJkGd/jwQAsSHMYdvJHSa0kXEOhi6AeFff
+kBtGIzYo8G6+7pdNOovx6BRyPFf5HGfN64KtIVvvyP4Kw8LS5tQG/XIHJY5XGFCe
++lERreLjByadnxFHV7gvuBH5/98tB2PuWgaI+IZWh30hVArhFZaNBVdTifofDB++
+/NoFYhAlpJ6kPKHZBMY=
+=7U7u
-----END PGP SIGNATURE-----
diff --git a/net-p2p/fms/files/fms b/net-p2p/fms/files/fms
index 2f26c39c10a4..36763ce2cfd1 100644
--- a/net-p2p/fms/files/fms
+++ b/net-p2p/fms/files/fms
@@ -1,11 +1,16 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.3 2009/02/12 18:07:25 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.4 2010/03/31 19:19:27 tommy Exp $
+
+# Check for OpenRC/Baselayout 2 - see bug #270646
+is_openrc() {
+ [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]
+}
start() {
ebegin "Starting FMS"
- if [[ -f /etc/init.d/sysfs ]]; then
+ if is_openrc; then
start-stop-daemon -S -u freenet:freenet -d /var/freenet/fms -b -x /usr/bin/fms
eend $?
else
@@ -17,7 +22,7 @@ start() {
stop() {
ebegin "Stopping FMS"
- if [[ -f /etc/init.d/sysfs ]]; then
+ if is_openrc; then
start-stop-daemon -K -u freenet:freenet -d /var/freenet/fms /usr/bin/fms
eend $?
else