From 8a6cacf3798f2e449b4788cc7fff6bf58edd867d Mon Sep 17 00:00:00 2001 From: Rosa Date: Wed, 1 Feb 2012 20:27:49 +0400 Subject: [PATCH] Automatic import for version 0.2.1.30 --- .abf.yml | 2 + tor.init | 108 ++++++++++++++++ tor.logrotate | 12 ++ tor.spec | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++ tor.sysconfig | 2 + 5 files changed, 464 insertions(+) create mode 100644 .abf.yml create mode 100755 tor.init create mode 100644 tor.logrotate create mode 100644 tor.spec create mode 100644 tor.sysconfig diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..2c1df20 --- /dev/null +++ b/.abf.yml @@ -0,0 +1,2 @@ +sources: + "tor-0.2.1.30.tar.gz": f25b89d8c677c83ee0559036d5b13d49b272b3b0 diff --git a/tor.init b/tor.init new file mode 100755 index 0000000..0bcfbb8 --- /dev/null +++ b/tor.init @@ -0,0 +1,108 @@ +#!/bin/bash +# +#tor The Onion Router +# +# chkconfig: 2345 90 10 +# description: Onion Router +### BEGIN INIT INFO +# Provides: tor +# Should-Start: $network +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Short-Description: The Onion Router +# Description: The Onion Router. +### END INIT INFO + +TORUSER=toruser +TORBIN=/usr/bin/tor +TORPID=/var/run/tor/tor.pid +TORLOG=/var/log/tor/tor.log +TORDATA=/var/lib/tor + +TORCONF=/etc/tor/torrc + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +[ -r /etc/sysconfig/tor ] && . /etc/sysconfig/tor + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +TORARGS="PIDFile $TORPID Log \"notice file $TORLOG\" RunAsDaemon 1 DataDirectory $TORDATA User $TORUSER" + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + gprintf "Starting %s:" tor + if [ -f $TORPID ]; then + failure "tor appears to be already running (pid file exists)" + exit 1 + fi + daemon $TORBIN -f $TORCONF $TORARGS + RETVAL=$? + if [ "$RETVAL" = 0 ]; then + success "%s startup" tor + touch /var/lock/subsys/tor + else + failure "%s startup" tor + fi + echo + ;; + stop) + gprintf "Stopping %s:" tor + if [ -f $TORPID ]; then + kill `cat $TORPID` + RETVAL=$? + if [ "$RETVAL" = 0 ]; then + success "%s shutdown" tor + rm -f /var/lock/subsys/tor + else + failure "%s shutdown" tor + fi + else + success "%s is not running" tor + RETVAL=0 + fi + echo + ;; + status) + status tor + ;; + restart) + $0 stop + $0 start + ;; + reload) + gprintf "Reloading %s:" tor + if [ -f $TORPID ]; then + gprintf "Sending HUP to tor: " + kill -HUP `cat $TORPID` + RETVAL=$? + [ "$RETVAL" = 0 ] && success "config reload" || failure "config reload" + else + failure "%s is not running" tor + RETVAL=1 + fi + echo + ;; + condrestart) + if [ -f $TORPID ]; then + $0 stop + $0 start + fi + ;; + log) + cat $TORLOG + ;; + *) + gprintf "Usage: %s {start|stop|restart|reload|status|log}\n" $0 + exit 1 +esac + +exit $RETVAL diff --git a/tor.logrotate b/tor.logrotate new file mode 100644 index 0000000..38a1b53 --- /dev/null +++ b/tor.logrotate @@ -0,0 +1,12 @@ +/var/log/tor/*.log { + daily + rotate 5 + compress + delaycompress + missingok + notifempty + sharedscripts + postrotate + service tor reload > /dev/null 2>&1 + endscript +} diff --git a/tor.spec b/tor.spec new file mode 100644 index 0000000..7f7ecbc --- /dev/null +++ b/tor.spec @@ -0,0 +1,340 @@ +%define runuser toruser + +Name: tor +Version: 0.2.1.30 +Release: %mkrel 1 +Summary: Anonymizing overlay network for TCP (The onion router) +URL: http://www.torproject.org/ +Group: Networking/Other +License: BSD-like +Requires(pre): rpm-helper +Requires(post): rpm-helper +Requires(preun): rpm-helper +Requires(postun): rpm-helper +Requires: openssl >= 0.9.6 +Requires: tsocks +BuildRequires: openssl-devel >= 0.9.6 +BuildRequires: libevent-devel +BuildRequires: zlib-devel +BuildRequires: autoconf2.5 +BuildRequires: transfig, tetex-latex +BuildRequires: ghostscript +Source0: http://www.torproject.org/dist/%{name}-%{version}.tar.gz +Source1: %{name}.logrotate +Source2: %{name}.init +Source3: %{name}.sysconfig + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +%description +Tor is a connection-based low-latency anonymous communication system. + +This package provides the "tor" program, which serves as both a client and +a relay node. Scripts will automatically create a "%{runuser}" user and +group, and set tor up to run as a daemon when the system is rebooted. + +Applications connect to the local Tor proxy using the SOCKS +protocol. The local proxy chooses a path through a set of relays, in +which each relay knows its predecessor and successor, but no +others. Traffic flowing down the circuit is unwrapped by a symmetric +key at each relay, which reveals the downstream relay. + +Warnings: Tor does no protocol cleaning. That means there is a danger +that application protocols and associated programs can be induced to +reveal information about the initiator. Tor depends on Privoxy and +similar protocol cleaners to solve this problem. This is alpha code, +and is even more likely than released code to have anonymity-spoiling +bugs. The present network is very small -- this further reduces the +strength of the anonymity provided. Tor is not presently suitable +for high-stakes anonymity. + +%prep +%setup -q + +%build +%configure2_5x +%make +make -C doc/design-paper tor-design.pdf + +%install +[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} + +%makeinstall + +%define _logdir %{_var}/log + +mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} +cat %{SOURCE2} > ${RPM_BUILD_ROOT}%{_initrddir}/%{name} +chmod 0755 ${RPM_BUILD_ROOT}%{_initrddir}/%{name} + +install -p -m 644 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/torrc.sample ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/torrc + +mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d +cat %{SOURCE1} > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} + +mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ +cat %{SOURCE3} > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} + +mkdir -p -m 700 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name} +mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{name} +mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_logdir}/%{name} + +# Bash completion +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/bash_completion.d +echo 'complete -F _command $filenames torify' > ${RPM_BUILD_ROOT}%{_sysconfdir}/bash_completion.d/%{name} + +%clean +[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} + +%pre +%_pre_useradd %{runuser} / /bin/false + +%post +%_post_service %{name} + +%preun +%_preun_service %{name} +rm -f %{_localstatedir}/%{name}/cached-directory +rm -f %{_localstatedir}/%{name}/bw_accounting +rm -f %{_localstatedir}/%{name}/control_auth_cookie +rm -f %{_localstatedir}/%{name}/router.desc +rm -f %{_localstatedir}/%{name}/fingerprint + +%postun +%_postun_userdel %{runuser} +%_postun_groupdel %{runuser} + +%files +%defattr(-,root,root) +%doc AUTHORS INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO doc/design-paper/tor-design.pdf +%{_mandir}/man*/* +%{_bindir}/tor +%{_bindir}/torify +%{_bindir}/tor-resolve +%{_bindir}/tor-gencert +%config(noreplace) %attr(0755,%{runuser},%{runuser}) %{_initrddir}/%{name} +%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} +%dir %attr(0755,root,%{runuser}) %{_sysconfdir}/%{name}/ +%config(noreplace) %attr(0644,root,%{runuser}) %{_sysconfdir}/%{name}/* +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%attr(0700,%{runuser},%{runuser}) %dir %{_localstatedir}/lib/%{name} +%attr(0750,%{runuser},%{runuser}) %dir %{_var}/run/%{name} +%attr(0750,%{runuser},%{runuser}) %dir %{_logdir}/%{name} +%{_sysconfdir}/bash_completion.d/%{name} +%{_datadir}/%{name} + + +%changelog +* Sun Feb 27 2011 Funda Wang 0.2.1.30-1mdv2011.0 ++ Revision: 640335 +- update to new version 0.2.1.30 + +* Wed Jan 19 2011 Funda Wang 0.2.1.29-1 ++ Revision: 631656 +- update to new version 0.2.1.29 + +* Wed Dec 22 2010 Oden Eriksson 0.2.1.28-2mdv2011.0 ++ Revision: 623881 +- rebuilt against libevent 2.x + +* Mon Dec 20 2010 Funda Wang 0.2.1.28-1mdv2011.0 ++ Revision: 623334 +- update to new version 0.2.1.28 + +* Sat Nov 27 2010 Funda Wang 0.2.1.27-1mdv2011.0 ++ Revision: 601752 +- update to new version 0.2.1.27 + + + Matthew Dawkins + - added missing ghostscript BR + +* Tue Jun 15 2010 Pascal Terjan 0.2.1.26-1mdv2010.1 ++ Revision: 548070 +- Update to 0.2.1.26 (bugfixes) + +* Mon Apr 12 2010 Funda Wang 0.2.1.25-2mdv2010.1 ++ Revision: 533634 +- rebuild + +* Tue Mar 30 2010 Pascal Terjan 0.2.1.25-1mdv2010.1 ++ Revision: 529894 +- update to new version 0.2.1.25 + +* Wed Mar 03 2010 Sandro Cazzaniga 0.2.1.24-1mdv2010.1 ++ Revision: 513772 +- Update to 0.2.1.24 + +* Thu Jan 21 2010 Michael Scherer 0.2.1.22-1mdv2010.1 ++ Revision: 494519 +- new version +- update website url + +* Tue Dec 29 2009 Pascal Terjan 0.2.1.21-1mdv2010.1 ++ Revision: 483281 +- Update to 0.2.1.21 + +* Sun Dec 20 2009 Pascal Terjan 0.2.1.20-2mdv2010.1 ++ Revision: 480257 +- Add upstream fix for new openssl + +* Fri Nov 13 2009 Pascal Terjan 0.2.1.20-1mdv2010.1 ++ Revision: 465828 +- update to new version 0.2.1.20 + +* Thu Aug 06 2009 Michael Scherer 0.2.1.19-1mdv2010.0 ++ Revision: 410624 +- update to new version 0.2.1.19 + +* Fri Jun 26 2009 Pascal Terjan 0.2.0.35-1mdv2010.0 ++ Revision: 389362 +- update to new version 0.2.0.35 +- hide reload error after logrotate + +* Tue Feb 10 2009 Pascal Terjan 0.2.0.34-1mdv2009.1 ++ Revision: 339154 +- Update to 0.2.0.34 + +* Thu Jan 22 2009 Frederik Himpe 0.2.0.33-1mdv2009.1 ++ Revision: 332633 +- update to new version 0.2.0.33 + +* Mon Nov 24 2008 Pascal Terjan 0.2.0.32-1mdv2009.1 ++ Revision: 306255 +- Group is no longer a valid option +- start tor as root and let it switch to its user +- Update to 0.2.0.32 +- Stop using initlog + + + Michael Scherer + - fix %%preun + +* Tue Sep 09 2008 Frederik Himpe 0.2.0.31-1mdv2009.0 ++ Revision: 283173 +- update to new version 0.2.0.31 + +* Wed Jul 23 2008 Pascal Terjan 0.2.0.30-1mdv2009.0 ++ Revision: 242320 +- Drop P0 +- Add back accidentaly dropped sources +- Switch to 0.2.0.* branch + +* Thu Jul 03 2008 Michael Scherer 0.1.2.19-3mdv2009.0 ++ Revision: 230955 +- add patch0, to build with fortify. Since /dev/null should not be created if + it doesn't exist, i removed the O_CREATE flag, instead of adding creation mode. +- add a config file in /etc/sysconfig/tor, so the user + can cleanly raise the limit of opened file with ulimit -n with touching + to initscript. + + + Pixel + - adapt to %%_localstatedir now being /var instead of /var/lib (#22312) + +* Wed May 14 2008 Oden Eriksson 0.1.2.19-2mdv2009.0 ++ Revision: 207049 +- rebuilt against libevent-1.4.4 + +* Sun Jan 20 2008 Pascal Terjan 0.1.2.19-1mdv2008.1 ++ Revision: 155377 +- update to new version 0.1.2.19 + + + Olivier Blin + - restore BuildRoot + + + Thierry Vignaud + - kill re-definition of %%buildroot on Pixel's request + +* Wed Nov 07 2007 Funda Wang 0.1.2.18-2mdv2008.1 ++ Revision: 106704 +- rebuild for new lzma + +* Wed Oct 31 2007 Pascal Terjan 0.1.2.18-1mdv2008.1 ++ Revision: 104166 +- update to new version 0.1.2.18 + +* Sun Sep 02 2007 Funda Wang 0.1.2.17-1mdv2008.0 ++ Revision: 77742 +- New version 0.1.2.17 + +* Fri Aug 03 2007 Pascal Terjan 0.1.2.16-1mdv2008.0 ++ Revision: 58448 +- update to new version 0.1.2.16 + +* Mon Jul 23 2007 Pascal Terjan 0.1.2.15-1mdv2008.0 ++ Revision: 54629 +- update to new version 0.1.2.15 + +* Sat May 26 2007 Pascal Terjan 0.1.2.14-1mdv2008.0 ++ Revision: 31230 +- 0.1.2.14 + +* Fri May 11 2007 David Walluck 0.1.2.13-2mdv2008.0 ++ Revision: 26281 +- LSB initscript + +* Wed Apr 25 2007 Pascal Terjan 0.1.2.13-1mdv2008.0 ++ Revision: 18291 +- 0.1.2.13 (first stable release of 1.2 branch) + + +* Sun Mar 04 2007 Adam Williamson 0.1.1.26-2mdv2007.0 ++ Revision: 132717 +- rebuild to fix 29130 + +* Sun Dec 17 2006 Pascal Terjan 0.1.1.26-1mdv2007.1 ++ Revision: 98257 +- 0.1.1.26 (fixes a serious privacy bug for people who use the HttpProxyAuthenticator config option) + +* Thu Nov 09 2006 Pascal Terjan 0.1.1.25-1mdv2007.0 ++ Revision: 79733 +- 0.1.1.25 +- Add bash completion for torify +- Import tor + +* Sun Sep 03 2006 Pascal Terjan 0.1.1.23-2mdv2007.0 +- Require tsocks for torify + +* Wed Aug 16 2006 Pascal Terjan 0.1.1.23-1mdv2007.0 +- New release 0.1.1.23 + +* Sun Jul 09 2006 Pascal Terjan 0.1.1.22-1mdv2007.0 +- New release 0.1.1.22 +- Fix macro in changelog + +* Wed Jun 14 2006 Lenny Cartier 0.1.1.21-1mdv2007.0 +- 0.1.1.21 + +* Fri May 26 2006 Pascal Terjan 0.1.1.20-1mdv2007.0 +- New release 0.1.1.20 +- use autoconf2.5 +- buildrequires latex and transfig for the doc + +* Sat Mar 11 2006 Pascal Terjan 0.1.0.17-1mdk +- New release 0.1.0.17 + +* Thu Jan 05 2006 Pascal Terjan 0.1.0.16-1mdk +- 0.1.0.16 + +* Wed Nov 23 2005 Laurent MONTEL 0.1.0.15-4 +- Rebuild with new openssl + +* Thu Oct 20 2005 Nicolas Lécureuil 0.1.0.15-3mdk +- Fix BuildRequires + +* Wed Sep 28 2005 Lev Givon 0.1.0.15-2mdk +- Define %%{_logdir} macro + +* Sun Sep 25 2005 Pascal Terjan 0.1.0.15-1mdk +- 0.1.0.15 + +* Wed Aug 17 2005 Pascal Terjan 0.1.0.14-2mdk +- Add forgotten changelog + +* Wed Aug 17 2005 Pascal Terjan 0.1.0.14-1mdk +- 0.1.0.14 (security fix) + +* Mon Aug 08 2005 Pascal Terjan 0.1.0.13-1mdk +- 0.1.0.13 + +* Mon Aug 08 2005 Pascal Terjan 0.1.0.12-1mdk +- first Mandriva version (partially based on the official rpm) + diff --git a/tor.sysconfig b/tor.sysconfig new file mode 100644 index 0000000..67197bd --- /dev/null +++ b/tor.sysconfig @@ -0,0 +1,2 @@ +# you can use this file to augment the limit of open file , with ulimit -n +#ulimit -n 2048