mirror of
https://abf.rosa.ru/djam/tor.git
synced 2025-02-23 09:32:47 +00:00
Updated to 0.2.4.21, migrated to systemd
This commit is contained in:
Denis Silakov
parent
243c480159
commit
5319dc6bdd
5 changed files with 40 additions and 347 deletions
6
.abf.yml
6
.abf.yml
|
|
@ -1,2 +1,6 @@
|
|||
removed_sources:
|
||||
tor-0.2.2.39.tar.gz: cc5021a7656c0cd22de42da9f0ce7335026852bf
|
||||
tor-0.2.3.25.tar.gz: ef02e5b0eb44ab1a5d6108c39bd4e28918de79dc
|
||||
tor-0.2.4.20.tar.gz: 09ba4eda9a73c46852a277b721ed74c8263e8dba
|
||||
sources:
|
||||
"tor-0.2.2.39.tar.gz": cc5021a7656c0cd22de42da9f0ce7335026852bf
|
||||
tor-0.2.4.21.tar.gz: b93b66e4d5162cefc711cb44f9167ed4799ef990
|
||||
|
|
|
|||
1
tor-tmpfiles.conf
Normal file
1
tor-tmpfiles.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
d /var/run/tor 0750 toruser toruser -
|
||||
108
tor.init
108
tor.init
|
|
@ -1,108 +0,0 @@
|
|||
#!/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
|
||||
16
tor.service
Normal file
16
tor.service
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
[Unit]
|
||||
Description=Anonymizing overlay network for TCP
|
||||
After=syslog.target network.target nss-lookup.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=toruser
|
||||
ExecStart=/usr/bin/tor -f /etc/tor/torrc Log "notice file /var/log/tor/tor.log" RunAsDaemon 0 DataDirectory /var/lib/tor
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
ExecStop=/bin/kill -INT $MAINPID
|
||||
TimeoutSec=30
|
||||
Restart=on-failure
|
||||
LimitNOFILE=4096
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
254
tor.spec
254
tor.spec
|
|
@ -1,26 +1,28 @@
|
|||
%define runuser toruser
|
||||
|
||||
Name: tor
|
||||
Version: 0.2.2.39
|
||||
Version: 0.2.4.21
|
||||
Release: 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): systemd
|
||||
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
|
||||
Source4: %{name}.service
|
||||
Source5: %{name}-tmpfiles.conf
|
||||
|
||||
%description
|
||||
Tor is a connection-based low-latency anonymous communication system.
|
||||
|
|
@ -44,6 +46,7 @@ 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
|
||||
|
||||
|
|
@ -56,10 +59,6 @@ for high-stakes anonymity.
|
|||
|
||||
%define _logdir %{_var}/log
|
||||
|
||||
mkdir -p %{buildroot}%{_initrddir}
|
||||
cat %{SOURCE2} > %{buildroot}%{_initrddir}/%{name}
|
||||
chmod 0755 %{buildroot}%{_initrddir}/%{name}
|
||||
|
||||
install -p -m 644 %{buildroot}%{_sysconfdir}/%{name}/torrc.sample %{buildroot}%{_sysconfdir}/%{name}/torrc
|
||||
|
||||
mkdir -p -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
|
||||
|
|
@ -69,17 +68,22 @@ mkdir -p -m 755 %{buildroot}%{_sysconfdir}/sysconfig/
|
|||
cat %{SOURCE3} > %{buildroot}%{_sysconfdir}/sysconfig/%{name}
|
||||
|
||||
mkdir -p -m 700 %{buildroot}%{_localstatedir}/lib/%{name}
|
||||
mkdir -p -m 755 %{buildroot}%{_var}/run/%{name}
|
||||
mkdir -p -m 755 %{buildroot}%{_var}/%{name}
|
||||
mkdir -p -m 755 %{buildroot}%{_logdir}/%{name}
|
||||
|
||||
# Bash completion
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
echo 'complete -F _command $filenames torify' > %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
|
||||
|
||||
# Systemd support
|
||||
install -D -p -m 0644 %SOURCE4 %{buildroot}%_unitdir/%name.service
|
||||
install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||
|
||||
%pre
|
||||
%_pre_useradd %{runuser} / /bin/false
|
||||
|
||||
%post
|
||||
%tmpfiles_create %{name}
|
||||
%_post_service %{name}
|
||||
|
||||
%preun
|
||||
|
|
@ -95,244 +99,20 @@ rm -f %{_localstatedir}/%{name}/fingerprint
|
|||
%_postun_groupdel %{runuser}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/TODO
|
||||
%doc ReleaseNotes INSTALL LICENSE README ChangeLog doc/HACKING
|
||||
%{_mandir}/man*/*
|
||||
%{_bindir}/tor
|
||||
%{_bindir}/torify
|
||||
%{_bindir}/tor-resolve
|
||||
%{_bindir}/tor-gencert
|
||||
%config(noreplace) %attr(0755,%{runuser},%{runuser}) %{_initrddir}/%{name}
|
||||
%_unitdir/%name.service
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
%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 %{_var}/%{name}
|
||||
%attr(0750,%{runuser},%{runuser}) %dir %{_logdir}/%{name}
|
||||
%{_sysconfdir}/bash_completion.d/%{name}
|
||||
%{_datadir}/%{name}
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Sep 09 2012 Dmitry Mikhirev <dmikhirev@mandriva.org> 0.2.2.38-1mdv2012.0
|
||||
+ Revision: 816596
|
||||
- update to 0.2.2.38
|
||||
|
||||
* Sun Jan 22 2012 Lev Givon <lev@mandriva.org> 0.2.2.35-1
|
||||
+ Revision: 765034
|
||||
- Update to 0.2.2.35.
|
||||
|
||||
* Sun Feb 27 2011 Funda Wang <fwang@mandriva.org> 0.2.1.30-1
|
||||
+ Revision: 640335
|
||||
- update to new version 0.2.1.30
|
||||
|
||||
* Wed Jan 19 2011 Funda Wang <fwang@mandriva.org> 0.2.1.29-1
|
||||
+ Revision: 631656
|
||||
- update to new version 0.2.1.29
|
||||
|
||||
* Wed Dec 22 2010 Oden Eriksson <oeriksson@mandriva.com> 0.2.1.28-2mdv2011.0
|
||||
+ Revision: 623881
|
||||
- rebuilt against libevent 2.x
|
||||
|
||||
* Mon Dec 20 2010 Funda Wang <fwang@mandriva.org> 0.2.1.28-1mdv2011.0
|
||||
+ Revision: 623334
|
||||
- update to new version 0.2.1.28
|
||||
|
||||
* Sat Nov 27 2010 Funda Wang <fwang@mandriva.org> 0.2.1.27-1mdv2011.0
|
||||
+ Revision: 601752
|
||||
- update to new version 0.2.1.27
|
||||
|
||||
+ Matthew Dawkins <mattydaw@mandriva.org>
|
||||
- added missing ghostscript BR
|
||||
|
||||
* Tue Jun 15 2010 Pascal Terjan <pterjan@mandriva.org> 0.2.1.26-1mdv2010.1
|
||||
+ Revision: 548070
|
||||
- Update to 0.2.1.26 (bugfixes)
|
||||
|
||||
* Mon Apr 12 2010 Funda Wang <fwang@mandriva.org> 0.2.1.25-2mdv2010.1
|
||||
+ Revision: 533634
|
||||
- rebuild
|
||||
|
||||
* Tue Mar 30 2010 Pascal Terjan <pterjan@mandriva.org> 0.2.1.25-1mdv2010.1
|
||||
+ Revision: 529894
|
||||
- update to new version 0.2.1.25
|
||||
|
||||
* Wed Mar 03 2010 Sandro Cazzaniga <kharec@mandriva.org> 0.2.1.24-1mdv2010.1
|
||||
+ Revision: 513772
|
||||
- Update to 0.2.1.24
|
||||
|
||||
* Thu Jan 21 2010 Michael Scherer <misc@mandriva.org> 0.2.1.22-1mdv2010.1
|
||||
+ Revision: 494519
|
||||
- new version
|
||||
- update website url
|
||||
|
||||
* Tue Dec 29 2009 Pascal Terjan <pterjan@mandriva.org> 0.2.1.21-1mdv2010.1
|
||||
+ Revision: 483281
|
||||
- Update to 0.2.1.21
|
||||
|
||||
* Sun Dec 20 2009 Pascal Terjan <pterjan@mandriva.org> 0.2.1.20-2mdv2010.1
|
||||
+ Revision: 480257
|
||||
- Add upstream fix for new openssl
|
||||
|
||||
* Fri Nov 13 2009 Pascal Terjan <pterjan@mandriva.org> 0.2.1.20-1mdv2010.1
|
||||
+ Revision: 465828
|
||||
- update to new version 0.2.1.20
|
||||
|
||||
* Thu Aug 06 2009 Michael Scherer <misc@mandriva.org> 0.2.1.19-1mdv2010.0
|
||||
+ Revision: 410624
|
||||
- update to new version 0.2.1.19
|
||||
|
||||
* Fri Jun 26 2009 Pascal Terjan <pterjan@mandriva.org> 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 <pterjan@mandriva.org> 0.2.0.34-1mdv2009.1
|
||||
+ Revision: 339154
|
||||
- Update to 0.2.0.34
|
||||
|
||||
* Thu Jan 22 2009 Frederik Himpe <fhimpe@mandriva.org> 0.2.0.33-1mdv2009.1
|
||||
+ Revision: 332633
|
||||
- update to new version 0.2.0.33
|
||||
|
||||
* Mon Nov 24 2008 Pascal Terjan <pterjan@mandriva.org> 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 <misc@mandriva.org>
|
||||
- fix %%preun
|
||||
|
||||
* Tue Sep 09 2008 Frederik Himpe <fhimpe@mandriva.org> 0.2.0.31-1mdv2009.0
|
||||
+ Revision: 283173
|
||||
- update to new version 0.2.0.31
|
||||
|
||||
* Wed Jul 23 2008 Pascal Terjan <pterjan@mandriva.org> 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 <misc@mandriva.org> 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 <pixel@mandriva.com>
|
||||
- adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
|
||||
|
||||
* Wed May 14 2008 Oden Eriksson <oeriksson@mandriva.com> 0.1.2.19-2mdv2009.0
|
||||
+ Revision: 207049
|
||||
- rebuilt against libevent-1.4.4
|
||||
|
||||
* Sun Jan 20 2008 Pascal Terjan <pterjan@mandriva.org> 0.1.2.19-1mdv2008.1
|
||||
+ Revision: 155377
|
||||
- update to new version 0.1.2.19
|
||||
|
||||
+ Olivier Blin <blino@mandriva.org>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tv@mandriva.org>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Wed Nov 07 2007 Funda Wang <fwang@mandriva.org> 0.1.2.18-2mdv2008.1
|
||||
+ Revision: 106704
|
||||
- rebuild for new lzma
|
||||
|
||||
* Wed Oct 31 2007 Pascal Terjan <pterjan@mandriva.org> 0.1.2.18-1mdv2008.1
|
||||
+ Revision: 104166
|
||||
- update to new version 0.1.2.18
|
||||
|
||||
* Sun Sep 02 2007 Funda Wang <fwang@mandriva.org> 0.1.2.17-1mdv2008.0
|
||||
+ Revision: 77742
|
||||
- New version 0.1.2.17
|
||||
|
||||
* Fri Aug 03 2007 Pascal Terjan <pterjan@mandriva.org> 0.1.2.16-1mdv2008.0
|
||||
+ Revision: 58448
|
||||
- update to new version 0.1.2.16
|
||||
|
||||
* Mon Jul 23 2007 Pascal Terjan <pterjan@mandriva.org> 0.1.2.15-1mdv2008.0
|
||||
+ Revision: 54629
|
||||
- update to new version 0.1.2.15
|
||||
|
||||
* Sat May 26 2007 Pascal Terjan <pterjan@mandriva.org> 0.1.2.14-1mdv2008.0
|
||||
+ Revision: 31230
|
||||
- 0.1.2.14
|
||||
|
||||
* Fri May 11 2007 David Walluck <walluck@mandriva.org> 0.1.2.13-2mdv2008.0
|
||||
+ Revision: 26281
|
||||
- LSB initscript
|
||||
|
||||
* Wed Apr 25 2007 Pascal Terjan <pterjan@mandriva.org> 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 <awilliamson@mandriva.com> 0.1.1.26-2mdv2007.0
|
||||
+ Revision: 132717
|
||||
- rebuild to fix 29130
|
||||
|
||||
* Sun Dec 17 2006 Pascal Terjan <pterjan@mandriva.org> 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 <pterjan@mandriva.org> 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 <pterjan@mandriva.org> 0.1.1.23-2mdv2007.0
|
||||
- Require tsocks for torify
|
||||
|
||||
* Wed Aug 16 2006 Pascal Terjan <pterjan@mandriva.org> 0.1.1.23-1mdv2007.0
|
||||
- New release 0.1.1.23
|
||||
|
||||
* Sun Jul 09 2006 Pascal Terjan <pterjan@mandriva.org> 0.1.1.22-1mdv2007.0
|
||||
- New release 0.1.1.22
|
||||
- Fix macro in changelog
|
||||
|
||||
* Wed Jun 14 2006 Lenny Cartier <lenny@mandriva.com> 0.1.1.21-1mdv2007.0
|
||||
- 0.1.1.21
|
||||
|
||||
* Fri May 26 2006 Pascal Terjan <pterjan@mandriva.org> 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 <pterjan@mandriva.org> 0.1.0.17-1mdk
|
||||
- New release 0.1.0.17
|
||||
|
||||
* Thu Jan 05 2006 Pascal Terjan <pterjan@mandriva.org> 0.1.0.16-1mdk
|
||||
- 0.1.0.16
|
||||
|
||||
* Wed Nov 23 2005 Laurent MONTEL <lmontel@mandriva.com> 0.1.0.15-4
|
||||
- Rebuild with new openssl
|
||||
|
||||
* Thu Oct 20 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.1.0.15-3mdk
|
||||
- Fix BuildRequires
|
||||
|
||||
* Wed Sep 28 2005 Lev Givon <lev@columbia.edu> 0.1.0.15-2mdk
|
||||
- Define %%{_logdir} macro
|
||||
|
||||
* Sun Sep 25 2005 Pascal Terjan <pterjan@mandriva.org> 0.1.0.15-1mdk
|
||||
- 0.1.0.15
|
||||
|
||||
* Wed Aug 17 2005 Pascal Terjan <pterjan@mandriva.org> 0.1.0.14-2mdk
|
||||
- Add forgotten changelog
|
||||
|
||||
* Wed Aug 17 2005 Pascal Terjan <pterjan@mandriva.org> 0.1.0.14-1mdk
|
||||
- 0.1.0.14 (security fix)
|
||||
|
||||
* Mon Aug 08 2005 Pascal Terjan <pterjan@zarb.org> 0.1.0.13-1mdk
|
||||
- 0.1.0.13
|
||||
|
||||
* Mon Aug 08 2005 Pascal Terjan <pterjan@zarb.org> 0.1.0.12-1mdk
|
||||
- first Mandriva version (partially based on the official rpm)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue