[tor] Revert "Package cleanup and various fixes"
ensc
ensc at fedoraproject.org
Sun Feb 10 13:15:17 UTC 2013
commit dcca5c196a47528c40b4563dac9bf0adf892cc89
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sun Feb 10 14:15:05 2013 +0100
Revert "Package cleanup and various fixes"
This reverts commit 397dff12633bb33d1f764a911da734989d33f602.
too much changes which are violating my personal coding style (tabs
vs. whitespace, curlies vs. non-curlies), breaking local things
(version watch) or builds on RHEL5 platforms (removal of %noarch).
Conflicts:
tor.spec
Makefile | 2 +
lastver | 1 +
tor.logrotate | 17 ++--
tor.spec | 239 +++++++++++++++++++++++++++------------------------
tor.systemd.service | 2 +-
verinfo | 2 +
6 files changed, 144 insertions(+), 119 deletions(-)
---
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..e5461e3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+MAKEFILE_COMMON = $(HOME)/.fedora/common.mk
+-include $(MAKEFILE_COMMON)
diff --git a/lastver b/lastver
new file mode 100644
index 0000000..5c0b7dc
--- /dev/null
+++ b/lastver
@@ -0,0 +1 @@
+0.2.3.25
diff --git a/tor.logrotate b/tor.logrotate
index 5d6f22b..3677b2c 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -1,10 +1,13 @@
/var/log/tor/*.log {
- su toranon toranon
- delaycompress
- notifempty
- sharedscripts
- missingok
+ su toranon toranon
+ delaycompress
+ notifempty
+ sharedscripts
+ missingok
postrotate
- /bin/systemctl reload tor.service >/dev/null 2>/dev/null || :
- endscript
+ test ! -f /etc/init.d/tor || /etc/init.d/tor reload >/dev/null 2>/dev/null || :
+ test ! -f /etc/initng/daemon/tor.i || /sbin/ngc --restart daemon/tor >/dev/null 2>/dev/null || :
+ test ! -d /etc/minit/services/tor || /bin/msvc -h services/tor >/dev/null 2>/dev/null || :
+ test ! -f /lib/systemd/system/tor.service || /bin/systemctl reload tor.service >/dev/null 2>/dev/null || :
+ endscript
}
diff --git a/tor.spec b/tor.spec
index 7fcd24c..2a8f40c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,75 +1,94 @@
## This package understands the following switches:
-%bcond_without fedora
-%bcond_without noarch
-%bcond_with upstart
-
-%global _hardened_build 1
-
-%global username toranon
-%global uid 19
-%global homedir %_var/lib/%{name}
-%global logdir %_var/log/%{name}
-
-Name: tor
-Version: 0.2.3.25
-Release: 1902
-Group: System Environment/Daemons
-License: BSD
-Summary: Anonymizing overlay network for TCP (The onion router)
-URL: http://www.torproject.org
-Requires: %{name}-core = %{version}-%{release}
-Requires: %{name}-systemd = %{version}-%{release}
+%bcond_without fedora
+%bcond_without noarch
+%bcond_with upstart
+
+%global _hardened_build 1
+
+%global username toranon
+%global uid 19
+%global homedir %_var/lib/%name
+%global logdir %_var/log/%name
+
+%{!?_unitdir:%global _unitdir /lib/systemd/system}
+%{?with_noarch:%global noarch BuildArch: noarch}
+%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
+%{!?systemd_reqs:%global systemd_reqs \
+Requires(post): /bin/systemctl\
+Requires(preun): /bin/systemctl\
+Requires(postun): /bin/systemctl\
+%nil}
+%{!?systemd_install:%global systemd_install()\
+%post %1\
+%systemd_post %2 \
+%preun %1\
+%systemd_preun %2 \
+%postun %1\
+%systemd_postun_with_restart %2 \
+%nil}
+
+
+Name: tor
+Version: 0.2.3.25
+Release: %release_func 1903
+Group: System Environment/Daemons
+License: BSD
+Summary: Anonymizing overlay network for TCP (The onion router)
+URL: http://www.torproject.org
+Requires: %name-core = %version-%release
+Requires: %name-systemd = %version-%release
%package core
-Summary: Core programs for tor
-Group: System Environment/Daemons
-Source0: https://www.torproject.org/dist/%{name}-%{version}.tar.gz
-Source1: https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
-Source2: tor.logrotate
+Summary: Core programs for tor
+Group: System Environment/Daemons
+Source0: https://www.torproject.org/dist/%name-%version.tar.gz
+Source1: https://www.torproject.org/dist/%name-%version.tar.gz.asc
+Source2: tor.logrotate
+BuildRoot: %_tmppath/%name-%version-%release-root
# tor-design.pdf is not shipped anymore with tor
-Obsoletes: tor-doc < 0.2.2
-
-BuildRequires: libevent-devel openssl-devel asciidoc
-BuildRequires: fedora-usermgmt-devel
-Provides: user(%{username}) = %uid
-Provides: group(%{username}) = %uid
-Requires: init(%{name})
-Requires(pre): /etc/logrotate.d
-Requires(postun): /etc/logrotate.d
+Obsoletes: tor-doc < 0.2.2
+
+BuildRequires: libevent-devel openssl-devel asciidoc
+BuildRequires: fedora-usermgmt-devel
+Provides: user(%username) = %uid
+Provides: group(%username) = %uid
+Requires: init(%name)
+Requires(pre): /etc/logrotate.d
+Requires(postun): /etc/logrotate.d
%{?FE_USERADD_REQ}
%package -n torify
-Summary: The torify wrapper script
-Group: System Environment/Daemons
-Requires: torsocks
-Requires: %{name}-core = %{version}-%{release}
+Summary: The torify wrapper script
+Group: System Environment/Daemons
+Requires: tsockstorsocks
+# Prevent version mix
+Conflicts: %name-core < %version-%release
+Conflicts: %name-core > %version-%release
%{?noarch}
%package systemd
-Summary: Systemd initscripts for tor
-Group: System Environment/Daemons
-Source10: tor.systemd.service
-Provides: init(%{name}) = systemd
-Requires: %{name}-core = %{version}-%{release}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+Summary: Systemd initscripts for tor
+Group: System Environment/Daemons
+Source10: tor.systemd.service
+Provides: init(%name) = systemd
+Requires: %name-core = %version-%release
+%{?systemd_reqs}
%{?noarch}
%package upstart
-Summary: upstart initscripts for %{name}
-Group: System Environment/Base
-Source20: %{name}.upstart
-Provides: init(%{name}) = upstart
-Requires: %{name}-core = %{version}-%{release}
-Requires(pre): /etc/init
-Requires(post): /usr/bin/killall
-Requires(postun): /sbin/initctl
+Summary: upstart initscripts for %name
+Group: System Environment/Base
+Source20: %name.upstart
+Provides: init(%name) = upstart
+Requires: %name-core = %version-%release
+Requires(pre): /etc/init
+Requires(post): /usr/bin/killall
+Requires(postun): /sbin/initctl
%{?noarch}
@@ -122,111 +141,109 @@ daemon.
%prep
%setup -q
+sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in
+cat <<EOF >>src/config/torrc.sample.in
+Log notice syslog
+User %username
+EOF
+
%build
export LDFLAGS='-Wl,--as-needed'
-%configure --with-tor-user=%{username} --with-tor-group=%{username}
+%configure
make %{?_smp_mflags}
%install
+rm -rf $RPM_BUILD_ROOT _doc _doc-torify
+
make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc{.sample,}
-sed -i -e "s|#DataDirectory.*$|DataDirectory %{homedir}/.tor|g" \
- $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
-cat << EOF >> $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
-Log notice syslog
-User %{username}
-EOF
+mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
-mkdir -p $RPM_BUILD_ROOT%{logdir}
-mkdir -p $RPM_BUILD_ROOT%{homedir}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/tor
+install -D -p -m 0644 %SOURCE10 $RPM_BUILD_ROOT%_unitdir/%name.service
+install -D -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
-install -D -p -m 0644 %{SOURCE10} \
- $RPM_BUILD_ROOT%_unitdir/%{name}.service
-install -D -p -m 0644 %{SOURCE2} \
- $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tor
-install -D -p -m 0644 %{SOURCE20} \
- $RPM_BUILD_ROOT%{_sysconfdir}/init/tor.conf
+install -D -p -m 0644 %SOURCE20 $RPM_BUILD_ROOT%_sysconfdir/init/tor.conf
-# Split docs for tor and torify
-mv $RPM_BUILD_ROOT%{_datadir}/doc/tor _doc
+mv $RPM_BUILD_ROOT%_datadir/doc/tor _doc
mkdir _doc-torify
mv _doc/torify.html _doc-torify
-%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init}
+%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
%pre core
-%__fe_groupadd %uid -r %{username} &>/dev/null || :
-%__fe_useradd %uid -r -s /sbin/nologin -d %{homedir} -M \
- -c 'TOR anonymizing user' \
- -g %{username} %{username} &>/dev/null || :
+%__fe_groupadd %uid -r %username &>/dev/null || :
+%__fe_useradd %uid -r -s /sbin/nologin -d %homedir -M \
+ -c 'TOR anonymizing user' -g %username %username &>/dev/null || :
%postun core
-%__fe_userdel %{username} &>/dev/null || :
-%__fe_groupdel %{username} &>/dev/null || :
+%__fe_userdel %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
-%post systemd
-%systemd_post tor.service
-%preun systemd
-%systemd_preun tor.service
+%systemd_install systemd %name.service
-%postun systemd
-%systemd_postun tor.service
%postun upstart
-/usr/bin/killall -u %{username} -s INT tor 2>/dev/null || :
+/usr/bin/killall -u %username -s INT tor 2>/dev/null || :
%preun upstart
test "$1" != "0" || /sbin/initctl -q stop tor || :
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
%files
%files core
-%doc LICENSE README ChangeLog ReleaseNotes _doc/*
-%{_bindir}/tor
-%{_bindir}/tor-gencert
-%{_bindir}/tor-resolve
-%{_datadir}/tor
-%{_mandir}/man1/tor.1*
-%{_mandir}/man1/tor-gencert.1*
-%{_mandir}/man1/tor-resolve.1*
-%dir %{_sysconfdir}/tor
-%attr(0640,root,%{username}) %config(noreplace) %{_sysconfdir}/tor/torrc
-%config(noreplace) %{_sysconfdir}/logrotate.d/tor
-%attr(0700,%{username},%{username}) %dir %{homedir}
-%attr(0750,%{username},%{username}) %dir %{logdir}
-%attr(0750,%{username},%{username}) %dir %{_localstatedir}/run/tor
-
-%exclude %{_mandir}/man1/torify.1*
-%exclude %{_bindir}/torify
+%defattr(-,root,root,-)
+%doc LICENSE README ChangeLog
+%doc ReleaseNotes
+%doc _doc/*
+%dir %_sysconfdir/tor
+%config(noreplace) %_sysconfdir/logrotate.d/tor
+%attr(0700,%username,%username) %dir %homedir
+%attr(0730,root,%username) %dir %logdir
+%attr(0640,root,%username) %config(noreplace) %_sysconfdir/tor/torrc
+%_bindir/*
+%_mandir/man1/*
+%_datadir/tor
+
+%exclude %_mandir/man1/torify*
+%exclude %_bindir/torify
%files -n torify
+%defattr(-,root,root,-)
%doc _doc-torify/*
-%{_bindir}/torify
-%{_mandir}/man1/torify*
-%dir %{_sysconfdir}/tor
-%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
+%_bindir/torify
+%_mandir/man1/torify*
+%dir %_sysconfdir/tor
+%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
%files systemd
-%{_unitdir}/tor.service
+%defattr(-,root,root,-)
+%_unitdir/%name.service
%if 0%{?with_upstart:1}
%files upstart
- %config(noreplace) %{_sysconfdir}/init/*
+ %defattr(-,root,root,-)
+ %config(noreplace) /etc/init/*
%endif
-
%changelog
+* Sun Feb 10 2013 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.3.25-1903
+- reverted "Package cleanup and various fixes"; too invasive and
+ non-auditable changes which are breaking things
+
* Thu Feb 07 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1902
- torify subpackage should depend on torsocks not tsocks (#908569)
diff --git a/tor.systemd.service b/tor.systemd.service
index 3b3d3f2..2fabf70 100644
--- a/tor.systemd.service
+++ b/tor.systemd.service
@@ -4,7 +4,7 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
-ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc -f /etc/tor/torrc --quiet
+ExecStart = /usr/bin/tor --runasdaemon 0 --quiet
ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
TimeoutSec = 30
diff --git a/verinfo b/verinfo
new file mode 100644
index 0000000..6614a11
--- /dev/null
+++ b/verinfo
@@ -0,0 +1,2 @@
+http://www.torproject.org/dist/
+tor-([^-]*?)\.tar\.
More information about the scm-commits
mailing list