From 81a3b18941422f009909dfc221a25163cd403eb4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Mon, 5 Mar 2007 15:13:52 +0000 Subject: [PATCH] Version bump, bug 143900 and fix bug 146147, and assign to net-p2p herd Package-Manager: portage-2.1.2.1 --- net-p2p/btpd/ChangeLog | 11 ++- net-p2p/btpd/Manifest | 58 ++++++-------- .../{btpd-0.11.ebuild => btpd-0.12.ebuild} | 11 ++- net-p2p/btpd/btpd-0.9.ebuild | 27 ------- net-p2p/btpd/files/confd_btpd | 5 ++ net-p2p/btpd/files/digest-btpd-0.11 | 3 - net-p2p/btpd/files/digest-btpd-0.12 | 3 + net-p2p/btpd/files/digest-btpd-0.9 | 3 - net-p2p/btpd/files/initd_btpd | 79 +++++++++++++++++++ net-p2p/btpd/metadata.xml | 1 + 10 files changed, 129 insertions(+), 72 deletions(-) rename net-p2p/btpd/{btpd-0.11.ebuild => btpd-0.12.ebuild} (68%) delete mode 100644 net-p2p/btpd/btpd-0.9.ebuild create mode 100644 net-p2p/btpd/files/confd_btpd delete mode 100644 net-p2p/btpd/files/digest-btpd-0.11 create mode 100644 net-p2p/btpd/files/digest-btpd-0.12 delete mode 100644 net-p2p/btpd/files/digest-btpd-0.9 create mode 100644 net-p2p/btpd/files/initd_btpd diff --git a/net-p2p/btpd/ChangeLog b/net-p2p/btpd/ChangeLog index 1ea9c593cf2a..71327688768f 100644 --- a/net-p2p/btpd/ChangeLog +++ b/net-p2p/btpd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-p2p/btpd -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/btpd/ChangeLog,v 1.2 2006/08/18 01:23:09 metalgod Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/btpd/ChangeLog,v 1.3 2007/03/05 15:13:52 armin76 Exp $ + +*btpd-0.12 (05 Mar 2007) + + 05 Mar 2007; Raúl Porcel +files/confd_btpd, + +files/initd_btpd, metadata.xml, -btpd-0.9.ebuild, -btpd-0.11.ebuild, + +btpd-0.12.ebuild: + Version bump, bug 143900 and fix bug 146147, and assign to net-p2p herd *btpd-0.11 (18 Aug 2006) diff --git a/net-p2p/btpd/Manifest b/net-p2p/btpd/Manifest index 918643943ea5..d28cfe47007d 100644 --- a/net-p2p/btpd/Manifest +++ b/net-p2p/btpd/Manifest @@ -1,34 +1,24 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST btpd-0.11.tar.gz 146794 RMD160 b43bcd6ece668c2f6365a940fdcc49d3275e4abe SHA1 fe9379b567d40afc8341df32baf31b2d6d99938a SHA256 f235667135c67320945788b839c90be8aa6aa8a7ac597c9d8b0841a7942285e2 -DIST btpd-0.9.tar.gz 146160 RMD160 ddb40e6ec8967c801219049f032a014145d3934c SHA1 a7bb6a6b5edc5b7055f145d7b3900a6bf82a6710 SHA256 a715e2d03620b62c65c8468425542782133f578ad507cc6915f6724d8172035f -EBUILD btpd-0.11.ebuild 755 RMD160 2a2fbbe3c5fdbfc275c3659fd210d2b75f304ae5 SHA1 e25e41b8542a5ef32ed67cea378711c9a568ac77 SHA256 0587dba654440edd256dee5e876270aa4e22bd86b79924b49b9254b8cc48dec5 -MD5 17471119d5516f8ec75dfae8598165d4 btpd-0.11.ebuild 755 -RMD160 2a2fbbe3c5fdbfc275c3659fd210d2b75f304ae5 btpd-0.11.ebuild 755 -SHA256 0587dba654440edd256dee5e876270aa4e22bd86b79924b49b9254b8cc48dec5 btpd-0.11.ebuild 755 -EBUILD btpd-0.9.ebuild 754 RMD160 1cae0028e32daefd011a21f5327ab1268ec637ca SHA1 bc80a18e62042cc2a36c2560c3743d12c79dad67 SHA256 ebf8ed926b370f90a4da8968a1c1f70aadb867a16bf2aa479d11978be9e71416 -MD5 d68ca98c8a624941e0efda13329a8a1b btpd-0.9.ebuild 754 -RMD160 1cae0028e32daefd011a21f5327ab1268ec637ca btpd-0.9.ebuild 754 -SHA256 ebf8ed926b370f90a4da8968a1c1f70aadb867a16bf2aa479d11978be9e71416 btpd-0.9.ebuild 754 -MISC ChangeLog 562 RMD160 8b782a450c007af4bdab56efba34de3f7261640e SHA1 154b58f4237885a75739e7977e7551719a956a25 SHA256 130ad11225d1eb2b028f1823bfcc0ae397b463ad8de89e8083064d5f31362ef0 -MD5 6d1a11744fe9db5a82e73332ab88a6ea ChangeLog 562 -RMD160 8b782a450c007af4bdab56efba34de3f7261640e ChangeLog 562 -SHA256 130ad11225d1eb2b028f1823bfcc0ae397b463ad8de89e8083064d5f31362ef0 ChangeLog 562 -MISC metadata.xml 452 RMD160 b1f61f82df3844c51ce51d973cbcf662ef995cbe SHA1 e9846696b51fc26a38fd47a23df4046055d231cb SHA256 fddbbf6ccd18ef824f347083f3b3c003fdbf6828b4eb6761712748ba5bfdf2cc -MD5 9402bad359a62a7e51c153db7771a6e3 metadata.xml 452 -RMD160 b1f61f82df3844c51ce51d973cbcf662ef995cbe metadata.xml 452 -SHA256 fddbbf6ccd18ef824f347083f3b3c003fdbf6828b4eb6761712748ba5bfdf2cc metadata.xml 452 -MD5 364919ad4996afa41b1d074c09c98e58 files/digest-btpd-0.11 229 -RMD160 f6c473f911b405dbf1c78b7eb5fcbe76bc0e864d files/digest-btpd-0.11 229 -SHA256 a223dd4293be7878f782e7a4e3c4fcad58827ccbc62c63a5e1b00859386a7188 files/digest-btpd-0.11 229 -MD5 c7bdab8c4a712112cba5ecbcf6b9a4db files/digest-btpd-0.9 226 -RMD160 123ffa33d4e3ac3c47f47e789d416a6fa165ab4d files/digest-btpd-0.9 226 -SHA256 56ade868f53e168ef08ad3a60a0dcde1cdef7f9f295555ac8a7604db259a2b21 files/digest-btpd-0.9 226 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFE5RafwUpWvClEHQoRAqWgAKCA2iP0Jgu81MUrHD8IboBj64ugCwCfezVl -yT0A1MLd13Ui6+hdcO0MZro= -=TQA8 ------END PGP SIGNATURE----- +AUX confd_btpd 112 RMD160 e5f5e3c32ff65a6d9f54855432edd316ffe4c0cf SHA1 662478b1db15c3e16c5dca540e8a81a1efe0e9eb SHA256 a84a5b7fc2d19d9bc93823d57f7774b4bc8f4b272ac4f830bac71507d5146916 +MD5 69d241367997125a0afe67c83f184b25 files/confd_btpd 112 +RMD160 e5f5e3c32ff65a6d9f54855432edd316ffe4c0cf files/confd_btpd 112 +SHA256 a84a5b7fc2d19d9bc93823d57f7774b4bc8f4b272ac4f830bac71507d5146916 files/confd_btpd 112 +AUX initd_btpd 1476 RMD160 05165552c95dd4012662af605ffa6a550aece8b7 SHA1 c86865f501e4bd9d81d58587468ccbe3865627da SHA256 da1fc516be16aaced00c63d705314472dd2d0a177e92a2c418f74676b5904b83 +MD5 2077247e5791368e1b5ceea2003976c6 files/initd_btpd 1476 +RMD160 05165552c95dd4012662af605ffa6a550aece8b7 files/initd_btpd 1476 +SHA256 da1fc516be16aaced00c63d705314472dd2d0a177e92a2c418f74676b5904b83 files/initd_btpd 1476 +DIST btpd-0.12.tar.gz 162543 RMD160 eaf6df635aae5140689d8547a5a1cefda05c0de4 SHA1 69337b5dfba249a6a83c98adc401351a1bf509bd SHA256 801b2f6f577b8b52f7b5e4c03725ef1808ab8bb7bdd07e0bcf7f319a7cbf2e4c +EBUILD btpd-0.12.ebuild 854 RMD160 ef9ac8ca0da295717345edaac9ec51653735be5d SHA1 f8af0438f01ea4236738f70f12395f084f6375e0 SHA256 2055eb0c15688ea6427521f0e43e21696a09e707a9ba083409ed2b0925645f02 +MD5 62844fc1e976b72d5b9e4bc251c9e04f btpd-0.12.ebuild 854 +RMD160 ef9ac8ca0da295717345edaac9ec51653735be5d btpd-0.12.ebuild 854 +SHA256 2055eb0c15688ea6427521f0e43e21696a09e707a9ba083409ed2b0925645f02 btpd-0.12.ebuild 854 +MISC ChangeLog 823 RMD160 8b6d7d09b25c51368030c4c92a86a0868b990b61 SHA1 f956dda6cb57f28ef56e6c3dbe1f042c5acf463d SHA256 eebbcefe8b42bbc8225e9ba785d663f05ea8d4562e9747ac73cbd5434bc0d9ae +MD5 98a4eb130aba8243e70a6b1005a66530 ChangeLog 823 +RMD160 8b6d7d09b25c51368030c4c92a86a0868b990b61 ChangeLog 823 +SHA256 eebbcefe8b42bbc8225e9ba785d663f05ea8d4562e9747ac73cbd5434bc0d9ae ChangeLog 823 +MISC metadata.xml 473 RMD160 42fcd0becaddc8ccab2a227c0452904c65e7dbea SHA1 0c71fb064e9281c2f68dee4a496c7b03125b3156 SHA256 086c874565ba5aa504458b1ce475caace06550d6269043ba8e81b66912d4a899 +MD5 a417cc567bbf6619f6691393852adc80 metadata.xml 473 +RMD160 42fcd0becaddc8ccab2a227c0452904c65e7dbea metadata.xml 473 +SHA256 086c874565ba5aa504458b1ce475caace06550d6269043ba8e81b66912d4a899 metadata.xml 473 +MD5 0ab773c1d623e5fe7a7838b2dc2dfff6 files/digest-btpd-0.12 229 +RMD160 cce5c5485532ccbd885715d9cbbcdaec705b7ec3 files/digest-btpd-0.12 229 +SHA256 f77deaefec99f1bc13d783616e06ea624b7195fa8bb9cef6eb0935c048367a8d files/digest-btpd-0.12 229 diff --git a/net-p2p/btpd/btpd-0.11.ebuild b/net-p2p/btpd/btpd-0.12.ebuild similarity index 68% rename from net-p2p/btpd/btpd-0.11.ebuild rename to net-p2p/btpd/btpd-0.12.ebuild index c91dc8755264..1b00522b02a7 100644 --- a/net-p2p/btpd/btpd-0.11.ebuild +++ b/net-p2p/btpd/btpd-0.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/btpd/btpd-0.11.ebuild,v 1.1 2006/08/18 01:23:09 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/btpd/btpd-0.12.ebuild,v 1.1 2007/03/05 15:13:52 armin76 Exp $ DESCRIPTION="BTPD is a bittorrent client consisting of a daemon and client commands" HOMEPAGE="http://www.murmeldjur.se/btpd/" @@ -13,7 +13,8 @@ IUSE="" RDEPEND="net-misc/curl dev-libs/openssl - dev-libs/libevent" + dev-libs/libevent + sys-apps/shadow" DEPEND="${RDEPEND}" src_compile() { @@ -23,5 +24,9 @@ src_compile() { src_install() { make DESTDIR=${D} install || die "make install failed" + + newinitd "${FILESDIR}/initd_btpd" btpd + newconfd "${FILESDIR}/confd_btpd" btpd + dodoc CHANGES COPYRIGHT README } diff --git a/net-p2p/btpd/btpd-0.9.ebuild b/net-p2p/btpd/btpd-0.9.ebuild deleted file mode 100644 index 81803fe3fd9b..000000000000 --- a/net-p2p/btpd/btpd-0.9.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/btpd/btpd-0.9.ebuild,v 1.1 2006/06/21 01:18:42 metalgod Exp $ - -DESCRIPTION="BTPD is a bittorrent client consisting of a daemon and client commands" -HOMEPAGE="http://www.murmeldjur.se/btpd/" -SRC_URI="http://www.murmeldjur.se/btpd/${P}.tar.gz http://people.su.se/~rnyberg/btpd/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND="net-misc/curl - dev-libs/openssl - dev-libs/libevent" -DEPEND="${RDEPEND}" - -src_compile() { - econf || die "econf failed" - emake || die "econf failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc CHANGES COPYRIGHT README -} diff --git a/net-p2p/btpd/files/confd_btpd b/net-p2p/btpd/files/confd_btpd new file mode 100644 index 000000000000..a7318f64d092 --- /dev/null +++ b/net-p2p/btpd/files/confd_btpd @@ -0,0 +1,5 @@ +# owner of btpd process (must be existing) +#BTPDUSER="p2p" + +# Extra arguments for btpd +#BTPDEXTRARGS="-p 43729" diff --git a/net-p2p/btpd/files/digest-btpd-0.11 b/net-p2p/btpd/files/digest-btpd-0.11 deleted file mode 100644 index 4af56e9f2360..000000000000 --- a/net-p2p/btpd/files/digest-btpd-0.11 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fff2cdc3c5ff7478e08bde60d95deda8 btpd-0.11.tar.gz 146794 -RMD160 b43bcd6ece668c2f6365a940fdcc49d3275e4abe btpd-0.11.tar.gz 146794 -SHA256 f235667135c67320945788b839c90be8aa6aa8a7ac597c9d8b0841a7942285e2 btpd-0.11.tar.gz 146794 diff --git a/net-p2p/btpd/files/digest-btpd-0.12 b/net-p2p/btpd/files/digest-btpd-0.12 new file mode 100644 index 000000000000..7776bd927316 --- /dev/null +++ b/net-p2p/btpd/files/digest-btpd-0.12 @@ -0,0 +1,3 @@ +MD5 9c2dcdb48b2cd2642c9250635b88c917 btpd-0.12.tar.gz 162543 +RMD160 eaf6df635aae5140689d8547a5a1cefda05c0de4 btpd-0.12.tar.gz 162543 +SHA256 801b2f6f577b8b52f7b5e4c03725ef1808ab8bb7bdd07e0bcf7f319a7cbf2e4c btpd-0.12.tar.gz 162543 diff --git a/net-p2p/btpd/files/digest-btpd-0.9 b/net-p2p/btpd/files/digest-btpd-0.9 deleted file mode 100644 index ef7b1a77961c..000000000000 --- a/net-p2p/btpd/files/digest-btpd-0.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e07689d2da7d24a603da666feb0b45d9 btpd-0.9.tar.gz 146160 -RMD160 ddb40e6ec8967c801219049f032a014145d3934c btpd-0.9.tar.gz 146160 -SHA256 a715e2d03620b62c65c8468425542782133f578ad507cc6915f6724d8172035f btpd-0.9.tar.gz 146160 diff --git a/net-p2p/btpd/files/initd_btpd b/net-p2p/btpd/files/initd_btpd new file mode 100644 index 000000000000..2d54e9bdb758 --- /dev/null +++ b/net-p2p/btpd/files/initd_btpd @@ -0,0 +1,79 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +BTPDUSERHOME=`getent passwd ${BTPDUSER} | cut -d : -f 6` +BTPDHOME=${BTPDUSERHOME}/.btpd +BTPDSTARTUPLOG=${BTPDHOME}/startup.log + +depend() { + need net +} + +checkconfig() { + if [ -z ${BTPDUSER} ]; then + + eerror "Must edit /etc/conf.d/btpd first." + return 1 + + elif [ -z "`getent passwd ${BTPDUSER}`" ]; then + + eerror "Check /etc/conf.d/btpd's \${BTPDUSER}. '${BTPDUSER}' doesn't exist." + return 1 + fi +} + +start() { + + ebegin "Starting BitTorrent Protocol Daemon" + checkconfig || return 1 + + if pgrep -u ${BTPDUSER} btpd >/dev/null; then + eerror "An instance of btpd is already running" + return 1 + else + su ${BTPDUSER} -c "btpd ${BTPDEXTRARGS}" + + sleep 2 + + if ! pgrep -u ${BTPDUSER} btpd > /dev/null; then + eerror "BitTorrent Protocol Daemon couldn't be started ! Check logfile: ${BTPDSTARTUPLOG}" + return 1 + fi + fi + + eend $? +} + +stop() { + checkconfig || return 1 + + local retries=0 + + ebegin "Stopping BitTorrent Protocol Daemon" + while [[ -n "`pgrep -u ${BTPDUSER} btpd`" && ${retries} -lt 4 ]]; do + if test ${retries} -eq 0; then + su ${BTPDUSER} -c "btcli kill" + else + kill -9 "`pgrep -u ${BTPDUSER} btpd`" + fi + + sleep 1 + let retries=$retries+1 + done + + if [ ${retries} -lt 4 ]; then + return 0 + else + eerror "Unable to stop btpd" + return 1 + fi + + eend $? +} + +restart() { + svc_stop + sleep 3 + svc_start +} diff --git a/net-p2p/btpd/metadata.xml b/net-p2p/btpd/metadata.xml index b838ea55fcd9..c43c68b25a8e 100644 --- a/net-p2p/btpd/metadata.xml +++ b/net-p2p/btpd/metadata.xml @@ -1,6 +1,7 @@ +net-p2p ricardo.cordeiro@iscte.pt Ricardo Cordeiro -- 2.26.2