[tor/el5] Update to upstream release 0.2.4.25
Jamie Nguyen
jamielinux at fedoraproject.org
Wed Oct 22 17:18:57 UTC 2014
commit 026fc3931af1a6b0457d6a665269020bc6c98f51
Author: Jamie Nguyen <j at jamielinux.com>
Date: Wed Oct 22 18:18:19 2014 +0100
Update to upstream release 0.2.4.25
.gitignore | 2 +
sources | 4 +-
tor-0.2.3.25.tar.gz.asc | 17 ------
defaults-torrc => tor.defaults-torrc | 0
tor.spec | 104 ++++++++++++++++++---------------
5 files changed, 61 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dab0abb..812c0b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
tor-0.2.1.19.tar.gz
/tor-0.2.3.25.tar.gz
/tor-0.2.3.25.tar.gz.asc
+/tor-0.2.4.25.tar.gz
+/tor-0.2.4.25.tar.gz.asc
diff --git a/sources b/sources
index 6eae516..d2d545f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a1c364189a9a66ed9daa8e6436489daf tor-0.2.3.25.tar.gz
-a4c12795ffb8f68550a5dab4a9eb0654 tor-0.2.3.25.tar.gz.asc
+454744ebff5033ae353f2dd6b1bc425e tor-0.2.4.25.tar.gz
+d92082a9ec977d8400c4dd108bacf16e tor-0.2.4.25.tar.gz.asc
diff --git a/defaults-torrc b/tor.defaults-torrc
similarity index 100%
rename from defaults-torrc
rename to tor.defaults-torrc
diff --git a/tor.spec b/tor.spec
index 6dad7ce..4e59779 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,35 +1,42 @@
-%global tor_user toranon
-%global tor_group toranon
-%global tor_homedir %{_sharedstatedir}/tor
-%global tor_logdir %{_localstatedir}/log/tor
%global _hardened_build 1
+%global toruser toranon
+%global torgroup toranon
+%global homedir %{_localstatedir}/lib/%{name}
+%global logdir %{_localstatedir}/log/%{name}
+%global rundir %{_localstatedir}/run/%{name}
+
Name: tor
-Version: 0.2.3.25
+Version: 0.2.4.25
Release: 1%{?dist}
-
-Summary: Anonymizing overlay network for TCP (The onion router)
Group: System Environment/Daemons
License: BSD
-URL: http://www.torproject.org
+Summary: Anonymizing overlay network for TCP (The onion router)
+URL: https://www.torproject.org
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source0: https://www.torproject.org/dist/tor-%{version}.tar.gz
Source1: https://www.torproject.org/dist/tor-%{version}.tar.gz.asc
+# Upstream ship their own logrotate file. Ours only has 2 modifications:
+# use 'toranon' user, and use systemctl to reload.
Source2: tor.logrotate
-Source3: tor.service
-Source4: defaults-torrc
+# This makes sure tor runs as 'toranon', logs to syslog at 'notice' level,
+# and writes to /var/lib/tor instead of /root/.tor directory.
+Source3: tor.defaults-torrc
+Source4: tor.service
+
+Obsoletes: tor-doc < 0.2.2
+Provides: tor-doc = %{version}-%{release}
BuildRequires: libevent-devel >= 1.4.13
BuildRequires: openssl-devel >= 0.9.7
+
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts
-Obsoletes: tor-doc < 0.2.2
-
%description
Tor is a connection-based low-latency anonymous communication system.
@@ -53,38 +60,30 @@ for high-stakes anonymity.
%prep
-%setup -q -n tor-%{version}
+%setup -q
%build
-%configure --with-tor-user=%{tor_user} --with-tor-group=%{tor_group} \
+%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
--docdir=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
-mv %{buildroot}%{_sysconfdir}/tor/torrc{.sample,}
-sed -i -e "s|#DataDirectory.*$|DataDirectory %{tor_homedir}/tor|g" \
- %{buildroot}%{_sysconfdir}/tor/torrc
-cat << EOF >> %{buildroot}%{_sysconfdir}/tor/torrc
-Log notice syslog
-User %{tor_user}
-EOF
+make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc.sample \
+ $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
-mkdir -p %{buildroot}%{tor_homedir}
-mkdir -p %{buildroot}%{tor_logdir}
-mkdir -p %{buildroot}%{_localstatedir}/run/tor
+mkdir -p $RPM_BUILD_ROOT%{logdir}
+mkdir -p $RPM_BUILD_ROOT%{homedir}
+mkdir -p $RPM_BUILD_ROOT%{rundir}
-install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/tor
-
-install -p -D -m 0755 contrib/torctl %{buildroot}%{_bindir}/torctl
-install -p -D -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/tor
-
-install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/tor/defaults-torrc
+install -D -p -m 0755 %SOURCE10 $RPM_BUILD_ROOT%{_initrddir}/tor
+install -D -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tor
+install -D -p -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults-torrc
+install -D -p -m 0755 contrib/torctl $RPM_BUILD_ROOT%{_bindir}/torctl
%clean
@@ -92,10 +91,11 @@ rm -rf %{buildroot}
%pre
-getent group %{tor_group} >/dev/null || groupadd -r %{tor_group}
-getent passwd %{tor_user} >/dev/null || \
- useradd -r -g %{tor_group} -d %{tor_homedir} -s /sbin/nologin \
- -c "Tor client" %{tor_user}
+getent group %{torgroup} >/dev/null || groupadd -r %{torgroup}
+getent passwd %{toruser} >/dev/null || \
+ useradd -r -s /sbin/nologin -d %{homedir} -M \
+ -c 'TOR anonymizing user' -g %{torgroup} %{toruser}
+exit 0
%post
/sbin/chkconfig --add tor
@@ -113,28 +113,38 @@ fi
%files
-%doc ChangeLog LICENSE README ReleaseNotes doc/HACKING doc/TODO
+%defattr(-,root,root,-)
+%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/*.html
%{_bindir}/tor
-%{_bindir}/torctl
-%{_bindir}/torify
%{_bindir}/tor-gencert
%{_bindir}/tor-resolve
-%{_datadir}/tor
+%{_bindir}/torctl
+%{_bindir}/torify
%{_mandir}/man1/tor.1*
-%{_mandir}/man1/torify.1*
%{_mandir}/man1/tor-gencert.1*
%{_mandir}/man1/tor-resolve.1*
+%{_mandir}/man1/torify.1*
+%dir %{_datadir}/tor
+%{_datadir}/tor/defaults-torrc
+%{_datadir}/tor/geoip
+%{_datadir}/tor/geoip6
%{_initrddir}/tor
+
%dir %{_sysconfdir}/tor
-%attr(0640,root,%{tor_user}) %config(noreplace) %{_sysconfdir}/tor/torrc
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
%config(noreplace) %{_sysconfdir}/logrotate.d/tor
-%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
-%attr(0700,%{tor_user},%{tor_group}) %dir %{tor_homedir}
-%attr(0750,%{tor_user},%{tor_group}) %dir %{tor_logdir}
-%attr(0750,%{tor_user},%{tor_group}) %dir %{_localstatedir}/run/tor
+
+%attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
+%attr(0700,%{toruser},%{torgroup}) %dir %{logdir}
+%attr(0700,%{toruser},%{torgroup}) %dir %{rundir}
%changelog
+* Wed Oct 22 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.4.25-1
+- update to upstream release 0.2.4.25
+- reduce diff between el6 and el5
+ (amend URL, amend macros, some whitespace changes for legibility)
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1
- rewrite package from scratch for simplicity and clarity
- stick closer with upstream defaults
More information about the scm-commits
mailing list