rpms/bittorrent/FC-3 btseed.init, NONE, 1.1 bttrack.init, NONE, 1.1 bittorrent.spec, 1.8, 1.9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Thu May 26 06:12:58 UTC 2005
Author: pghmcfc
Update of /cvs/extras/rpms/bittorrent/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7557
Modified Files:
bittorrent.spec .cvsignore sources
Added Files:
btseed.init bttrack.init
Log Message:
resync with devel
--- NEW FILE btseed.init ---
#!/bin/bash
#
# chkconfig: - 16 84
# description: Start up seed clients for BitTorrennt
#
# processname: btlaunchmany.py
# config: /etc/sysconfig/btseed
# source function library
. /etc/rc.d/init.d/functions
# Get network config
#. /etc/sysconfig/network
# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0
# default directory for torrents to seed
DIR=/var/spool/bittorrent
# source the config
. /etc/sysconfig/btseed
RETVAL=0
prog="/usr/bin/btlaunchmany.py"
btuser="torrent"
case "$1" in
start)
echo -n $"Starting BitTorrent seed client: "
daemon --user $btuser $prog $OPTIONS $DIR &
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/btseed
echo
;;
stop)
echo -n $"Shutting down BitTorrent seed client: "
killproc $prog
#killproc "/usr/bin/python $prog"
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/btseed
echo
;;
restart|reload)
$0 stop
$0 start
RETVAL=$?
;;
condrestart)
if [ -f /var/lock/subsys/btseed ]; then
$0 stop
$0 start
fi
RETVAL=$?
;;
status)
status btseed
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
exit 1
esac
exit $RETVAL
--- NEW FILE bttrack.init ---
#!/bin/bash
#
# chkconfig: - 16 84
# description: Start up tracker for BitTorrennt
#
# processname: bttrack.py
# config: /etc/sysconfig/bttrack
# source function library
. /etc/rc.d/init.d/functions
# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0
#default
PORT=6969
STATEFILE=/var/lib/bittorrent/bttrack
OPTIONS=
LOGFILE=/var/log/bittorrent/bttrack.log
# directly of torrents that the tracker is allowed to serve
DIR="/var/spool/bittorrent"
# source the config
. /etc/sysconfig/bttrack
RETVAL=0
prog="/usr/bin/bttrack.py"
btuser="torrent"
case "$1" in
start)
echo -n $"Starting BitTorrent tracker: "
daemon --user $btuser $prog --port $PORT --dfile $STATEFILE \
--logfile $LOGFILE $OPTIONS --allowed_dir $DIR &
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bttrack
echo
;;
stop)
echo -n $"Shutting down BitTorrent tracker: "
killproc $prog
#killproc "/usr/bin/python $prog"
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bttrack
echo
;;
restart|reload)
$0 stop
$0 start
RETVAL=$?
;;
condrestart)
if [ -f /var/lock/subsys/bttrack ]; then
$0 stop
$0 start
fi
RETVAL=$?
;;
status)
status bttrack
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
exit 1
esac
exit $RETVAL
Index: bittorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/bittorrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bittorrent.spec 19 May 2005 07:29:32 -0000 1.8
+++ bittorrent.spec 26 May 2005 06:12:56 -0000 1.9
@@ -3,7 +3,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: bittorrent
-Version: 4.0.1
+Version: 4.0.2
Release: 1%{?dist}
Summary: BitTorrent swarming network file transfer tool
@@ -13,6 +13,8 @@
Source0: http://dl.sf.net/bittorrent/BitTorrent-%{version}.tar.gz
Source1: bittorrent.desktop
Source2: bittorrent.png
+Source3: btseed.init
+Source4: bttrack.init
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -20,6 +22,15 @@
Requires: python
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires(pre): %{_sbindir}/useradd
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): %{_sbindir}/userdel
+Requires(postun): %{_sbindir}/groupdel
+Requires(postun): /sbin/service
+
%description
BitTorrent is a tool for copying files from one machine to
another. FTP punishes sites for being popular: Since all uploading is
@@ -41,30 +52,84 @@
%prep
%setup -q -n BitTorrent-%{version}
-sed -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
+%{__sed} -i "s/appdir = .*/appdir = '%{name}-%{version}'/" BitTorrent/__init__.py
+
+%{__cat} <<EOF >btseed.sysconfig
+#DIR=%{_localstatedir}/spool/bittorrent
+OPTIONS="--max_upload_rate 350"
+EOF
+
+%{__cat} <<EOF >bttrack.sysconfig
+#PORT=6969
+#DIR=%{_localstatedir}/spool/bittorrent
+#STATEFILE=%{_localstatedir}/lib/bittorrent/bttrack
+#LOGFILE=%{_localstatedir}/log/bittorrent/bttrack.log
+OPTIONS="--show_names 1 --hupmonitor 1"
+EOF
+
+%{__cat} <<EOF >torrent.logrotate
+%{_localstatedir}/log/bittorrent/bttrack.log {
+ notifempty
+ missingok
+ postrotate
+ /sbin/service bttrack condrestart 2>/dev/null >/dev/null || true
+ endscript
+}
+EOF
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-sed -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
+%{__sed} -i -e 's/env python2/env python/' $RPM_BUILD_ROOT%{_bindir}/*
-desktop-file-install --vendor %{desktopvendor} \
+%{_bindir}/desktop-file-install --vendor %{desktopvendor} \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
+%{__install} -d $RPM_BUILD_ROOT%{_localstatedir}/{spool,lib,log}/bittorrent
+%{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bittorrent.png
+%{__install} -m 0755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/btseed
+%{__install} -m 0755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bttrack
+%{__install} -m 0644 -D btseed.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/btseed
+%{__install} -m 0644 -D bttrack.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bttrack
+%{__install} -m 0644 -D torrent.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bittorrent
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%pre
+%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/spool/bittorrent \
+ -c "BitTorrent Seed/Tracker" torrent &>/dev/null || :
+
+%post
+/sbin/chkconfig --add btseed || :
+/sbin/chkconfig --add bttrack || :
+
+%preun
+if [ $1 -eq 0 ]; then
+ /sbin/service btseed stop &>/dev/null || :
+ /sbin/service bttrack stop &>/dev/null || :
+ /sbin/chkconfig --del btseed || :
+ /sbin/chkconfig --del bttrack || :
+fi
+
+%postun
+if [ $1 -eq 0 ]; then
+ %{_sbindir}/userdel torrent &>/dev/null || :
+ %{_sbindir}/groupdel torrent &>/dev/null || :
+else
+ /sbin/service btseed condrestart &>/dev/null || :
+ /sbin/service bttrack condrestart &>/dev/null || :
+fi
%post gui
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
%postun gui
-update-desktop-database %{_datadir}/applications &>/dev/null || :
+%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
%files
%defattr(-,root,root,-)
@@ -82,9 +147,17 @@
%{python_sitelib}/BitTorrent/*.py
%{python_sitelib}/BitTorrent/*.pyc
%ghost %{python_sitelib}/BitTorrent/*.pyo
+%attr(-,torrent,torrent) %dir %{_localstatedir}/spool/bittorrent
+%attr(-,torrent,torrent) %dir %{_localstatedir}/lib/bittorrent
+%attr(-,torrent,torrent) %dir %{_localstatedir}/log/bittorrent
+%{_sysconfdir}/rc.d/init.d/btseed
+%{_sysconfdir}/rc.d/init.d/bttrack
+%config(noreplace) %{_sysconfdir}/logrotate.d/bittorrent
+%config(noreplace) %{_sysconfdir}/sysconfig/btseed
+%config(noreplace) %{_sysconfdir}/sysconfig/bttrack
%files gui
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/btdownloadgui.py
%{_bindir}/btmaketorrentgui.py
%{_datadir}/applications/%{desktopvendor}-bittorrent.desktop
@@ -92,6 +165,16 @@
%{_datadir}/pixmaps/bittorrent.png
%changelog
+* Tue May 24 2005 Paul Howarth <paul at city-fan.org> 4.0.2-1%{?dist}
+- Update to 4.0.2
+
+* Mon May 23 2005 Paul Howarth <paul at city-fan.org> 4.0.1-2%{?dist}
+- use macros consistently throughout
+- add initscripts so users can easily set up trackers and seeders
+ on their own (#158273)
+- add user torrent for tracker/seeder
+- add logrotate script for tracker
+
* Wed May 18 2005 Paul Howarth <paul at city-fan.org> 4.0.1-1%{?dist}
- new upstream release 4.0.1 (#157632)
- add dist tag
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 May 2005 07:29:32 -0000 1.5
+++ .cvsignore 26 May 2005 06:12:56 -0000 1.6
@@ -1 +1 @@
-BitTorrent-4.0.1.tar.gz
+BitTorrent-4.0.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bittorrent/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 19 May 2005 07:29:32 -0000 1.5
+++ sources 26 May 2005 06:12:56 -0000 1.6
@@ -1 +1 @@
-e890d856d43b3d0af14b28714bc5801a BitTorrent-4.0.1.tar.gz
+4640b7c1bac3146d628f54b20afb87b7 BitTorrent-4.0.2.tar.gz
More information about the fedora-extras-commits
mailing list