The package rpms/tor.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/tor.git/commit/?id=258f9f5d341905....
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit b5f1d70840260a5049a64ad202a86676c1a956b4
Author: mh <mh+fedora(a)scrit.ch>
Date: Sat Jul 21 00:33:49 2018 +0200
fixing DAC problems on onionservices with SELinux (#1602171)
diff --git a/tor.defaults-torrc b/tor.defaults-torrc
index 83ebb3b..e6bc6ce 100644
--- a/tor.defaults-torrc
+++ b/tor.defaults-torrc
@@ -1,4 +1,2 @@
DataDirectory /var/lib/tor
-DataDirectoryGroupReadable 1
-User toranon
Log notice syslog
diff --git a/tor.service b/tor.service
index 84bc50c..1ee32fa 100644
--- a/tor.service
+++ b/tor.service
@@ -16,6 +16,8 @@ Restart=on-failure
RestartSec=1
WatchdogSec=1m
LimitNOFILE=32768
+User=toranon
+Group=toranon
# Hardening
PrivateTmp=yes
@@ -23,13 +25,11 @@ DeviceAllow=/dev/null rw
DeviceAllow=/dev/urandom r
ProtectHome=yes
ProtectSystem=full
-ReadOnlyDirectories=/run
-ReadOnlyDirectories=/var
-ReadWriteDirectories=/run/tor
+ReadOnlyDirectories=/
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
-CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE CAP_DAC_READ_SEARCH
-PermissionsStartOnly=yes
+ReadWriteDirectories=/run/tor
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
[Install]
WantedBy = multi-user.target
diff --git a/tor.spec b/tor.spec
index ab50675..e8b4c5a 100644
--- a/tor.spec
+++ b/tor.spec
@@ -167,12 +167,15 @@ fi
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
%config(noreplace) %{_sysconfdir}/logrotate.d/tor
-%attr(0750,%{toruser},root) %dir %{homedir}
+%attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
%attr(0750,%{toruser},%{torgroup}) %dir %{rundir}
%changelog
+* Sat Jul 21 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.9-2
+- fixing DAC problems on onionservices with SELinux (#1602171)
+
* Sat Jul 14 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.9-1
- update to latest upstream stable release 0.3.3.9 (#1581512)
diff --git a/tor@.service b/tor@.service
index 0406abc..e0d3f33 100644
--- a/tor@.service
+++ b/tor@.service
@@ -16,6 +16,8 @@ Restart=on-failure
RestartSec=1
WatchdogSec=1m
LimitNOFILE=32768
+User=toranon
+Group=toranon
# Hardening
PrivateTmp=yes
@@ -23,13 +25,11 @@ DeviceAllow=/dev/null rw
DeviceAllow=/dev/urandom r
ProtectHome=yes
ProtectSystem=full
-ReadOnlyDirectories=/run
-ReadOnlyDirectories=/var
-ReadWriteDirectories=/run/tor
+ReadOnlyDirectories=/
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
-CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE CAP_DAC_READ_SEARCH
-PermissionsStartOnly=yes
+ReadWriteDirectories=/run/tor
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
[Install]
WantedBy = multi-user.target
commit 4409405b87754bed053121a785451a0ddcf17deb
Author: mh <mh+fedora(a)scrit.ch>
Date: Sat Jul 14 11:51:30 2018 +0200
update to 0.3.3.9-1
diff --git a/sources b/sources
index e141b86..02b5291 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.3.8.tar.gz) =
b937f7f429690fa92d112d5bc48234c4b96f69614f319f04dab62e5b11b87e5e141d48642afac89e1dfe62a394d56b82ebf7fb1ac10de91923135a434a79718f
-SHA512 (tor-0.3.3.8.tar.gz.asc) =
3eea6a1f3b94419f3e80ac7ff681986860fff54e198f2861fb50902e7455bea372138a20372b6e0d80f16279f711be5f97e44f145c52da4e1d92150f9af0442d
+SHA512 (tor-0.3.3.9.tar.gz) =
3b1fd9926988233c605996281510cd966a08bc1008e1e4bf7e0ed76b40c1820b7789a85555d5a4d9c0b58db992366d7a62d5d3b20e818a0d68df3b2286d0df3d
+SHA512 (tor-0.3.3.9.tar.gz.asc) =
1e3df8bff3aaa3d20af953c16bb89374f4b67cd6071062d3a5b7716e98cf42a1c3f8e31a9b3873427fc752485a57a03b2093280a5b55a5d3fd6b2732a35aad23
diff --git a/tor.spec b/tor.spec
index 0fe9385..ab50675 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,8 +19,8 @@
%endif
Name: tor
-Version: 0.3.3.8
-Release: 2%{?dist}
+Version: 0.3.3.9
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -173,6 +173,9 @@ fi
%changelog
+* Sat Jul 14 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.9-1
+- update to latest upstream stable release 0.3.3.9 (#1581512)
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.3.3.8-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 73ae647ef0cc42bfdde95546ed1a130a5ded73e8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 07:44:06 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/tor.spec b/tor.spec
index f431f35..0fe9385 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.3.3.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -173,6 +173,9 @@ fi
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.3.3.8-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Jul 10 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.8-1
- update to latest upstream stable release 0.3.3.8 (#1581512)
commit a420a74fb75ede8a719e1841260f4a43d5af5bda
Author: mh <mh+fedora(a)scrit.ch>
Date: Tue Jul 10 07:58:46 2018 +0200
update to latest upstream release 0.3.3.8
diff --git a/sources b/sources
index 5227e82..e141b86 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.3.7.tar.gz.asc) =
90699631828ee1ae1352c71d8cdf89e46ad0ab73fda2a08a01885831484a4ffb139c7127c5bdbcd5364da8f5730f1698dc1b50f015e04d1df230e038864535cc
-SHA512 (tor-0.3.3.7.tar.gz) =
70c7d089fecde7d5c4ccf4fc0c774aa3da2121f297012065292f9e5efda54206365ef1fa830116ee143b027f5023a5eadcd6fd4629c4d2d930c12fa9fa7abf9d
+SHA512 (tor-0.3.3.8.tar.gz) =
b937f7f429690fa92d112d5bc48234c4b96f69614f319f04dab62e5b11b87e5e141d48642afac89e1dfe62a394d56b82ebf7fb1ac10de91923135a434a79718f
+SHA512 (tor-0.3.3.8.tar.gz.asc) =
3eea6a1f3b94419f3e80ac7ff681986860fff54e198f2861fb50902e7455bea372138a20372b6e0d80f16279f711be5f97e44f145c52da4e1d92150f9af0442d
diff --git a/tor.spec b/tor.spec
index 498edca..f431f35 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.3.3.7
+Version: 0.3.3.8
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -173,6 +173,9 @@ fi
%changelog
+* Tue Jul 10 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.8-1
+- update to latest upstream stable release 0.3.3.8 (#1581512)
+
* Mon Jun 18 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.7-1
- update to latest upstream stable release 0.3.3.7 (#1581512)
commit 96c73e151421ffb4ed050fd11749cd59735fd72b
Author: mh <mh+fedora(a)scrit.ch>
Date: Mon Jun 18 21:05:18 2018 +0200
upgrade to 0.3.3.7
diff --git a/sources b/sources
index d3125a2..5227e82 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.3.6.tar.gz.asc) =
5eb00c63b19518683fa2adc7e635dbe1e67f0b3d8a50144fb648e313560ea210657852e8754f8e07695f99275f48c970c2d4f654de3b30e6acc0ad9da61ecbe7
-SHA512 (tor-0.3.3.6.tar.gz) =
ab2a6324844c0015c58b65faf61e9b72fe1aca2c90dc3c2970939f962f7d999483e223b980f3088207035d2ad1dc6a5628a253a486e048a072b4c5022b9cb0d3
+SHA512 (tor-0.3.3.7.tar.gz.asc) =
90699631828ee1ae1352c71d8cdf89e46ad0ab73fda2a08a01885831484a4ffb139c7127c5bdbcd5364da8f5730f1698dc1b50f015e04d1df230e038864535cc
+SHA512 (tor-0.3.3.7.tar.gz) =
70c7d089fecde7d5c4ccf4fc0c774aa3da2121f297012065292f9e5efda54206365ef1fa830116ee143b027f5023a5eadcd6fd4629c4d2d930c12fa9fa7abf9d
diff --git a/tor.spec b/tor.spec
index 57b40d6..498edca 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.3.3.6
+Version: 0.3.3.7
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -173,6 +173,9 @@ fi
%changelog
+* Mon Jun 18 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.7-1
+- update to latest upstream stable release 0.3.3.7 (#1581512)
+
* Wed May 23 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.6-1
- update to latest upstream stable release 0.3.3.6 (#1581512)
commit 17de54bda20bc9e10ec1c81564db61366503cfb0
Author: mh <mh+fedora(a)scrit.ch>
Date: Wed May 23 21:32:29 2018 +0200
update to latest upstream 0.3.3.6
diff --git a/sources b/sources
index 5441936..d3125a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.2.10.tar.gz) =
b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
-SHA512 (tor-0.3.2.10.tar.gz.asc) =
ec258e66023c80567b5c02fa6ac79e2fbf7e6ba5313e48417caa075f20af30bb94566b0070c88758238d68bdd9dfed0ea3962cddf20bb773bcca0d26485a9224
+SHA512 (tor-0.3.3.6.tar.gz.asc) =
5eb00c63b19518683fa2adc7e635dbe1e67f0b3d8a50144fb648e313560ea210657852e8754f8e07695f99275f48c970c2d4f654de3b30e6acc0ad9da61ecbe7
+SHA512 (tor-0.3.3.6.tar.gz) =
ab2a6324844c0015c58b65faf61e9b72fe1aca2c90dc3c2970939f962f7d999483e223b980f3088207035d2ad1dc6a5628a253a486e048a072b4c5022b9cb0d3
diff --git a/tor.spec b/tor.spec
index 0f79acc..57b40d6 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.3.2.10
+Version: 0.3.3.6
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -173,6 +173,9 @@ fi
%changelog
+* Wed May 23 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.3.6-1
+- update to latest upstream stable release 0.3.3.6 (#1581512)
+
* Sat Mar 03 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.10-1
- Update to latest version. Security-Fixes TROVE-2018-001, TROVE-2018-002,
TROVE-2018-003 and TROVE-2018-004
commit a957a6e823fdb727448bc4f6734eab2603fdd0c3
Author: mh <mh+fedora(a)scrit.ch>
Date: Wed Mar 7 21:58:53 2018 +0100
Added gcc to BuildRequires as per "Packaging:C and C++" Wiki guidelines
Bump considered unnecessary
diff --git a/tor.spec b/tor.spec
index 81f1fe1..0f79acc 100644
--- a/tor.spec
+++ b/tor.spec
@@ -38,6 +38,7 @@ Source20: README
Patch0: tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
+BuildRequires: gcc
BuildRequires: asciidoc
BuildRequires: libevent-devel
BuildRequires: openssl-devel
commit a27a6b89c302b95dfb3fbe282b3a7a2ee071351d
Author: mh <mh+fedora(a)scrit.ch>
Date: Sat Mar 3 16:25:11 2018 +0100
new sources
diff --git a/sources b/sources
index ad6948a..5441936 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.2.9.tar.gz) =
60b8d93eee8d0b04b49a8fa941ea3489e8cd9b3f3923d9da39865caa1f5bce6666c1db06594520aa3726151a54c9c0c30bb8d9b25fb38d7172ffb15a011d6c8c
-SHA512 (tor-0.3.2.9.tar.gz.asc) =
7c8e3c8535c20059819e2040940666233253989c60b746bb453dc6d548a2a239ab1562b8c3055d90d2c26baac521b7d8cbe6dc58454489a71e3204faf72bb492
+SHA512 (tor-0.3.2.10.tar.gz) =
b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
+SHA512 (tor-0.3.2.10.tar.gz.asc) =
ec258e66023c80567b5c02fa6ac79e2fbf7e6ba5313e48417caa075f20af30bb94566b0070c88758238d68bdd9dfed0ea3962cddf20bb773bcca0d26485a9224
commit c4ec1f27eaa3daef2c51b140c3c2eb17cce9d6da
Author: mh <mh+fedora(a)scrit.ch>
Date: Sat Mar 3 16:22:32 2018 +0100
update to 0.3.2.10
diff --git a/tor.spec b/tor.spec
index c2bf63b..81f1fe1 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,8 +19,8 @@
%endif
Name: tor
-Version: 0.3.2.9
-Release: 3%{?dist}
+Version: 0.3.2.10
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,10 @@ fi
%changelog
+* Sat Mar 03 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.10-1
+- Update to latest version. Security-Fixes TROVE-2018-001, TROVE-2018-002,
+ TROVE-2018-003 and TROVE-2018-004
+
* Sun Feb 18 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.9-3
- Rebuilt due to libevent SONAME change
commit f57c9d6a7932e77f1604bd92a27213d8bcdf034f
Author: mh <mh+fedora(a)scrit.ch>
Date: Sun Feb 18 12:46:24 2018 +0100
rebuild to due libevent SONAME change
diff --git a/tor.spec b/tor.spec
index ef3f558..c2bf63b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.3.2.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,9 @@ fi
%changelog
+* Sun Feb 18 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.9-3
+- Rebuilt due to libevent SONAME change
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.3.2.9-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit feb9ade5a501facabc19a60492ef038f13cb937b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 19:13:07 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/tor.spec b/tor.spec
index 81e35f2..ef3f558 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.3.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,9 @@ fi
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.3.2.9-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Jan 10 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.9-1
- update to latest upstream stable release 0.3.2.9 (#1532909)
commit 15b6147b90ac214b8036f70eaf11fc24fc10c54d
Author: mh <mh+fedora(a)scrit.ch>
Date: Wed Jan 10 21:00:07 2018 +0100
fix date
diff --git a/tor.spec b/tor.spec
index c168f91..81e35f2 100644
--- a/tor.spec
+++ b/tor.spec
@@ -172,7 +172,7 @@ fi
%changelog
-* Wed Jan 10 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.9-1
+* Wed Jan 10 2018 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.9-1
- update to latest upstream stable release 0.3.2.9 (#1532909)
* Sun Dec 03 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.1.9-1
commit 82c8b6f399ef5633026dd898f132fe1093a53fd9
Author: mh <mh+fedora(a)scrit.ch>
Date: Wed Jan 10 20:59:19 2018 +0100
update to latest upstream stable release 0.3.2.9
diff --git a/sources b/sources
index b942af7..ad6948a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.1.9.tar.gz) =
c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
-SHA512 (tor-0.3.1.9.tar.gz.asc) =
d786c7d6f6eefe206ee2e4f0a70874ae329c8168be64e9586c85cb0e7fed871d0d07718efe1503a6a3e05092a962d3c134b3d6098104dc9efae239e116c739c6
+SHA512 (tor-0.3.2.9.tar.gz) =
60b8d93eee8d0b04b49a8fa941ea3489e8cd9b3f3923d9da39865caa1f5bce6666c1db06594520aa3726151a54c9c0c30bb8d9b25fb38d7172ffb15a011d6c8c
+SHA512 (tor-0.3.2.9.tar.gz.asc) =
7c8e3c8535c20059819e2040940666233253989c60b746bb453dc6d548a2a239ab1562b8c3055d90d2c26baac521b7d8cbe6dc58454489a71e3204faf72bb492
diff --git a/tor.spec b/tor.spec
index 81a6158..c168f91 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.3.1.9
+Version: 0.3.2.9
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Wed Jan 10 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.2.9-1
+- update to latest upstream stable release 0.3.2.9 (#1532909)
+
* Sun Dec 03 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.1.9-1
- update to upstream release 0.3.1.9. Fixes:
- CVE-2017-8819: Replay-cache ineffective for v2 onion services
commit 76bf91fa1af834806e22314e148813644345795b
Author: mh <mh+fedora(a)scrit.ch>
Date: Sun Dec 3 17:57:52 2017 +0100
update to upstream release 0.3.1.9.
Fixes:
* CVE-2017-8819: Replay-cache ineffective for v2 onion services
* CVE-2017-8820: Remote DoS attack against directory authorities
* CVE-2017-8821: An attacker can make Tor ask for a password
* CVE-2017-8822: Relays can pick themselves in a circuit path
* CVE-2017-8823: Use-after-free in onion service v2
diff --git a/sources b/sources
index 4f5227c..b942af7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.1.8.tar.gz) =
0c2d5f6e444815f0812b0f8bb2102f2013c890375cf20b62025d0704e8ee7742bbf7173764795e3e63606a47d0695a5a982c318c55a30ca50600eb6de5b94b16
-SHA512 (tor-0.3.1.8.tar.gz.asc) =
d97f0776e3e90b0d101a3eb7c35d305c0a93500a0fcc037c3d3f3cfcdf0ee79ff9e8d86fbdc6d60f9f6fbbe842c3abafbca43deaab33d729f1f8279485e4be2a
+SHA512 (tor-0.3.1.9.tar.gz) =
c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
+SHA512 (tor-0.3.1.9.tar.gz.asc) =
d786c7d6f6eefe206ee2e4f0a70874ae329c8168be64e9586c85cb0e7fed871d0d07718efe1503a6a3e05092a962d3c134b3d6098104dc9efae239e116c739c6
diff --git a/tor.spec b/tor.spec
index d54ac2e..81a6158 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.3.1.8
+Version: 0.3.1.9
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,14 @@ fi
%changelog
+* Sun Dec 03 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.1.9-1
+- update to upstream release 0.3.1.9. Fixes:
+- CVE-2017-8819: Replay-cache ineffective for v2 onion services
+- CVE-2017-8820: Remote DoS attack against directory authorities
+- CVE-2017-8821: An attacker can make Tor ask for a password
+- CVE-2017-8822: Relays can pick themselves in a circuit path
+- CVE-2017-8823: Use-after-free in onion service v2
+
* Wed Oct 25 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.1.8-1
- update to upstream release 0.3.1.8
commit 217610cb7b058300145c1b4d1915f9e91737e4d5
Author: mh <mh+fedora(a)scrit.ch>
Date: Wed Oct 25 21:36:44 2017 +0200
update to 0.3.1.8
diff --git a/sources b/sources
index e2c9e79..4f5227c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.3.1.7.tar.gz) =
a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4
-SHA512 (tor-0.3.1.7.tar.gz.asc) =
60a162f715f6bfb2bbe7e9e0ad988755c3b7ad8c97927dc8b36a251b2205a7b7084771f073c92639bb6212039e5dce2baa3a7634d61fe3e1110c51ac919a6659
+SHA512 (tor-0.3.1.8.tar.gz) =
0c2d5f6e444815f0812b0f8bb2102f2013c890375cf20b62025d0704e8ee7742bbf7173764795e3e63606a47d0695a5a982c318c55a30ca50600eb6de5b94b16
+SHA512 (tor-0.3.1.8.tar.gz.asc) =
d97f0776e3e90b0d101a3eb7c35d305c0a93500a0fcc037c3d3f3cfcdf0ee79ff9e8d86fbdc6d60f9f6fbbe842c3abafbca43deaab33d729f1f8279485e4be2a
diff --git a/tor.spec b/tor.spec
index a25f1d5..d54ac2e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.3.1.7
+Version: 0.3.1.8
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Wed Oct 25 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.1.8-1
+- update to upstream release 0.3.1.8
+
* Wed Oct 04 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.1.7-1
- update to upstream release 0.3.1.7
commit f6cf87fdfbe5adad0bbc174630fcb018f8f11146
Author: mh <mh+fedora(a)scrit.ch>
Date: Fri Aug 4 11:50:22 2017 +0200
update to 0.3.1.7
diff --git a/sources b/sources
index 218c91d..e2c9e79 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.2.9.12.tar.gz) =
f464df89311fc8ccbb83f586771e023eb82eb8c05c1d7665e0845775f6691dbcf2019cb686a65400dcb121ad7f28faf996550b9cf53e8c9c4500e3841184e9f5
-SHA512 (tor-0.2.9.12.tar.gz.asc) =
609256159d393dadbfbdefc9fae9b897a6d79dcc8386400295bcaba9428db26eea501771d542216ea1bc05b9c1d5bc6cf113f082da15aae07d96a7a69d2883f6
+SHA512 (tor-0.3.1.7.tar.gz) =
a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4
+SHA512 (tor-0.3.1.7.tar.gz.asc) =
60a162f715f6bfb2bbe7e9e0ad988755c3b7ad8c97927dc8b36a251b2205a7b7084771f073c92639bb6212039e5dce2baa3a7634d61fe3e1110c51ac919a6659
diff --git a/tor.spec b/tor.spec
index 56633a8..a25f1d5 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.2.9.12
+Version: 0.3.1.7
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Wed Oct 04 2017 Marcel Hrry <mh+fedora(a)scrit.ch> - 0.3.1.7-1
+- update to upstream release 0.3.1.7
+
* Sun Sep 24 2017 Marcel Haerry <mh+fedora(a)scrit.ch> - 0.2.9.12-1
- update to upstream release 0.2.9.12 (SECURITY) (#1494860)
- CVE-2017-0380 Stack disclosure in hidden services logs when
commit 6c59d4d7cf6853cd2f40f7abbba31f0931d79f2a
Author: vascom <vascom2(a)gmail.com>
Date: Sat Sep 9 04:15:36 2017 +0000
Cleanup tor.spec
I hope this cleanup changes can make spec file more simple and accurate with Fedora
packaging guidelines.
diff --git a/tor.spec b/tor.spec
index 7f103bd..56633a8 100644
--- a/tor.spec
+++ b/tor.spec
@@ -77,17 +77,16 @@ Tor network, or as a client to connect to the Tor network.
%prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
%build
%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup}
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=%{buildroot}
+%make_install
mv %{buildroot}%{_sysconfdir}/tor/torrc.sample \
%{buildroot}%{_sysconfdir}/tor/torrc
@@ -143,7 +142,8 @@ fi
%files
-%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/*.html
+%doc README ChangeLog ReleaseNotes doc/HACKING doc/*.html
+%license LICENSE
%{_bindir}/tor
%{_bindir}/tor-gencert
%{_bindir}/tor-resolve
@@ -176,6 +176,7 @@ fi
- update to upstream release 0.2.9.12 (SECURITY) (#1494860)
- CVE-2017-0380 Stack disclosure in hidden services logs when
SafeLogging disabled (#1493512) (#1493513)
+- Cleanup spec
* Fri Aug 04 2017 Marcel Hrry <maha+fedora(a)scrit.ch> - 0.2.9.11-1
- update to upstream release 0.2.9.11 (SECURITY)
commit 505ea114f69beb16f36392b9e6582e53d5656be3
Author: mh <mh+fedora(a)scrit.ch>
Date: Sun Sep 24 21:34:24 2017 +0200
update to 0.2.9.12
diff --git a/sources b/sources
index 4d953df..218c91d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.2.9.11.tar.gz) =
bb7ceb416c6cdcf127cb3c45226aa0ce787fba85b6fb59e9c222193c6f2522f2ef85ee0f5062554a4d301ac49d20b68fd82c7ce00406ceae0d00f6ac4107d074
-SHA512 (tor-0.2.9.11.tar.gz.asc) =
f8da93761ea54eb7272255a28b33510fd923fda2591699a20af7c005fa3ae14ba4890bb0ccd24919e771e3179c0c2a61f7e41b67ab6a37b458c962cf52139c52
+SHA512 (tor-0.2.9.12.tar.gz) =
f464df89311fc8ccbb83f586771e023eb82eb8c05c1d7665e0845775f6691dbcf2019cb686a65400dcb121ad7f28faf996550b9cf53e8c9c4500e3841184e9f5
+SHA512 (tor-0.2.9.12.tar.gz.asc) =
609256159d393dadbfbdefc9fae9b897a6d79dcc8386400295bcaba9428db26eea501771d542216ea1bc05b9c1d5bc6cf113f082da15aae07d96a7a69d2883f6
diff --git a/tor.spec b/tor.spec
index 6761d30..7f103bd 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.2.9.11
+Version: 0.2.9.12
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,11 @@ fi
%changelog
+* Sun Sep 24 2017 Marcel Haerry <mh+fedora(a)scrit.ch> - 0.2.9.12-1
+- update to upstream release 0.2.9.12 (SECURITY) (#1494860)
+- CVE-2017-0380 Stack disclosure in hidden services logs when
+ SafeLogging disabled (#1493512) (#1493513)
+
* Fri Aug 04 2017 Marcel Hrry <maha+fedora(a)scrit.ch> - 0.2.9.11-1
- update to upstream release 0.2.9.11 (SECURITY)
- CVE-2017-0375 & CVE-2017-0376: denial of service (assertion
commit 58e0db6b642f369cb4242ccff31f955a4c911f37
Author: mh <mh+fedora(a)scrit.ch>
Date: Wed Jul 26 10:26:46 2017 +0200
update to 0.2.9.11
diff --git a/sources b/sources
index 8677d7a..4d953df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.2.9.10.tar.gz) =
c18c4faf18406f04165136f0d70e6bc2896f3f02770beadaab5e7a99441d71b897ae3a14a046eaec99a1bd6d8ad7758b28f7d652588842b77621cdc95d4fb7e1
-SHA512 (tor-0.2.9.10.tar.gz.asc) =
40ba335f960d14558b207489456145d27f8be9e59d3c79eb0c56f4dae599cb19a28edc86456b635c92adf2877ed5665d36e30c93d06d4011e5627d8f612affc6
+SHA512 (tor-0.2.9.11.tar.gz) =
bb7ceb416c6cdcf127cb3c45226aa0ce787fba85b6fb59e9c222193c6f2522f2ef85ee0f5062554a4d301ac49d20b68fd82c7ce00406ceae0d00f6ac4107d074
+SHA512 (tor-0.2.9.11.tar.gz.asc) =
f8da93761ea54eb7272255a28b33510fd923fda2591699a20af7c005fa3ae14ba4890bb0ccd24919e771e3179c0c2a61f7e41b67ab6a37b458c962cf52139c52
diff --git a/tor.spec b/tor.spec
index 3b75b65..6761d30 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,8 +19,8 @@
%endif
Name: tor
-Version: 0.2.9.10
-Release: 3%{?dist}
+Version: 0.2.9.11
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,11 @@ fi
%changelog
+* Fri Aug 04 2017 Marcel Hrry <maha+fedora(a)scrit.ch> - 0.2.9.11-1
+- update to upstream release 0.2.9.11 (SECURITY)
+- CVE-2017-0375 & CVE-2017-0376: denial of service (assertion
+ failure and daemon exit) (#1461276) (#1461275)
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.9.10-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit 3dd9e1f2eabd626d25259a2a9938f684c9cbaf73
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 09:32:32 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index ebc1792..3b75b65 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.9.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,9 @@ fi
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.9.10-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.9.10-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit b84105f1551b80dcd570c4fe5e3878be09f1930f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 20:27:34 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index 17f5b22..ebc1792 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.9.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,9 @@ fi
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.9.10-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Fri Mar 03 2017 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.9.10-1
- update to upstream release 0.2.9.10
commit 3489b283f5013e364ffca51ca485a4b4848a22a0
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Mar 3 16:17:24 2017 +0000
Add sources
diff --git a/sources b/sources
index f6946a8..8677d7a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tor-0.2.8.12.tar.gz) =
b0cfa34914208bbb28f74178a87ece2a320a44606a94c35de715548fc5a3517cd3d9bf27512d9efe2f1c4685620a62ed591927f828e72fe5ac0a1fffa543eb26
-SHA512 (tor-0.2.8.12.tar.gz.asc) =
dd98d38bef3124787e79ed0d42754210fb73d599c3c0a7b0401526dff50b5dcf6e10033fbe389dc805ee4076ee45a893b77e25ed45253d961c15b40590e65b3f
+SHA512 (tor-0.2.9.10.tar.gz) =
c18c4faf18406f04165136f0d70e6bc2896f3f02770beadaab5e7a99441d71b897ae3a14a046eaec99a1bd6d8ad7758b28f7d652588842b77621cdc95d4fb7e1
+SHA512 (tor-0.2.9.10.tar.gz.asc) =
40ba335f960d14558b207489456145d27f8be9e59d3c79eb0c56f4dae599cb19a28edc86456b635c92adf2877ed5665d36e30c93d06d4011e5627d8f612affc6
commit 5385fe059567b9d5faf4432bc0ee4500ee249086
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Mar 3 14:58:41 2017 +0000
Update to 0.2.9.10
diff --git a/tor.spec b/tor.spec
index de01b98..17f5b22 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,8 +19,8 @@
%endif
Name: tor
-Version: 0.2.8.12
-Release: 2%{?dist}
+Version: 0.2.9.10
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,9 @@ fi
%changelog
+* Fri Mar 03 2017 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.9.10-1
+- update to upstream release 0.2.9.10
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.8.12-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 0f8c6f026784f118e2048441a886410d196e94d1
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 16:09:02 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index 09c6758..de01b98 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.8.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,9 @@ fi
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.8.12-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Tue Dec 20 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.12-1
- update to upstream release 0.2.8.12
commit c8c6596d359467b0e559269f95a0e2f4b4efec8c
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Dec 20 18:31:01 2016 +0000
Update to 0.2.8.1
diff --git a/sources b/sources
index a945c23..f6946a8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-53feaecb15be43b09b06ff0a23252e0d tor-0.2.8.11.tar.gz
-40e0e4680b66a8bd52c0ee3eda9428dd tor-0.2.8.11.tar.gz.asc
+SHA512 (tor-0.2.8.12.tar.gz) =
b0cfa34914208bbb28f74178a87ece2a320a44606a94c35de715548fc5a3517cd3d9bf27512d9efe2f1c4685620a62ed591927f828e72fe5ac0a1fffa543eb26
+SHA512 (tor-0.2.8.12.tar.gz.asc) =
dd98d38bef3124787e79ed0d42754210fb73d599c3c0a7b0401526dff50b5dcf6e10033fbe389dc805ee4076ee45a893b77e25ed45253d961c15b40590e65b3f
diff --git a/tor.spec b/tor.spec
index 54c40be..09c6758 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.2.8.11
+Version: 0.2.8.12
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Tue Dec 20 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.12-1
+- update to upstream release 0.2.8.12
+
* Thu Dec 08 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.11-1
- update to upstream release 0.2.8.11
commit 23603fb2ba02fa0c870f9b4c1e042a1c906da950
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Dec 8 16:58:29 2016 +0000
Update to 0.2.8.11
diff --git a/sources b/sources
index dea4fae..a945c23 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f5762c9eeb7bc68a6405cd5d6a53b5d7 tor-0.2.8.10.tar.gz
-a2c16842abd093646c56f96fd4719ea0 tor-0.2.8.10.tar.gz.asc
+53feaecb15be43b09b06ff0a23252e0d tor-0.2.8.11.tar.gz
+40e0e4680b66a8bd52c0ee3eda9428dd tor-0.2.8.11.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index a793b62..54c40be 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.2.8.10
+Version: 0.2.8.11
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Thu Dec 08 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.11-1
+- update to upstream release 0.2.8.11
+
* Wed Dec 07 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.10-1
- update to upstream release 0.2.8.10
commit e1af4ca2e40a89468017915e91d0ab879beade61
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Wed Dec 7 06:00:23 2016 +0000
Update to 0.2.8.10
diff --git a/sources b/sources
index a126470..dea4fae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e1f8bc2b2e2b365fc916388304e5e40d tor-0.2.8.9.tar.gz
-625f38a05520b29c7831ee70a713dbc1 tor-0.2.8.9.tar.gz.asc
+f5762c9eeb7bc68a6405cd5d6a53b5d7 tor-0.2.8.10.tar.gz
+a2c16842abd093646c56f96fd4719ea0 tor-0.2.8.10.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 5fdb163..a793b62 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.2.8.9
+Version: 0.2.8.10
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Wed Dec 07 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.10-1
+- update to upstream release 0.2.8.10
+
* Wed Oct 19 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.9-1
- update to upstream release 0.2.8.9
commit 8a69ecd7af16a288351b65d13a105b89aaece93e
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Wed Oct 19 07:41:57 2016 +0100
Update to 0.2.8.9
diff --git a/sources b/sources
index b1a37b3..a126470 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a9627e1655cab3a3df0da9b0f74aa21b tor-0.2.8.8.tar.gz
-c1ddd749f8a0f22f12274971bebfb0fd tor-0.2.8.8.tar.gz.asc
+e1f8bc2b2e2b365fc916388304e5e40d tor-0.2.8.9.tar.gz
+625f38a05520b29c7831ee70a713dbc1 tor-0.2.8.9.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 66ec0b8..5fdb163 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.2.8.8
+Version: 0.2.8.9
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Wed Oct 19 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.9-1
+- update to upstream release 0.2.8.9
+
* Sun Oct 02 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.8-1
- update to upstream release 0.2.8.8
commit a910c5c094839dce054c7e06a281bb79a1a712db
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Oct 2 21:24:46 2016 +0100
Update to 0.2.8.8
diff --git a/sources b/sources
index d66836e..b1a37b3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-59771fe2d098893fe955edfb8b13401f tor-0.2.8.7.tar.gz
-737e18292daa87355dd86751dc326cd7 tor-0.2.8.7.tar.gz.asc
+a9627e1655cab3a3df0da9b0f74aa21b tor-0.2.8.8.tar.gz
+c1ddd749f8a0f22f12274971bebfb0fd tor-0.2.8.8.tar.gz.asc
diff --git a/tor.service b/tor.service
index 78d4a72..84bc50c 100644
--- a/tor.service
+++ b/tor.service
@@ -28,7 +28,7 @@ ReadOnlyDirectories=/var
ReadWriteDirectories=/run/tor
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
-CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE CAP_DAC_READ_SEARCH
PermissionsStartOnly=yes
[Install]
diff --git a/tor.spec b/tor.spec
index 84d4877..66ec0b8 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
%endif
Name: tor
-Version: 0.2.8.7
+Version: 0.2.8.8
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -172,6 +172,9 @@ fi
%changelog
+* Sun Oct 02 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.8-1
+- update to upstream release 0.2.8.8
+
* Thu Aug 25 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.7-1
- update to upstream release 0.2.8.7
diff --git a/tor@.service b/tor@.service
index 79cc99e..0406abc 100644
--- a/tor@.service
+++ b/tor@.service
@@ -28,7 +28,7 @@ ReadOnlyDirectories=/var
ReadWriteDirectories=/run/tor
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
-CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE CAP_DAC_READ_SEARCH
PermissionsStartOnly=yes
[Install]
commit c097c1387f223532e6b8ef1e4fb7210210a0cfe5
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Aug 25 18:01:18 2016 +0100
Update to 0.2.8.7
diff --git a/sources b/sources
index 62efe01..d66836e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-195e4b3f8d19ca2cd816f1e826b61f86 tor-0.2.8.6.tar.gz
-05e1a00dad988124defde90c6ee06bc4 tor-0.2.8.6.tar.gz.asc
+59771fe2d098893fe955edfb8b13401f tor-0.2.8.7.tar.gz
+737e18292daa87355dd86751dc326cd7 tor-0.2.8.7.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 239d28c..84d4877 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,8 +19,8 @@
%endif
Name: tor
-Version: 0.2.8.6
-Release: 2%{?dist}
+Version: 0.2.8.7
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -172,6 +172,9 @@ fi
%changelog
+* Thu Aug 25 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.7-1
+- update to upstream release 0.2.8.7
+
* Sun Aug 21 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.6-2
- re-add patch0
commit 2fb9612dd3473f35007761d890a039507b571bca
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Aug 21 16:00:20 2016 +0100
Re-add patch0
diff --git a/tor.spec b/tor.spec
index 459a51c..239d28c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.8.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -78,6 +78,7 @@ Tor network, or as a client to connect to the Tor network.
%prep
%setup -q
+%patch0 -p1
%build
@@ -171,6 +172,9 @@ fi
%changelog
+* Sun Aug 21 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.6-2
+- re-add patch0
+
* Sun Aug 21 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.6-1
- update to upstream release 0.2.8.6
- remove upstreamed patches
commit bb75e20839eaa787a51cd3811095631a97a581e1
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Aug 21 15:46:08 2016 +0100
Remove upstreamed patches
diff --git a/0001-Permit-filesystem-group-to-be-root.patch
b/0001-Permit-filesystem-group-to-be-root.patch
deleted file mode 100644
index a6eb6e7..0000000
--- a/0001-Permit-filesystem-group-to-be-root.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8b43cb98bf31a30c5d0ee5c580520797697078b2 Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j(a)jamielinux.com>
-Date: Fri, 13 Nov 2015 14:17:02 +0000
-Subject: [PATCH 1/3] Permit filesystem group to be root
-
----
- changes/bug17562-allow-root-group-read | 6 ++++++
- src/common/util.c | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
- create mode 100644 changes/bug17562-allow-root-group-read
-
-diff --git a/changes/bug17562-allow-root-group-read
b/changes/bug17562-allow-root-group-read
-new file mode 100644
-index 0000000..7a0903c
---- /dev/null
-+++ b/changes/bug17562-allow-root-group-read
-@@ -0,0 +1,6 @@
-+ o Minor bug fixes:
-+ - If any directory created by Tor is marked as group readable, the
-+ filesystem group is allowed to be either the default GID or the root
-+ user. Allowing root to read the DataDirectory prevents the need for
-+ CAP_READ_SEARCH when using systemd's CapabilityBoundingSet, or
-+ dac_read_search when using SELinux.
-diff --git a/src/common/util.c b/src/common/util.c
-index b33c80f..c0178a3 100644
---- a/src/common/util.c
-+++ b/src/common/util.c
-@@ -2116,7 +2116,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
- return -1;
- }
- if ( (check & (CPD_GROUP_OK|CPD_GROUP_READ))
-- && (st.st_gid != running_gid) ) {
-+ && (st.st_gid != running_gid) && (st.st_gid != 0)) {
- struct group *gr;
- char *process_groupname = NULL;
- gr = getgrgid(running_gid);
---
-2.5.0
-
diff --git a/0002-Introduce-DataDirectoryGroupReadable-boolean.patch
b/0002-Introduce-DataDirectoryGroupReadable-boolean.patch
deleted file mode 100644
index f5b62bd..0000000
--- a/0002-Introduce-DataDirectoryGroupReadable-boolean.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From c60ea133362213f0b7d4572ac30ff0a2195918b7 Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j(a)jamielinux.com>
-Date: Fri, 13 Nov 2015 14:18:26 +0000
-Subject: [PATCH 2/3] Introduce DataDirectoryGroupReadable boolean
-
----
- changes/bug17562-DataDirectoryGroupReadable | 3 +++
- doc/tor.1.txt | 5 +++++
- src/or/config.c | 17 ++++++++++++++++-
- src/or/or.h | 1 +
- 4 files changed, 25 insertions(+), 1 deletion(-)
- create mode 100644 changes/bug17562-DataDirectoryGroupReadable
-
-diff --git a/changes/bug17562-DataDirectoryGroupReadable
b/changes/bug17562-DataDirectoryGroupReadable
-new file mode 100644
-index 0000000..524e5ef
---- /dev/null
-+++ b/changes/bug17562-DataDirectoryGroupReadable
-@@ -0,0 +1,3 @@
-+ o Minor bug fixes:
-+ - Introduce DataDirectoryGroupReadable boolean. If set to 1, the
-+ DataDirectory will be made readable by the default GID.
-diff --git a/doc/tor.1.txt b/doc/tor.1.txt
-index 916433b..00cac95 100644
---- a/doc/tor.1.txt
-+++ b/doc/tor.1.txt
-@@ -350,6 +350,11 @@ GENERAL OPTIONS
- [[DataDirectory]] **DataDirectory** __DIR__::
- Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
-
-+[[DataDirectoryGroupReadable]] **DataDirectoryGroupReadable** **0**|**1**::
-+ If this option is set to 0, don't allow the filesystem group to read the
-+ DataDirectory. If the option is set to 1, make the DataDirectory readable
-+ by the default GID. (Default: 0)
-+
- [[FallbackDir]] **FallbackDir** __address__:__port__ orport=__port__ id=__fingerprint__
[weight=__num__]::
- When we're unable to connect to any directory cache for directory info
- (usually because we don't know about any yet) we try a FallbackDir.
-diff --git a/src/or/config.c b/src/or/config.c
-index 22039b4..45293db 100644
---- a/src/or/config.c
-+++ b/src/or/config.c
-@@ -212,6 +212,7 @@ static config_var_t option_vars_[] = {
- V(CookieAuthFile, STRING, NULL),
- V(CountPrivateBandwidth, BOOL, "0"),
- V(DataDirectory, FILENAME, NULL),
-+ V(DataDirectoryGroupReadable, BOOL, "0"),
- V(DisableNetwork, BOOL, "0"),
- V(DirAllowPrivateAddresses, BOOL, "0"),
- V(TestingAuthDirTimeToLearnReachability, INTERVAL, "30 minutes"),
-@@ -1187,16 +1188,30 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
- }
-
- /* Ensure data directory is private; create if possible. */
-+ cpd_check_t cpd_group_opts = CPD_NONE;
-+ if (options->DataDirectoryGroupReadable)
-+ cpd_group_opts = CPD_GROUP_READ;
- if (check_private_dir(options->DataDirectory,
-- running_tor ? CPD_CREATE : CPD_CHECK,
-+ running_tor ?
-+ CPD_CREATE|cpd_group_opts : CPD_CHECK|cpd_group_opts,
- options->User)<0) {
- tor_asprintf(msg,
- "Couldn't access/create private data directory
\"%s\"",
- options->DataDirectory);
-+
- goto done;
- /* No need to roll back, since you can't change the value. */
- }
-
-+#ifndef _WIN32
-+ if (options->DataDirectoryGroupReadable) {
-+ /* Only new dirs created get new opts, also enforce group read. */
-+ if (chmod(options->DataDirectory, 0750)) {
-+ log_warn(LD_FS,"Unable to make %s group-readable.",
options->DataDirectory);
-+ }
-+ }
-+#endif
-+
- /* Bail out at this point if we're not going to be a client or server:
- * we don't run Tor itself. */
- if (!running_tor)
-diff --git a/src/or/or.h b/src/or/or.h
-index 651d8be..112fe21 100644
---- a/src/or/or.h
-+++ b/src/or/or.h
-@@ -3428,6 +3428,7 @@ typedef struct {
-
- char *DebugLogFile; /**< Where to send verbose log messages. */
- char *DataDirectory; /**< OR only: where to store long-term data. */
-+ int DataDirectoryGroupReadable; /**< Boolean: Is the DataDirectory g+r? */
- char *Nickname; /**< OR only: nickname of this onion router. */
- char *Address; /**< OR only: configured address for this onion router. */
- char *PidFile; /**< Where to store PID of Tor process. */
---
-2.5.0
-
diff --git a/0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
b/0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
deleted file mode 100644
index 871b3d6..0000000
--- a/0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c4fbdc2d3a0d3e54bb9ad1238be87390bd04dc9b Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j(a)jamielinux.com>
-Date: Fri, 13 Nov 2015 13:57:11 +0000
-Subject: [PATCH 3/3] Defer creation of Unix socket until after setuid
-
----
- changes/bug17562-defer-unix-socket-creation | 4 ++++
- src/or/connection.c | 8 ++++++++
- 2 files changed, 12 insertions(+)
- create mode 100644 changes/bug17562-defer-unix-socket-creation
-
-diff --git a/changes/bug17562-defer-unix-socket-creation
b/changes/bug17562-defer-unix-socket-creation
-new file mode 100644
-index 0000000..f1896c0
---- /dev/null
-+++ b/changes/bug17562-defer-unix-socket-creation
-@@ -0,0 +1,4 @@
-+ o Minor bug fixes:
-+ - Defer creation of Unix sockets until after setuid. This avoids needing
-+ CAP_CHOWN and CAP_FOWNER when using systemd's CapabilityBoundingSet, or
-+ chown and fowner when using SELinux.
-diff --git a/src/or/connection.c b/src/or/connection.c
-index 78176d3..f2a82dd 100644
---- a/src/or/connection.c
-+++ b/src/or/connection.c
-@@ -2381,6 +2381,14 @@ retry_listener_ports(smartlist_t *old_conns,
- if (port->server_cfg.no_listen)
- continue;
-
-+#ifndef _WIN32
-+ /* We don't need to be root to create a UNIX socket, so defer until after
-+ * setuid. */
-+ const or_options_t *options = get_options();
-+ if (port->is_unix_addr && !geteuid() && strcmp(options->User,
"root"))
-+ continue;
-+#endif
-+
- if (port->is_unix_addr) {
- listensockaddr = (struct sockaddr *)
- create_unix_sockaddr(port->unix_addr,
---
-2.5.0
-
diff --git a/0004-Simplify-cpd_opts-usage.patch b/0004-Simplify-cpd_opts-usage.patch
deleted file mode 100644
index 00cf5f1..0000000
--- a/0004-Simplify-cpd_opts-usage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 01334589f1eae801b4ed8fb72fe3816ad5b0fe78 Mon Sep 17 00:00:00 2001
-From: Nick Mathewson <nickm(a)torproject.org>
-Date: Thu, 10 Dec 2015 20:02:22 -0500
-Subject: [PATCH 4/5] Simplify cpd_opts usage.
-
----
- src/or/config.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/or/config.c b/src/or/config.c
-index d9ba774..c6d4de3 100644
---- a/src/or/config.c
-+++ b/src/or/config.c
-@@ -1187,12 +1187,11 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
- }
-
- /* Ensure data directory is private; create if possible. */
-- cpd_check_t cpd_group_opts = CPD_NONE;
-+ cpd_check_t cpd_opts = running_tor ? CPD_CREATE : CPD_CHECK;
- if (options->DataDirectoryGroupReadable)
-- cpd_group_opts = CPD_GROUP_READ;
-+ cpd_opts |= CPD_GROUP_READ;
- if (check_private_dir(options->DataDirectory,
-- running_tor ?
-- CPD_CREATE|cpd_group_opts : CPD_CHECK|cpd_group_opts,
-+ cpd_opts,
- options->User)<0) {
- tor_asprintf(msg,
- "Couldn't access/create private data directory
\"%s\"",
---
-2.5.0
-
diff --git a/0005-Fix-wide-line-log-why-chmod-failed.patch
b/0005-Fix-wide-line-log-why-chmod-failed.patch
deleted file mode 100644
index a07331b..0000000
--- a/0005-Fix-wide-line-log-why-chmod-failed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4b0e9fff27acec544615810138e678869fcdd280 Mon Sep 17 00:00:00 2001
-From: Nick Mathewson <nickm(a)torproject.org>
-Date: Thu, 10 Dec 2015 20:03:37 -0500
-Subject: [PATCH 5/5] Fix wide line; log why chmod failed.
-
----
- src/or/config.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/or/config.c b/src/or/config.c
-index c6d4de3..7b42c9f 100644
---- a/src/or/config.c
-+++ b/src/or/config.c
-@@ -1205,7 +1205,8 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
- if (options->DataDirectoryGroupReadable) {
- /* Only new dirs created get new opts, also enforce group read. */
- if (chmod(options->DataDirectory, 0750)) {
-- log_warn(LD_FS,"Unable to make %s group-readable.",
options->DataDirectory);
-+ log_warn(LD_FS,"Unable to make %s group-readable: %s",
-+ options->DataDirectory, strerror(errno));
- }
- }
- #endif
---
-2.5.0
-
commit f66452aea6c4aa8349633de34b371d06617878d0
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Aug 21 15:42:09 2016 +0100
New sources
diff --git a/sources b/sources
index 61faf55..62efe01 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cc19107b57136a68e8c563bf2d35b072 tor-0.2.7.6.tar.gz
-010890be655951c47376b5ec728d5fe8 tor-0.2.7.6.tar.gz.asc
+195e4b3f8d19ca2cd816f1e826b61f86 tor-0.2.8.6.tar.gz
+05e1a00dad988124defde90c6ee06bc4 tor-0.2.8.6.tar.gz.asc
commit 7ea410f03354581cc76f26e0bf29283bd384eba0
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Aug 21 15:41:00 2016 +0100
Update to 0.2.8.6
diff --git a/tor.spec b/tor.spec
index 0cf2211..459a51c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,8 +19,8 @@
%endif
Name: tor
-Version: 0.2.7.6
-Release: 6%{?dist}
+Version: 0.2.8.6
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -38,14 +38,6 @@ Source20: README
Patch0: tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
-# These patches have been sent upstream and accepted:
-#
https://trac.torproject.org/projects/tor/ticket/17562
-Patch1: 0001-Permit-filesystem-group-to-be-root.patch
-Patch2: 0002-Introduce-DataDirectoryGroupReadable-boolean.patch
-Patch3: 0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
-Patch4: 0004-Simplify-cpd_opts-usage.patch
-Patch5: 0005-Fix-wide-line-log-why-chmod-failed.patch
-
BuildRequires: asciidoc
BuildRequires: libevent-devel
BuildRequires: openssl-devel
@@ -86,12 +78,6 @@ Tor network, or as a client to connect to the Tor network.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
@@ -185,6 +171,10 @@ fi
%changelog
+* Sun Aug 21 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.8.6-1
+- update to upstream release 0.2.8.6
+- remove upstreamed patches
+
* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.7.6-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit 1c2af27be23e24e1331eb9488d7c03240aa9d991
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 5 01:47:48 2016 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index cd03b67..0cf2211 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.7.6
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -185,6 +185,9 @@ fi
%changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.2.7.6-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Thu Jan 07 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-5
- make ControlSocket writable by toranon group (#1296226)
commit a1f396e66c38129555456430e662c00fcde481b6
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Jan 7 11:23:26 2016 +0000
Fix sources
diff --git a/sources b/sources
index 7d9f33a..61faf55 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
cc19107b57136a68e8c563bf2d35b072 tor-0.2.7.6.tar.gz
+010890be655951c47376b5ec728d5fe8 tor-0.2.7.6.tar.gz.asc
commit 4146ffbc0fd5ccc927e95f4be1f4e6d572d63f30
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Jan 7 11:08:15 2016 +0000
Make ControlSocket writable by toranon group
diff --git a/sources b/sources
index 61faf55..7d9f33a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
cc19107b57136a68e8c563bf2d35b072 tor-0.2.7.6.tar.gz
-010890be655951c47376b5ec728d5fe8 tor-0.2.7.6.tar.gz.asc
diff --git a/tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
b/tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
index 37fa4bc..86ac5c3 100644
--- a/tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
+++ b/tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
@@ -1,23 +1,25 @@
-From 960992ebca360e1e7303f15f27238e34d5c0d303 Mon Sep 17 00:00:00 2001
+From 836960177eb961d1009cdb5fb4632592abfb3376 Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j(a)jamielinux.com>
-Date: Fri, 11 Dec 2015 09:50:00 +0000
+Date: Thu, 7 Jan 2016 11:01:32 +0000
Subject: [PATCH] Add ControlSocket and CookieAuthFile to torrc
---
- src/config/torrc.sample.in | 4 ++++
- 1 file changed, 4 insertions(+)
+ src/config/torrc.sample.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
-index 248cb5c..a62917d 100644
+index 248cb5c..295cff4 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
-@@ -12,6 +12,10 @@
+@@ -12,6 +12,12 @@
## Tor will look for this file in various places based on your platform:
##
https://www.torproject.org/docs/faq#torrc
+ControlSocket /run/tor/control
++ControlSocketsGroupWritable 1
+CookieAuthentication 1
+CookieAuthFile /run/tor/control.authcookie
++CookieAuthFileGroupReadable 1
+
## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
diff --git a/tor.spec b/tor.spec
index 5d3b37a..cd03b67 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -181,10 +181,13 @@ fi
%attr(0750,%{toruser},root) %dir %{homedir}
%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
-%attr(0700,%{toruser},%{torgroup}) %dir %{rundir}
+%attr(0750,%{toruser},%{torgroup}) %dir %{rundir}
%changelog
+* Thu Jan 07 2016 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-5
+- make ControlSocket writable by toranon group (#1296226)
+
* Wed Dec 16 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-4
- fix tmpfiles.d
diff --git a/tor.tmpfiles.d b/tor.tmpfiles.d
index d3ed116..438d26d 100644
--- a/tor.tmpfiles.d
+++ b/tor.tmpfiles.d
@@ -1 +1 @@
-d /run/tor 0700 toranon toranon
+d /run/tor 0750 toranon toranon
commit 03f9ea85fdf52938aac2c99ad6f2484f778cfa7d
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Wed Dec 16 17:27:59 2015 +0000
Fix tmpfiles.d
diff --git a/tor.spec b/tor.spec
index 57b3428..5d3b37a 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -185,6 +185,9 @@ fi
%changelog
+* Wed Dec 16 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-4
+- fix tmpfiles.d
+
* Fri Dec 11 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-3
- place ControlSocket and CookieAuthFile at top of torrc for visibility
diff --git a/tor.tmpfiles.d b/tor.tmpfiles.d
index 403e646..d3ed116 100644
--- a/tor.tmpfiles.d
+++ b/tor.tmpfiles.d
@@ -1 +1 @@
-d /run/tor 0700 tor tor
+d /run/tor 0700 toranon toranon
commit ef2689ea74818a3915a0512220e97fe889f22baf
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 10:10:56 2015 +0000
Minor spec cleanup
diff --git a/tor.spec b/tor.spec
index ff59e85..57b3428 100644
--- a/tor.spec
+++ b/tor.spec
@@ -108,6 +108,7 @@ install -D -p -m 0644 %{SOURCE20}
%{buildroot}%{_sysconfdir}/tor/README
mkdir -p %{buildroot}%{logdir}
mkdir -p %{buildroot}%{homedir}
+mkdir -p %{buildroot}%{rundir}
install -D -p -m 0644 %{SOURCE10} %{buildroot}%_unitdir/tor.service
install -D -p -m 0644 %{SOURCE11} %{buildroot}%_unitdir/tor@.service
@@ -116,8 +117,6 @@ install -D -p -m 0644 %{SOURCE2}
%{buildroot}%{_sysconfdir}/logrotate.d/tor
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/tor/defaults-torrc
install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/tor.conf
-install -d -m 0750 %{buildroot}/run/tor
-
%if 0%{without libsystemd}
# Some features are not available for systemd 208 on RHEL 7.
sed -i %{buildroot}%_unitdir/tor.service \
commit 609d9b10385718b38b4fe5fc4bb944d294dd6e48
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 09:53:37 2015 +0000
Move ControlSocket/CookieAuthFile to top of torrc for visibility
diff --git a/tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
b/tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
new file mode 100644
index 0000000..37fa4bc
--- /dev/null
+++ b/tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
@@ -0,0 +1,27 @@
+From 960992ebca360e1e7303f15f27238e34d5c0d303 Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j(a)jamielinux.com>
+Date: Fri, 11 Dec 2015 09:50:00 +0000
+Subject: [PATCH] Add ControlSocket and CookieAuthFile to torrc
+
+---
+ src/config/torrc.sample.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
+index 248cb5c..a62917d 100644
+--- a/src/config/torrc.sample.in
++++ b/src/config/torrc.sample.in
+@@ -12,6 +12,10 @@
+ ## Tor will look for this file in various places based on your platform:
+ ##
https://www.torproject.org/docs/faq#torrc
+
++ControlSocket /run/tor/control
++CookieAuthentication 1
++CookieAuthFile /run/tor/control.authcookie
++
+ ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
+ ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
+ ## as a relay, and not make any local application connections yourself.
+--
+2.5.0
+
diff --git a/tor.spec b/tor.spec
index 78328c0..ff59e85 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.7.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -36,13 +36,15 @@ Source11: tor@.service
Source12: tor-master.service
Source20: README
+Patch0: tor-0.2.7.6-torrc-ControlSocket-and-CookieAuthFile.patch
+
# These patches have been sent upstream and accepted:
#
https://trac.torproject.org/projects/tor/ticket/17562
-Patch0: 0001-Permit-filesystem-group-to-be-root.patch
-Patch1: 0002-Introduce-DataDirectoryGroupReadable-boolean.patch
-Patch2: 0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
-Patch3: 0004-Simplify-cpd_opts-usage.patch
-Patch4: 0005-Fix-wide-line-log-why-chmod-failed.patch
+Patch1: 0001-Permit-filesystem-group-to-be-root.patch
+Patch2: 0002-Introduce-DataDirectoryGroupReadable-boolean.patch
+Patch3: 0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
+Patch4: 0004-Simplify-cpd_opts-usage.patch
+Patch5: 0005-Fix-wide-line-log-why-chmod-failed.patch
BuildRequires: asciidoc
BuildRequires: libevent-devel
@@ -87,6 +89,9 @@ Tor network, or as a client to connect to the Tor network.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
@@ -98,11 +103,6 @@ make %{?_smp_mflags}
make install DESTDIR=%{buildroot}
mv %{buildroot}%{_sysconfdir}/tor/torrc.sample \
%{buildroot}%{_sysconfdir}/tor/torrc
-cat << EOF >> %{buildroot}%{_sysconfdir}/tor/torrc
-ControlSocket /run/tor/control
-CookieAuthentication 1
-CookieAuthFile /run/tor/control.authcookie
-EOF
install -D -p -m 0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/tor/README
@@ -186,6 +186,9 @@ fi
%changelog
+* Fri Dec 11 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-3
+- place ControlSocket and CookieAuthFile at top of torrc for visibility
+
* Fri Dec 11 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-2
- some minor patch fixes
commit 70bf2c2f66ced97990623f807d243d952ee82784
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 09:01:22 2015 +0000
Some minor patch fixes
diff --git a/0004-Simplify-cpd_opts-usage.patch b/0004-Simplify-cpd_opts-usage.patch
new file mode 100644
index 0000000..00cf5f1
--- /dev/null
+++ b/0004-Simplify-cpd_opts-usage.patch
@@ -0,0 +1,32 @@
+From 01334589f1eae801b4ed8fb72fe3816ad5b0fe78 Mon Sep 17 00:00:00 2001
+From: Nick Mathewson <nickm(a)torproject.org>
+Date: Thu, 10 Dec 2015 20:02:22 -0500
+Subject: [PATCH 4/5] Simplify cpd_opts usage.
+
+---
+ src/or/config.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/or/config.c b/src/or/config.c
+index d9ba774..c6d4de3 100644
+--- a/src/or/config.c
++++ b/src/or/config.c
+@@ -1187,12 +1187,11 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
+ }
+
+ /* Ensure data directory is private; create if possible. */
+- cpd_check_t cpd_group_opts = CPD_NONE;
++ cpd_check_t cpd_opts = running_tor ? CPD_CREATE : CPD_CHECK;
+ if (options->DataDirectoryGroupReadable)
+- cpd_group_opts = CPD_GROUP_READ;
++ cpd_opts |= CPD_GROUP_READ;
+ if (check_private_dir(options->DataDirectory,
+- running_tor ?
+- CPD_CREATE|cpd_group_opts : CPD_CHECK|cpd_group_opts,
++ cpd_opts,
+ options->User)<0) {
+ tor_asprintf(msg,
+ "Couldn't access/create private data directory
\"%s\"",
+--
+2.5.0
+
diff --git a/0005-Fix-wide-line-log-why-chmod-failed.patch
b/0005-Fix-wide-line-log-why-chmod-failed.patch
new file mode 100644
index 0000000..a07331b
--- /dev/null
+++ b/0005-Fix-wide-line-log-why-chmod-failed.patch
@@ -0,0 +1,26 @@
+From 4b0e9fff27acec544615810138e678869fcdd280 Mon Sep 17 00:00:00 2001
+From: Nick Mathewson <nickm(a)torproject.org>
+Date: Thu, 10 Dec 2015 20:03:37 -0500
+Subject: [PATCH 5/5] Fix wide line; log why chmod failed.
+
+---
+ src/or/config.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/or/config.c b/src/or/config.c
+index c6d4de3..7b42c9f 100644
+--- a/src/or/config.c
++++ b/src/or/config.c
+@@ -1205,7 +1205,8 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
+ if (options->DataDirectoryGroupReadable) {
+ /* Only new dirs created get new opts, also enforce group read. */
+ if (chmod(options->DataDirectory, 0750)) {
+- log_warn(LD_FS,"Unable to make %s group-readable.",
options->DataDirectory);
++ log_warn(LD_FS,"Unable to make %s group-readable: %s",
++ options->DataDirectory, strerror(errno));
+ }
+ }
+ #endif
+--
+2.5.0
+
diff --git a/tor.spec b/tor.spec
index ee83543..78328c0 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,7 +20,7 @@
Name: tor
Version: 0.2.7.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -36,11 +36,13 @@ Source11: tor@.service
Source12: tor-master.service
Source20: README
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1279222
+# These patches have been sent upstream and accepted:
#
https://trac.torproject.org/projects/tor/ticket/17562
Patch0: 0001-Permit-filesystem-group-to-be-root.patch
Patch1: 0002-Introduce-DataDirectoryGroupReadable-boolean.patch
Patch2: 0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
+Patch3: 0004-Simplify-cpd_opts-usage.patch
+Patch4: 0005-Fix-wide-line-log-why-chmod-failed.patch
BuildRequires: asciidoc
BuildRequires: libevent-devel
@@ -184,6 +186,9 @@ fi
%changelog
+* Fri Dec 11 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-2
+- some minor patch fixes
+
* Fri Dec 11 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-1
- update to upstream release 0.2.7.6
- use version of patches that have been accepted upstream
commit c191f8bf4ef7275d3d9472a53476946e00ddb00d
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 08:53:18 2015 +0000
new sources
diff --git a/sources b/sources
index 647459d..61faf55 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2fa650d387eb2ce08ad65ac1f182d3cc tor-0.2.7.5.tar.gz
-d0a5ffac99e4443165a3e74c899a23e4 tor-0.2.7.5.tar.gz.asc
+cc19107b57136a68e8c563bf2d35b072 tor-0.2.7.6.tar.gz
+010890be655951c47376b5ec728d5fe8 tor-0.2.7.6.tar.gz.asc
commit f9ee9f1af7c89f605273f8df46221a9b6ef0beff
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 08:41:38 2015 +0000
Add ControlSocket and CookieAuthFile to /etc/tor/torrc
diff --git a/tor.spec b/tor.spec
index 63c5318..ee83543 100644
--- a/tor.spec
+++ b/tor.spec
@@ -96,6 +96,12 @@ make %{?_smp_mflags}
make install DESTDIR=%{buildroot}
mv %{buildroot}%{_sysconfdir}/tor/torrc.sample \
%{buildroot}%{_sysconfdir}/tor/torrc
+cat << EOF >> %{buildroot}%{_sysconfdir}/tor/torrc
+ControlSocket /run/tor/control
+CookieAuthentication 1
+CookieAuthFile /run/tor/control.authcookie
+EOF
+
install -D -p -m 0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/tor/README
mkdir -p %{buildroot}%{logdir}
@@ -181,6 +187,7 @@ fi
* Fri Dec 11 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-1
- update to upstream release 0.2.7.6
- use version of patches that have been accepted upstream
+- add ControlSocket and CookieAuthFile to /etc/tor/torrc
* Thu Dec 10 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-6
- use ReadOnlyDirectories=/var instead of ReadOnlyDirectories=/ (#1290444)
commit c5783ad7f721044e06c4f4eaf53976327670634a
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 07:52:42 2015 +0000
Add /run/tor
diff --git a/tor.service b/tor.service
index 8518d52..78d4a72 100644
--- a/tor.service
+++ b/tor.service
@@ -23,7 +23,9 @@ DeviceAllow=/dev/null rw
DeviceAllow=/dev/urandom r
ProtectHome=yes
ProtectSystem=full
+ReadOnlyDirectories=/run
ReadOnlyDirectories=/var
+ReadWriteDirectories=/run/tor
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
diff --git a/tor.spec b/tor.spec
index a5861cb..63c5318 100644
--- a/tor.spec
+++ b/tor.spec
@@ -2,8 +2,9 @@
%global toruser toranon
%global torgroup toranon
-%global homedir %{_localstatedir}/lib/%{name}
-%global logdir %{_localstatedir}/log/%{name}
+%global homedir %{_localstatedir}/lib/tor
+%global logdir %{_localstatedir}/log/tor
+%global rundir /run/tor
%if 0%{?fedora} || 0%{?rhel} >= 8
%bcond_without libsystemd
@@ -25,10 +26,11 @@ License: BSD
Summary: Anonymizing overlay network for TCP
URL:
https://www.torproject.org
-Source0:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz
-Source1:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
+Source0:
https://www.torproject.org/dist/tor-%{version}.tar.gz
+Source1:
https://www.torproject.org/dist/tor-%{version}.tar.gz.asc
Source2: tor.logrotate
Source3: tor.defaults-torrc
+Source4: tor.tmpfiles.d
Source10: tor.service
Source11: tor@.service
Source12: tor-master.service
@@ -91,24 +93,27 @@ make %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc.sample \
- $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
-install -D -p -m 0644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/tor/README
+make install DESTDIR=%{buildroot}
+mv %{buildroot}%{_sysconfdir}/tor/torrc.sample \
+ %{buildroot}%{_sysconfdir}/tor/torrc
+install -D -p -m 0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/tor/README
-mkdir -p $RPM_BUILD_ROOT%{logdir}
-mkdir -p $RPM_BUILD_ROOT%{homedir}
+mkdir -p %{buildroot}%{logdir}
+mkdir -p %{buildroot}%{homedir}
-install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%_unitdir/%{name}.service
-install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%_unitdir/%{name}@.service
-install -D -p -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%_unitdir/%{name}-master.service
-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 0644 %{SOURCE10} %{buildroot}%_unitdir/tor.service
+install -D -p -m 0644 %{SOURCE11} %{buildroot}%_unitdir/tor@.service
+install -D -p -m 0644 %{SOURCE12} %{buildroot}%_unitdir/tor-master.service
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/tor
+install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/tor/defaults-torrc
+install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/tor.conf
+
+install -d -m 0750 %{buildroot}/run/tor
%if 0%{without libsystemd}
# Some features are not available for systemd 208 on RHEL 7.
-sed -i $RPM_BUILD_ROOT%_unitdir/%{name}.service \
- -i $RPM_BUILD_ROOT%_unitdir/%{name}@.service \
+sed -i %{buildroot}%_unitdir/tor.service \
+ -i %{buildroot}%_unitdir/tor@.service \
-e 's/^Type=.*/Type=simple/g' \
-e '/^NotifyAccess=.*/d' \
-e '/^WatchdogSec=.*/d' \
@@ -128,18 +133,18 @@ getent passwd %{toruser} >/dev/null || \
exit 0
%post
-%systemd_post %{name}.service
+%systemd_post tor.service
%preun
-%systemd_preun %{name}.service
-%systemd_preun %{name}-master.service
+%systemd_preun tor.service
+%systemd_preun tor-master.service
%postun
systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ]; then
# Use restart instead of try-restart, as tor-master may be "inactive" even
# when there are tor.service and tor@.service instances running.
- systemctl restart %{name}-master.service >/dev/null 2>&1 || :
+ systemctl restart tor-master.service >/dev/null 2>&1 || :
fi
@@ -157,9 +162,10 @@ fi
%{_datadir}/tor/defaults-torrc
%{_datadir}/tor/geoip
%{_datadir}/tor/geoip6
-%{_unitdir}/%{name}.service
-%{_unitdir}/%{name}@.service
-%{_unitdir}/%{name}-master.service
+%{_tmpfilesdir}/tor.conf
+%{_unitdir}/tor.service
+%{_unitdir}/tor@.service
+%{_unitdir}/tor-master.service
%dir %{_sysconfdir}/tor
%{_sysconfdir}/tor/README
@@ -168,6 +174,7 @@ fi
%attr(0750,%{toruser},root) %dir %{homedir}
%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
+%attr(0700,%{toruser},%{torgroup}) %dir %{rundir}
%changelog
diff --git a/tor.tmpfiles.d b/tor.tmpfiles.d
new file mode 100644
index 0000000..403e646
--- /dev/null
+++ b/tor.tmpfiles.d
@@ -0,0 +1 @@
+d /run/tor 0700 tor tor
diff --git a/tor@.service b/tor@.service
index 987135d..79cc99e 100644
--- a/tor@.service
+++ b/tor@.service
@@ -23,7 +23,9 @@ DeviceAllow=/dev/null rw
DeviceAllow=/dev/urandom r
ProtectHome=yes
ProtectSystem=full
+ReadOnlyDirectories=/run
ReadOnlyDirectories=/var
+ReadWriteDirectories=/run/tor
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
commit d6477420df63a3bc27231259461c7a79677787f2
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 07:31:13 2015 +0000
Update to upstream release 0.2.7.6
diff --git a/tor.spec b/tor.spec
index 51fd3d6..a5861cb 100644
--- a/tor.spec
+++ b/tor.spec
@@ -18,8 +18,8 @@
%endif
Name: tor
-Version: 0.2.7.5
-Release: 6%{?dist}
+Version: 0.2.7.6
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -171,6 +171,10 @@ fi
%changelog
+* Fri Dec 11 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.6-1
+- update to upstream release 0.2.7.6
+- use version of patches that have been accepted upstream
+
* Thu Dec 10 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-6
- use ReadOnlyDirectories=/var instead of ReadOnlyDirectories=/ (#1290444)
and other service file improvements
commit 3addba3a57795b40fa1521d59da43b026845fedb
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Dec 11 07:30:36 2015 +0000
Use version of patches accepted upstream
diff --git a/0001-Permit-filesystem-group-to-be-root.patch
b/0001-Permit-filesystem-group-to-be-root.patch
new file mode 100644
index 0000000..a6eb6e7
--- /dev/null
+++ b/0001-Permit-filesystem-group-to-be-root.patch
@@ -0,0 +1,39 @@
+From 8b43cb98bf31a30c5d0ee5c580520797697078b2 Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j(a)jamielinux.com>
+Date: Fri, 13 Nov 2015 14:17:02 +0000
+Subject: [PATCH 1/3] Permit filesystem group to be root
+
+---
+ changes/bug17562-allow-root-group-read | 6 ++++++
+ src/common/util.c | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 changes/bug17562-allow-root-group-read
+
+diff --git a/changes/bug17562-allow-root-group-read
b/changes/bug17562-allow-root-group-read
+new file mode 100644
+index 0000000..7a0903c
+--- /dev/null
++++ b/changes/bug17562-allow-root-group-read
+@@ -0,0 +1,6 @@
++ o Minor bug fixes:
++ - If any directory created by Tor is marked as group readable, the
++ filesystem group is allowed to be either the default GID or the root
++ user. Allowing root to read the DataDirectory prevents the need for
++ CAP_READ_SEARCH when using systemd's CapabilityBoundingSet, or
++ dac_read_search when using SELinux.
+diff --git a/src/common/util.c b/src/common/util.c
+index b33c80f..c0178a3 100644
+--- a/src/common/util.c
++++ b/src/common/util.c
+@@ -2116,7 +2116,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
+ return -1;
+ }
+ if ( (check & (CPD_GROUP_OK|CPD_GROUP_READ))
+- && (st.st_gid != running_gid) ) {
++ && (st.st_gid != running_gid) && (st.st_gid != 0)) {
+ struct group *gr;
+ char *process_groupname = NULL;
+ gr = getgrgid(running_gid);
+--
+2.5.0
+
diff --git a/0002-Introduce-DataDirectoryGroupReadable-boolean.patch
b/0002-Introduce-DataDirectoryGroupReadable-boolean.patch
new file mode 100644
index 0000000..f5b62bd
--- /dev/null
+++ b/0002-Introduce-DataDirectoryGroupReadable-boolean.patch
@@ -0,0 +1,97 @@
+From c60ea133362213f0b7d4572ac30ff0a2195918b7 Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j(a)jamielinux.com>
+Date: Fri, 13 Nov 2015 14:18:26 +0000
+Subject: [PATCH 2/3] Introduce DataDirectoryGroupReadable boolean
+
+---
+ changes/bug17562-DataDirectoryGroupReadable | 3 +++
+ doc/tor.1.txt | 5 +++++
+ src/or/config.c | 17 ++++++++++++++++-
+ src/or/or.h | 1 +
+ 4 files changed, 25 insertions(+), 1 deletion(-)
+ create mode 100644 changes/bug17562-DataDirectoryGroupReadable
+
+diff --git a/changes/bug17562-DataDirectoryGroupReadable
b/changes/bug17562-DataDirectoryGroupReadable
+new file mode 100644
+index 0000000..524e5ef
+--- /dev/null
++++ b/changes/bug17562-DataDirectoryGroupReadable
+@@ -0,0 +1,3 @@
++ o Minor bug fixes:
++ - Introduce DataDirectoryGroupReadable boolean. If set to 1, the
++ DataDirectory will be made readable by the default GID.
+diff --git a/doc/tor.1.txt b/doc/tor.1.txt
+index 916433b..00cac95 100644
+--- a/doc/tor.1.txt
++++ b/doc/tor.1.txt
+@@ -350,6 +350,11 @@ GENERAL OPTIONS
+ [[DataDirectory]] **DataDirectory** __DIR__::
+ Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
+
++[[DataDirectoryGroupReadable]] **DataDirectoryGroupReadable** **0**|**1**::
++ If this option is set to 0, don't allow the filesystem group to read the
++ DataDirectory. If the option is set to 1, make the DataDirectory readable
++ by the default GID. (Default: 0)
++
+ [[FallbackDir]] **FallbackDir** __address__:__port__ orport=__port__ id=__fingerprint__
[weight=__num__]::
+ When we're unable to connect to any directory cache for directory info
+ (usually because we don't know about any yet) we try a FallbackDir.
+diff --git a/src/or/config.c b/src/or/config.c
+index 22039b4..45293db 100644
+--- a/src/or/config.c
++++ b/src/or/config.c
+@@ -212,6 +212,7 @@ static config_var_t option_vars_[] = {
+ V(CookieAuthFile, STRING, NULL),
+ V(CountPrivateBandwidth, BOOL, "0"),
+ V(DataDirectory, FILENAME, NULL),
++ V(DataDirectoryGroupReadable, BOOL, "0"),
+ V(DisableNetwork, BOOL, "0"),
+ V(DirAllowPrivateAddresses, BOOL, "0"),
+ V(TestingAuthDirTimeToLearnReachability, INTERVAL, "30 minutes"),
+@@ -1187,16 +1188,30 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
+ }
+
+ /* Ensure data directory is private; create if possible. */
++ cpd_check_t cpd_group_opts = CPD_NONE;
++ if (options->DataDirectoryGroupReadable)
++ cpd_group_opts = CPD_GROUP_READ;
+ if (check_private_dir(options->DataDirectory,
+- running_tor ? CPD_CREATE : CPD_CHECK,
++ running_tor ?
++ CPD_CREATE|cpd_group_opts : CPD_CHECK|cpd_group_opts,
+ options->User)<0) {
+ tor_asprintf(msg,
+ "Couldn't access/create private data directory
\"%s\"",
+ options->DataDirectory);
++
+ goto done;
+ /* No need to roll back, since you can't change the value. */
+ }
+
++#ifndef _WIN32
++ if (options->DataDirectoryGroupReadable) {
++ /* Only new dirs created get new opts, also enforce group read. */
++ if (chmod(options->DataDirectory, 0750)) {
++ log_warn(LD_FS,"Unable to make %s group-readable.",
options->DataDirectory);
++ }
++ }
++#endif
++
+ /* Bail out at this point if we're not going to be a client or server:
+ * we don't run Tor itself. */
+ if (!running_tor)
+diff --git a/src/or/or.h b/src/or/or.h
+index 651d8be..112fe21 100644
+--- a/src/or/or.h
++++ b/src/or/or.h
+@@ -3428,6 +3428,7 @@ typedef struct {
+
+ char *DebugLogFile; /**< Where to send verbose log messages. */
+ char *DataDirectory; /**< OR only: where to store long-term data. */
++ int DataDirectoryGroupReadable; /**< Boolean: Is the DataDirectory g+r? */
+ char *Nickname; /**< OR only: nickname of this onion router. */
+ char *Address; /**< OR only: configured address for this onion router. */
+ char *PidFile; /**< Where to store PID of Tor process. */
+--
+2.5.0
+
diff --git a/0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
b/0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
new file mode 100644
index 0000000..871b3d6
--- /dev/null
+++ b/0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
@@ -0,0 +1,43 @@
+From c4fbdc2d3a0d3e54bb9ad1238be87390bd04dc9b Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j(a)jamielinux.com>
+Date: Fri, 13 Nov 2015 13:57:11 +0000
+Subject: [PATCH 3/3] Defer creation of Unix socket until after setuid
+
+---
+ changes/bug17562-defer-unix-socket-creation | 4 ++++
+ src/or/connection.c | 8 ++++++++
+ 2 files changed, 12 insertions(+)
+ create mode 100644 changes/bug17562-defer-unix-socket-creation
+
+diff --git a/changes/bug17562-defer-unix-socket-creation
b/changes/bug17562-defer-unix-socket-creation
+new file mode 100644
+index 0000000..f1896c0
+--- /dev/null
++++ b/changes/bug17562-defer-unix-socket-creation
+@@ -0,0 +1,4 @@
++ o Minor bug fixes:
++ - Defer creation of Unix sockets until after setuid. This avoids needing
++ CAP_CHOWN and CAP_FOWNER when using systemd's CapabilityBoundingSet, or
++ chown and fowner when using SELinux.
+diff --git a/src/or/connection.c b/src/or/connection.c
+index 78176d3..f2a82dd 100644
+--- a/src/or/connection.c
++++ b/src/or/connection.c
+@@ -2381,6 +2381,14 @@ retry_listener_ports(smartlist_t *old_conns,
+ if (port->server_cfg.no_listen)
+ continue;
+
++#ifndef _WIN32
++ /* We don't need to be root to create a UNIX socket, so defer until after
++ * setuid. */
++ const or_options_t *options = get_options();
++ if (port->is_unix_addr && !geteuid() && strcmp(options->User,
"root"))
++ continue;
++#endif
++
+ if (port->is_unix_addr) {
+ listensockaddr = (struct sockaddr *)
+ create_unix_sockaddr(port->unix_addr,
+--
+2.5.0
+
diff --git a/tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
b/tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
deleted file mode 100644
index 5aae5db..0000000
--- a/tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From bc29ca103c07d542a65980be97d8f565dcb5aaa0 Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j(a)jamielinux.com>
-Date: Mon, 9 Nov 2015 09:27:48 +0000
-Subject: [PATCH] Optionally allow root group access to DataDirectory
-
-Directories created by Tor have 0700 and TorUser:TorUser permissions.
-Tor also checks the permissions again at runtime, reducing the
-permissions if they aren't 0700 and refusing to run if the directory
-UID and GID aren't both TorUser.
-
-These precautions protect the security of the Tor files. However, the
-DataDirectory (ie, /var/lib/tor) is unreadable by the root user. When
-Tor is started as root, it accesses the DataDirectory before dropping
-root permissions. Normally this wouldn't cause any problems, but there
-are two situations in which Tor is prevented from running:
-
-(1) If the systemd CapabilityBoundingSet option is set but CAP_READ_SEARCH
- isn't listed, root is denied access to the DataDirectory.
-
-(2) If SELinux is enabled but tor_t domain isn't allowed dac_read_search
- permissions, root is denied access to the DataDirectory.
-
-CAP_READ_SEARCH and dac_read_search should be avoided; a process with
-these permissions can read arbitrary files regardless of DAC
-permissions.
-
-The solution proposed in this patch is to allow DataDirectory to have
-either 0700 or 0750 permissions, and allow the group to be either
-TorUser or root (but nobody else). The default will remain 0700
-TorUser:TorUser, but an administrator has the option of using 0750
-TorUser:root permissions when using either CapabilityBoundingSet or
-SELinux (or both).
----
- changes/bug17562 | 6 ++++++
- src/common/util.c | 2 +-
- src/or/config.c | 3 ++-
- 3 files changed, 9 insertions(+), 2 deletions(-)
- create mode 100644 changes/bug17562
-
-diff --git a/changes/bug17562 b/changes/bug17562
-new file mode 100644
-index 0000000..ed241cf
---- /dev/null
-+++ b/changes/bug17562
-@@ -0,0 +1,6 @@
-+ o Minor bug fixes:
-+ - Allow DataDirectory to have either 0700 or 0750 permissions, and allow
-+ directory GID to be Tor User or root (but nobody else). An administrator
-+ therefore has the option of 0750 TorUser:root permissions. This prevents
-+ needing CAP_READ_SEARCH when using systemd' CapabilityBoundingSet, or
-+ dac_read_search when using SELinux. (The default of 0700 is unchanged.)
-diff --git a/src/common/util.c b/src/common/util.c
-index b33c80f..c0178a3 100644
---- a/src/common/util.c
-+++ b/src/common/util.c
-@@ -2116,7 +2116,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
- return -1;
- }
- if ( (check & (CPD_GROUP_OK|CPD_GROUP_READ))
-- && (st.st_gid != running_gid) ) {
-+ && (st.st_gid != running_gid) && (st.st_gid != 0)) {
- struct group *gr;
- char *process_groupname = NULL;
- gr = getgrgid(running_gid);
-diff --git a/src/or/config.c b/src/or/config.c
-index 22039b4..894d0ff 100644
---- a/src/or/config.c
-+++ b/src/or/config.c
-@@ -1188,7 +1188,8 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
-
- /* Ensure data directory is private; create if possible. */
- if (check_private_dir(options->DataDirectory,
-- running_tor ? CPD_CREATE : CPD_CHECK,
-+ running_tor ?
-+ CPD_CREATE|CPD_GROUP_OK : CPD_CHECK|CPD_GROUP_OK,
- options->User)<0) {
- tor_asprintf(msg,
- "Couldn't access/create private data directory
\"%s\"",
---
-2.5.0
-
diff --git a/tor.defaults-torrc b/tor.defaults-torrc
index 7359f3a..83ebb3b 100644
--- a/tor.defaults-torrc
+++ b/tor.defaults-torrc
@@ -1,3 +1,4 @@
DataDirectory /var/lib/tor
+DataDirectoryGroupReadable 1
User toranon
Log notice syslog
diff --git a/tor.spec b/tor.spec
index 2978011..51fd3d6 100644
--- a/tor.spec
+++ b/tor.spec
@@ -36,7 +36,9 @@ Source20: README
#
https://bugzilla.redhat.com/show_bug.cgi?id=1279222
#
https://trac.torproject.org/projects/tor/ticket/17562
-Patch0: tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
+Patch0: 0001-Permit-filesystem-group-to-be-root.patch
+Patch1: 0002-Introduce-DataDirectoryGroupReadable-boolean.patch
+Patch2: 0003-Defer-creation-of-Unix-socket-until-after-setuid.patch
BuildRequires: asciidoc
BuildRequires: libevent-devel
@@ -79,6 +81,8 @@ Tor network, or as a client to connect to the Tor network.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
commit ed4953a48d2c66a12de91aa249460cb2213b1ef4
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Dec 10 18:14:03 2015 +0000
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index a037010..2978011 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.7.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -167,6 +167,10 @@ fi
%changelog
+* Thu Dec 10 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-6
+- use ReadOnlyDirectories=/var instead of ReadOnlyDirectories=/ (#1290444)
+ and other service file improvements
+
* Sun Dec 06 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-5
- improve systemd scriptlets
commit ed8db279d85bb287cb63625f5b9e5bfd61c5bec0
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Dec 10 18:13:37 2015 +0000
Add *.rpm to gitignore
diff --git a/.gitignore b/.gitignore
index eaa30db..84c3937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/tor-*.tar.gz
/tor-*.tar.gz.asc
+/*.rpm
commit c53f0939cdf06c801c86ca0355c1ebd32433c424
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Dec 10 18:11:50 2015 +0000
Improve service files (#1290444)
diff --git a/tor.service b/tor.service
index 4c60acf..8518d52 100644
--- a/tor.service
+++ b/tor.service
@@ -23,7 +23,7 @@ DeviceAllow=/dev/null rw
DeviceAllow=/dev/urandom r
ProtectHome=yes
ProtectSystem=full
-ReadOnlyDirectories=/
+ReadOnlyDirectories=/var
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
diff --git a/tor.spec b/tor.spec
index a4d25c4..a037010 100644
--- a/tor.spec
+++ b/tor.spec
@@ -108,8 +108,8 @@ sed -i $RPM_BUILD_ROOT%_unitdir/%{name}.service \
-e 's/^Type=.*/Type=simple/g' \
-e '/^NotifyAccess=.*/d' \
-e '/^WatchdogSec=.*/d' \
- -e 's#^ProtectHome=.*#InaccessibleDirectories=/home#g' \
- -e '/^ProtectSystem=.*/d'
+ -e
's#^ProtectHome=.*#InaccessibleDirectories=/home\nInaccessibleDirectories=/root\nInaccessibleDirectories=/run/user#g'
\
+ -e
's#^ProtectSystem=.*#ReadOnlyDirectories=/boot\nReadOnlyDirectories=/etc\nReadOnlyDirectories=/usr#g'
%endif
# Install docs manually.
diff --git a/tor@.service b/tor@.service
index 8a5e1ed..987135d 100644
--- a/tor@.service
+++ b/tor@.service
@@ -23,7 +23,7 @@ DeviceAllow=/dev/null rw
DeviceAllow=/dev/urandom r
ProtectHome=yes
ProtectSystem=full
-ReadOnlyDirectories=/
+ReadOnlyDirectories=/var
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
commit f3e09cc679a0236d3fb0a749638bf86acbf55420
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Dec 10 18:11:38 2015 +0000
gitignore
diff --git a/.gitignore b/.gitignore
index b746c89..eaa30db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,2 @@
-/tor-0.2.3.25.tar.gz
-/tor-0.2.3.25.tar.gz.asc
-/tor-0.2.4.21.tar.gz
-/tor-0.2.4.21.tar.gz.asc
-/tor-0.2.4.22.tar.gz
-/tor-0.2.4.23.tar.gz
-/tor-0.2.4.23.tar.gz.asc
-/tor-0.2.4.24.tar.gz
-/tor-0.2.4.24.tar.gz.asc
-/tor-0.2.4.25.tar.gz
-/tor-0.2.4.25.tar.gz.asc
-/tor-0.2.5.10.tar.gz
-/tor-0.2.5.10.tar.gz.asc
-/tor-0.2.5.11.tar.gz
-/tor-0.2.5.11.tar.gz.asc
-/tor-0.2.5.12.tar.gz
-/tor-0.2.5.12.tar.gz.asc
-/tor-0.2.6.8.tar.gz
-/tor-0.2.6.8.tar.gz.asc
-/tor-0.2.6.9.tar.gz
-/tor-0.2.6.9.tar.gz.asc
-/tor-0.2.6.10.tar.gz
-/tor-0.2.6.10.tar.gz.asc
-/tor-0.2.7.5.tar.gz
-/tor-0.2.7.5.tar.gz.asc
+/tor-*.tar.gz
+/tor-*.tar.gz.asc
commit 7c8827dfe456f70e1b26e05d314b6cad7f0e4354
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Dec 6 15:25:17 2015 +0000
Add comment
diff --git a/tor.spec b/tor.spec
index 5785701..a4d25c4 100644
--- a/tor.spec
+++ b/tor.spec
@@ -134,7 +134,7 @@ exit 0
systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ]; then
# Use restart instead of try-restart, as tor-master may be "inactive" even
- # when there are tor@.service instances running.
+ # when there are tor.service and tor@.service instances running.
systemctl restart %{name}-master.service >/dev/null 2>&1 || :
fi
commit 1114b928a2a8b7d0648c310edc8a6e1927d4f842
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Dec 6 15:16:14 2015 +0000
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index 4b036e7..5785701 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.7.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -167,6 +167,9 @@ fi
%changelog
+* Sun Dec 06 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-5
+- improve systemd scriptlets
+
* Sun Dec 06 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-4
- add PermissionsStartOnly=yes and RestartSec=1 to service file
commit ca855c71be503e5c3102aac4e5e7814fd7312361
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Dec 6 15:15:49 2015 +0000
Improve systemd scriptlets
diff --git a/tor.spec b/tor.spec
index 0019cfb..4b036e7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -124,13 +124,19 @@ getent passwd %{toruser} >/dev/null || \
exit 0
%post
-%systemd_post %{name}-master.service
+%systemd_post %{name}.service
%preun
+%systemd_preun %{name}.service
%systemd_preun %{name}-master.service
%postun
-%systemd_postun_with_restart %{name}-master.service
+systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ]; then
+ # Use restart instead of try-restart, as tor-master may be "inactive" even
+ # when there are tor@.service instances running.
+ systemctl restart %{name}-master.service >/dev/null 2>&1 || :
+fi
%files
commit 52626b9ddc78bf35725c70395535961799c4c30d
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Dec 6 14:04:28 2015 +0000
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index c67c57f..0019cfb 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.7.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -161,6 +161,9 @@ exit 0
%changelog
+* Sun Dec 06 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-4
+- add PermissionsStartOnly=yes and RestartSec=1 to service file
+
* Mon Nov 30 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-3
- amend README
commit f0cf68d166e067469f7428e75a2bdb3e389dc58e
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Dec 6 14:02:17 2015 +0000
Add PermissionsStartOnly=yes and RestartSec=1 to service file
diff --git a/tor-master.service b/tor-master.service
index 4b21b7f..e6fce78 100644
--- a/tor-master.service
+++ b/tor-master.service
@@ -1,4 +1,7 @@
-# systemd targets cannot be reloaded, so use a service instead.
+# Use tor-master.service to restart/reload/stop the main tor.service and
+# all instances of tor@.service that are running.
+#
+# systemd targets cannot be reloaded so this is a service instead.
[Unit]
Description=Anonymizing overlay network for TCP (multi-instance master)
diff --git a/tor.service b/tor.service
index 86e0921..4c60acf 100644
--- a/tor.service
+++ b/tor.service
@@ -13,6 +13,7 @@ ExecReload=/bin/kill -HUP ${MAINPID}
KillSignal=SIGINT
TimeoutSec=30
Restart=on-failure
+RestartSec=1
WatchdogSec=1m
LimitNOFILE=32768
@@ -26,6 +27,7 @@ ReadOnlyDirectories=/
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
+PermissionsStartOnly=yes
[Install]
WantedBy = multi-user.target
diff --git a/tor@.service b/tor@.service
index 08933bc..8a5e1ed 100644
--- a/tor@.service
+++ b/tor@.service
@@ -13,6 +13,7 @@ ExecReload=/bin/kill -HUP ${MAINPID}
KillSignal=SIGINT
TimeoutSec=30
Restart=on-failure
+RestartSec=1
WatchdogSec=1m
LimitNOFILE=32768
@@ -26,6 +27,7 @@ ReadOnlyDirectories=/
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
+PermissionsStartOnly=yes
[Install]
WantedBy = multi-user.target
commit c98fdc6fe4f49eeddb2a27595bb3d82f3403a44c
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Nov 30 09:30:45 2015 +0000
Amend README
diff --git a/README b/README
index 19de442..41f5a34 100644
--- a/README
+++ b/README
@@ -7,11 +7,11 @@ Multiple instances of Tor can be run simultaneously using different
configuration files. For example, tor(a)custom.service will use the configuration
file "/etc/tor/custom.torrc".
- # cp /etc/tor/torrc /etc/tor/custom.torrc
- # mkdir /var/lib/tor/custom
- # chown toranon:toranon /var/lib/tor/custom
+ # touch /etc/tor/custom.torrc
# echo "SOCKSPort 9051" >> /etc/tor/custom.torrc
- # echo "DataDirectory /var/lib/tor/custom" > /etc/tor/custom.torrc
+ # echo "DataDirectory /var/lib/tor/custom" >> /etc/tor/custom.torrc
+ # mkdir /var/lib/tor/custom
+ # chown toranon:root /var/lib/tor/custom
# systemctl start tor(a)custom.service
To restart, reload, or stop all running instances of Tor (including tor.service
diff --git a/tor.spec b/tor.spec
index 6d97c9c..c67c57f 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP
@@ -161,6 +161,9 @@ exit 0
%changelog
+* Mon Nov 30 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-3
+- amend README
+
* Mon Nov 30 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-2
- improve summary and description
- use tor-master.service to restart/reload all instances (#1286359)
commit fd51c0001bb55215d2ac6bd1272f263e97656568
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Nov 30 08:47:32 2015 +0000
Use tor-master.service to restart/reload all instances
diff --git a/README b/README
new file mode 100644
index 0000000..19de442
--- /dev/null
+++ b/README
@@ -0,0 +1,22 @@
+The default configuration file for Tor is "/etc/tor/torrc" and is used when
you
+run this command:
+
+ # systemctl start tor.service
+
+Multiple instances of Tor can be run simultaneously using different
+configuration files. For example, tor(a)custom.service will use the configuration
+file "/etc/tor/custom.torrc".
+
+ # cp /etc/tor/torrc /etc/tor/custom.torrc
+ # mkdir /var/lib/tor/custom
+ # chown toranon:toranon /var/lib/tor/custom
+ # echo "SOCKSPort 9051" >> /etc/tor/custom.torrc
+ # echo "DataDirectory /var/lib/tor/custom" > /etc/tor/custom.torrc
+ # systemctl start tor(a)custom.service
+
+To restart, reload, or stop all running instances of Tor (including tor.service
+and any tor@.service), use tor-master.service. For example, to restart all
+instances of Tor, run this command:
+
+ # systemctl restart tor-master.service
+
diff --git a/tor-master.service b/tor-master.service
new file mode 100644
index 0000000..4b21b7f
--- /dev/null
+++ b/tor-master.service
@@ -0,0 +1,13 @@
+# systemd targets cannot be reloaded, so use a service instead.
+
+[Unit]
+Description=Anonymizing overlay network for TCP (multi-instance master)
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/true
+ExecReload=/bin/true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/tor.logrotate b/tor.logrotate
index 7d67feb..0fd02b3 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -8,6 +8,6 @@
create 0640 toranon toranon
sharedscripts
postrotate
- /bin/systemctl reload tor.service >/dev/null 2>/dev/null || :
+ /bin/systemctl reload tor-master.service >/dev/null 2>/dev/null || :
endscript
}
diff --git a/tor.service b/tor.service
index 05fd808..86e0921 100644
--- a/tor.service
+++ b/tor.service
@@ -1,6 +1,8 @@
[Unit]
-Description = Anonymizing overlay network for TCP
-After = syslog.target network.target nss-lookup.target
+Description=Anonymizing overlay network for TCP
+After=syslog.target network.target nss-lookup.target
+PartOf=tor-master.service
+ReloadPropagatedFrom=tor-master.service
[Service]
Type=notify
diff --git a/tor.spec b/tor.spec
index f1a9b1b..6d97c9c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -30,6 +30,9 @@ Source1:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
Source2: tor.logrotate
Source3: tor.defaults-torrc
Source10: tor.service
+Source11: tor@.service
+Source12: tor-master.service
+Source20: README
#
https://bugzilla.redhat.com/show_bug.cgi?id=1279222
#
https://trac.torproject.org/projects/tor/ticket/17562
@@ -87,17 +90,21 @@ make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc.sample \
$RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
+install -D -p -m 0644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/tor/README
mkdir -p $RPM_BUILD_ROOT%{logdir}
mkdir -p $RPM_BUILD_ROOT%{homedir}
install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%_unitdir/%{name}.service
+install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%_unitdir/%{name}@.service
+install -D -p -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%_unitdir/%{name}-master.service
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
%if 0%{without libsystemd}
# Some features are not available for systemd 208 on RHEL 7.
sed -i $RPM_BUILD_ROOT%_unitdir/%{name}.service \
+ -i $RPM_BUILD_ROOT%_unitdir/%{name}@.service \
-e 's/^Type=.*/Type=simple/g' \
-e '/^NotifyAccess=.*/d' \
-e '/^WatchdogSec=.*/d' \
@@ -105,10 +112,6 @@ sed -i $RPM_BUILD_ROOT%_unitdir/%{name}.service \
-e '/^ProtectSystem=.*/d'
%endif
-sed -e 's#/etc/tor/torrc#/etc/tor/%%i.torrc#g' \
- $RPM_BUILD_ROOT%_unitdir/%{name}.service \
- > $RPM_BUILD_ROOT%_unitdir/%{name}@.service
-
# Install docs manually.
rm -rf %{buildroot}%{_datadir}/doc
@@ -121,13 +124,13 @@ getent passwd %{toruser} >/dev/null || \
exit 0
%post
-%systemd_post %{name}.service
+%systemd_post %{name}-master.service
%preun
-%systemd_preun %{name}.service
+%systemd_preun %{name}-master.service
%postun
-%systemd_postun_with_restart %{name}.service
+%systemd_postun_with_restart %{name}-master.service
%files
@@ -146,8 +149,10 @@ exit 0
%{_datadir}/tor/geoip6
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}@.service
+%{_unitdir}/%{name}-master.service
%dir %{_sysconfdir}/tor
+%{_sysconfdir}/tor/README
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
%config(noreplace) %{_sysconfdir}/logrotate.d/tor
@@ -158,6 +163,8 @@ exit 0
%changelog
* Mon Nov 30 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-2
- improve summary and description
+- use tor-master.service to restart/reload all instances (#1286359)
+- add /etc/tor/README
* Sun Nov 29 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-1
- update to upstream release 0.2.7.5
diff --git a/tor@.service b/tor@.service
new file mode 100644
index 0000000..08933bc
--- /dev/null
+++ b/tor@.service
@@ -0,0 +1,31 @@
+[Unit]
+Description=Anonymizing overlay network for TCP (instance: %i)
+After=syslog.target network.target nss-lookup.target
+PartOf=tor-master.service
+ReloadPropagatedFrom=tor-master.service
+
+[Service]
+Type=notify
+NotifyAccess=all
+ExecStartPre=/usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/%i.torrc --verify-config
+ExecStart=/usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc -f
/etc/tor/%i.torrc
+ExecReload=/bin/kill -HUP ${MAINPID}
+KillSignal=SIGINT
+TimeoutSec=30
+Restart=on-failure
+WatchdogSec=1m
+LimitNOFILE=32768
+
+# Hardening
+PrivateTmp=yes
+DeviceAllow=/dev/null rw
+DeviceAllow=/dev/urandom r
+ProtectHome=yes
+ProtectSystem=full
+ReadOnlyDirectories=/
+ReadWriteDirectories=/var/lib/tor
+ReadWriteDirectories=/var/log/tor
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy = multi-user.target
commit 754bd22e085891fa238c377a597655281fa416bb
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Nov 30 08:26:38 2015 +0000
Improve summary and description
diff --git a/tor.spec b/tor.spec
index 74214a6..f1a9b1b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,19 +19,15 @@
Name: tor
Version: 0.2.7.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
-Summary: Anonymizing overlay network for TCP (The onion router)
+Summary: Anonymizing overlay network for TCP
URL:
https://www.torproject.org
Source0:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz
Source1:
https://www.torproject.org/dist/%{name}-%{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
-# 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
Source10: tor.service
@@ -63,22 +59,18 @@ Requires(postun): systemd
%description
-Tor is a connection-based low-latency anonymous communication system.
+The Tor network is a group of volunteer-operated servers that allows people to
+improve their privacy and security on the Internet. Tor's users employ this
+network by connecting through a series of virtual tunnels rather than making a
+direct connection, thus allowing both organizations and individuals to share
+information over public networks without compromising their privacy. Along the
+same line, Tor is an effective censorship circumvention tool, allowing its
+users to reach otherwise blocked destinations or content. Tor can also be used
+as a building block for software developers to create new communication tools
+with built-in privacy features.
-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.
+This package contains the Tor software that can act as either a server on the
+Tor network, or as a client to connect to the Tor network.
%prep
@@ -164,6 +156,9 @@ exit 0
%changelog
+* Mon Nov 30 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-2
+- improve summary and description
+
* Sun Nov 29 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-1
- update to upstream release 0.2.7.5
commit 4a96400b9a753ff007ef403feec1cb3a959bbd0c
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Nov 29 22:08:22 2015 +0000
Update to upstream release 0.2.7.5
diff --git a/.gitignore b/.gitignore
index fcc47a1..b746c89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
/tor-0.2.6.9.tar.gz.asc
/tor-0.2.6.10.tar.gz
/tor-0.2.6.10.tar.gz.asc
+/tor-0.2.7.5.tar.gz
+/tor-0.2.7.5.tar.gz.asc
diff --git a/sources b/sources
index 86bcf27..647459d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-04f919e7882d1ca80f835545af562bad tor-0.2.6.10.tar.gz
-230a2e90bd0d8f7e53741cac9942fedf tor-0.2.6.10.tar.gz.asc
+2fa650d387eb2ce08ad65ac1f182d3cc tor-0.2.7.5.tar.gz
+d0a5ffac99e4443165a3e74c899a23e4 tor-0.2.7.5.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 6c5d929..74214a6 100644
--- a/tor.spec
+++ b/tor.spec
@@ -18,8 +18,8 @@
%endif
Name: tor
-Version: 0.2.6.10
-Release: 6%{?dist}
+Version: 0.2.7.5
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -164,6 +164,9 @@ exit 0
%changelog
+* Sun Nov 29 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.7.5-1
+- update to upstream release 0.2.7.5
+
* Mon Nov 09 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-6
- amend patch so that the default of 0700 doesn't change (but instead allow
either 0700 or 0750)
commit 3b9a7cea49106197c2bc590608130656a6930a1c
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Nov 9 13:58:46 2015 +0000
Amend patch
diff --git a/tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
b/tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
deleted file mode 100644
index 5b649c5..0000000
--- a/tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ec35ad51e585023b718c2b257721bdf2d2f25f3e Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j(a)jamielinux.com>
-Date: Mon, 9 Nov 2015 07:38:19 +0000
-Subject: [PATCH] Create DataDirectory with group read permissions
-
-Directories created by Tor have 0700 and toranon:toranon permissions. Tor also
-checks the permissions again at runtime, reducing the permissions if they
-aren't 0700 and refusing to run if the owner or group aren't both toranon.
-
-These precautions protect the security of the Tor files. However, these
-permissions make the Tor DataDirectory (ie, /var/lib/tor) unreadable by the
-root user. When Tor is started as root, it accesses the DataDirectory before
-dropping root permissions. Normally this wouldn't cause any problems, but there
-are two situations in which Tor is prevented from running:
-
-(1) If the systemd CapabilityBoundingSet option is set but CAP_READ_SEARCH isn't
- listed, root is denied access to the Tor DataDirectory.
-
-(2) If SELinux is enabled but tor_t domain isn't allowed dac_read_search
- permissions, root is denied access to the Tor DataDirectory.
-
-CAP_READ_SEARCH and dac_read_search should be avoided; a process with these
-permissions can read arbitrary files regardless of DAC permissions. The
-solution proposed in this patch is to default to creating the DataDirectory
-with 0750 permissions, while also allowing the group to be either toranon or
-root.
----
- src/common/util.c | 2 +-
- src/or/config.c | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/common/util.c b/src/common/util.c
-index 442d57a..793fbb4 100644
---- a/src/common/util.c
-+++ b/src/common/util.c
-@@ -2196,7 +2196,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
- return -1;
- }
- if ( (check & (CPD_GROUP_OK|CPD_GROUP_READ))
-- && (st.st_gid != running_gid) ) {
-+ && (st.st_gid != running_gid) && (st.st_gid != 0)) {
- struct group *gr;
- char *process_groupname = NULL;
- gr = getgrgid(running_gid);
-diff --git a/src/or/config.c b/src/or/config.c
-index fca350c..5cefc7c 100644
---- a/src/or/config.c
-+++ b/src/or/config.c
-@@ -1152,7 +1152,8 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
-
- /* Ensure data directory is private; create if possible. */
- if (check_private_dir(options->DataDirectory,
-- running_tor ? CPD_CREATE : CPD_CHECK,
-+ running_tor ?
-+ CPD_CREATE|CPD_GROUP_READ : CPD_CHECK|CPD_GROUP_READ,
- options->User)<0) {
- tor_asprintf(msg,
- "Couldn't access/create private data directory
\"%s\"",
---
-2.5.0
-
diff --git a/tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
b/tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
new file mode 100644
index 0000000..5aae5db
--- /dev/null
+++ b/tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
@@ -0,0 +1,81 @@
+From bc29ca103c07d542a65980be97d8f565dcb5aaa0 Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j(a)jamielinux.com>
+Date: Mon, 9 Nov 2015 09:27:48 +0000
+Subject: [PATCH] Optionally allow root group access to DataDirectory
+
+Directories created by Tor have 0700 and TorUser:TorUser permissions.
+Tor also checks the permissions again at runtime, reducing the
+permissions if they aren't 0700 and refusing to run if the directory
+UID and GID aren't both TorUser.
+
+These precautions protect the security of the Tor files. However, the
+DataDirectory (ie, /var/lib/tor) is unreadable by the root user. When
+Tor is started as root, it accesses the DataDirectory before dropping
+root permissions. Normally this wouldn't cause any problems, but there
+are two situations in which Tor is prevented from running:
+
+(1) If the systemd CapabilityBoundingSet option is set but CAP_READ_SEARCH
+ isn't listed, root is denied access to the DataDirectory.
+
+(2) If SELinux is enabled but tor_t domain isn't allowed dac_read_search
+ permissions, root is denied access to the DataDirectory.
+
+CAP_READ_SEARCH and dac_read_search should be avoided; a process with
+these permissions can read arbitrary files regardless of DAC
+permissions.
+
+The solution proposed in this patch is to allow DataDirectory to have
+either 0700 or 0750 permissions, and allow the group to be either
+TorUser or root (but nobody else). The default will remain 0700
+TorUser:TorUser, but an administrator has the option of using 0750
+TorUser:root permissions when using either CapabilityBoundingSet or
+SELinux (or both).
+---
+ changes/bug17562 | 6 ++++++
+ src/common/util.c | 2 +-
+ src/or/config.c | 3 ++-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+ create mode 100644 changes/bug17562
+
+diff --git a/changes/bug17562 b/changes/bug17562
+new file mode 100644
+index 0000000..ed241cf
+--- /dev/null
++++ b/changes/bug17562
+@@ -0,0 +1,6 @@
++ o Minor bug fixes:
++ - Allow DataDirectory to have either 0700 or 0750 permissions, and allow
++ directory GID to be Tor User or root (but nobody else). An administrator
++ therefore has the option of 0750 TorUser:root permissions. This prevents
++ needing CAP_READ_SEARCH when using systemd' CapabilityBoundingSet, or
++ dac_read_search when using SELinux. (The default of 0700 is unchanged.)
+diff --git a/src/common/util.c b/src/common/util.c
+index b33c80f..c0178a3 100644
+--- a/src/common/util.c
++++ b/src/common/util.c
+@@ -2116,7 +2116,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
+ return -1;
+ }
+ if ( (check & (CPD_GROUP_OK|CPD_GROUP_READ))
+- && (st.st_gid != running_gid) ) {
++ && (st.st_gid != running_gid) && (st.st_gid != 0)) {
+ struct group *gr;
+ char *process_groupname = NULL;
+ gr = getgrgid(running_gid);
+diff --git a/src/or/config.c b/src/or/config.c
+index 22039b4..894d0ff 100644
+--- a/src/or/config.c
++++ b/src/or/config.c
+@@ -1188,7 +1188,8 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
+
+ /* Ensure data directory is private; create if possible. */
+ if (check_private_dir(options->DataDirectory,
+- running_tor ? CPD_CREATE : CPD_CHECK,
++ running_tor ?
++ CPD_CREATE|CPD_GROUP_OK : CPD_CHECK|CPD_GROUP_OK,
+ options->User)<0) {
+ tor_asprintf(msg,
+ "Couldn't access/create private data directory
\"%s\"",
+--
+2.5.0
+
diff --git a/tor.spec b/tor.spec
index 66ff38e..6c5d929 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.6.10
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -36,7 +36,8 @@ Source3: tor.defaults-torrc
Source10: tor.service
#
https://bugzilla.redhat.com/show_bug.cgi?id=1279222
-Patch0: tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
+#
https://trac.torproject.org/projects/tor/ticket/17562
+Patch0: tor-0.2.6.10-Optionally-allow-root-group-access-to-DataDirectory.patch
BuildRequires: asciidoc
BuildRequires: libevent-devel
@@ -163,6 +164,10 @@ exit 0
%changelog
+* Mon Nov 09 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-6
+- amend patch so that the default of 0700 doesn't change (but instead allow
+ either 0700 or 0750)
+
* Sun Nov 08 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-5
- allow group read of DataDirectory and change owner to root (#1279222),
as otherwise CapabilityBoundingSet requires CAP_READ_SEARCH and SELinux
commit 87eb17d1a5184ff782a39d67c7ca61f7ebb9f38b
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Nov 9 08:34:39 2015 +0000
Add asc to sources
diff --git a/sources b/sources
index 2c32a83..86bcf27 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
04f919e7882d1ca80f835545af562bad tor-0.2.6.10.tar.gz
+230a2e90bd0d8f7e53741cac9942fedf tor-0.2.6.10.tar.gz.asc
commit 9043f9db646529d4d34198aa7848cddb8fd81047
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Nov 9 07:59:12 2015 +0000
Create DataDirectory with group read permissions (#1279222)
diff --git a/sources b/sources
index 86bcf27..2c32a83 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
04f919e7882d1ca80f835545af562bad tor-0.2.6.10.tar.gz
-230a2e90bd0d8f7e53741cac9942fedf tor-0.2.6.10.tar.gz.asc
diff --git a/tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
b/tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
new file mode 100644
index 0000000..5b649c5
--- /dev/null
+++ b/tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
@@ -0,0 +1,61 @@
+From ec35ad51e585023b718c2b257721bdf2d2f25f3e Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j(a)jamielinux.com>
+Date: Mon, 9 Nov 2015 07:38:19 +0000
+Subject: [PATCH] Create DataDirectory with group read permissions
+
+Directories created by Tor have 0700 and toranon:toranon permissions. Tor also
+checks the permissions again at runtime, reducing the permissions if they
+aren't 0700 and refusing to run if the owner or group aren't both toranon.
+
+These precautions protect the security of the Tor files. However, these
+permissions make the Tor DataDirectory (ie, /var/lib/tor) unreadable by the
+root user. When Tor is started as root, it accesses the DataDirectory before
+dropping root permissions. Normally this wouldn't cause any problems, but there
+are two situations in which Tor is prevented from running:
+
+(1) If the systemd CapabilityBoundingSet option is set but CAP_READ_SEARCH isn't
+ listed, root is denied access to the Tor DataDirectory.
+
+(2) If SELinux is enabled but tor_t domain isn't allowed dac_read_search
+ permissions, root is denied access to the Tor DataDirectory.
+
+CAP_READ_SEARCH and dac_read_search should be avoided; a process with these
+permissions can read arbitrary files regardless of DAC permissions. The
+solution proposed in this patch is to default to creating the DataDirectory
+with 0750 permissions, while also allowing the group to be either toranon or
+root.
+---
+ src/common/util.c | 2 +-
+ src/or/config.c | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/util.c b/src/common/util.c
+index 442d57a..793fbb4 100644
+--- a/src/common/util.c
++++ b/src/common/util.c
+@@ -2196,7 +2196,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
+ return -1;
+ }
+ if ( (check & (CPD_GROUP_OK|CPD_GROUP_READ))
+- && (st.st_gid != running_gid) ) {
++ && (st.st_gid != running_gid) && (st.st_gid != 0)) {
+ struct group *gr;
+ char *process_groupname = NULL;
+ gr = getgrgid(running_gid);
+diff --git a/src/or/config.c b/src/or/config.c
+index fca350c..5cefc7c 100644
+--- a/src/or/config.c
++++ b/src/or/config.c
+@@ -1152,7 +1152,8 @@ options_act_reversible(const or_options_t *old_options, char
**msg)
+
+ /* Ensure data directory is private; create if possible. */
+ if (check_private_dir(options->DataDirectory,
+- running_tor ? CPD_CREATE : CPD_CHECK,
++ running_tor ?
++ CPD_CREATE|CPD_GROUP_READ : CPD_CHECK|CPD_GROUP_READ,
+ options->User)<0) {
+ tor_asprintf(msg,
+ "Couldn't access/create private data directory
\"%s\"",
+--
+2.5.0
+
diff --git a/tor.spec b/tor.spec
index 46218ca..66ff38e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.6.10
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -35,6 +35,9 @@ Source2: tor.logrotate
Source3: tor.defaults-torrc
Source10: tor.service
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1279222
+Patch0: tor-0.2.6.10-Create-DataDirectory-with-group-read.patch
+
BuildRequires: asciidoc
BuildRequires: libevent-devel
BuildRequires: openssl-devel
@@ -79,6 +82,7 @@ high-stakes anonymity.
%prep
%setup -q
+%patch0 -p1
%build
@@ -154,11 +158,16 @@ exit 0
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
%config(noreplace) %{_sysconfdir}/logrotate.d/tor
-%attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
-%attr(0700,%{toruser},%{torgroup}) %dir %{logdir}
+%attr(0750,%{toruser},root) %dir %{homedir}
+%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
%changelog
+* Sun Nov 08 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-5
+- allow group read of DataDirectory and change owner to root (#1279222),
+ as otherwise CapabilityBoundingSet requires CAP_READ_SEARCH and SELinux
+ tor_t requires dac_read_search
+
* Sat Oct 03 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-4
- remove NoNewPrivileges as it prevents SELinux transition
- revert to DeviceAllow instead of PrivateDevices due to SELinux denials
commit c25e25902c9dd884c5eb165c681c91ede57fbc28
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sat Oct 3 17:54:10 2015 +0100
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index aff5494..46218ca 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.6.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -159,6 +159,10 @@ exit 0
%changelog
+* Sat Oct 03 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-4
+- remove NoNewPrivileges as it prevents SELinux transition
+- revert to DeviceAllow instead of PrivateDevices due to SELinux denials
+
* Tue Sep 29 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-3
- only build with libseccomp support on ix86, x86_64
commit a8ea8c0e5336719d6174409434e5b260b93a8ba7
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sat Oct 3 17:53:54 2015 +0100
Revert NoNewPrivileges as it prevents SELinux transition
diff --git a/tor.service b/tor.service
index 8329219..05fd808 100644
--- a/tor.service
+++ b/tor.service
@@ -23,7 +23,6 @@ ProtectSystem=full
ReadOnlyDirectories=/
ReadWriteDirectories=/var/lib/tor
ReadWriteDirectories=/var/log/tor
-NoNewPrivileges=yes
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
[Install]
commit e955eb43eecad0ba7783ba8a93328630823d0ab6
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sat Oct 3 17:53:30 2015 +0100
Revert PrivateDevices due to SELinux denials
diff --git a/tor.service b/tor.service
index 128a8a8..8329219 100644
--- a/tor.service
+++ b/tor.service
@@ -16,7 +16,8 @@ LimitNOFILE=32768
# Hardening
PrivateTmp=yes
-PrivateDevices=yes
+DeviceAllow=/dev/null rw
+DeviceAllow=/dev/urandom r
ProtectHome=yes
ProtectSystem=full
ReadOnlyDirectories=/
diff --git a/tor.spec b/tor.spec
index 2316989..aff5494 100644
--- a/tor.spec
+++ b/tor.spec
@@ -104,7 +104,6 @@ sed -i $RPM_BUILD_ROOT%_unitdir/%{name}.service \
-e 's/^Type=.*/Type=simple/g' \
-e '/^NotifyAccess=.*/d' \
-e '/^WatchdogSec=.*/d' \
- -e 's#^PrivateDevices=.*#DeviceAllow=/dev/null rw\nDeviceAllow=/dev/urandom
r#g' \
-e 's#^ProtectHome=.*#InaccessibleDirectories=/home#g' \
-e '/^ProtectSystem=.*/d'
%endif
commit e36d88a3293c470a596999ebb17f37495290e5b8
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Sep 29 13:12:52 2015 +0100
Bump release
diff --git a/tor.spec b/tor.spec
index 96fe5cb..2316989 100644
--- a/tor.spec
+++ b/tor.spec
@@ -19,7 +19,7 @@
Name: tor
Version: 0.2.6.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -160,6 +160,9 @@ exit 0
%changelog
+* Tue Sep 29 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-3
+- only build with libseccomp support on ix86, x86_64
+
* Tue Sep 29 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-2
- improve systemd integration
- add BR: libseccomp-devel
commit 258f9f5d341905520017de1ac8e7a5aa58c4b6ba
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Sep 29 13:11:58 2015 +0100
Only build with libseccomp support on ix86, x86_64
diff --git a/tor.spec b/tor.spec
index 9188a40..96fe5cb 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,6 +11,12 @@
%bcond_with libsystemd
%endif
+%ifarch %{ix86} x86_64
+%bcond_without libseccomp
+%else
+%bcond_with libseccomp
+%endif
+
Name: tor
Version: 0.2.6.10
Release: 2%{?dist}
@@ -31,9 +37,13 @@ Source10: tor.service
BuildRequires: asciidoc
BuildRequires: libevent-devel
-BuildRequires: libseccomp-devel
BuildRequires: openssl-devel
+%if 0%{with libseccomp}
+# Only available on certain architectures.
+BuildRequires: libseccomp-devel
+%endif
+
%if 0%{with libsystemd}
# Requires systemd >= 209. RHEL 7 has systemd 208.
BuildRequires: systemd-devel
commit 0058464ea3a8e62d8d7aa25b4f945e36dea4e200
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Sep 29 12:53:23 2015 +0100
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index 3954b6c..9188a40 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.6.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -150,6 +150,10 @@ exit 0
%changelog
+* Tue Sep 29 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-2
+- improve systemd integration
+- add BR: libseccomp-devel
+
* Mon Jul 13 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-1
- update to upstream release 0.2.6.10
commit a86c118c1a361658bec6c6e901838e7954f31882
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Sep 29 12:52:53 2015 +0100
Add BR: libseccomp-devel
diff --git a/tor.spec b/tor.spec
index fca4d39..3954b6c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -31,6 +31,7 @@ Source10: tor.service
BuildRequires: asciidoc
BuildRequires: libevent-devel
+BuildRequires: libseccomp-devel
BuildRequires: openssl-devel
%if 0%{with libsystemd}
commit 486f3398c66b41275e0c8e52792a1492143d0b22
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Sep 29 12:04:18 2015 +0100
Sync systemd service with upstream
diff --git a/tor.service b/tor.service
index 7911e66..128a8a8 100644
--- a/tor.service
+++ b/tor.service
@@ -3,22 +3,27 @@ Description = Anonymizing overlay network for TCP
After = syslog.target network.target nss-lookup.target
[Service]
-Type = simple
-ExecStartPre = /usr/bin/tor --runasdaemon 0 --defaults-torrc
/usr/share/tor/defaults-torrc -f /etc/tor/torrc --verify-config
-ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc
-ExecReload = /bin/kill -HUP ${MAINPID}
-KillSignal = SIGINT
-TimeoutSec = 30
-Restart = on-failure
-LimitNOFILE = 32768
+Type=notify
+NotifyAccess=all
+ExecStartPre=/usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc --verify-config
+ExecStart=/usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc -f
/etc/tor/torrc
+ExecReload=/bin/kill -HUP ${MAINPID}
+KillSignal=SIGINT
+TimeoutSec=30
+Restart=on-failure
+WatchdogSec=1m
+LimitNOFILE=32768
-PrivateTmp = yes
-DeviceAllow = /dev/null rw
-DeviceAllow = /dev/urandom r
-InaccessibleDirectories = /home
-ReadOnlyDirectories = /
-ReadWriteDirectories = /var/lib/tor
-ReadWriteDirectories = /var/log/tor
+# Hardening
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectHome=yes
+ProtectSystem=full
+ReadOnlyDirectories=/
+ReadWriteDirectories=/var/lib/tor
+ReadWriteDirectories=/var/log/tor
+NoNewPrivileges=yes
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
[Install]
WantedBy = multi-user.target
diff --git a/tor.spec b/tor.spec
index eed94f2..fca4d39 100644
--- a/tor.spec
+++ b/tor.spec
@@ -5,6 +5,12 @@
%global homedir %{_localstatedir}/lib/%{name}
%global logdir %{_localstatedir}/log/%{name}
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_without libsystemd
+%else
+%bcond_with libsystemd
+%endif
+
Name: tor
Version: 0.2.6.10
Release: 1%{?dist}
@@ -22,12 +28,16 @@ Source2: tor.logrotate
# and writes to /var/lib/tor instead of /root/.tor directory.
Source3: tor.defaults-torrc
Source10: tor.service
-Source11: tor@.service
BuildRequires: asciidoc
BuildRequires: libevent-devel
BuildRequires: openssl-devel
+%if 0%{with libsystemd}
+# Requires systemd >= 209. RHEL 7 has systemd 208.
+BuildRequires: systemd-devel
+%endif
+
# /usr/bin/torify is now just a wrapper for torsocks and is only there for
# backwards compatibility.
Requires: torsocks
@@ -74,10 +84,24 @@ mkdir -p $RPM_BUILD_ROOT%{logdir}
mkdir -p $RPM_BUILD_ROOT%{homedir}
install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%_unitdir/%{name}.service
-install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%_unitdir/%{name}@.service
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
+%if 0%{without libsystemd}
+# Some features are not available for systemd 208 on RHEL 7.
+sed -i $RPM_BUILD_ROOT%_unitdir/%{name}.service \
+ -e 's/^Type=.*/Type=simple/g' \
+ -e '/^NotifyAccess=.*/d' \
+ -e '/^WatchdogSec=.*/d' \
+ -e 's#^PrivateDevices=.*#DeviceAllow=/dev/null rw\nDeviceAllow=/dev/urandom
r#g' \
+ -e 's#^ProtectHome=.*#InaccessibleDirectories=/home#g' \
+ -e '/^ProtectSystem=.*/d'
+%endif
+
+sed -e 's#/etc/tor/torrc#/etc/tor/%%i.torrc#g' \
+ $RPM_BUILD_ROOT%_unitdir/%{name}.service \
+ > $RPM_BUILD_ROOT%_unitdir/%{name}@.service
+
# Install docs manually.
rm -rf %{buildroot}%{_datadir}/doc
diff --git a/tor@.service b/tor@.service
deleted file mode 100644
index 8dc2068..0000000
--- a/tor@.service
+++ /dev/null
@@ -1,24 +0,0 @@
-[Unit]
-Description = Anonymizing overlay network for TCP
-After = syslog.target network.target nss-lookup.target
-
-[Service]
-Type = simple
-ExecStartPre = /usr/bin/tor --runasdaemon 0 --defaults-torrc
/usr/share/tor/defaults-torrc -f /etc/tor/%i.torrc --verify-config
-ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/%i.torrc
-ExecReload = /bin/kill -HUP ${MAINPID}
-KillSignal = SIGINT
-TimeoutSec = 30
-Restart = on-failure
-LimitNOFILE = 32768
-
-PrivateTmp = yes
-DeviceAllow = /dev/null rw
-DeviceAllow = /dev/urandom r
-InaccessibleDirectories = /home
-ReadOnlyDirectories = /
-ReadWriteDirectories = /var/lib/tor
-ReadWriteDirectories = /var/log/tor
-
-[Install]
-WantedBy = multi-user.target
commit 48330691b2f54b50c759ad0ad565d202f9cbc162
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Jul 13 15:26:09 2015 +0100
new sources
diff --git a/.gitignore b/.gitignore
index 029614c..fcc47a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
/tor-0.2.6.8.tar.gz.asc
/tor-0.2.6.9.tar.gz
/tor-0.2.6.9.tar.gz.asc
+/tor-0.2.6.10.tar.gz
+/tor-0.2.6.10.tar.gz.asc
diff --git a/sources b/sources
index 9ca45d1..86bcf27 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4a1b334c30d7b37ea72fa33425220d5d tor-0.2.6.9.tar.gz
-f1370116fa1be5b185004304090ad3c2 tor-0.2.6.9.tar.gz.asc
+04f919e7882d1ca80f835545af562bad tor-0.2.6.10.tar.gz
+230a2e90bd0d8f7e53741cac9942fedf tor-0.2.6.10.tar.gz.asc
commit cf25f5cd02f771cae657061710cd60f7dd8a81c6
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Jul 13 07:03:57 2015 +0100
Update to upstream release 0.2.6.10
diff --git a/tor.spec b/tor.spec
index 1ec2bac..eed94f2 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,8 +6,8 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.6.9
-Release: 5%{?dist}
+Version: 0.2.6.10
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Mon Jul 13 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.10-1
+- update to upstream release 0.2.6.10
+
* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-5
- also fix ExecStartPre in tor@.service
commit e603774c702ef7c0bec56aa558c00d8f53598abb
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:16:32 2015 +0100
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index fa26de7..1ec2bac 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-5
+- also fix ExecStartPre in tor@.service
+
* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-4
- rebuild
commit a26cf59e2b60add4c825d332878259a9e464ac3e
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:15:58 2015 +0100
Also fix ExecStartPre in tor@.service
diff --git a/tor@.service b/tor@.service
index 105c825..8dc2068 100644
--- a/tor@.service
+++ b/tor@.service
@@ -4,7 +4,7 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
-ExecStartPre = /usr/bin/tor -f /etc/tor/%i.torrc --verify-config
+ExecStartPre = /usr/bin/tor --runasdaemon 0 --defaults-torrc
/usr/share/tor/defaults-torrc -f /etc/tor/%i.torrc --verify-config
ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/%i.torrc
ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
commit 3f1a4776258bb93ec44854d31389d340fef507dc
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:09:37 2015 +0100
Rebuild
diff --git a/tor.spec b/tor.spec
index 6b5c405..fa26de7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-4
+- rebuild
+
* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-3
- add missing arguments to config checks executed in ExecStartPre
commit 7d67e0c051108b02240cac2031166452aa4af7c0
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:09:09 2015 +0100
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index 58bb0ee..6b5c405 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-3
+- add missing arguments to config checks executed in ExecStartPre
+
* Fri Jul 03 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-2
- remove leading '-' from ReadWriteDirectories
commit 02f3190bb11ef8636e06237dcbf416498bf569e4
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:05:39 2015 +0100
Add missing arguments to ExecStartPre
diff --git a/tor.service b/tor.service
index 6828e94..7911e66 100644
--- a/tor.service
+++ b/tor.service
@@ -4,7 +4,7 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
-ExecStartPre = /usr/bin/tor -f /etc/tor/torrc --verify-config
+ExecStartPre = /usr/bin/tor --runasdaemon 0 --defaults-torrc
/usr/share/tor/defaults-torrc -f /etc/tor/torrc --verify-config
ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc
ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
commit 6aa2dfac47a15fd7ad35a6bd5355b3e268bf027d
Merge: e4de418 b059728
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:07:56 2015 +0100
Merge branch 'f22'
commit e4de418a9cc376ddab1b3936cc0f38eb1c2384e6
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:07:52 2015 +0100
Revert "- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild"
This reverts commit d457fe81da8a0f7a828ae7495b377edd87f170bb.
diff --git a/tor.spec b/tor.spec
index 95169e0..03430d1 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 2%{?dist}
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,9 +125,6 @@ exit 0
%changelog
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.6.9-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
* Fri Jun 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-1
- update to upstream release 0.2.6.9
commit b1dc519193a6c8e696679aeb2ff98901d5ed0372
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:07:38 2015 +0100
Revert "Add missing arguments to ExecStartPre"
This reverts commit 5cc32ae9cc4f4acce52387f30f4981480ac803d5.
diff --git a/tor.service b/tor.service
index 5a41983..ec6dcd7 100644
--- a/tor.service
+++ b/tor.service
@@ -4,7 +4,7 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
-ExecStartPre = /usr/bin/tor --runasdaemon 0 --defaults-torrc
/usr/share/tor/defaults-torrc -f /etc/tor/torrc --verify-config
+ExecStartPre = /usr/bin/tor -f /etc/tor/torrc --verify-config
ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc
ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
commit f7e6fbe589681b11ceca39fe9c907960d4efb10a
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:07:29 2015 +0100
Revert "Bump release and changelog"
This reverts commit 5dbf241d79b9c0395cc302ac4fb74efc7bf31140.
diff --git a/tor.spec b/tor.spec
index ce78c74..95169e0 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 3%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,9 +125,6 @@ exit 0
%changelog
-* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-3
-- add missing arguments to the config check executed in ExecStartPre
-
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.6.9-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 5dbf241d79b9c0395cc302ac4fb74efc7bf31140
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:06:24 2015 +0100
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index 95169e0..ce78c74 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Sun Jul 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-3
+- add missing arguments to the config check executed in ExecStartPre
+
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.6.9-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 5cc32ae9cc4f4acce52387f30f4981480ac803d5
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Jul 12 18:05:39 2015 +0100
Add missing arguments to ExecStartPre
diff --git a/tor.service b/tor.service
index ec6dcd7..5a41983 100644
--- a/tor.service
+++ b/tor.service
@@ -4,7 +4,7 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
-ExecStartPre = /usr/bin/tor -f /etc/tor/torrc --verify-config
+ExecStartPre = /usr/bin/tor --runasdaemon 0 --defaults-torrc
/usr/share/tor/defaults-torrc -f /etc/tor/torrc --verify-config
ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc
ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
commit b059728460d915fe1bbdf4cf03ae22b00a19e0a1
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Jul 3 14:05:25 2015 +0100
Bump release and changelog
diff --git a/tor.spec b/tor.spec
index 03430d1..58bb0ee 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Fri Jul 03 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-2
+- remove leading '-' from ReadWriteDirectories
+
* Fri Jun 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-1
- update to upstream release 0.2.6.9
commit 99a456cbdbccd7fc46f5e208633733b209a81667
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Jul 3 14:00:45 2015 +0100
Remove leading '-' from ReadWriteDirectories
diff --git a/tor.service b/tor.service
index ec6dcd7..6828e94 100644
--- a/tor.service
+++ b/tor.service
@@ -17,8 +17,8 @@ DeviceAllow = /dev/null rw
DeviceAllow = /dev/urandom r
InaccessibleDirectories = /home
ReadOnlyDirectories = /
-ReadWriteDirectories = -/var/lib/tor
-ReadWriteDirectories = -/var/log/tor
+ReadWriteDirectories = /var/lib/tor
+ReadWriteDirectories = /var/log/tor
[Install]
WantedBy = multi-user.target
diff --git a/tor@.service b/tor@.service
index 96dfe17..105c825 100644
--- a/tor@.service
+++ b/tor@.service
@@ -17,8 +17,8 @@ DeviceAllow = /dev/null rw
DeviceAllow = /dev/urandom r
InaccessibleDirectories = /home
ReadOnlyDirectories = /
-ReadWriteDirectories = -/var/lib/tor
-ReadWriteDirectories = -/var/log/tor
+ReadWriteDirectories = /var/lib/tor
+ReadWriteDirectories = /var/log/tor
[Install]
WantedBy = multi-user.target
commit d457fe81da8a0f7a828ae7495b377edd87f170bb
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jun 19 03:07:30 2015 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index 03430d1..95169e0 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.6.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.6.9-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Fri Jun 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-1
- update to upstream release 0.2.6.9
commit a8815cf4d357fcb06d57834a19b1e3ae891034d9
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Jun 12 20:01:47 2015 +0100
Update to upstream release 0.2.6.9
diff --git a/.gitignore b/.gitignore
index f18fbd0..029614c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@
/tor-0.2.5.12.tar.gz.asc
/tor-0.2.6.8.tar.gz
/tor-0.2.6.8.tar.gz.asc
+/tor-0.2.6.9.tar.gz
+/tor-0.2.6.9.tar.gz.asc
diff --git a/sources b/sources
index cde2876..9ca45d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-20a8c1f8cd7e8c912c4f3f0b67740fa5 tor-0.2.6.8.tar.gz
-ccb8886658580ddb618809948fd2ed12 tor-0.2.6.8.tar.gz.asc
+4a1b334c30d7b37ea72fa33425220d5d tor-0.2.6.9.tar.gz
+f1370116fa1be5b185004304090ad3c2 tor-0.2.6.9.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index df43a6d..03430d1 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,7 +6,7 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.6.8
+Version: 0.2.6.9
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -125,6 +125,9 @@ exit 0
%changelog
+* Fri Jun 12 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.9-1
+- update to upstream release 0.2.6.9
+
* Thu May 21 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.8-1
- update to upstream release 0.2.6.8
- improve/harden systemd service file
commit 4f51bac26c7cdbe12fce2ac7342d2684f4f57795
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu May 21 17:06:58 2015 +0100
Update to 0.2.6.8 and improve systemd service file
diff --git a/.gitignore b/.gitignore
index 3b7e746..f18fbd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
/tor-0.2.5.11.tar.gz.asc
/tor-0.2.5.12.tar.gz
/tor-0.2.5.12.tar.gz.asc
+/tor-0.2.6.8.tar.gz
+/tor-0.2.6.8.tar.gz.asc
diff --git a/sources b/sources
index 3ef8097..cde2876 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-89745069a7efb7aafd01ae263bd0fe5c tor-0.2.5.12.tar.gz
-3db5c03de8abc1ffd3c9915b88b7b883 tor-0.2.5.12.tar.gz.asc
+20a8c1f8cd7e8c912c4f3f0b67740fa5 tor-0.2.6.8.tar.gz
+ccb8886658580ddb618809948fd2ed12 tor-0.2.6.8.tar.gz.asc
diff --git a/tor.service b/tor.service
new file mode 100644
index 0000000..ec6dcd7
--- /dev/null
+++ b/tor.service
@@ -0,0 +1,24 @@
+[Unit]
+Description = Anonymizing overlay network for TCP
+After = syslog.target network.target nss-lookup.target
+
+[Service]
+Type = simple
+ExecStartPre = /usr/bin/tor -f /etc/tor/torrc --verify-config
+ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc
+ExecReload = /bin/kill -HUP ${MAINPID}
+KillSignal = SIGINT
+TimeoutSec = 30
+Restart = on-failure
+LimitNOFILE = 32768
+
+PrivateTmp = yes
+DeviceAllow = /dev/null rw
+DeviceAllow = /dev/urandom r
+InaccessibleDirectories = /home
+ReadOnlyDirectories = /
+ReadWriteDirectories = -/var/lib/tor
+ReadWriteDirectories = -/var/log/tor
+
+[Install]
+WantedBy = multi-user.target
diff --git a/tor.spec b/tor.spec
index 94f0494..df43a6d 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,7 +6,7 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.5.12
+Version: 0.2.6.8
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -21,9 +21,8 @@ Source2: tor.logrotate
# 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
-# A ticket has been opened to have the systemd service included upstream:
-#
https://trac.torproject.org/projects/tor/ticket/8368
-Source10: tor.systemd.service
+Source10: tor.service
+Source11: tor@.service
BuildRequires: asciidoc
BuildRequires: libevent-devel
@@ -75,6 +74,7 @@ mkdir -p $RPM_BUILD_ROOT%{logdir}
mkdir -p $RPM_BUILD_ROOT%{homedir}
install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%_unitdir/%{name}.service
+install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%_unitdir/%{name}@.service
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
@@ -114,6 +114,7 @@ exit 0
%{_datadir}/tor/geoip
%{_datadir}/tor/geoip6
%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}@.service
%dir %{_sysconfdir}/tor
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
@@ -124,6 +125,11 @@ exit 0
%changelog
+* Thu May 21 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.6.8-1
+- update to upstream release 0.2.6.8
+- improve/harden systemd service file
+- add multi-instance systemd service file (#1210837)
+
* Tue Apr 07 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.5.12-1
- update to upstream release 0.2.5.12
diff --git a/tor.systemd.service b/tor.systemd.service
deleted file mode 100644
index c598283..0000000
--- a/tor.systemd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description = Anonymizing overlay network for TCP
-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
-ExecReload = /bin/kill -HUP ${MAINPID}
-ExecStop = /bin/kill -INT ${MAINPID}
-TimeoutSec = 30
-Restart = on-failure
-LimitNOFILE = 32768
-
-[Install]
-WantedBy = multi-user.target
diff --git a/tor@.service b/tor@.service
new file mode 100644
index 0000000..96dfe17
--- /dev/null
+++ b/tor@.service
@@ -0,0 +1,24 @@
+[Unit]
+Description = Anonymizing overlay network for TCP
+After = syslog.target network.target nss-lookup.target
+
+[Service]
+Type = simple
+ExecStartPre = /usr/bin/tor -f /etc/tor/%i.torrc --verify-config
+ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/%i.torrc
+ExecReload = /bin/kill -HUP ${MAINPID}
+KillSignal = SIGINT
+TimeoutSec = 30
+Restart = on-failure
+LimitNOFILE = 32768
+
+PrivateTmp = yes
+DeviceAllow = /dev/null rw
+DeviceAllow = /dev/urandom r
+InaccessibleDirectories = /home
+ReadOnlyDirectories = /
+ReadWriteDirectories = -/var/lib/tor
+ReadWriteDirectories = -/var/log/tor
+
+[Install]
+WantedBy = multi-user.target
commit 7f3daa38d83a75dfa1c07386d7a0523a811c691e
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Apr 7 18:59:02 2015 +0100
Remove asc
diff --git a/tor-0.2.5.11.tar.gz.asc b/tor-0.2.5.11.tar.gz.asc
deleted file mode 100644
index 85700f8..0000000
--- a/tor-0.2.5.11.tar.gz.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQGVAwUAVQgwjZEDl9iNKTGaAQLt6wv/SPWWXqD+M/rJ0KsMr4lgBTT0k2GHkkZZ
-QPeyFzOI6a67bDFWnNFRBfXPbB0IQEhBpeWDXf0OjjvkX97bckTwKttUv53voM4S
-ZbiFzcNQkGQs5uwYHq4f84pI66jlbYc8FJBSaUwjevyTi2ridIgfyY6rqWrM0V3E
-AEAsojb4OHJrFNZ/es41AF+2Ssyz2RvgtOn+zoREABVOC0o8l/GDXgivuZpT+h1J
-63/RSO2LMtimd2Qn2SfG9SddugEcU30qOnKMYKyZ+7jjEeuKK6hib7K4iZnpQ/wr
-ai4bHSbIDy2ms1rAqOAiux/CzSIiEAeZF8eKfcFU8szyQhy73AJRQdv2NsFQ9lYY
-U6DDP5HGX5xOqDu7JC3Ru+hzzHVALpJbWd5AqlWUXi+fw9bUhtGuiTPaKM0G2ZmG
-RJAIXYQhPv8ZqpRdvQ1n6OeUsrnpoi+b532lDDoosREDZyGQ+s6hES9q9Ba2fcQI
-sHXyantfw8xnKFJH/TG7O3dHygvi5+FI
-=x9C8
------END PGP SIGNATURE-----
commit 886b68c809f8aa8260481d6405dde89232ed85a0
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Apr 7 09:00:22 2015 +0100
Update to upstream release 0.2.5.12
diff --git a/.gitignore b/.gitignore
index 7e73364..3b7e746 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
/tor-0.2.5.10.tar.gz.asc
/tor-0.2.5.11.tar.gz
/tor-0.2.5.11.tar.gz.asc
+/tor-0.2.5.12.tar.gz
+/tor-0.2.5.12.tar.gz.asc
diff --git a/sources b/sources
index 15e9778..3ef8097 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9ca64f76996cb8a750e50c792e2c4c52 tor-0.2.5.11.tar.gz
-5641043a829cf761e74650010568263c tor-0.2.5.11.tar.gz.asc
+89745069a7efb7aafd01ae263bd0fe5c tor-0.2.5.12.tar.gz
+3db5c03de8abc1ffd3c9915b88b7b883 tor-0.2.5.12.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index cb9cad0..94f0494 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,7 +6,7 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.5.11
+Version: 0.2.5.12
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Tue Apr 07 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.5.12-1
+- update to upstream release 0.2.5.12
+
* Mon Mar 23 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.5.11-1
- update to upstream release 0.2.5.11
commit 79f88dafea1bdfff2a0b9e9863b5cb3c7f4898d4
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Mar 23 20:26:56 2015 +0000
Update to upstream release 0.2.5.11
diff --git a/.gitignore b/.gitignore
index 9ebeecc..7e73364 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@
/tor-0.2.4.25.tar.gz.asc
/tor-0.2.5.10.tar.gz
/tor-0.2.5.10.tar.gz.asc
+/tor-0.2.5.11.tar.gz
+/tor-0.2.5.11.tar.gz.asc
diff --git a/sources b/sources
index 311044e..15e9778 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4bde375229a7a7f77c0596ae05556527 tor-0.2.5.10.tar.gz
-1bb7f0535848c6f22ba1c438fc5b1683 tor-0.2.5.10.tar.gz.asc
+9ca64f76996cb8a750e50c792e2c4c52 tor-0.2.5.11.tar.gz
+5641043a829cf761e74650010568263c tor-0.2.5.11.tar.gz.asc
diff --git a/tor-0.2.5.11.tar.gz.asc b/tor-0.2.5.11.tar.gz.asc
new file mode 100644
index 0000000..85700f8
--- /dev/null
+++ b/tor-0.2.5.11.tar.gz.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQGVAwUAVQgwjZEDl9iNKTGaAQLt6wv/SPWWXqD+M/rJ0KsMr4lgBTT0k2GHkkZZ
+QPeyFzOI6a67bDFWnNFRBfXPbB0IQEhBpeWDXf0OjjvkX97bckTwKttUv53voM4S
+ZbiFzcNQkGQs5uwYHq4f84pI66jlbYc8FJBSaUwjevyTi2ridIgfyY6rqWrM0V3E
+AEAsojb4OHJrFNZ/es41AF+2Ssyz2RvgtOn+zoREABVOC0o8l/GDXgivuZpT+h1J
+63/RSO2LMtimd2Qn2SfG9SddugEcU30qOnKMYKyZ+7jjEeuKK6hib7K4iZnpQ/wr
+ai4bHSbIDy2ms1rAqOAiux/CzSIiEAeZF8eKfcFU8szyQhy73AJRQdv2NsFQ9lYY
+U6DDP5HGX5xOqDu7JC3Ru+hzzHVALpJbWd5AqlWUXi+fw9bUhtGuiTPaKM0G2ZmG
+RJAIXYQhPv8ZqpRdvQ1n6OeUsrnpoi+b532lDDoosREDZyGQ+s6hES9q9Ba2fcQI
+sHXyantfw8xnKFJH/TG7O3dHygvi5+FI
+=x9C8
+-----END PGP SIGNATURE-----
diff --git a/tor.spec b/tor.spec
index fb77f80..cb9cad0 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,7 +6,7 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.5.10
+Version: 0.2.5.11
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Mon Mar 23 2015 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.5.11-1
+- update to upstream release 0.2.5.11
+
* Mon Oct 27 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.5.10-1
- update to upstream release 0.2.5.10
commit 4cdd3c1d255b9b88da808e520a16036c77107bc1
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon Oct 27 18:05:57 2014 +0000
Update to upstream release 0.2.5.10
diff --git a/.gitignore b/.gitignore
index 46e6b4c..9ebeecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
/tor-0.2.4.24.tar.gz.asc
/tor-0.2.4.25.tar.gz
/tor-0.2.4.25.tar.gz.asc
+/tor-0.2.5.10.tar.gz
+/tor-0.2.5.10.tar.gz.asc
diff --git a/sources b/sources
index d2d545f..311044e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-454744ebff5033ae353f2dd6b1bc425e tor-0.2.4.25.tar.gz
-d92082a9ec977d8400c4dd108bacf16e tor-0.2.4.25.tar.gz.asc
+4bde375229a7a7f77c0596ae05556527 tor-0.2.5.10.tar.gz
+1bb7f0535848c6f22ba1c438fc5b1683 tor-0.2.5.10.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 3205235..fb77f80 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,7 +6,7 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.4.25
+Version: 0.2.5.10
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Mon Oct 27 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.5.10-1
+- update to upstream release 0.2.5.10
+
* Wed Oct 22 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.25-1
- update to upstream release 0.2.4.25
commit a21b4c1cc8a3a54d19d7ee06e8bc458417829b69
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Wed Oct 22 17:51:37 2014 +0100
Update to upstream release 0.2.4.25
diff --git a/.gitignore b/.gitignore
index fe2c6a0..46e6b4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/tor-0.2.4.23.tar.gz.asc
/tor-0.2.4.24.tar.gz
/tor-0.2.4.24.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 26b5ff4..d2d545f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9acb86b529f0f48cc495da3801f85d1f tor-0.2.4.24.tar.gz
-279a4c939cf4ad22683263f03e53ab34 tor-0.2.4.24.tar.gz.asc
+454744ebff5033ae353f2dd6b1bc425e tor-0.2.4.25.tar.gz
+d92082a9ec977d8400c4dd108bacf16e tor-0.2.4.25.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 2e950eb..3205235 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,7 +6,7 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.4.24
+Version: 0.2.4.25
Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Wed Oct 22 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.25-1
+- update to upstream release 0.2.4.25
+
* Tue Sep 23 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.24-1
- update to upstream release 0.2.4.24
commit cf63d6ddda5f3c970466ce31ccd8d68c614eebf9
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Sep 23 15:27:28 2014 +0100
Update to upstream release 0.2.4.24
diff --git a/.gitignore b/.gitignore
index 72c336e..fe2c6a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
/tor-0.2.4.22.tar.gz
/tor-0.2.4.23.tar.gz
/tor-0.2.4.23.tar.gz.asc
+/tor-0.2.4.24.tar.gz
+/tor-0.2.4.24.tar.gz.asc
diff --git a/sources b/sources
index eb47761..26b5ff4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9e39928e310612c3bffee727f554c63f tor-0.2.4.23.tar.gz
-0b6af7ec9baecb2859f9668c27a0043a tor-0.2.4.23.tar.gz.asc
+9acb86b529f0f48cc495da3801f85d1f tor-0.2.4.24.tar.gz
+279a4c939cf4ad22683263f03e53ab34 tor-0.2.4.24.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 80df3c7..2e950eb 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,8 +6,8 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.4.23
-Release: 2%{?dist}
+Version: 0.2.4.24
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Tue Sep 23 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.24-1
+- update to upstream release 0.2.4.24
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.4.23-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit e0623cf4c5a393de514637d7e9b205a961a522f7
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Mon Aug 18 06:07:26 2014 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index 3f188bb..80df3c7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.4.23
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.4.23-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Thu Jul 31 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.23-1
- update to upstream release 0.2.4.23
- CVE-2014-5117: potential for traffic-confirmation attacks
commit c752f3d3a005745adce4a9fbf672d101e9ee3288
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Jul 31 08:31:32 2014 +0100
Remove .asc
diff --git a/tor-0.2.4.22.tar.gz.asc b/tor-0.2.4.22.tar.gz.asc
deleted file mode 100644
index 19bf7cb..0000000
--- a/tor-0.2.4.22.tar.gz.asc
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQGVAwUAU3YqqZEDl9iNKTGaAQIFjwv9HY0B29W3DcyUJ1E0g7IKuZbNmTPTgutS
-5OcRYYwWrpAsqdsH2QS0wtCjXJjq4IBS3ztgj3o4nJgAV7AKfnLL7/ghoibDE+gs
-8BnJL0F79bADW9YfI9/sV4T5/lTTYjxCj1DAO8qpUefI+7OxJyLZ49R23k/g/yHU
-8YSvCqoer2becyUzbzc5Zs8RnAQN+3MOT9FOrExQBEieaJHNHoMCyIEHiRLzhxxa
-ZydaHMjEWQCnk28HyXPJ2NbohvRkUOSixMoBKNJa4B6zfwsS3L+6kLhcefY4aLDu
-o7cfbKyIks89+eWNmbiEPO+g3iwdEyalfGUgDjuWhuIRFLIbt4fFgREksEtqXlra
-ySd5LiuIyVV3GDTqoebWCxNlVCOdNjlJNJNj5rsR/YiHYn6jMizFQmxuQBqZwUcc
-A0w2of57BHZnQAu1SYZjBIGjs+FbwXQt4ujJV9nJs2unPR4LZeSno3wlZ+QR0L9a
-NxXFzI09Wr4U7k7k8R8WZRvmL7wpcTOQ
-=nmdR
------END PGP SIGNATURE-----
commit a8462a342f6644c4fee5916b28e6b20d022d5626
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Jul 31 08:26:39 2014 +0100
Update to upstream release 0.2.4.23
diff --git a/.gitignore b/.gitignore
index 08690f5..72c336e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
/tor-0.2.4.21.tar.gz
/tor-0.2.4.21.tar.gz.asc
/tor-0.2.4.22.tar.gz
+/tor-0.2.4.23.tar.gz
+/tor-0.2.4.23.tar.gz.asc
diff --git a/sources b/sources
index 8c888f2..eb47761 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-5a7eee0d9df87233255d78b25c6f8270 tor-0.2.4.22.tar.gz
+9e39928e310612c3bffee727f554c63f tor-0.2.4.23.tar.gz
+0b6af7ec9baecb2859f9668c27a0043a tor-0.2.4.23.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index ea48cca..3f188bb 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,8 +6,8 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.4.22
-Release: 2%{?dist}
+Version: 0.2.4.23
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -124,6 +124,10 @@ exit 0
%changelog
+* Thu Jul 31 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.23-1
+- update to upstream release 0.2.4.23
+- CVE-2014-5117: potential for traffic-confirmation attacks
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.4.22-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit 8d35cf0f88ab7d9f37954524a5c44a8fca420967
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Jun 8 03:46:15 2014 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index 184777a..ea48cca 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.4.22
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.4.22-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Mon May 19 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.22-1
- update to upstream release 0.2.4.22
commit 9b7c15568dba2ee46461f3f0d7800d007f708ce7
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Mon May 19 22:04:25 2014 +0100
Update to upstream release 0.2.4.22
diff --git a/.gitignore b/.gitignore
index 2846e7a..08690f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/tor-0.2.3.25.tar.gz.asc
/tor-0.2.4.21.tar.gz
/tor-0.2.4.21.tar.gz.asc
+/tor-0.2.4.22.tar.gz
diff --git a/sources b/sources
index 9ca3012..8c888f2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-bde981d10e8faf1e171ef1ebbb7b398a tor-0.2.4.21.tar.gz
-d4b4623533984deeab0c5185ef8ea246 tor-0.2.4.21.tar.gz.asc
+5a7eee0d9df87233255d78b25c6f8270 tor-0.2.4.22.tar.gz
diff --git a/tor-0.2.4.22.tar.gz.asc b/tor-0.2.4.22.tar.gz.asc
new file mode 100644
index 0000000..19bf7cb
--- /dev/null
+++ b/tor-0.2.4.22.tar.gz.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQGVAwUAU3YqqZEDl9iNKTGaAQIFjwv9HY0B29W3DcyUJ1E0g7IKuZbNmTPTgutS
+5OcRYYwWrpAsqdsH2QS0wtCjXJjq4IBS3ztgj3o4nJgAV7AKfnLL7/ghoibDE+gs
+8BnJL0F79bADW9YfI9/sV4T5/lTTYjxCj1DAO8qpUefI+7OxJyLZ49R23k/g/yHU
+8YSvCqoer2becyUzbzc5Zs8RnAQN+3MOT9FOrExQBEieaJHNHoMCyIEHiRLzhxxa
+ZydaHMjEWQCnk28HyXPJ2NbohvRkUOSixMoBKNJa4B6zfwsS3L+6kLhcefY4aLDu
+o7cfbKyIks89+eWNmbiEPO+g3iwdEyalfGUgDjuWhuIRFLIbt4fFgREksEtqXlra
+ySd5LiuIyVV3GDTqoebWCxNlVCOdNjlJNJNj5rsR/YiHYn6jMizFQmxuQBqZwUcc
+A0w2of57BHZnQAu1SYZjBIGjs+FbwXQt4ujJV9nJs2unPR4LZeSno3wlZ+QR0L9a
+NxXFzI09Wr4U7k7k8R8WZRvmL7wpcTOQ
+=nmdR
+-----END PGP SIGNATURE-----
diff --git a/tor.spec b/tor.spec
index 44dd5d9..184777a 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,8 +6,8 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.4.21
-Release: 2%{?dist}
+Version: 0.2.4.22
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Mon May 19 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.22-1
+- update to upstream release 0.2.4.22
+
* Wed Mar 26 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.21-2
- remove `--quiet` from default systemd service file
commit 682321bb657fc77ac28f076e334ae9de4b13b968
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Wed Mar 26 15:23:35 2014 +0000
Remove `--quiet` from default systemd service file
diff --git a/tor.spec b/tor.spec
index 1d0b4d8..44dd5d9 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.4.21
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -124,6 +124,9 @@ exit 0
%changelog
+* Wed Mar 26 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.21-2
+- remove `--quiet` from default systemd service file
+
* Tue Mar 25 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.21-1
- update to upstream release 0.2.4.21
- remove crazy Release numbering
diff --git a/tor.systemd.service b/tor.systemd.service
index ad77c67..c598283 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 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc
ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
TimeoutSec = 30
commit 479b0ae6bc6347e8db10523b095120b9a9e5c1a6
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Tue Mar 25 17:39:37 2014 +0000
Update to upstream release 0.2.4.21
diff --git a/.gitignore b/.gitignore
index 8bd3db8..2846e7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/tor-0.2.3.25.tar.gz
/tor-0.2.3.25.tar.gz.asc
+/tor-0.2.4.21.tar.gz
+/tor-0.2.4.21.tar.gz.asc
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e5461e3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-MAKEFILE_COMMON = $(HOME)/.fedora/common.mk
--include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index 6eae516..9ca3012 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
+bde981d10e8faf1e171ef1ebbb7b398a tor-0.2.4.21.tar.gz
+d4b4623533984deeab0c5185ef8ea246 tor-0.2.4.21.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index b2aaf15..1d0b4d8 100644
--- a/tor.spec
+++ b/tor.spec
@@ -6,8 +6,8 @@
%global logdir %{_localstatedir}/log/%{name}
Name: tor
-Version: 0.2.3.25
-Release: 1931%{?dist}
+Version: 0.2.4.21
+Release: 1%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -25,15 +25,6 @@ Source3: tor.defaults-torrc
#
https://trac.torproject.org/projects/tor/ticket/8368
Source10: tor.systemd.service
-# Obsoletes/Provides for tor-core, tor-systemd and torify were introduced
-# in Fedora 19 (rawhide).
-Obsoletes: tor-core < 0:0.2.3.25-1914
-Provides: tor-core = 0:%{version}-%{release}
-Obsoletes: tor-systemd < 0:0.2.3.25-1915
-Provides: tor-systemd = 0:%{version}-%{release}
-Obsoletes: torify < 0:0.2.3.25-1916
-Provides: torify = 0:%{version}-%{release}
-
BuildRequires: asciidoc
BuildRequires: libevent-devel
BuildRequires: openssl-devel
@@ -121,10 +112,10 @@ exit 0
%dir %{_datadir}/tor
%{_datadir}/tor/defaults-torrc
%{_datadir}/tor/geoip
+%{_datadir}/tor/geoip6
%{_unitdir}/%{name}.service
%dir %{_sysconfdir}/tor
-%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
%config(noreplace) %{_sysconfdir}/logrotate.d/tor
@@ -133,6 +124,13 @@ exit 0
%changelog
+* Tue Mar 25 2014 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.4.21-1
+- update to upstream release 0.2.4.21
+- remove crazy Release numbering
+- remove Obsoletes/Provides that were introduced in F19
+- remove tor-tsocks.conf which has been removed completely upstream
+- include new file: _datadir/tor/geoip6
+
* Sun Aug 04 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.3.25-1931
- add fix for new unversioned docdir
commit 11ff229c82b1e613feb55f7f533388aaf562c53d
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Aug 4 08:18:17 2013 +0100
Add fix for new unversioned docdir
diff --git a/tor.spec b/tor.spec
index 8e61449..b2aaf15 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1930%{?dist}
+Release: 1931%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -71,8 +71,7 @@ high-stakes anonymity.
%build
-%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
- --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup}
make %{?_smp_mflags}
@@ -84,16 +83,19 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc.sample \
mkdir -p $RPM_BUILD_ROOT%{logdir}
mkdir -p $RPM_BUILD_ROOT%{homedir}
-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 %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults-torrc
+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 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults-torrc
+
+# Install docs manually.
+rm -rf %{buildroot}%{_datadir}/doc
%pre
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}
+ -c 'Tor anonymizing user' -g %{torgroup} %{toruser}
exit 0
%post
@@ -131,6 +133,9 @@ exit 0
%changelog
+* Sun Aug 04 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.3.25-1931
+- add fix for new unversioned docdir
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.3.25-1930
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit ffc0097a28fbf304b36625540204338ac6329d3f
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Aug 4 08:16:47 2013 +0100
Remove old changelog entries
diff --git a/tor.spec b/tor.spec
index dd7a0f2..8e61449 100644
--- a/tor.spec
+++ b/tor.spec
@@ -406,220 +406,3 @@ exit 0
* Thu Jan 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.22-1300
- updated to 0.2.1.22
-
-* Thu Dec 31 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.21-1300
-- updated to 0.2.1.21
-
-* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1301
-- updated -upstart to upstart 0.6.3
-
-* Sat Nov 14 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1300
-- updated URLs (#532373)
-- removed (inactive) update mechanism for GeoIP data; this might
- reduce anonimity (#532373)
-- use the pidfile at various places in the LSB initscript to operate
- on the correct process (#532373)
-- set a higher 'nofile' limit in the upstart initscript to allow fast
- relays; LSB users will have to add a 'ulimit -n' into /etc/sysconfig/tor
- to get a similar effect (#532373)
-- let the LSB initscript wait until process exits within a certain
- time; this fixes shutdown/restart problems when working as a server
- (#532373)
-- fixed initng related typo in logrotate script (#532373)
-- removed <linux/netfilter_ipv4.h> hack; it is fixed upstream and/or
- in the kernel sources
-- use %%postun, not %%post as a -upstart scriptlet and send INT, not
- TERM signal to stop/restart daemon
-
-* Sun Oct 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1
-- updated to 0.2.1.20
-
-* Sat Sep 12 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.19-2
-- workaround bug in redhat-lsb (#522053)
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.2.1.19-1
-- rebuilt with new openssl
-
-* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.19-0
-- updated to 0.2.1.19
-- rediffed patches
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.0.35-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jun 26 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.35-1
-- updated to 0.2.0.35
-- added '--quiet' to startup options (bug #495987)
-- updated %%doc entries
-
-* Wed May 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-4
-- made it easy to rebuild package in RHEL by adding a 'noarch'
- conditional to enable/disable noarch subpackages
-
-* Sat Mar 7 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-3
-- added -upstart subpackage (-lsb still wins by default as there exists
- no end-user friendly solution for managing upstart initscripts)
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.0.34-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 10 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-1
-- updated to 0.2.0.34 (SECURITY: fixes DoS vulnerabilities)
-
-* Thu Jan 22 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.33-1
-- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
-
-* Sun Jan 18 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.2.0.32-2
-- rebuild with new openssl
-
-* Sun Dec 7 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.32-1
-- updated to 0.2.0.32
-- removed -setgroups patch; supplementary groups are now set upstream
-
-* Sun Jul 20 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.30-1
-- updated to 0.2.0.30; rediffed patches
-- (re)enabled transparent proxy support by workarounding broken
- <linux/netfilter_ipv4.h> header
-- moved the 'geoip' database to /var/lib/tor-data where it can be
- updated periodically
-- built with -Wl,--as-needed
-
-* Thu Jul 10 2008 Nikolay Vladimirov <nikolay(a)vladimiroff.com> - 0.1.2.19-3
-- rebuild for new libevent
-
-* Wed Feb 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.19-2
-- added 'missingok' to logrotate script (#429402)
-
-* Tue Feb 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.19-1
-- updated to 0.1.2.19
-- use file based BR for latex
-- improved 'status' method of initscript to return rc of 'pidofproc'
- instead of doing further manual tests. Calling 'pidofproc' directly
- instead of within a subshell should workaround #432254 too.
-
-* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18-4
-- Update BuildRequires: tex(latex),
-- BR: texlive-texmf-fonts seems also to be necessary
-
-* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18-3
-- Rebuild for new libevent.
-
-* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> -
0.1.2.18-2
-- Rebuild for deps
-
-* Tue Oct 30 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.18-1
-- updated to 0.1.2.18
-
-* Fri Aug 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.17-1
-- updated to 0.1.2.17
-
-* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.16-2
-- fixed open(2) issue
-
-* Fri Aug 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.16-1
-- updated to 0.1.2.16 (SECURITY)
-
-* Sat Jul 28 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.15-1
-- updated to 0.1.2.15
-
-* Sat May 26 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.14-1
-- updated to 0.1.2.14
-
-* Wed Apr 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.13-1
-- updated to 0.1.2.13
-- minor cleanups; especially in the %%doc section
-
-* Sun Apr 8 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-4
-- rebuilt for (yet another) new libevent
-
-* Mon Feb 26 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-3
-- rebuilt for new libevent
-
-* Wed Jan 24 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-2
-- updated -setgroups patch (#224090, thx to Sami Farin)
-
-* Sun Dec 17 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-1
-- updated to 0.1.1.26 (SECURITY)
-- do not turn on logging by default; it's easier to say "we do not log
- anything" to the police instead of enumerating the logged event
- classes and trying to explain that they do not contain any valuable
- information
-
-* Sun Nov 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.25-1
-- updated to 0.1.1.25
-
-* Thu Oct 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.24-1
-- updated to 0.1.1.24
-
-* Sat Sep 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-5
-- updated to recent fedora-usermgmt
-- minor cleanups
-- require only 'lsb-core-noarch' instead of whole 'lsb'
-
-* Tue Sep 26 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-4
-- first FE release (review #175433)
-
-* Mon Sep 25 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-3
-- removed '.have-lsb' and related logic in logrotate script; check for
- existence of the corresponding initscript instead of
-- fixed bare '%%' in changelog section
-
-* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-2
-- simplified things yet more and removed tsocks/torify too
-- build -lsb unconditionally
-
-* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-1
-- simplified spec file and removed -initng and -minit stuff
-
-* Sun Aug 13 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-0
-- updated to 0.1.1.23
-
-* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.22-0
-- updated to 0.1.1.22
-
-* Tue Jun 13 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.21-0
-- updated to 0.1.1.21
-
-* Wed May 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.20-0
-- updated to 0.1.1.20; adjusted %%doc file-list
-- added (optional) -tsocks subpackage
-- use the more modern %%bcond_with* for specifying optional features
-
-* Sun Feb 19 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.17-0
-- updated to 0.1.0.17
-
-* Mon Jan 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.16-0.1
-- renamed the current main-package into a '-core' subpackage and
- created a new main-package which requires both the 'tor-core'
- subpackage and this with the current default init-method. This
- allows 'yum install tor' to work better; because yum is not very
- smart, the old packaging might install unwanted packages else.
-
-* Wed Jan 4 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.16-0
-- updated to 0.1.0.16
-
-* Fri Dec 23 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.11
-- reworked the 'setgroups' patch so that 'tor' survives a SIGHUP
-- (re)added the 'reload' functionality to the lsb initscript and use
- it in logrotate
-
-* Fri Dec 23 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.8
-- added ChangeLog to %%doc
-- made torrc not world-readable
-- added logrotate script
-
-* Thu Dec 22 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.4
-- updated initng scripts to initng-0.4.8 syntax
-- tweaked some Requires(...):
-- added ghostscript BuildRequires:
-- install initng scripts into the correct dir
-
-* Thu Dec 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.2
-- use relative UID of 19 instead of 18 due to conflicts with the
- 'munin' package
-
-* Wed Dec 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.1
-- added -minit subpackage
-
-* Sat Dec 10 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1
-- initial build
commit dbcbb57004023d3433085fd4a23d373ed46865bf
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Aug 3 23:20:51 2013 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index ff5e43b..dd7a0f2 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1929%{?dist}
+Release: 1930%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -131,6 +131,9 @@ exit 0
%changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.3.25-1930
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Sat Mar 02 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1929
- add "Log notice syslog" back to tor.defaults-torrc as recommended by
upstream:
https://bugzilla.redhat.com/show_bug.cgi?id=532373#c19
commit d69d0008fc137ab16be8440106b885a994bdf31f
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Mar 3 23:05:52 2013 +0000
Disallow group read for /var/log/tor
The plan was to change /var/lib/tor permissions to 0750 to match
/var/log/tor, but tor actually "fixes" the permissions back to
0700 at runtime. Thus, we'll change the permissions of /var/log/tor
to 0700 to match /var/lib/tor instead.
diff --git a/tor.spec b/tor.spec
index 4768e8b..ff5e43b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -126,8 +126,8 @@ exit 0
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
%config(noreplace) %{_sysconfdir}/logrotate.d/tor
-%attr(0750,%{toruser},%{torgroup}) %dir %{homedir}
-%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
+%attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
+%attr(0700,%{toruser},%{torgroup}) %dir %{logdir}
%changelog
@@ -136,8 +136,7 @@ exit 0
upstream:
https://bugzilla.redhat.com/show_bug.cgi?id=532373#c19
- remove unused files in git (verinfo and lastver)
- change URL to HTTPS
-- allow group read for %%{homedir}, which makes more sense as %%{logdir}
- also has group read
+- disallow group read for /var/log/tor
- remove TODO as it doesn't contain any useful information
* Fri Mar 01 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1928
commit 5be7d86795f354b048566af42cccf262f07e713d
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sun Mar 3 08:33:40 2013 +0000
Allow group read for /var/lib/tor directory
diff --git a/tor.spec b/tor.spec
index e1b8156..4768e8b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -38,7 +38,8 @@ BuildRequires: asciidoc
BuildRequires: libevent-devel
BuildRequires: openssl-devel
-# /usr/bin/torify depends on torsocks, as tsocks has been deprecated.
+# /usr/bin/torify is now just a wrapper for torsocks and is only there for
+# backwards compatibility.
Requires: torsocks
Requires(pre): shadow-utils
Requires(post): systemd
@@ -106,7 +107,7 @@ exit 0
%files
-%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/TODO doc/*.html
+%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/*.html
%{_bindir}/tor
%{_bindir}/tor-gencert
%{_bindir}/tor-resolve
@@ -125,7 +126,7 @@ exit 0
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
%config(noreplace) %{_sysconfdir}/logrotate.d/tor
-%attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
+%attr(0750,%{toruser},%{torgroup}) %dir %{homedir}
%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
@@ -133,6 +134,11 @@ exit 0
* Sat Mar 02 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1929
- add "Log notice syslog" back to tor.defaults-torrc as recommended by
upstream:
https://bugzilla.redhat.com/show_bug.cgi?id=532373#c19
+- remove unused files in git (verinfo and lastver)
+- change URL to HTTPS
+- allow group read for %%{homedir}, which makes more sense as %%{logdir}
+ also has group read
+- remove TODO as it doesn't contain any useful information
* Fri Mar 01 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1928
- increase LimitNOFILE in tor.service from 4096 to 32768, as advised by
commit 3b81e095543c4a5ebb116b8b6251bd4deb72b73b
Author: Paul Wouters <Paul.Wouters(a)interisle.net>
Date: Sat Mar 2 23:58:02 2013 -0500
* delete unused files
diff --git a/lastver b/lastver
deleted file mode 100644
index 5c0b7dc..0000000
--- a/lastver
+++ /dev/null
@@ -1 +0,0 @@
-0.2.3.25
diff --git a/verinfo b/verinfo
deleted file mode 100644
index 6614a11..0000000
--- a/verinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-http://www.torproject.org/dist/
-tor-([^-]*?)\.tar\.
commit d6a1f8bd381efa975040345feb7bf614f24c2a53
Author: Paul Wouters <Paul.Wouters(a)interisle.net>
Date: Sat Mar 2 23:44:01 2013 -0500
* fix URL to use https:// , delete unused lastver/verinfo files
diff --git a/tor.spec b/tor.spec
index 211d9ef..e1b8156 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@ Release: 1929%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
-URL:
http://www.torproject.org
+URL:
https://www.torproject.org
Source0:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz
Source1:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
commit ee87220564190f28ddac961cfdfec6bb7d8ba3dd
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Sat Mar 2 10:33:20 2013 +0000
Add "Log notice syslog" to defaults-torrc
diff --git a/tor.defaults-torrc b/tor.defaults-torrc
index c33bfd8..7359f3a 100644
--- a/tor.defaults-torrc
+++ b/tor.defaults-torrc
@@ -1,2 +1,3 @@
DataDirectory /var/lib/tor
User toranon
+Log notice syslog
diff --git a/tor.spec b/tor.spec
index 2c2a096..211d9ef 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1928%{?dist}
+Release: 1929%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -18,8 +18,8 @@ Source1:
https://www.torproject.org/dist/%{name}-%{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
-# This makes sure tor runs as 'toranon' and writes to /var/lib/tor instead
-# of /root/.tor directory.
+# 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
# A ticket has been opened to have the systemd service included upstream:
#
https://trac.torproject.org/projects/tor/ticket/8368
@@ -130,6 +130,10 @@ exit 0
%changelog
+* Sat Mar 02 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1929
+- add "Log notice syslog" back to tor.defaults-torrc as recommended by
+ upstream:
https://bugzilla.redhat.com/show_bug.cgi?id=532373#c19
+
* Fri Mar 01 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1928
- increase LimitNOFILE in tor.service from 4096 to 32768, as advised by
upstream:
https://trac.torproject.org/projects/tor/ticket/8368#comment:4
commit 595ad7abf96577f302f971782952f1307dbb254c
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Mar 1 07:29:55 2013 +0000
Increase LimitNOFILE to 32768
diff --git a/tor.spec b/tor.spec
index f9fe858..2c2a096 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1927%{?dist}
+Release: 1928%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -130,6 +130,10 @@ exit 0
%changelog
+* Fri Mar 01 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1928
+- increase LimitNOFILE in tor.service from 4096 to 32768, as advised by
+ upstream:
https://trac.torproject.org/projects/tor/ticket/8368#comment:4
+
* Thu Feb 28 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1927
- package should own the %%{_datadir}/tor directory
diff --git a/tor.systemd.service b/tor.systemd.service
index 3b3d3f2..ad77c67 100644
--- a/tor.systemd.service
+++ b/tor.systemd.service
@@ -9,7 +9,7 @@ ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
TimeoutSec = 30
Restart = on-failure
-LimitNOFILE = 4096
+LimitNOFILE = 32768
[Install]
WantedBy = multi-user.target
commit b19b5d4e8c34ad7ea4d41e055b255565d17a30a4
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Mar 1 00:35:51 2013 +0000
Package should own the %{_datadir}/tor directory
diff --git a/tor.spec b/tor.spec
index 3759d4f..f9fe858 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1926%{?dist}
+Release: 1927%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -115,9 +115,10 @@ exit 0
%{_mandir}/man1/tor-gencert.1*
%{_mandir}/man1/tor-resolve.1*
%{_mandir}/man1/torify.1*
+%dir %{_datadir}/tor
%{_datadir}/tor/defaults-torrc
%{_datadir}/tor/geoip
-%_unitdir/%{name}.service
+%{_unitdir}/%{name}.service
%dir %{_sysconfdir}/tor
%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
@@ -129,6 +130,9 @@ exit 0
%changelog
+* Thu Feb 28 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1927
+- package should own the %%{_datadir}/tor directory
+
* Thu Feb 28 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1926
- remove unnecessary custom LDFLAGS
commit 9acd0994fcd50a44bb69ecec33efffc91c8870f1
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Mar 1 00:34:47 2013 +0000
Remove unnecessary custom LDFLAGS
diff --git a/tor.spec b/tor.spec
index f1068a7..3759d4f 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1925%{?dist}
+Release: 1926%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -70,7 +70,6 @@ high-stakes anonymity.
%build
-export LDFLAGS='-Wl,--as-needed'
%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
--docdir=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
@@ -130,6 +129,9 @@ exit 0
%changelog
+* Thu Feb 28 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1926
+- remove unnecessary custom LDFLAGS
+
* Thu Feb 28 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1925
- remove Obsoletes/Provides for tor-doc, which was introduced in Fedora 16
- add some useful comments about the Obsoletes/Provides/Requires
commit 707ad7213e7bbeb90d4c0d939bd9ce8156e7e4e6
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Fri Mar 1 00:33:38 2013 +0000
Remove tor-doc obsoletes/provides and add useful comments
diff --git a/tor.spec b/tor.spec
index e93d9e1..f1068a7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1924%{?dist}
+Release: 1925%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -15,12 +15,18 @@ URL:
http://www.torproject.org
Source0:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz
Source1:
https://www.torproject.org/dist/%{name}-%{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
+# This makes sure tor runs as 'toranon' and writes to /var/lib/tor instead
+# of /root/.tor directory.
Source3: tor.defaults-torrc
+# A ticket has been opened to have the systemd service included upstream:
+#
https://trac.torproject.org/projects/tor/ticket/8368
Source10: tor.systemd.service
-Obsoletes: tor-doc < 0.2.2
-Provides: tor-doc = 0:%{version}-%{release}
+# Obsoletes/Provides for tor-core, tor-systemd and torify were introduced
+# in Fedora 19 (rawhide).
Obsoletes: tor-core < 0:0.2.3.25-1914
Provides: tor-core = 0:%{version}-%{release}
Obsoletes: tor-systemd < 0:0.2.3.25-1915
@@ -32,6 +38,7 @@ BuildRequires: asciidoc
BuildRequires: libevent-devel
BuildRequires: openssl-devel
+# /usr/bin/torify depends on torsocks, as tsocks has been deprecated.
Requires: torsocks
Requires(pre): shadow-utils
Requires(post): systemd
@@ -123,6 +130,11 @@ exit 0
%changelog
+* Thu Feb 28 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1925
+- remove Obsoletes/Provides for tor-doc, which was introduced in Fedora 16
+- add some useful comments about the Obsoletes/Provides/Requires
+- add comments about tor.logrotate, tor.defaults-torrc and tor.systemd.service
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1924
- whitespace changes and reorganization in the interests of readability
and clarity
commit fa1290e436915fe2c2e045743c43e3c79e7fa62b
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 12:56:49 2013 +0000
Whitespace changes for clarity and readability
diff --git a/tor.spec b/tor.spec
index b4fc4c5..e93d9e1 100644
--- a/tor.spec
+++ b/tor.spec
@@ -2,33 +2,36 @@
%global toruser toranon
%global torgroup toranon
-%global homedir %_localstatedir/lib/%name
-%global logdir %_localstatedir/log/%name
+%global homedir %{_localstatedir}/lib/%{name}
+%global logdir %{_localstatedir}/log/%{name}
Name: tor
Version: 0.2.3.25
-Release: 1923%{?dist}
+Release: 1924%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
URL:
http://www.torproject.org
-Source0:
https://www.torproject.org/dist/%name-%version.tar.gz
-Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
+
+Source0:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz
+Source1:
https://www.torproject.org/dist/%{name}-%{version}.tar.gz.asc
Source2: tor.logrotate
Source3: tor.defaults-torrc
Source10: tor.systemd.service
-# tor-design.pdf is not shipped anymore with tor
-Obsoletes: tor-doc < 0.2.2
-Provides: tor-doc = 0:%version-%release
-Obsoletes: tor-core < 0:0.2.3.25-1914
-Provides: tor-core = 0:%version-%release
+Obsoletes: tor-doc < 0.2.2
+Provides: tor-doc = 0:%{version}-%{release}
+Obsoletes: tor-core < 0:0.2.3.25-1914
+Provides: tor-core = 0:%{version}-%{release}
Obsoletes: tor-systemd < 0:0.2.3.25-1915
-Provides: tor-systemd = 0:%version-%release
-Obsoletes: torify < 0:0.2.3.25-1916
-Provides: torify = 0:%version-%release
+Provides: tor-systemd = 0:%{version}-%{release}
+Obsoletes: torify < 0:0.2.3.25-1916
+Provides: torify = 0:%{version}-%{release}
+
+BuildRequires: asciidoc
+BuildRequires: libevent-devel
+BuildRequires: openssl-devel
-BuildRequires: libevent-devel openssl-devel asciidoc
Requires: torsocks
Requires(pre): shadow-utils
Requires(post): systemd
@@ -61,61 +64,69 @@ high-stakes anonymity.
%build
export LDFLAGS='-Wl,--as-needed'
-%configure --with-tor-user=%toruser --with-tor-group=%torgroup \
- --docdir=%_docdir/%name-%version
+%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
+ --docdir=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
+mv $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc.sample \
+ $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
-mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir}
+mkdir -p $RPM_BUILD_ROOT%{logdir}
+mkdir -p $RPM_BUILD_ROOT%{homedir}
-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 %SOURCE3 $RPM_BUILD_ROOT%_datadir/%name/defaults-torrc
+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 %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults-torrc
%pre
-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
+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
-%systemd_post %name.service
+%systemd_post %{name}.service
%preun
-%systemd_preun %name.service
+%systemd_preun %{name}.service
%postun
-%systemd_postun_with_restart %name.service
+%systemd_postun_with_restart %{name}.service
%files
%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/TODO doc/*.html
-%dir %_sysconfdir/tor
-%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
-%config(noreplace) %_sysconfdir/logrotate.d/tor
-%attr(0700,%toruser,%torgroup) %dir %homedir
-%attr(0750,%toruser,%torgroup) %dir %logdir
-%attr(0644,root,root) %config(noreplace) %_sysconfdir/tor/torrc
-%_bindir/tor
-%_bindir/tor-gencert
-%_bindir/tor-resolve
-%_bindir/torify
-%_mandir/man1/tor.1*
-%_mandir/man1/tor-gencert.1*
-%_mandir/man1/tor-resolve.1*
-%_mandir/man1/torify.1*
-%_datadir/tor/defaults-torrc
-%_datadir/tor/geoip
-%_unitdir/%name.service
+%{_bindir}/tor
+%{_bindir}/tor-gencert
+%{_bindir}/tor-resolve
+%{_bindir}/torify
+%{_mandir}/man1/tor.1*
+%{_mandir}/man1/tor-gencert.1*
+%{_mandir}/man1/tor-resolve.1*
+%{_mandir}/man1/torify.1*
+%{_datadir}/tor/defaults-torrc
+%{_datadir}/tor/geoip
+%_unitdir/%{name}.service
+
+%dir %{_sysconfdir}/tor
+%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
+%config(noreplace) %{_sysconfdir}/logrotate.d/tor
+
+%attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
+%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1924
+- whitespace changes and reorganization in the interests of readability
+ and clarity
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1923
- mix of tabs and spaces, so remove all tabs
commit d3885408deda6a20aa25360b5d5bd3f84eebf209
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 13:46:05 2013 +0000
Replace mix of tabs and spaces with just spaces
diff --git a/tor.spec b/tor.spec
index 7d439f7..b4fc4c5 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,25 +1,25 @@
-%global _hardened_build 1
-
-%global toruser toranon
-%global torgroup toranon
-%global homedir %_localstatedir/lib/%name
-%global logdir %_localstatedir/log/%name
-
-Name: tor
-Version: 0.2.3.25
-Release: 1922%{?dist}
-Group: System Environment/Daemons
-License: BSD
-Summary: Anonymizing overlay network for TCP (The onion router)
-URL:
http://www.torproject.org
-Source0:
https://www.torproject.org/dist/%name-%version.tar.gz
-Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
-Source2: tor.logrotate
-Source3: tor.defaults-torrc
-Source10: tor.systemd.service
+%global _hardened_build 1
+
+%global toruser toranon
+%global torgroup toranon
+%global homedir %_localstatedir/lib/%name
+%global logdir %_localstatedir/log/%name
+
+Name: tor
+Version: 0.2.3.25
+Release: 1923%{?dist}
+Group: System Environment/Daemons
+License: BSD
+Summary: Anonymizing overlay network for TCP (The onion router)
+URL:
http://www.torproject.org
+Source0:
https://www.torproject.org/dist/%name-%version.tar.gz
+Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
+Source2: tor.logrotate
+Source3: tor.defaults-torrc
+Source10: tor.systemd.service
# tor-design.pdf is not shipped anymore with tor
-Obsoletes: tor-doc < 0.2.2
+Obsoletes: tor-doc < 0.2.2
Provides: tor-doc = 0:%version-%release
Obsoletes: tor-core < 0:0.2.3.25-1914
Provides: tor-core = 0:%version-%release
@@ -28,11 +28,11 @@ Provides: tor-systemd = 0:%version-%release
Obsoletes: torify < 0:0.2.3.25-1916
Provides: torify = 0:%version-%release
-BuildRequires: libevent-devel openssl-devel asciidoc
-Requires: torsocks
-Requires(pre): shadow-utils
-Requires(post): systemd
-Requires(preun): systemd
+BuildRequires: libevent-devel openssl-devel asciidoc
+Requires: torsocks
+Requires(pre): shadow-utils
+Requires(post): systemd
+Requires(preun): systemd
Requires(postun): systemd
@@ -96,11 +96,11 @@ exit 0
%files
%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/TODO doc/*.html
-%dir %_sysconfdir/tor
+%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%toruser,%torgroup) %dir %homedir
-%attr(0750,%toruser,%torgroup) %dir %logdir
+%attr(0750,%toruser,%torgroup) %dir %logdir
%attr(0644,root,root) %config(noreplace) %_sysconfdir/tor/torrc
%_bindir/tor
%_bindir/tor-gencert
@@ -116,6 +116,9 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1923
+- mix of tabs and spaces, so remove all tabs
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1922
- the /var/run/tor directory is not needed so remove it, which also fixes
bug #656707
commit 16856039a57d0e3a06b64b113d6147554877fa93
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 11:43:38 2013 +0000
Remove the unnecessary /var/run/tor directory
diff --git a/tor.spec b/tor.spec
index 8412e8b..7d439f7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -2,12 +2,12 @@
%global toruser toranon
%global torgroup toranon
-%global homedir %_var/lib/%name
-%global logdir %_var/log/%name
+%global homedir %_localstatedir/lib/%name
+%global logdir %_localstatedir/log/%name
Name: tor
Version: 0.2.3.25
-Release: 1921%{?dist}
+Release: 1922%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -70,7 +70,7 @@ make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
-mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
+mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir}
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
@@ -116,6 +116,11 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1922
+- the /var/run/tor directory is not needed so remove it, which also fixes
+ bug #656707
+- use %%_localstatedir instead of %%_var
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1921
- take a more cautious approach in the %%files section and specify filenames
more explicitly rather than using wildcards, which also makes it easier to
commit 4b0c77f3f51d50cce65948400ffb8352e62a49b8
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 13:44:48 2013 +0000
Specify files more explicitly in %files
diff --git a/tor.spec b/tor.spec
index e4cb863..8412e8b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1920%{?dist}
+Release: 1921%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -95,22 +95,32 @@ exit 0
%files
-%doc LICENSE README ChangeLog
-%doc ReleaseNotes
-%doc doc/HACKING doc/TODO doc/*.html
+%doc LICENSE README ChangeLog ReleaseNotes doc/HACKING doc/TODO doc/*.html
%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%toruser,%torgroup) %dir %homedir
%attr(0750,%toruser,%torgroup) %dir %logdir
%attr(0644,root,root) %config(noreplace) %_sysconfdir/tor/torrc
-%_bindir/*
-%_mandir/man1/*
-%_datadir/tor
+%_bindir/tor
+%_bindir/tor-gencert
+%_bindir/tor-resolve
+%_bindir/torify
+%_mandir/man1/tor.1*
+%_mandir/man1/tor-gencert.1*
+%_mandir/man1/tor-resolve.1*
+%_mandir/man1/torify.1*
+%_datadir/tor/defaults-torrc
+%_datadir/tor/geoip
%_unitdir/%name.service
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1921
+- take a more cautious approach in the %%files section and specify filenames
+ more explicitly rather than using wildcards, which also makes it easier to
+ see the contents of the package
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1920
- remove all modifications to the default tor configuration file so that we
can stick more closely to upstream defaults
commit 14014d7ad6ebf345a77c19a196aacedb512f342b
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 13:43:47 2013 +0000
Stick closer to default upstream configuration
diff --git a/tor.defaults-torrc b/tor.defaults-torrc
new file mode 100644
index 0000000..c33bfd8
--- /dev/null
+++ b/tor.defaults-torrc
@@ -0,0 +1,2 @@
+DataDirectory /var/lib/tor
+User toranon
diff --git a/tor.spec b/tor.spec
index 598af31..e4cb863 100644
--- a/tor.spec
+++ b/tor.spec
@@ -7,7 +7,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1919%{?dist}
+Release: 1920%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -15,6 +15,7 @@ URL:
http://www.torproject.org
Source0:
https://www.torproject.org/dist/%name-%version.tar.gz
Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
+Source3: tor.defaults-torrc
Source10: tor.systemd.service
# tor-design.pdf is not shipped anymore with tor
@@ -57,12 +58,6 @@ high-stakes anonymity.
%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 %toruser
-EOF
-
%build
export LDFLAGS='-Wl,--as-needed'
@@ -79,6 +74,7 @@ mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
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 %SOURCE3 $RPM_BUILD_ROOT%_datadir/%name/defaults-torrc
%pre
@@ -115,6 +111,15 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1920
+- remove all modifications to the default tor configuration file so that we
+ can stick more closely to upstream defaults
+- add /usr/share/tor/defaults-torrc file, which only contains two options:
+ DataDirectory /var/lib/tor
+ User toranon
+- when starting the tor service, use the following options as recommended by
+ upstream: --defaults-torrc /usr/share/tor/defaults-torrc -f /etc/tor/torrc
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1919
- split username global variable into separate toruser and torgroup global
variables to improve spec flexibility and ease of comprehension, as well
diff --git a/tor.systemd.service b/tor.systemd.service
index 2fabf70..3b3d3f2 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 --quiet
+ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc --quiet
ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
TimeoutSec = 30
commit 98a6cd2de8b935138e61a3cc4bc470a0b3ca6c7b
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 13:38:17 2013 +0000
Build with --with-tor-user and --with-tor-group
diff --git a/tor.spec b/tor.spec
index 2cbdc56..598af31 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,12 +1,13 @@
%global _hardened_build 1
-%global username toranon
+%global toruser toranon
+%global torgroup toranon
%global homedir %_var/lib/%name
%global logdir %_var/log/%name
Name: tor
Version: 0.2.3.25
-Release: 1918%{?dist}
+Release: 1919%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -59,13 +60,14 @@ high-stakes anonymity.
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
+User %toruser
EOF
%build
export LDFLAGS='-Wl,--as-needed'
-%configure --docdir=%_docdir/%name-%version
+%configure --with-tor-user=%toruser --with-tor-group=%torgroup \
+ --docdir=%_docdir/%name-%version
make %{?_smp_mflags}
@@ -80,10 +82,10 @@ install -D -p -m 0644 %SOURCE2
$RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
%pre
-getent group %username >/dev/null || groupadd -r %username
-getent passwd %username >/dev/null || \
+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 %username %username
+ -c 'TOR anonymizing user' -g %torgroup %toruser
exit 0
%post
@@ -103,8 +105,8 @@ exit 0
%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
%config(noreplace) %_sysconfdir/logrotate.d/tor
-%attr(0700,%username,%username) %dir %homedir
-%attr(0750,%username,%username) %dir %logdir
+%attr(0700,%toruser,%torgroup) %dir %homedir
+%attr(0750,%toruser,%torgroup) %dir %logdir
%attr(0644,root,root) %config(noreplace) %_sysconfdir/tor/torrc
%_bindir/*
%_mandir/man1/*
@@ -113,6 +115,13 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1919
+- split username global variable into separate toruser and torgroup global
+ variables to improve spec flexibility and ease of comprehension, as well
+ as matching how upstream have written their spec
+- use --with-tor-user=%%toruser and --with-tor-group=%%torgroup options when
+ running %%configure, as recommended by upstream
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1918
- after moving the tor-systemd and torify subpackages back into the main tor
package, the %%with_noarch macro and the associated conditionals are no
commit 12f4bc9b759faa9b7d27b2060184a1c24d99163c
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 13:37:17 2013 +0000
Remove unused %with_noarch macros and conditionals
diff --git a/tor.spec b/tor.spec
index 6fdc190..2cbdc56 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,18 +1,12 @@
-## This package understands the following switches:
-%bcond_without noarch
-
%global _hardened_build 1
%global username toranon
%global homedir %_var/lib/%name
%global logdir %_var/log/%name
-%{?with_noarch:%global noarch BuildArch: noarch}
-
-
Name: tor
Version: 0.2.3.25
-Release: 1917%{?dist}
+Release: 1918%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -119,6 +113,11 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1918
+- after moving the tor-systemd and torify subpackages back into the main tor
+ package, the %%with_noarch macro and the associated conditionals are no
+ longer used so remove them
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1917
- add missing Provides for the obsoleted tor-doc subpackage
commit 18b6385d24fc70e419e02189f59d98908874a9fe
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 13:33:36 2013 +0000
Add missing Provides for obsoleted tor-doc
diff --git a/tor.spec b/tor.spec
index f58fd28..6fdc190 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,7 +12,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1916%{?dist}
+Release: 1917%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -24,6 +24,7 @@ Source10: tor.systemd.service
# tor-design.pdf is not shipped anymore with tor
Obsoletes: tor-doc < 0.2.2
+Provides: tor-doc = 0:%version-%release
Obsoletes: tor-core < 0:0.2.3.25-1914
Provides: tor-core = 0:%version-%release
Obsoletes: tor-systemd < 0:0.2.3.25-1915
@@ -118,6 +119,9 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1917
+- add missing Provides for the obsoleted tor-doc subpackage
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1916
- move the torify subpackage back into the main tor package to match upstream
expectations and user expectations (ie, yum install tor)
commit f03ed6f174e75bea2c5426f95fb26eddd637ce34
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 10:14:10 2013 +0000
Move torify subpackage into main tor package
diff --git a/tor.spec b/tor.spec
index 709773b..f58fd28 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,7 +12,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1915%{?dist}
+Release: 1916%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -28,24 +28,17 @@ Obsoletes: tor-core < 0:0.2.3.25-1914
Provides: tor-core = 0:%version-%release
Obsoletes: tor-systemd < 0:0.2.3.25-1915
Provides: tor-systemd = 0:%version-%release
+Obsoletes: torify < 0:0.2.3.25-1916
+Provides: torify = 0:%version-%release
BuildRequires: libevent-devel openssl-devel asciidoc
+Requires: torsocks
Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
-%package -n torify
-Summary: The torify wrapper script
-Group: System Environment/Daemons
-Requires: torsocks
-# Prevent version mix
-Conflicts: %name < %version-%release
-Conflicts: %name > %version-%release
-%{?noarch}
-
-
%description
Tor is a connection-based low-latency anonymous communication system.
@@ -65,12 +58,6 @@ strength of the anonymity provided. Tor is not presently suitable for
high-stakes anonymity.
-%description -n torify
-Tor is a connection-based low-latency anonymous communication system.
-
-This package contains the "torify" wrapper script.
-
-
%prep
%setup -q
@@ -83,13 +70,11 @@ EOF
%build
export LDFLAGS='-Wl,--as-needed'
-%configure
+%configure --docdir=%_docdir/%name-%version
make %{?_smp_mflags}
%install
-rm -rf _doc _doc-torify
-
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
@@ -98,10 +83,6 @@ mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
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
-mv $RPM_BUILD_ROOT%_datadir/doc/tor _doc
-mkdir _doc-torify
-mv _doc/torify.html _doc-torify
-
%pre
getent group %username >/dev/null || groupadd -r %username
@@ -123,8 +104,9 @@ exit 0
%files
%doc LICENSE README ChangeLog
%doc ReleaseNotes
-%doc _doc/*
+%doc doc/HACKING doc/TODO doc/*.html
%dir %_sysconfdir/tor
+%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%username,%username) %dir %homedir
%attr(0750,%username,%username) %dir %logdir
@@ -134,19 +116,15 @@ exit 0
%_datadir/tor
%_unitdir/%name.service
-%exclude %_mandir/man1/torify*
-%exclude %_bindir/torify
-
-
-%files -n torify
-%doc _doc-torify/*
-%_bindir/torify
-%_mandir/man1/torify*
-%dir %_sysconfdir/tor
-%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
-
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1916
+- move the torify subpackage back into the main tor package to match upstream
+ expectations and user expectations (ie, yum install tor)
+- remove the logic separating the documentation files for tor and torify,
+ which is now no longer needed
+- use --docdir option when running %%configure
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1915
- move the tor-systemd subpackage back into the main tor package:
the main tor package has a hard requirement on tor-systemd, so there is no
commit 392b8f22ee833d75ea79e5ee366534791d689474
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 10:06:42 2013 +0000
Move tor-systemd subpackage into main tor package
diff --git a/tor.spec b/tor.spec
index 0481d2c..709773b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,23 +12,28 @@
Name: tor
Version: 0.2.3.25
-Release: 1914%{?dist}
+Release: 1915%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
URL:
http://www.torproject.org
-Requires: %name-systemd = %version-%release
Source0:
https://www.torproject.org/dist/%name-%version.tar.gz
Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
+Source10: tor.systemd.service
# tor-design.pdf is not shipped anymore with tor
Obsoletes: tor-doc < 0.2.2
Obsoletes: tor-core < 0:0.2.3.25-1914
Provides: tor-core = 0:%version-%release
+Obsoletes: tor-systemd < 0:0.2.3.25-1915
+Provides: tor-systemd = 0:%version-%release
BuildRequires: libevent-devel openssl-devel asciidoc
Requires(pre): shadow-utils
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%package -n torify
@@ -41,17 +46,6 @@ Conflicts: %name > %version-%release
%{?noarch}
-%package systemd
-Summary: Systemd initscripts for tor
-Group: System Environment/Daemons
-Source10: tor.systemd.service
-Requires: %name = %version-%release
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-%{?noarch}
-
-
%description
Tor is a connection-based low-latency anonymous communication system.
@@ -77,13 +71,6 @@ Tor is a connection-based low-latency anonymous communication system.
This package contains the "torify" wrapper script.
-%description systemd
-Tor is a connection-based low-latency anonymous communication system.
-
-This package contains the systemd initscripts to start the "tor"
-daemon.
-
-
%prep
%setup -q
@@ -145,6 +132,7 @@ exit 0
%_bindir/*
%_mandir/man1/*
%_datadir/tor
+%_unitdir/%name.service
%exclude %_mandir/man1/torify*
%exclude %_bindir/torify
@@ -158,11 +146,13 @@ exit 0
%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
-%files systemd
-%_unitdir/%name.service
-
-
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1915
+- move the tor-systemd subpackage back into the main tor package:
+ the main tor package has a hard requirement on tor-systemd, so there is no
+ purpose for keeping tor-systemd separate from the main package
+- remove "Requires: tor-systemd"
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1914
- move the tor-core subpackage back into the main tor package to match upstream
expectations and user expectations (ie, yum install tor)
commit 9f7f859615cbdff3a613fe4d687cb9c71a7e5374
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 09:56:06 2013 +0000
Move tor-core subpackage into main tor package
diff --git a/tor.spec b/tor.spec
index 53e478c..0481d2c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,24 +12,20 @@
Name: tor
Version: 0.2.3.25
-Release: 1913%{?dist}
+Release: 1914%{?dist}
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
# tor-design.pdf is not shipped anymore with tor
Obsoletes: tor-doc < 0.2.2
+Obsoletes: tor-core < 0:0.2.3.25-1914
+Provides: tor-core = 0:%version-%release
BuildRequires: libevent-devel openssl-devel asciidoc
Requires(pre): shadow-utils
@@ -40,8 +36,8 @@ Summary: The torify wrapper script
Group: System Environment/Daemons
Requires: torsocks
# Prevent version mix
-Conflicts: %name-core < %version-%release
-Conflicts: %name-core > %version-%release
+Conflicts: %name < %version-%release
+Conflicts: %name > %version-%release
%{?noarch}
@@ -49,7 +45,7 @@ Conflicts: %name-core > %version-%release
Summary: Systemd initscripts for tor
Group: System Environment/Daemons
Source10: tor.systemd.service
-Requires: %name-core = %version-%release
+Requires: %name = %version-%release
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -75,13 +71,6 @@ strength of the anonymity provided. Tor is not presently suitable for
high-stakes anonymity.
-%description core
-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.
-
-
%description -n torify
Tor is a connection-based low-latency anonymous communication system.
@@ -127,7 +116,7 @@ mkdir _doc-torify
mv _doc/torify.html _doc-torify
-%pre core
+%pre
getent group %username >/dev/null || groupadd -r %username
getent passwd %username >/dev/null || \
useradd -r -s /sbin/nologin -d %homedir -M \
@@ -145,9 +134,6 @@ exit 0
%files
-
-
-%files core
%doc LICENSE README ChangeLog
%doc ReleaseNotes
%doc _doc/*
@@ -177,6 +163,10 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1914
+- move the tor-core subpackage back into the main tor package to match upstream
+ expectations and user expectations (ie, yum install tor)
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1913
- the tor-systemd subpackage is a hard requirement, so remove the conditional
that decides whether it is built
commit 99fc92dd9a679edec951d857153b96d5a6031771
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 09:44:45 2013 +0000
Remove the conditional for building tor-systemd
diff --git a/tor.spec b/tor.spec
index edfdbc3..53e478c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,6 +1,5 @@
## This package understands the following switches:
%bcond_without noarch
-%bcond_without systemd
%global _hardened_build 1
@@ -13,7 +12,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1912%{?dist}
+Release: 1913%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -127,8 +126,6 @@ mv $RPM_BUILD_ROOT%_datadir/doc/tor _doc
mkdir _doc-torify
mv _doc/torify.html _doc-torify
-%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir}
-
%pre core
getent group %username >/dev/null || groupadd -r %username
@@ -175,13 +172,15 @@ exit 0
%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
-%if 0%{?with_systemd:1}
%files systemd
- %_unitdir/%name.service
-%endif
+%_unitdir/%name.service
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1913
+- the tor-systemd subpackage is a hard requirement, so remove the conditional
+ that decides whether it is built
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1912
- amend logrotate file to match closer with upstream defaults, and removing
references to several obsolete init systems
commit 6cb25042203a9f2fadb6a9ccdeaf280edc06a269
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 09:40:05 2013 +0000
Amend logrotate configuration file
diff --git a/tor.logrotate b/tor.logrotate
index 3677b2c..7d67feb 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -1,13 +1,13 @@
/var/log/tor/*.log {
- su toranon toranon
- delaycompress
- notifempty
- sharedscripts
- missingok
- postrotate
- 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
+ daily
+ rotate 5
+ compress
+ delaycompress
+ missingok
+ notifempty
+ create 0640 toranon toranon
+ sharedscripts
+ postrotate
+ /bin/systemctl reload tor.service >/dev/null 2>/dev/null || :
+ endscript
}
diff --git a/tor.spec b/tor.spec
index be8535e..edfdbc3 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1911%{?dist}
+Release: 1912%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -182,6 +182,10 @@ exit 0
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1912
+- amend logrotate file to match closer with upstream defaults, and removing
+ references to several obsolete init systems
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1911
- remove tor-upstart subpackage as upstart is no longer installable within
Fedora and renders the the subpackage obsolete
commit dddb33c64b38434c8315eb91f0cd717c57f5f0cc
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 09:23:15 2013 +0000
Remove obsolete tor-upstart subpackage
diff --git a/tor.spec b/tor.spec
index 241c9b8..be8535e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,7 +1,6 @@
## This package understands the following switches:
%bcond_without noarch
%bcond_without systemd
-%bcond_with upstart
%global _hardened_build 1
@@ -14,7 +13,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1910%{?dist}
+Release: 1911%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -34,7 +33,6 @@ Source2: tor.logrotate
Obsoletes: tor-doc < 0.2.2
BuildRequires: libevent-devel openssl-devel asciidoc
-Requires: init(%name)
Requires(pre): shadow-utils
@@ -52,7 +50,6 @@ Conflicts: %name-core > %version-%release
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
@@ -60,18 +57,6 @@ Requires(postun): systemd
%{?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
-%{?noarch}
-
-
%description
Tor is a connection-based low-latency anonymous communication system.
@@ -111,13 +96,6 @@ This package contains the systemd initscripts to start the
"tor"
daemon.
-%description upstart
-Tor is a connection-based low-latency anonymous communication system.
-
-This package contains the upstart compliant initscripts to start the "tor"
-daemon.
-
-
%prep
%setup -q
@@ -145,13 +123,10 @@ mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
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
-
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_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir}
@@ -172,13 +147,6 @@ exit 0
%systemd_postun_with_restart %name.service
-%postun upstart
-/usr/bin/killall -u %username -s INT tor 2>/dev/null || :
-
-%preun upstart
-test "$1" != "0" || /sbin/initctl -q stop tor || :
-
-
%files
@@ -212,12 +180,12 @@ test "$1" != "0" || /sbin/initctl -q stop tor ||
:
%_unitdir/%name.service
%endif
-%if 0%{?with_upstart:1}
-%files upstart
- %config(noreplace) /etc/init/*
-%endif
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1911
+- remove tor-upstart subpackage as upstart is no longer installable within
+ Fedora and renders the the subpackage obsolete
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1910
- remove dependency on fedora-usermgmt as it has been queued for obsoletion
from Fedora
diff --git a/tor.upstart b/tor.upstart
deleted file mode 100644
index 03975db..0000000
--- a/tor.upstart
+++ /dev/null
@@ -1,10 +0,0 @@
-### Uncomment matching 'start' lines below.
-
-#start on runlevel [345] and starting local
-
-stop on runlevel [!345]
-
-limit nofile 4096 4096
-
-respawn
-exec /usr/bin/tor --runasdaemon 0 --quiet
commit 2b7b900d0a345b2e3a6652ddee08a54ff30e88ff
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 09:11:55 2013 +0000
Remove dependency on fedora-usermgmt
diff --git a/tor.spec b/tor.spec
index 84d5c39..241c9b8 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,5 +1,4 @@
## This package understands the following switches:
-%bcond_without fedora
%bcond_without noarch
%bcond_without systemd
%bcond_with upstart
@@ -7,7 +6,6 @@
%global _hardened_build 1
%global username toranon
-%global uid 19
%global homedir %_var/lib/%name
%global logdir %_var/log/%name
@@ -16,7 +14,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1909%{?dist}
+Release: 1910%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -36,11 +34,8 @@ Source2: tor.logrotate
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)
-%{?FE_USERADD_REQ}
+Requires(pre): shadow-utils
%package -n torify
@@ -161,14 +156,11 @@ mv _doc/torify.html _doc-torify
%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 || :
-
-%postun core
-%__fe_userdel %username &>/dev/null || :
-%__fe_groupdel %username &>/dev/null || :
-
+getent group %username >/dev/null || groupadd -r %username
+getent passwd %username >/dev/null || \
+ useradd -r -s /sbin/nologin -d %homedir -M \
+ -c 'TOR anonymizing user' -g %username %username
+exit 0
%post
%systemd_post %name.service
@@ -226,6 +218,14 @@ test "$1" != "0" || /sbin/initctl -q stop tor ||
:
%endif
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1910
+- remove dependency on fedora-usermgmt as it has been queued for obsoletion
+ from Fedora
+- add users and groups without forcing use of uid=19 as it is not necessarily
+ available, nor is it required or expected by upstream
+- do not remove users/groups in %%postun as the guidelines state:
+
https://fedoraproject.org/wiki/Packaging:UsersAndGroups
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1909
- change permissions of the following files/directories to match upstream:
/var/log/tor should be owned by toranon:toranon with 0750 permissions;
commit 86ed4ef42c2336752a0384b6ca11d27db6194d89
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 08:58:32 2013 +0000
Amend file/directory permissions to match upstream
diff --git a/tor.spec b/tor.spec
index 052917d..84d5c39 100644
--- a/tor.spec
+++ b/tor.spec
@@ -16,7 +16,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1908%{?dist}
+Release: 1909%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -197,8 +197,8 @@ test "$1" != "0" || /sbin/initctl -q stop tor ||
:
%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
+%attr(0750,%username,%username) %dir %logdir
+%attr(0644,root,root) %config(noreplace) %_sysconfdir/tor/torrc
%_bindir/*
%_mandir/man1/*
%_datadir/tor
@@ -226,6 +226,12 @@ test "$1" != "0" || /sbin/initctl -q stop tor ||
:
%endif
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1909
+- change permissions of the following files/directories to match upstream:
+ /var/log/tor should be owned by toranon:toranon with 0750 permissions;
+ /var/lib/tor should be owned by toranon:toranon with 0700 permissions;
+ /etc/tor/torrc should be owned by root:root with 0644 permissions;
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1908
- remove unnecessary Requires on logrotate directory
commit 1ddf8b0e9e415ac9d5301cab331b8095cc007b95
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 08:57:22 2013 +0000
Remove unnecessary Requires on logrotate directory
diff --git a/tor.spec b/tor.spec
index af5f5ea..052917d 100644
--- a/tor.spec
+++ b/tor.spec
@@ -16,7 +16,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1907%{?dist}
+Release: 1908%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -40,8 +40,6 @@ 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}
@@ -228,6 +226,9 @@ test "$1" != "0" || /sbin/initctl -q stop tor ||
:
%endif
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1908
+- remove unnecessary Requires on logrotate directory
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1907
- remove unnecessary BuildRoot tag
- remove unnecessary rm -rf RPM_BUILD_ROOT
commit 37ad318e66331c4d3edd6b1b40f9ef26c4a613f7
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 08:55:52 2013 +0000
Remove EPEL 5 tags and macros
diff --git a/tor.spec b/tor.spec
index 6815c14..af5f5ea 100644
--- a/tor.spec
+++ b/tor.spec
@@ -16,7 +16,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1906%{?dist}
+Release: 1907%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -31,7 +31,6 @@ 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
@@ -143,7 +142,7 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT _doc _doc-torify
+rm -rf _doc _doc-torify
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
@@ -190,15 +189,10 @@ mv _doc/torify.html _doc-torify
test "$1" != "0" || /sbin/initctl -q stop tor || :
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
%files core
-%defattr(-,root,root,-)
%doc LICENSE README ChangeLog
%doc ReleaseNotes
%doc _doc/*
@@ -216,7 +210,6 @@ rm -rf $RPM_BUILD_ROOT
%files -n torify
-%defattr(-,root,root,-)
%doc _doc-torify/*
%_bindir/torify
%_mandir/man1/torify*
@@ -226,17 +219,21 @@ rm -rf $RPM_BUILD_ROOT
%if 0%{?with_systemd:1}
%files systemd
-%defattr(-,root,root,-)
%_unitdir/%name.service
%endif
%if 0%{?with_upstart:1}
%files upstart
- %defattr(-,root,root,-)
%config(noreplace) /etc/init/*
%endif
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1907
+- remove unnecessary BuildRoot tag
+- remove unnecessary rm -rf RPM_BUILD_ROOT
+- remove unnecessary %%clean
+- remove unnecessary defattr's
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1906
- remove unnecessary %%_unitdir macro
- remove %%systemd_reqs and %%systemd_install macros, moving the parts to
commit 60828eb220fffdeb42af97c473fbdd53f726fd94
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 08:55:22 2013 +0000
Cleanup systemd macros
diff --git a/tor.spec b/tor.spec
index 4c4e750..6815c14 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,26 +11,12 @@
%global homedir %_var/lib/%name
%global logdir %_var/log/%name
-%{!?_unitdir:%global _unitdir /lib/systemd/system}
%{?with_noarch:%global noarch BuildArch: noarch}
-%{!?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: 1905%{?dist}
+Release: 1906%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -76,7 +62,9 @@ Group: System Environment/Daemons
Source10: tor.systemd.service
Provides: init(%name) = systemd
Requires: %name-core = %version-%release
-%{?systemd_reqs}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%{?noarch}
@@ -185,7 +173,14 @@ mv _doc/torify.html _doc-torify
%__fe_groupdel %username &>/dev/null || :
-%systemd_install systemd %name.service
+%post
+%systemd_post %name.service
+
+%preun
+%systemd_preun %name.service
+
+%postun
+%systemd_postun_with_restart %name.service
%postun upstart
@@ -242,6 +237,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1906
+- remove unnecessary %%_unitdir macro
+- remove %%systemd_reqs and %%systemd_install macros, moving the parts to
+ the appropriate sections to improve readability and consistency with other
+ SPECS
+
* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1905
- remove %%release_func macro to improve readability and consistency with
other SPECS
commit 16ac40a1a2a68377590eb2bb7894adad39d7be74
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 28 08:55:03 2013 +0000
Remove %release_func macro
diff --git a/tor.spec b/tor.spec
index fb7bf55..4c4e750 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,6 @@
%{!?_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\
@@ -31,7 +30,7 @@ Requires(postun): /bin/systemctl\
Name: tor
Version: 0.2.3.25
-Release: %release_func 1904
+Release: 1905%{?dist}
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -243,6 +242,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Feb 27 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> 0.2.3.25-1905
+- remove %%release_func macro to improve readability and consistency with
+ other SPECS
+
* Wed Feb 13 2013 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.3.25-1904
- fixed torsocks requirement
- conditionalized systemd builds
commit fd27ca8afd53e69d9b5987bfc684d8ab94687ec2
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Wed Feb 13 10:17:21 2013 +0100
fixed typo caused by last merge conflict
diff --git a/tor.spec b/tor.spec
index db76ea7..fb7bf55 100644
--- a/tor.spec
+++ b/tor.spec
@@ -31,7 +31,7 @@ Requires(postun): /bin/systemctl\
Name: tor
Version: 0.2.3.25
-Release: %release_func 1903
+Release: %release_func 1904
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -64,7 +64,7 @@ Requires(postun): /etc/logrotate.d
%package -n torify
Summary: The torify wrapper script
Group: System Environment/Daemons
-Requires: tsockstorsocks
+Requires: torsocks
# Prevent version mix
Conflicts: %name-core < %version-%release
Conflicts: %name-core > %version-%release
@@ -243,7 +243,8 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-* Sun Feb 10 2013 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+* Wed Feb 13 2013 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.3.25-1904
+- fixed torsocks requirement
- conditionalized systemd builds
* Sun Feb 10 2013 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.3.25-1903
commit cd57e42e2a141c7ba829ef673031ea0ce8cb1494
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Feb 10 14:27:51 2013 +0100
conditionalized systemd builds
diff --git a/tor.spec b/tor.spec
index 2a8f40c..db76ea7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,6 +1,7 @@
## This package understands the following switches:
%bcond_without fedora
%bcond_without noarch
+%bcond_without systemd
%bcond_with upstart
%global _hardened_build 1
@@ -172,6 +173,7 @@ mkdir _doc-torify
mv _doc/torify.html _doc-torify
%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
+%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir}
%pre core
@@ -228,10 +230,11 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
+%if 0%{?with_systemd:1}
%files systemd
%defattr(-,root,root,-)
-%_unitdir/%name.service
-
+ %_unitdir/%name.service
+%endif
%if 0%{?with_upstart:1}
%files upstart
@@ -240,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Feb 10 2013 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+- conditionalized systemd builds
+
* Sun Feb 10 2013 Enrico Scholz <enrico.scholz(a)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
commit dcca5c196a47528c40b4563dac9bf0adf892cc89
Author: Enrico Scholz <enrico.scholz(a)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
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(a)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(a)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\.
commit 8a1f68a84a5f0953ab358414a18e9cc17a5da74a
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Thu Feb 7 05:02:21 2013 +0000
torify subpackage should depend on torsocks not tsocks
diff --git a/tor.spec b/tor.spec
index 31eb95e..7fcd24c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,7 +12,7 @@
Name: tor
Version: 0.2.3.25
-Release: 1901
+Release: 1902
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -44,7 +44,7 @@ Requires(postun): /etc/logrotate.d
%package -n torify
Summary: The torify wrapper script
Group: System Environment/Daemons
-Requires: tsocks
+Requires: torsocks
Requires: %{name}-core = %{version}-%{release}
%{?noarch}
@@ -227,6 +227,9 @@ test "$1" != "0" || /sbin/initctl -q stop tor ||
:
%changelog
+* Thu Feb 07 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.3.25-1902
+- torify subpackage should depend on torsocks not tsocks (#908569)
+
* Wed Feb 06 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.3.25-1901
- add additional %%configure options for user and group
- add --defaults-torrc to systemd service to make sure sane defaults are set
commit 397dff12633bb33d1f764a911da734989d33f602
Author: Jamie Nguyen <j(a)jamielinux.com>
Date: Wed Feb 6 20:18:36 2013 +0000
Package cleanup and various fixes
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e5461e3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-MAKEFILE_COMMON = $(HOME)/.fedora/common.mk
--include $(MAKEFILE_COMMON)
diff --git a/lastver b/lastver
deleted file mode 100644
index 5c0b7dc..0000000
--- a/lastver
+++ /dev/null
@@ -1 +0,0 @@
-0.2.3.25
diff --git a/tor.logrotate b/tor.logrotate
index 3677b2c..5d6f22b 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -1,13 +1,10 @@
/var/log/tor/*.log {
- su toranon toranon
- delaycompress
- notifempty
- sharedscripts
- missingok
+ su toranon toranon
+ delaycompress
+ notifempty
+ sharedscripts
+ missingok
postrotate
- 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
+ /bin/systemctl reload tor.service >/dev/null 2>/dev/null || :
+ endscript
}
diff --git a/tor.spec b/tor.spec
index 3470d14..31eb95e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,94 +1,75 @@
## 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
-
-%{!?_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 1900
-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}
+
+Name: tor
+Version: 0.2.3.25
+Release: 1901
+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
-BuildRoot: %_tmppath/%name-%version-%release-root
+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
# 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: tsocks
-# Prevent version mix
-Conflicts: %name-core < %version-%release
-Conflicts: %name-core > %version-%release
+Summary: The torify wrapper script
+Group: System Environment/Daemons
+Requires: tsocks
+Requires: %{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
-%{?systemd_reqs}
+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
%{?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}
@@ -141,105 +122,123 @@ 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
+%configure --with-tor-user=%{username} --with-tor-group=%{username}
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,}
-mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
+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
-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
+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 %SOURCE20 $RPM_BUILD_ROOT%_sysconfdir/init/tor.conf
+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
-mv $RPM_BUILD_ROOT%_datadir/doc/tor _doc
+# Split docs for tor and torify
+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
-%systemd_install systemd %name.service
+%preun systemd
+%systemd_preun tor.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
-%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
+%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
%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
-%defattr(-,root,root,-)
-%_unitdir/%name.service
+%{_unitdir}/tor.service
%if 0%{?with_upstart:1}
%files upstart
- %defattr(-,root,root,-)
- %config(noreplace) /etc/init/*
+ %config(noreplace) %{_sysconfdir}/init/*
%endif
+
%changelog
+* Wed Feb 06 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.2.3.25-1901
+- add additional %%configure options for user and group
+- add --defaults-torrc to systemd service to make sure sane defaults are set
+ unless explicitly overridden
+- remove unnecessary BuildRoot tag
+- remove unnecessary rm -rf RPM_BUILD_ROOT
+- remove unnecessary %%clean section
+- remove unnecessary defattr's
+- fix Requires for torify subpackage
+- update scriptlets to latest systemd guidelines
+- aesthetic changes to the SPEC for clarity and readability
+
* Sun Dec 9 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.3.25-1900
- updated to 0.2.3.25
diff --git a/tor.systemd.service b/tor.systemd.service
index 2fabf70..3b3d3f2 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 --quiet
+ExecStart = /usr/bin/tor --runasdaemon 0 --defaults-torrc /usr/share/tor/defaults-torrc
-f /etc/tor/torrc --quiet
ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
TimeoutSec = 30
diff --git a/verinfo b/verinfo
deleted file mode 100644
index 6614a11..0000000
--- a/verinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-http://www.torproject.org/dist/
-tor-([^-]*?)\.tar\.
commit 6ac6a774f6bb7d4d9476854db36e791d7c58c2fb
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Dec 9 13:03:59 2012 +0100
br asciidoc
diff --git a/tor.spec b/tor.spec
index 1b7654e..3470d14 100644
--- a/tor.spec
+++ b/tor.spec
@@ -50,7 +50,7 @@ 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
+BuildRequires: libevent-devel openssl-devel asciidoc
BuildRequires: fedora-usermgmt-devel
Provides: user(%username) = %uid
Provides: group(%username) = %uid
commit 7dbdc05df4a5ef3d84c1982f058cd10f9d895195
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Dec 9 13:02:17 2012 +0100
updated to 0.2.3.25
diff --git a/.gitignore b/.gitignore
index 63bee14..8bd3db8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/tor-0.2.2.39.tar.gz
-/tor-0.2.2.39.tar.gz.asc
+/tor-0.2.3.25.tar.gz
+/tor-0.2.3.25.tar.gz.asc
diff --git a/lastver b/lastver
index 2ac7f2b..5c0b7dc 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.2.39
+0.2.3.25
diff --git a/sources b/sources
index 6cea52c..6eae516 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9157a1f02fcda9d7d2c5744176373abd tor-0.2.2.39.tar.gz
-7944de0693fccf65fe0e3ea6712887b6 tor-0.2.2.39.tar.gz.asc
+a1c364189a9a66ed9daa8e6436489daf tor-0.2.3.25.tar.gz
+a4c12795ffb8f68550a5dab4a9eb0654 tor-0.2.3.25.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 9cef595..1b7654e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -29,7 +29,7 @@ Requires(postun): /bin/systemctl\
Name: tor
-Version: 0.2.2.39
+Version: 0.2.3.25
Release: %release_func 1900
Group: System Environment/Daemons
License: BSD
@@ -240,6 +240,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Dec 9 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.3.25-1900
+- updated to 0.2.3.25
+
* Sat Sep 22 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.39-1900
- updated to 0.2.2.29
- CVE-2012-4419: assertion failure when comparing an address with port
commit ea1aa79faa6e866d3f92d602524a5127d471ecac
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Sep 22 11:54:53 2012 +0200
use %systemd macros
diff --git a/tor.spec b/tor.spec
index 761202b..9cef595 100644
--- a/tor.spec
+++ b/tor.spec
@@ -20,13 +20,11 @@ Requires(postun): /bin/systemctl\
%nil}
%{!?systemd_install:%global systemd_install()\
%post %1\
-test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null
2>&1 || :\
+%systemd_post %2 \
%preun %1\
-test "$1" != "0" || /bin/systemctl --no-reload disable %2
>/dev/null 2>&1 || :\
-test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1
|| :\
+%systemd_preun %2 \
%postun %1\
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :\
-test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null
2>&1 || :\
+%systemd_postun_with_restart %2 \
%nil}
@@ -247,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT
- CVE-2012-4419: assertion failure when comparing an address with port
0 to an address policy
- CVE-2012-4422: assertion failure in tor_timegm()
+- use %%systemd macros
* Sun Aug 19 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.38-1900
- updated to 0.2.2.38
commit ab51a94935a188421102764ceb28cec75ad6c744
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Sep 22 11:51:12 2012 +0200
updated to 0.2.2.29
diff --git a/.gitignore b/.gitignore
index 3e6a7c6..63bee14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/tor-0.2.2.37.tar.gz
-/tor-0.2.2.37.tar.gz.asc
-/tor-0.2.2.38.tar.gz
-/tor-0.2.2.38.tar.gz.asc
+/tor-0.2.2.39.tar.gz
+/tor-0.2.2.39.tar.gz.asc
diff --git a/lastver b/lastver
index feeb3fc..2ac7f2b 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.2.38
+0.2.2.39
diff --git a/sources b/sources
index 853a2de..6cea52c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-91a9dd2c9d7fbd946bda5a13edbe5667 tor-0.2.2.38.tar.gz
-3486e60baeebe27d5702dbd38fa39c9d tor-0.2.2.38.tar.gz.asc
+9157a1f02fcda9d7d2c5744176373abd tor-0.2.2.39.tar.gz
+7944de0693fccf65fe0e3ea6712887b6 tor-0.2.2.39.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 5e68871..761202b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -31,7 +31,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
-Version: 0.2.2.38
+Version: 0.2.2.39
Release: %release_func 1900
Group: System Environment/Daemons
License: BSD
@@ -242,6 +242,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Sep 22 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.39-1900
+- updated to 0.2.2.29
+- CVE-2012-4419: assertion failure when comparing an address with port
+ 0 to an address policy
+- CVE-2012-4422: assertion failure in tor_timegm()
+
* Sun Aug 19 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.38-1900
- updated to 0.2.2.38
- conditionalized upstart and disabled it by default
commit 6a1122943470da6de1f2f418de6937c1c17fa4d1
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Aug 19 14:28:20 2012 +0200
conditionalized upstart and disabled it by default
diff --git a/tor.spec b/tor.spec
index d0305d3..5e68871 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,6 +1,7 @@
## This package understands the following switches:
%bcond_without fedora
%bcond_without noarch
+%bcond_with upstart
%global _hardened_build 1
@@ -172,6 +173,8 @@ 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}
+
%pre core
%__fe_groupadd %uid -r %username &>/dev/null || :
@@ -232,14 +235,16 @@ rm -rf $RPM_BUILD_ROOT
%_unitdir/%name.service
+%if 0%{?with_upstart:1}
%files upstart
-%defattr(-,root,root,-)
-%config(noreplace) /etc/init/*
-
+ %defattr(-,root,root,-)
+ %config(noreplace) /etc/init/*
+%endif
%changelog
* Sun Aug 19 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.38-1900
- updated to 0.2.2.38
+- conditionalized upstart and disabled it by default
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.37-1801
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit effda7fa656217bff1ac931fddde0cc39c68acaa
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Aug 19 14:27:30 2012 +0200
updated to 0.2.2.38
diff --git a/.gitignore b/.gitignore
index b38f532..3e6a7c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/tor-0.2.2.37.tar.gz
/tor-0.2.2.37.tar.gz.asc
+/tor-0.2.2.38.tar.gz
+/tor-0.2.2.38.tar.gz.asc
diff --git a/lastver b/lastver
index 3050e6b..feeb3fc 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.2.37
+0.2.2.38
diff --git a/sources b/sources
index bc65ef0..853a2de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5aafdca4fb6af6e12b503d32b03f14a7 tor-0.2.2.37.tar.gz
-8d3adf70109d16e860dbf414f9d70eac tor-0.2.2.37.tar.gz.asc
+91a9dd2c9d7fbd946bda5a13edbe5667 tor-0.2.2.38.tar.gz
+3486e60baeebe27d5702dbd38fa39c9d tor-0.2.2.38.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 995de8d..d0305d3 100644
--- a/tor.spec
+++ b/tor.spec
@@ -30,8 +30,8 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
-Version: 0.2.2.37
-Release: %release_func 1801
+Version: 0.2.2.38
+Release: %release_func 1900
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 19 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.38-1900
+- updated to 0.2.2.38
+
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.37-1801
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit 7680332da7c8179533ce0ebeb9e2335c4e044171
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jul 27 03:44:01 2012 -0500
Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index de69713..995de8d 100644
--- a/tor.spec
+++ b/tor.spec
@@ -31,7 +31,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
Version: 0.2.2.37
-Release: %release_func 1800
+Release: %release_func 1801
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.37-1801
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Tue Jun 12 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.37-1800
- updated to 0.2.2.37
commit 9a9ab6621afe1a20af0d89d414d607017b59c579
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Tue Jun 12 21:41:02 2012 +0200
updated to 0.2.2.37
diff --git a/.gitignore b/.gitignore
index 0fc44e9..b38f532 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/tor-0.2.2.36.tar.gz
-/tor-0.2.2.36.tar.gz.asc
+/tor-0.2.2.37.tar.gz
+/tor-0.2.2.37.tar.gz.asc
diff --git a/lastver b/lastver
index a7063a6..3050e6b 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.2.36
+0.2.2.37
diff --git a/sources b/sources
index 4d064a3..bc65ef0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-620b2110086aba01236b57f1d5aba416 tor-0.2.2.36.tar.gz
-0401cf01ad0bcc9aba4f9c1bb5e8e810 tor-0.2.2.36.tar.gz.asc
+5aafdca4fb6af6e12b503d32b03f14a7 tor-0.2.2.37.tar.gz
+8d3adf70109d16e860dbf414f9d70eac tor-0.2.2.37.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 33a0275..de69713 100644
--- a/tor.spec
+++ b/tor.spec
@@ -30,7 +30,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
-Version: 0.2.2.36
+Version: 0.2.2.37
Release: %release_func 1800
Group: System Environment/Daemons
License: BSD
@@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 12 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.37-1800
+- updated to 0.2.2.37
+
* Sat May 26 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.36-1800
- updated to 0.2.2.36
commit 47603fe9d22124588624ea7f3f5b9feb9078bdef
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat May 26 12:13:26 2012 +0200
removed old cruft
diff --git a/tor.spec b/tor.spec
index 7bad8f8..33a0275 100644
--- a/tor.spec
+++ b/tor.spec
@@ -78,12 +78,6 @@ Source10: tor.systemd.service
Provides: init(%name) = systemd
Requires: %name-core = %version-%release
%{?systemd_reqs}
-
-# TODO: remove me in F17
-Obsoletes: %name-lsb < %version-%release
-Provides: %name-lsb = %version-%release
-Obsoletes: %name-sysv < %version-%release
-Provides: %name-sysv = %version-%release
%{?noarch}
commit af2f4e51830a85bc65d5fcef5a28633aa33a9131
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat May 26 12:13:00 2012 +0200
updated to 0.2.2.36
diff --git a/.gitignore b/.gitignore
index 30f3bd6..0fc44e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/tor-0.2.2.34.tar.gz
-/tor-0.2.2.34.tar.gz.asc
-/tor-0.2.2.35.tar.gz
-/tor-0.2.2.35.tar.gz.asc
+/tor-0.2.2.36.tar.gz
+/tor-0.2.2.36.tar.gz.asc
diff --git a/lastver b/lastver
index 9830555..a7063a6 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.2.35
+0.2.2.36
diff --git a/sources b/sources
index 7237a39..4d064a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dcecf699c4b929319d5f1ce0358d4835 tor-0.2.2.35.tar.gz
-73472ede84e22f8e3589baf47b0f4427 tor-0.2.2.35.tar.gz.asc
+620b2110086aba01236b57f1d5aba416 tor-0.2.2.36.tar.gz
+0401cf01ad0bcc9aba4f9c1bb5e8e810 tor-0.2.2.36.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 90118be..7bad8f8 100644
--- a/tor.spec
+++ b/tor.spec
@@ -30,7 +30,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
-Version: 0.2.2.35
+Version: 0.2.2.36
Release: %release_func 1800
Group: System Environment/Daemons
License: BSD
@@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat May 26 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.36-1800
+- updated to 0.2.2.36
+
* Fri Apr 13 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1800
- build with -fPIE
commit ef499c07e03f09cb75e541d27356fdce2f5d2f6d
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Fri Apr 13 11:02:03 2012 +0200
build with -fPIE
diff --git a/tor.spec b/tor.spec
index ec2d755..90118be 100644
--- a/tor.spec
+++ b/tor.spec
@@ -2,6 +2,7 @@
%bcond_without fedora
%bcond_without noarch
+%global _hardened_build 1
%global username toranon
%global uid 19
@@ -30,7 +31,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
Version: 0.2.2.35
-Release: %release_func 1702
+Release: %release_func 1800
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -243,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Apr 13 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1800
+- build with -fPIE
+
* Tue Mar 6 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
- fixed urls (#800236)
commit 3904e56701793b1273697133a56920cad2cbdca5
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Tue Mar 6 10:22:59 2012 +0100
fixed urls
diff --git a/tor.spec b/tor.spec
index 3d4401c..ec2d755 100644
--- a/tor.spec
+++ b/tor.spec
@@ -34,7 +34,7 @@ Release: %release_func 1702
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
-URL:
http://tor.eff.org
+URL:
http://www.torproject.org
Requires: %name-core = %version-%release
Requires: %name-systemd = %version-%release
@@ -42,7 +42,6 @@ Requires: %name-systemd = %version-%release
%package core
Summary: Core programs for tor
Group: System Environment/Daemons
-URL:
http://www.torproject.org
Source0:
https://www.torproject.org/dist/%name-%version.tar.gz
Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
@@ -244,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Mar 6 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+- fixed urls (#800236)
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.35-1702
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
commit 05756b9d1bb4599b9a581682401d3df15a66ee0a
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jan 14 00:53:49 2012 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index cd53b22..3d4401c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -30,7 +30,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
Version: 0.2.2.35
-Release: %release_func 1701
+Release: %release_func 1702
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.35-1702
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1701
- added 'su' logrotate option (#751525)
- fixed systemd unit file; customization of TimeoutSec + LimitNOFILE is
commit ba4e330292c69918229221e3d41f3f9907e53ded
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Dec 17 12:58:47 2011 +0100
added systemd rule in the postrotate script
diff --git a/tor.logrotate b/tor.logrotate
index eaf313a..3677b2c 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -8,5 +8,6 @@
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 3e67d52..cd53b22 100644
--- a/tor.spec
+++ b/tor.spec
@@ -249,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
- fixed systemd unit file; customization of TimeoutSec + LimitNOFILE is
not possible by environment variables. Hardcode some values which can
be overridden by the systemd .include method (#755167).
+- added systemd rule in the postrotate script
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1700
- updated to 0.2.2.35 (security)
commit 632d78ca11259b82925b18d4299ee99f9a5c20d6
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Dec 17 12:56:30 2011 +0100
fixed systemd unit file
customization of TimeoutSec + LimitNOFILE is not possible by environment
variables. Hardcode some values which can be overridden by the systemd
.include method.
diff --git a/tor.spec b/tor.spec
index 61c316e..3e67d52 100644
--- a/tor.spec
+++ b/tor.spec
@@ -246,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1701
- added 'su' logrotate option (#751525)
+- fixed systemd unit file; customization of TimeoutSec + LimitNOFILE is
+ not possible by environment variables. Hardcode some values which can
+ be overridden by the systemd .include method (#755167).
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1700
- updated to 0.2.2.35 (security)
diff --git a/tor.systemd.service b/tor.systemd.service
index d8f36e8..2fabf70 100644
--- a/tor.systemd.service
+++ b/tor.systemd.service
@@ -3,17 +3,13 @@ Description = Anonymizing overlay network for TCP
After = syslog.target network.target nss-lookup.target
[Service]
-Environment = TOR_SHUTDOWN_WAIT=30
-Environment = TOR_NOFILE=4096
-EnvironmentFile = -/etc/sysconfig/tor
-
Type = simple
ExecStart = /usr/bin/tor --runasdaemon 0 --quiet
ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
-TimeoutSec = ${TOR_SHUTDOWN_WAIT}
+TimeoutSec = 30
Restart = on-failure
-LimitNOFILE = ${TOR_NOFILE}
+LimitNOFILE = 4096
[Install]
WantedBy = multi-user.target
commit a491a2da076d015ab67607ec75c65ef3e1c77a21
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Dec 17 12:51:11 2011 +0100
added su logrotate option
diff --git a/tor.logrotate b/tor.logrotate
index 545bc69..eaf313a 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -1,4 +1,5 @@
/var/log/tor/*.log {
+ su toranon toranon
delaycompress
notifempty
sharedscripts
diff --git a/tor.spec b/tor.spec
index 2b809aa..61c316e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -245,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1701
+- added 'su' logrotate option (#751525)
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1700
- updated to 0.2.2.35 (security)
commit 7e0533c7dbf56ee406bccac25abd90a045e9d8a1
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Dec 17 12:50:12 2011 +0100
bumped release
diff --git a/tor.spec b/tor.spec
index 07faf26..2b809aa 100644
--- a/tor.spec
+++ b/tor.spec
@@ -30,7 +30,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
Version: 0.2.2.35
-Release: %release_func 1700
+Release: %release_func 1701
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -244,6 +244,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1701
+
* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1700
- updated to 0.2.2.35 (security)
- CVE-2011-2778: Tor heap-based buffer overflow
commit b84c8aede4228b0ad23fcc2f18deda5e79983f27
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Dec 17 12:29:02 2011 +0100
updated to 0.2.2.35
diff --git a/.gitignore b/.gitignore
index bfffe0f..30f3bd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/tor-0.2.2.34.tar.gz
/tor-0.2.2.34.tar.gz.asc
+/tor-0.2.2.35.tar.gz
+/tor-0.2.2.35.tar.gz.asc
diff --git a/lastver b/lastver
index 5323ffc..9830555 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.2.34
+0.2.2.35
diff --git a/sources b/sources
index 354f5e5..7237a39 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0f1bbb8e086ea2aba41ff7f898fcf3bd tor-0.2.2.34.tar.gz
-ac486d8d22cf9d28ff92708a20047bc9 tor-0.2.2.34.tar.gz.asc
+dcecf699c4b929319d5f1ce0358d4835 tor-0.2.2.35.tar.gz
+73472ede84e22f8e3589baf47b0f4427 tor-0.2.2.35.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index d2a854e..07faf26 100644
--- a/tor.spec
+++ b/tor.spec
@@ -29,7 +29,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
-Version: 0.2.2.34
+Version: 0.2.2.35
Release: %release_func 1700
Group: System Environment/Daemons
License: BSD
@@ -244,6 +244,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Dec 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.35-1700
+- updated to 0.2.2.35 (security)
+- CVE-2011-2778: Tor heap-based buffer overflow
+
* Fri Oct 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.34-1700
- updated to 0.2.2.34; critical privacy/anonymity fixes
- CVE-2011-2768
commit 58e3d78681f0df0e90aabb6e8df0667386067ff5
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sat Dec 17 12:29:09 2011 +0100
added CVE numbers
diff --git a/tor.spec b/tor.spec
index a6ae57e..d2a854e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -246,6 +246,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Oct 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.34-1700
- updated to 0.2.2.34; critical privacy/anonymity fixes
+- CVE-2011-2768
+- CVE-2011-2769
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.33-1701
- Rebuilt for glibc bug#747377
commit f87a00a93fd33d0331d4571deb6bacf3ac989ef0
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Fri Oct 28 10:16:26 2011 +0200
updated to 0.2.2.34; critical privacy/anonymity fixes
diff --git a/.gitignore b/.gitignore
index eb0ef6b..bfffe0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,2 @@
-tor-0.2.1.26.tar.gz
-tor-0.2.1.26.tar.gz.asc
-/tor-0.2.1.27.tar.gz
-/tor-0.2.1.27.tar.gz.asc
-/tor-0.2.1.28.tar.gz
-/tor-0.2.1.28.tar.gz.asc
-/tor-0.2.1.30.tar.gz
-/tor-0.2.1.30.tar.gz.asc
-/tor-0.2.2.33.tar.gz
-/tor-0.2.2.33.tar.gz.asc
+/tor-0.2.2.34.tar.gz
+/tor-0.2.2.34.tar.gz.asc
diff --git a/lastver b/lastver
index f60464c..5323ffc 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.2.33
+0.2.2.34
diff --git a/sources b/sources
index 237356f..354f5e5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ea99aba49694bb982d2fccc57a70d58e tor-0.2.2.33.tar.gz
-41b5e6b654298dc513403af02fbd75f0 tor-0.2.2.33.tar.gz.asc
+0f1bbb8e086ea2aba41ff7f898fcf3bd tor-0.2.2.34.tar.gz
+ac486d8d22cf9d28ff92708a20047bc9 tor-0.2.2.34.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 7287cd2..a6ae57e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -29,8 +29,8 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
-Version: 0.2.2.33
-Release: %release_func 1701
+Version: 0.2.2.34
+Release: %release_func 1700
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Oct 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.34-1700
+- updated to 0.2.2.34; critical privacy/anonymity fixes
+
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.33-1701
- Rebuilt for glibc bug#747377
commit 1961e7a73d3e27767ef1256a7007ab802d9ffca6
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Oct 26 19:26:07 2011 -0500
- Rebuilt for glibc bug#747377
diff --git a/tor.spec b/tor.spec
index 10fa2d1..7287cd2 100644
--- a/tor.spec
+++ b/tor.spec
@@ -30,7 +30,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
Version: 0.2.2.33
-Release: %release_func 1700
+Release: %release_func 1701
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.2.33-1701
+- Rebuilt for glibc bug#747377
+
* Sun Sep 18 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.33-1700
- updated to 2.2.33
- removed -doc subpackage because shipped files are not available
commit ef887003cbf107266c4a98812cbc176bfdab0056
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Sep 18 13:13:23 2011 +0200
init: specify --runasdaemon explicitly
diff --git a/tor.systemd.service b/tor.systemd.service
index eb94a22..d8f36e8 100644
--- a/tor.systemd.service
+++ b/tor.systemd.service
@@ -8,7 +8,7 @@ Environment = TOR_NOFILE=4096
EnvironmentFile = -/etc/sysconfig/tor
Type = simple
-ExecStart = /usr/bin/tor --quiet
+ExecStart = /usr/bin/tor --runasdaemon 0 --quiet
ExecReload = /bin/kill -HUP ${MAINPID}
ExecStop = /bin/kill -INT ${MAINPID}
TimeoutSec = ${TOR_SHUTDOWN_WAIT}
diff --git a/tor.upstart b/tor.upstart
index e1a64eb..03975db 100644
--- a/tor.upstart
+++ b/tor.upstart
@@ -7,4 +7,4 @@ stop on runlevel [!345]
limit nofile 4096 4096
respawn
-exec /usr/bin/tor --quiet
+exec /usr/bin/tor --runasdaemon 0 --quiet
commit 393af75253a60ddc478e1b7a252cef5c9f04d54a
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Thu Jul 28 21:00:55 2011 +0200
systemd: start after network and nss-looup is up
diff --git a/tor.spec b/tor.spec
index 6cc271e..10fa2d1 100644
--- a/tor.spec
+++ b/tor.spec
@@ -249,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
- removed -doc subpackage because shipped files are not available
anymore
- ship torify files only in torify subpackage; not in main one
+- start systemd service after nss-lookup.target (#719476)
* Thu Jul 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1700
- added and use systemd macros
diff --git a/tor.systemd.service b/tor.systemd.service
index 9ae0c07..eb94a22 100644
--- a/tor.systemd.service
+++ b/tor.systemd.service
@@ -1,6 +1,6 @@
[Unit]
Description = Anonymizing overlay network for TCP
-After = syslog.target
+After = syslog.target network.target nss-lookup.target
[Service]
Environment = TOR_SHUTDOWN_WAIT=30
commit 5f727d83b02ff6c79c043dcb9e317b00bb728a57
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Sep 18 12:42:21 2011 +0200
ship torify files only in torify subpackage; not in main one
diff --git a/tor.spec b/tor.spec
index 5b9873e..6cc271e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
%_mandir/man1/*
%_datadir/tor
+%exclude %_mandir/man1/torify*
+%exclude %_bindir/torify
+
%files -n torify
%defattr(-,root,root,-)
@@ -245,6 +248,7 @@ rm -rf $RPM_BUILD_ROOT
- updated to 2.2.33
- removed -doc subpackage because shipped files are not available
anymore
+- ship torify files only in torify subpackage; not in main one
* Thu Jul 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1700
- added and use systemd macros
commit 5e18c18d1f703851a45bdc6ce60f793ecae6bb5d
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Sun Sep 18 12:41:07 2011 +0200
updated to 2.2.33
updated packaging of documentation to work with new version
diff --git a/.gitignore b/.gitignore
index a40a4bf..eb0ef6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ tor-0.2.1.26.tar.gz.asc
/tor-0.2.1.28.tar.gz.asc
/tor-0.2.1.30.tar.gz
/tor-0.2.1.30.tar.gz.asc
+/tor-0.2.2.33.tar.gz
+/tor-0.2.2.33.tar.gz.asc
diff --git a/lastver b/lastver
index d20c0fe..f60464c 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.30
+0.2.2.33
diff --git a/sources b/sources
index 8d33f78..237356f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6c6d61e053af5969a245d025c4cfce9d tor-0.2.1.30.tar.gz
-41ae54e36a4e3df76282f48d63b27554 tor-0.2.1.30.tar.gz.asc
+ea99aba49694bb982d2fccc57a70d58e tor-0.2.2.33.tar.gz
+41b5e6b654298dc513403af02fbd75f0 tor-0.2.2.33.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index f9205ce..5b9873e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -29,7 +29,7 @@ test "$1" = "0" || /bin/systemctl try-restart %2
>/dev/null 2>&1 || :\
Name: tor
-Version: 0.2.1.30
+Version: 0.2.2.33
Release: %release_func 1700
Group: System Environment/Daemons
License: BSD
@@ -48,9 +48,10 @@ Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
BuildRoot: %_tmppath/%name-%version-%release-root
-BuildRequires: libevent-devel openssl-devel transfig ghostscript
-BuildRequires: /usr/bin/latex
-BuildRequires: texlive-texmf-fonts
+# tor-design.pdf is not shipped anymore with tor
+Obsoletes: tor-doc < 0.2.2
+
+BuildRequires: libevent-devel openssl-devel
BuildRequires: fedora-usermgmt-devel
Provides: user(%username) = %uid
Provides: group(%username) = %uid
@@ -70,13 +71,6 @@ Conflicts: %name-core > %version-%release
%{?noarch}
-%package doc
-Summary: Documentation for tor
-Group: System Environment/Daemons
-Requires: %name-core = %version-%release
-%{?noarch}
-
-
%package systemd
Summary: Systemd initscripts for tor
Group: System Environment/Daemons
@@ -137,12 +131,6 @@ Tor is a connection-based low-latency anonymous communication
system.
This package contains the "torify" wrapper script.
-%description doc
-Tor is a connection-based low-latency anonymous communication system.
-
-This package provides documentation for "tor".
-
-
%description systemd
Tor is a connection-based low-latency anonymous communication system.
@@ -171,11 +159,10 @@ EOF
export LDFLAGS='-Wl,--as-needed'
%configure
make %{?_smp_mflags}
-make -C doc/design-paper tor-design.pdf
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT _doc _doc-torify
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
@@ -187,6 +174,10 @@ 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
+mv $RPM_BUILD_ROOT%_datadir/doc/tor _doc
+mkdir _doc-torify
+mv _doc/torify.html _doc-torify
+
%pre core
%__fe_groupadd %uid -r %username &>/dev/null || :
@@ -215,16 +206,11 @@ rm -rf $RPM_BUILD_ROOT
%files
-%files doc
-%defattr(-,root,root,-)
-%doc doc/HACKING
-%doc doc/design-paper/tor-design.pdf
-
-
%files core
%defattr(-,root,root,-)
-%doc AUTHORS LICENSE README ChangeLog
+%doc LICENSE README ChangeLog
%doc ReleaseNotes
+%doc _doc/*
%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%username,%username) %dir %homedir
@@ -237,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n torify
%defattr(-,root,root,-)
+%doc _doc-torify/*
%_bindir/torify
%_mandir/man1/torify*
%dir %_sysconfdir/tor
@@ -254,6 +241,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Sep 18 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.2.33-1700
+- updated to 2.2.33
+- removed -doc subpackage because shipped files are not available
+ anymore
+
* Thu Jul 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1700
- added and use systemd macros
commit ef9e56243766d599600d7130ed09728a12972be0
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Thu Jul 28 20:35:52 2011 +0200
added and use systemd macros
diff --git a/tor.spec b/tor.spec
index 2579966..f9205ce 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,6 +11,22 @@
%{!?_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\
+test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null
2>&1 || :\
+%preun %1\
+test "$1" != "0" || /bin/systemctl --no-reload disable %2
>/dev/null 2>&1 || :\
+test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1
|| :\
+%postun %1\
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :\
+test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null
2>&1 || :\
+%nil}
+
Name: tor
Version: 0.2.1.30
@@ -67,9 +83,7 @@ Group: System Environment/Daemons
Source10: tor.systemd.service
Provides: init(%name) = systemd
Requires: %name-core = %version-%release
-Requires(post): /bin/systemctl
-Requires(preun): /bin/systemctl
-Requires(postun): /bin/systemctl
+%{?systemd_reqs}
# TODO: remove me in F17
Obsoletes: %name-lsb < %version-%release
@@ -184,16 +198,7 @@ install -D -p -m 0644 %SOURCE20
$RPM_BUILD_ROOT%_sysconfdir/init/tor.conf
%__fe_groupdel %username &>/dev/null || :
-%post systemd
-test "$1" -ne 1 || /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
-%preun systemd
-test "$1" -ne 1 || /bin/systemctl disable %name.service > /dev/null
2>&1 || :
-test "$1" -ne 1 || /bin/systemctl stop %name.service > /dev/null
2>&1 || :
-
-%postun systemd
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-test "$1" -eq 1 || /bin/systemctl try-restart %name.service >/dev/null
2>&1 || :
+%systemd_install systemd %name.service
%postun upstart
@@ -249,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1700
+- added and use systemd macros
+
* Thu Mar 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1601
- made EnvironmentFile in systemd definition optional
- systemd: added Requires: for core package; made it noarch
commit 881fe5c6cf5e735a6c61d4824bcb4bbbaa9b6efb
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Thu Jul 28 20:30:48 2011 +0200
fedora 17 branch
diff --git a/tor.spec b/tor.spec
index 8643fe7..2579966 100644
--- a/tor.spec
+++ b/tor.spec
@@ -14,7 +14,7 @@
Name: tor
Version: 0.2.1.30
-Release: %release_func 1601
+Release: %release_func 1700
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
commit 16063192ac28e2e55a3192dd6173f4ea4b2155bb
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Thu Mar 17 11:47:28 2011 +0100
systemd: added Requires: for core package; made it noarch
diff --git a/tor.spec b/tor.spec
index bc5096d..8643fe7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -66,6 +66,7 @@ Summary: Systemd initscripts for tor
Group: System Environment/Daemons
Source10: tor.systemd.service
Provides: init(%name) = systemd
+Requires: %name-core = %version-%release
Requires(post): /bin/systemctl
Requires(preun): /bin/systemctl
Requires(postun): /bin/systemctl
@@ -75,6 +76,7 @@ Obsoletes: %name-lsb < %version-%release
Provides: %name-lsb = %version-%release
Obsoletes: %name-sysv < %version-%release
Provides: %name-sysv = %version-%release
+%{?noarch}
%package upstart
@@ -249,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Mar 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1601
- made EnvironmentFile in systemd definition optional
+- systemd: added Requires: for core package; made it noarch
* Mon Feb 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1600
- updated to 0.2.1.30
commit 4ac537c43f4a771baf2f859b207435658831c939
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Thu Mar 17 11:41:28 2011 +0100
incremented release
diff --git a/tor.spec b/tor.spec
index e3b7a1b..bc5096d 100644
--- a/tor.spec
+++ b/tor.spec
@@ -14,7 +14,7 @@
Name: tor
Version: 0.2.1.30
-Release: %release_func 1600
+Release: %release_func 1601
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -247,7 +247,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Mar 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+* Thu Mar 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1601
- made EnvironmentFile in systemd definition optional
* Mon Feb 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1600
commit 5966c833450112dc9c6e10b18fee17648a7291e7
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Thu Mar 17 11:40:45 2011 +0100
made EnvironmentFile in systemd definition optional
diff --git a/tor.spec b/tor.spec
index d074fbd..e3b7a1b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -247,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+- made EnvironmentFile in systemd definition optional
+
* Mon Feb 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1600
- updated to 0.2.1.30
- added 'torify' script (#669684)
diff --git a/tor.systemd.service b/tor.systemd.service
index 7b587ee..9ae0c07 100644
--- a/tor.systemd.service
+++ b/tor.systemd.service
@@ -5,7 +5,7 @@ After = syslog.target
[Service]
Environment = TOR_SHUTDOWN_WAIT=30
Environment = TOR_NOFILE=4096
-EnvironmentFile = /etc/sysconfig/tor
+EnvironmentFile = -/etc/sysconfig/tor
Type = simple
ExecStart = /usr/bin/tor --quiet
commit 558597ebde8015c082e2607996b1bce242fb77c4
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Mon Feb 28 15:13:27 2011 +0100
added torify script
diff --git a/tor.spec b/tor.spec
index f69387b..d074fbd 100644
--- a/tor.spec
+++ b/tor.spec
@@ -44,6 +44,16 @@ Requires(postun): /etc/logrotate.d
%{?FE_USERADD_REQ}
+%package -n torify
+Summary: The torify wrapper script
+Group: System Environment/Daemons
+Requires: tsocks
+# Prevent version mix
+Conflicts: %name-core < %version-%release
+Conflicts: %name-core > %version-%release
+%{?noarch}
+
+
%package doc
Summary: Documentation for tor
Group: System Environment/Daemons
@@ -105,6 +115,12 @@ This package provides the "tor" program, which serves as
both a client
and a relay node.
+%description -n torify
+Tor is a connection-based low-latency anonymous communication system.
+
+This package contains the "torify" wrapper script.
+
+
%description doc
Tor is a connection-based low-latency anonymous communication system.
@@ -211,9 +227,13 @@ rm -rf $RPM_BUILD_ROOT
%_mandir/man1/*
%_datadir/tor
-%exclude %_bindir/torify
-%exclude %_mandir/man1/torify*
-%exclude %_sysconfdir/tor/tor-tsocks.conf
+
+%files -n torify
+%defattr(-,root,root,-)
+%_bindir/torify
+%_mandir/man1/torify*
+%dir %_sysconfdir/tor
+%config(noreplace) %_sysconfdir/tor/tor-tsocks.conf
%files systemd
@@ -229,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Feb 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1600
- updated to 0.2.1.30
+- added 'torify' script (#669684)
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.1.29-1501
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
commit daadcbf49de0f4d258283934f43bad9e38e21394
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Mon Feb 28 15:12:57 2011 +0100
updated to 0.2.1.30
diff --git a/.gitignore b/.gitignore
index cda6f51..a40a4bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ tor-0.2.1.26.tar.gz.asc
/tor-0.2.1.27.tar.gz.asc
/tor-0.2.1.28.tar.gz
/tor-0.2.1.28.tar.gz.asc
+/tor-0.2.1.30.tar.gz
+/tor-0.2.1.30.tar.gz.asc
diff --git a/lastver b/lastver
index 1724964..d20c0fe 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.29
+0.2.1.30
diff --git a/sources b/sources
index cf75b28..8d33f78 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1cd4feea84f2b066717b500d090bcf65 tor-0.2.1.29.tar.gz
-5b56d553f915c7621b6eaad60be0d38b tor-0.2.1.29.tar.gz.asc
+6c6d61e053af5969a245d025c4cfce9d tor-0.2.1.30.tar.gz
+41ae54e36a4e3df76282f48d63b27554 tor-0.2.1.30.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index f8cf847..f69387b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,8 +13,8 @@
%{!?release_func:%global release_func()
%%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
Name: tor
-Version: 0.2.1.29
-Release: %release_func 1501
+Version: 0.2.1.30
+Release: %release_func 1600
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -195,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root,-)
%doc doc/HACKING
-%doc doc/spec/*.txt
%doc doc/design-paper/tor-design.pdf
@@ -228,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 28 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.30-1600
+- updated to 0.2.1.30
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.1.29-1501
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
commit 97c0561156ca52a4fa462e2e6b8aef51d7b69db6
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 9 13:58:53 2011 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index 6d5bada..f8cf847 100644
--- a/tor.spec
+++ b/tor.spec
@@ -14,7 +14,7 @@
Name: tor
Version: 0.2.1.29
-Release: %release_func 1500
+Release: %release_func 1501
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -228,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.1.29-1501
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Mon Jan 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.29-1500
- updated to 0.2.1.29 (SECURITY)
- CVE-2011-0427: heap overflow bug, potential remote code execution
commit be547a2276a3cd19980424211ae6ac6511718f5f
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Mon Jan 17 13:22:35 2011 +0100
updated to 0.2.1.29
diff --git a/lastver b/lastver
index 1f0bcc3..1724964 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.26
+0.2.1.29
diff --git a/sources b/sources
index 2a566d8..cf75b28 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-11e8384414623b50fe50ba7da85893db tor-0.2.1.28.tar.gz
-1f6d712752056c298d36dac5a1ea1196 tor-0.2.1.28.tar.gz.asc
+1cd4feea84f2b066717b500d090bcf65 tor-0.2.1.29.tar.gz
+5b56d553f915c7621b6eaad60be0d38b tor-0.2.1.29.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 7405b24..6d5bada 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,14 +13,14 @@
%{!?release_func:%global release_func()
%%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
Name: tor
-Version: 0.2.1.28
-Release: %release_func 1502
+Version: 0.2.1.29
+Release: %release_func 1500
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
URL:
http://tor.eff.org
Requires: %name-core = %version-%release
-Requires: %name-lsb = %version-%release
+Requires: %name-systemd = %version-%release
%package core
@@ -228,6 +228,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jan 17 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.29-1500
+- updated to 0.2.1.29 (SECURITY)
+- CVE-2011-0427: heap overflow bug, potential remote code execution
+
* Tue Dec 21 2010 Luke Macken <lmacken(a)redhat.com> - 0.2.1.28-1502
- updated to 0.2.1.28 (SECURITY: fixes a remotely exploitable heap overflow bug)
diff --git a/verinfo b/verinfo
index b84a6ba..6614a11 100644
--- a/verinfo
+++ b/verinfo
@@ -1,2 +1,2 @@
-http://tor.eff.org/dist/
+http://www.torproject.org/dist/
tor-([^-]*?)\.tar\.
commit 5e465b13a9b3767850bf6bf2dfcb4b9743127367
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Dec 21 12:57:56 2010 -0500
Add the signature file
diff --git a/.gitignore b/.gitignore
index 40d64ca..cda6f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ tor-0.2.1.26.tar.gz.asc
/tor-0.2.1.27.tar.gz
/tor-0.2.1.27.tar.gz.asc
/tor-0.2.1.28.tar.gz
+/tor-0.2.1.28.tar.gz.asc
diff --git a/sources b/sources
index 09e73c8..2a566d8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
11e8384414623b50fe50ba7da85893db tor-0.2.1.28.tar.gz
+1f6d712752056c298d36dac5a1ea1196 tor-0.2.1.28.tar.gz.asc
commit 5fe7ea914a2e86a5d6d64ddfcdbb9caf2082bf83
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Dec 21 12:53:04 2010 -0500
Fix the release numbering
diff --git a/tor.spec b/tor.spec
index 026472b..7405b24 100644
--- a/tor.spec
+++ b/tor.spec
@@ -14,7 +14,7 @@
Name: tor
Version: 0.2.1.28
-Release: %release_func 1600
+Release: %release_func 1502
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -228,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Dec 21 2010 Luke Macken <lmacken(a)redhat.com> - 0.2.1.28-1600
+* Tue Dec 21 2010 Luke Macken <lmacken(a)redhat.com> - 0.2.1.28-1502
- updated to 0.2.1.28 (SECURITY: fixes a remotely exploitable heap overflow bug)
* Tue Dec 7 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.27-1501
commit 0697cae912768abc19c6a758b53bfc04f6c3d64d
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Dec 21 12:42:27 2010 -0500
updated to 0.2.1.28 (SECURITY: fixes a remotely exploitable heap overflow bug)
diff --git a/.gitignore b/.gitignore
index eb627f5..40d64ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ tor-0.2.1.26.tar.gz
tor-0.2.1.26.tar.gz.asc
/tor-0.2.1.27.tar.gz
/tor-0.2.1.27.tar.gz.asc
+/tor-0.2.1.28.tar.gz
diff --git a/sources b/sources
index 6eba899..09e73c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-1719642b3f25a23c3b3843ee99be18fb tor-0.2.1.27.tar.gz
-4608cd53ee2efed692252fced25c5b6e tor-0.2.1.27.tar.gz.asc
+11e8384414623b50fe50ba7da85893db tor-0.2.1.28.tar.gz
diff --git a/tor.spec b/tor.spec
index 7682793..026472b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,8 +13,8 @@
%{!?release_func:%global release_func()
%%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
Name: tor
-Version: 0.2.1.27
-Release: %release_func 1501
+Version: 0.2.1.28
+Release: %release_func 1600
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -228,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 21 2010 Luke Macken <lmacken(a)redhat.com> - 0.2.1.28-1600
+- updated to 0.2.1.28 (SECURITY: fixes a remotely exploitable heap overflow bug)
+
* Tue Dec 7 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.27-1501
- replaced lsb and sysv init stuff with systemd init script
commit b9ae6134c7c42100721e3b5d908e0b2d8334518c
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Tue Dec 7 20:57:11 2010 +0100
replaced lsb and sysv init stuff with systemd init script
diff --git a/tor.lsb b/tor.lsb
deleted file mode 100755
index c0962c8..0000000
--- a/tor.lsb
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-#
-# Init file for tor - An Anonymizing overlay network for TCP
-#
-# chkconfig: - 99 01
-# description: An Anonymizing overlay network for TCP
-#
-### BEGIN INIT INFO
-# Default-Start: 4
-# Default-Stop: 0 1 2 6
-# Short-Description: An Anonymizing overlay network for TCP
-# Description: An Anonymizing overlay network for TCP
-# Required-Start: $network
-# Should-Start: $syslog $time $remote_fs
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-f=/etc/sysconfig/tor
-
-TOR_SHUTDOWN_WAIT=30
-TOR_OPTS=--quiet
-TOR_PIDFILE=/var/run/tor/tor.pid
-TOR_USER=toranon
-test ! -r "$f" || . "$f"
-
-prog="/usr/bin/tor"
-
-lockfile=/var/lock/subsys/tor
-pidfile=$TOR_PIDFILE
-
-start() {
- echo -n $"Starting $prog: "
-
- start_daemon $prog --PIDFile "$pidfile" --RunAsDaemon 1 $TOR_OPTS
- rc=$?
- if test $rc -eq 0 && touch $lockfile; then
- log_success_msg
- else
- log_failure_msg
- fi
-
- return $rc
-}
-
-stop() {
- echo -n $"Stopping $prog: "
- if ! killproc -p "$pidfile" $prog -INT; then
- log_failure_msg
- else
- cnt=$TOR_SHUTDOWN_WAIT
- while let '--cnt > 0' && killproc -p "$pidfile" $prog -0;
do
- sleep 1
- done
-
- if test $cnt -ne 0 || killproc -p "$pidfile" $prog; then
- log_success_msg
- else
- log_failure_msg
- fi
- fi
-
- rm -f $pidfile $lockfile
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- echo -n $"Reloading $prog: "
- killproc -p "$pidfile" $prog -HUP && log_success_msg ||
log_failure_msg
-}
-
-status() {
- pidofproc -p "$pidfile" "$prog" >/dev/null 2>&1
- rc=$?
- case $rc in
- (0) echo $"$prog is running";;
- (1) echo $"program is dead and /var/run pid file exists";;
- (2) echo $"program is dead and /var/lock lock file exists";;
- (3) echo $"program is not running";;
- (4) echo $"program or service status is unknown";;
- (*) echo $"status $rc of $prog";;
- esac
-
- return $rc
-}
-
-case $1 in
- (start|stop|reload|status|restart)
- $1
- ;;
- (force-reload)
- restart
- ;;
- (condrestart|try-restart)
- if [ -f $lockfile ]; then
- restart
- fi
- ;;
- (*)
- echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
- exit 3
-esac
diff --git a/tor.spec b/tor.spec
index 292d8ed..7682793 100644
--- a/tor.spec
+++ b/tor.spec
@@ -8,12 +8,13 @@
%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}}
Name: tor
Version: 0.2.1.27
-Release: %release_func 1500
+Release: %release_func 1501
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -50,36 +51,20 @@ Requires: %name-core = %version-%release
%{?noarch}
-%package lsb
-Summary: LSB initscripts for tor
+%package systemd
+Summary: Systemd initscripts for tor
Group: System Environment/Daemons
-Provides: init(%name) = lsb
-Conflicts: init(%name) = sysv
-Requires: %name-core = %version-%release
-Source10: tor.lsb
-Source11: tor.tmpfiles
-Requires(pre): %name-core
-Requires(postun): lsb-core-noarch %name-core
-Requires(post): lsb-core-noarch
-Requires(preun): lsb-core-noarch
-%{?noarch}
-
+Source10: tor.systemd.service
+Provides: init(%name) = systemd
+Requires(post): /bin/systemctl
+Requires(preun): /bin/systemctl
+Requires(postun): /bin/systemctl
-%package sysv
-Summary: Tor initscripts for Red Hat's proprietary initsystem
-Group: System Environment/Daemons
-Provides: init(%name) = sysv
-Conflicts: init(%name) = lsb
-Requires: %name-core = %version-%release
-Source30: tor.sysv
-Requires(pre): %name-core
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-# This is for /sbin/service
-Requires(postun): initscripts
-%{?noarch}
+# TODO: remove me in F17
+Obsoletes: %name-lsb < %version-%release
+Provides: %name-lsb = %version-%release
+Obsoletes: %name-sysv < %version-%release
+Provides: %name-sysv = %version-%release
%package upstart
@@ -126,26 +111,20 @@ Tor is a connection-based low-latency anonymous communication
system.
This package provides documentation for "tor".
-%description lsb
+%description systemd
Tor is a connection-based low-latency anonymous communication system.
-This package contains the LSB compliant initscripts to start the "tor"
+This package contains the systemd initscripts to start the "tor"
daemon.
-%description sysv
-Tor is a connection-based low-latency anonymous communication system.
-
-This package contains the initscripts to start the "tor" daemon with
-Red Hat's proprietary initsystem.
-
-
%description upstart
Tor is a connection-based low-latency anonymous communication system.
This package contains the upstart compliant initscripts to start the "tor"
daemon.
+
%prep
%setup -q
@@ -171,8 +150,7 @@ mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
-install -D -p -m 0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/%name
-install -D -p -m 0755 %SOURCE11 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf
+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
@@ -188,31 +166,16 @@ install -D -p -m 0644 %SOURCE20
$RPM_BUILD_ROOT%_sysconfdir/init/tor.conf
%__fe_groupdel %username &>/dev/null || :
-%post lsb
-/usr/lib/lsb/install_initd %_initrddir/tor
-
-%preun lsb
-test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
-test "$1" != 0 || /usr/lib/lsb/remove_initd %_initrddir/tor
-
-%postun lsb
-test "$1" = 0 || env -i %_initrddir/tor try-restart &>/dev/null
+%post systemd
+test "$1" -ne 1 || /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%preun systemd
+test "$1" -ne 1 || /bin/systemctl disable %name.service > /dev/null
2>&1 || :
+test "$1" -ne 1 || /bin/systemctl stop %name.service > /dev/null
2>&1 || :
-%post sysv
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add <script>
-
-%preun sysv
-if [ $1 = 0 ] ; then
- /sbin/service <script> stop >/dev/null 2>&1
- /sbin/chkconfig --del <script>
-fi
-
-%postun sysv
-if [ "$1" -ge "1" ] ; then
- /sbin/service <script> condrestart >/dev/null 2>&1 || :
-fi
+%postun systemd
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+test "$1" -eq 1 || /bin/systemctl try-restart %name.service >/dev/null
2>&1 || :
%postun upstart
@@ -254,11 +217,9 @@ rm -rf $RPM_BUILD_ROOT
%exclude %_sysconfdir/tor/tor-tsocks.conf
-%files lsb
+%files systemd
%defattr(-,root,root,-)
-%config %_initrddir/*
-%config %_sysconfdir/tmpfiles.d/%name.conf
-%ghost %attr(0755,%username,%username) %dir %_var/run/%name
+%_unitdir/%name.service
%files upstart
@@ -267,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 7 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.27-1501
+- replaced lsb and sysv init stuff with systemd init script
+
* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.27-1500
- updated to 0.2.1.27
- added tmpfiles.d file to create %%_var/run/%%name directory in -lsb
diff --git a/tor.systemd.service b/tor.systemd.service
new file mode 100644
index 0000000..7b587ee
--- /dev/null
+++ b/tor.systemd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description = Anonymizing overlay network for TCP
+After = syslog.target
+
+[Service]
+Environment = TOR_SHUTDOWN_WAIT=30
+Environment = TOR_NOFILE=4096
+EnvironmentFile = /etc/sysconfig/tor
+
+Type = simple
+ExecStart = /usr/bin/tor --quiet
+ExecReload = /bin/kill -HUP ${MAINPID}
+ExecStop = /bin/kill -INT ${MAINPID}
+TimeoutSec = ${TOR_SHUTDOWN_WAIT}
+Restart = on-failure
+LimitNOFILE = ${TOR_NOFILE}
+
+[Install]
+WantedBy = multi-user.target
diff --git a/tor.sysv b/tor.sysv
deleted file mode 100755
index c100aef..0000000
--- a/tor.sysv
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-#
-# Init file for tor - An Anonymizing overlay network for TCP
-#
-# chkconfig: - 99 01
-# description: An Anonymizing overlay network for TCP
-#
-
-. /etc/rc.d/init.d/functions
-
-f=/etc/sysconfig/tor
-
-TOR_SHUTDOWN_WAIT=30
-TOR_OPTS=--quiet
-TOR_PIDFILE=/var/run/tor/tor.pid
-TOR_USER=toranon
-test ! -r "$f" || . "$f"
-
-prog="/usr/bin/tor"
-
-lockfile=/var/lock/subsys/tor
-pidfile=$TOR_PIDFILE
-
-start() {
- echo -n $"Starting $prog: "
- daemon --pidfile="$pidfile" $prog --PIDFile "$pidfile"
--RunAsDaemon 1 $TOR_OPTS || failure
- rc=$?
- test $rc -ne 0 || touch $lockfile
- return $rc
-}
-
-stop() {
- echo -n $"Stopping $prog: "
- if ! killproc -p "$pidfile" $prog -INT; then
- failure
- else
- cnt=$TOR_SHUTDOWN_WAIT
- while let '--cnt > 0' && killproc -p "$pidfile" $prog -0;
do
- sleep 1
- done
-
- if test $cnt -ne 0 || killproc -p "$pidfile" $prog; then
- success
- else
- failure
- fi
- fi
-
- rm -f $pidfile $lockfile
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- echo -n $"Reloading $prog: "
- killproc -p "$pidfile" $prog -HUP && success || failure || return
7
-}
-
-_status() {
- status -p $pidfile $prog
-}
-
-case $1 in
- (start|stop|reload|restart)
- $1
- ;;
- (force-reload)
- restart
- ;;
- (status)
- _status
- ;;
- (condrestart|try-restart)
- if _status &>/dev/null; then
- restart
- fi
- ;;
- (-*)
- exit 2
- (*)
- echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
>&2
- exit 3
-esac
diff --git a/tor.tmpfiles b/tor.tmpfiles
deleted file mode 100644
index 7a7a317..0000000
--- a/tor.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/tor 0755 toranon toranon
commit fe953a1004cf9279434abbc65a534f35d0f905f2
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Fri Nov 26 21:57:35 2010 +0100
work around broken chkconfig by adding dummy Default-Start: in -lsb
diff --git a/tor.lsb b/tor.lsb
index 48fb011..c0962c8 100755
--- a/tor.lsb
+++ b/tor.lsb
@@ -6,6 +6,7 @@
# description: An Anonymizing overlay network for TCP
#
### BEGIN INIT INFO
+# Default-Start: 4
# Default-Stop: 0 1 2 6
# Short-Description: An Anonymizing overlay network for TCP
# Description: An Anonymizing overlay network for TCP
diff --git a/tor.spec b/tor.spec
index 08d985d..292d8ed 100644
--- a/tor.spec
+++ b/tor.spec
@@ -270,6 +270,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.27-1500
- updated to 0.2.1.27
- added tmpfiles.d file to create %%_var/run/%%name directory in -lsb
+- work around broken chkconfig by adding dummy Default-Start: in -lsb
* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.26-1500
- fixed 'limit' statement in upstart script
commit 738b1d09169afeda5157396b216e7d7988b16761
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Fri Nov 26 21:56:21 2010 +0100
improved 'install' operations a little bit
diff --git a/tor.spec b/tor.spec
index 256e68e..08d985d 100644
--- a/tor.spec
+++ b/tor.spec
@@ -169,13 +169,13 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
-mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name}
+mkdir -p $RPM_BUILD_ROOT{%logdir,%homedir,%_var/run/%name}
-install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
+install -D -p -m 0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/%name
install -D -p -m 0755 %SOURCE11 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf
-install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
+install -D -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
-install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor.conf
+install -D -p -m 0644 %SOURCE20 $RPM_BUILD_ROOT%_sysconfdir/init/tor.conf
%pre core
commit 594b82e85c59b684b79b458ed47a4ba61380d262
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Fri Nov 26 21:42:17 2010 +0100
added tmpfiles.d file to create %_var/run/%name directory in -lsb
diff --git a/tor.spec b/tor.spec
index 1bc8cb5..256e68e 100644
--- a/tor.spec
+++ b/tor.spec
@@ -57,6 +57,7 @@ Provides: init(%name) = lsb
Conflicts: init(%name) = sysv
Requires: %name-core = %version-%release
Source10: tor.lsb
+Source11: tor.tmpfiles
Requires(pre): %name-core
Requires(postun): lsb-core-noarch %name-core
Requires(post): lsb-core-noarch
@@ -171,6 +172,7 @@ mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name}
install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
+install -D -p -m 0755 %SOURCE11 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf
install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor.conf
@@ -253,9 +255,10 @@ rm -rf $RPM_BUILD_ROOT
%files lsb
- %defattr(-,root,root,-)
- %config %_initrddir/*
- %attr(0755,%username,%username) %dir %_var/run/%name
+%defattr(-,root,root,-)
+%config %_initrddir/*
+%config %_sysconfdir/tmpfiles.d/%name.conf
+%ghost %attr(0755,%username,%username) %dir %_var/run/%name
%files upstart
@@ -266,6 +269,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.27-1500
- updated to 0.2.1.27
+- added tmpfiles.d file to create %%_var/run/%%name directory in -lsb
* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.26-1500
- fixed 'limit' statement in upstart script
diff --git a/tor.tmpfiles b/tor.tmpfiles
new file mode 100644
index 0000000..7a7a317
--- /dev/null
+++ b/tor.tmpfiles
@@ -0,0 +1 @@
+d /var/run/tor 0755 toranon toranon
commit 02e6842fc9a5b5d288886e16edb3f662b11e0379
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Fri Nov 26 21:34:52 2010 +0100
updated to 0.2.1.27
diff --git a/tor.spec b/tor.spec
index 8f05fc3..1bc8cb5 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,8 +12,8 @@
%{!?release_func:%global release_func()
%%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
Name: tor
-Version: 0.2.1.26
-Release: %release_func 1400
+Version: 0.2.1.27
+Release: %release_func 1500
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -232,17 +232,6 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/HACKING
%doc doc/spec/*.txt
%doc doc/design-paper/tor-design.pdf
-%doc %lang(de) doc/website/*.de
-%doc %lang(en) doc/website/*.en
-%doc %lang(es) doc/website/*.es
-%doc %lang(fr) doc/website/*.fr
-%doc %lang(it) doc/website/*.it
-%doc %lang(ko) doc/website/*.ko
-%doc %lang(pl) doc/website/*.pl
-%doc %lang(pt) doc/website/*.pt
-%doc %lang(ru) doc/website/*.ru
-%doc %lang(zh-cn) doc/website/*.zh-cn
-%doc doc/website/*.css
%files core
@@ -275,6 +264,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.27-1500
+- updated to 0.2.1.27
+
* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.26-1500
- fixed 'limit' statement in upstart script
commit 571c1e1c92fb25e701de1e05f1c2b2da218e02c6
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Fri Nov 26 21:34:04 2010 +0100
fixed limit statement in upstart script
diff --git a/.gitignore b/.gitignore
index 0b55ff0..eb627f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
tor-0.2.1.26.tar.gz
tor-0.2.1.26.tar.gz.asc
+/tor-0.2.1.27.tar.gz
+/tor-0.2.1.27.tar.gz.asc
diff --git a/sources b/sources
index 919c68f..6eba899 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f7b30a144e1da41aa43f496bd47ffba7 tor-0.2.1.26.tar.gz
-c41c1bf61cb883303fb4cb8f7b477fae tor-0.2.1.26.tar.gz.asc
+1719642b3f25a23c3b3843ee99be18fb tor-0.2.1.27.tar.gz
+4608cd53ee2efed692252fced25c5b6e tor-0.2.1.27.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 0f5eff5..8f05fc3 100644
--- a/tor.spec
+++ b/tor.spec
@@ -275,6 +275,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Nov 26 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.26-1500
+- fixed 'limit' statement in upstart script
+
* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.26-1400
- updated to 0.2.1.26
- log to syslog as request by upstream (#532373#19)
diff --git a/tor.upstart b/tor.upstart
index 91ab317..e1a64eb 100644
--- a/tor.upstart
+++ b/tor.upstart
@@ -4,7 +4,7 @@
stop on runlevel [!345]
-limit nofile 4096
+limit nofile 4096 4096
respawn
exec /usr/bin/tor --quiet
commit 5b17160415c8cdfb8cabcb81ae62858cbf4badf1
Author: Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
Date: Mon Aug 16 00:07:34 2010 +0200
readded makefile
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)
commit 28adef3b8a0a6757d410c4c5693eea8b59828b04
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Thu Jul 29 14:21:26 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 0b55ff0..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-tor-0.2.1.26.tar.gz
-tor-0.2.1.26.tar.gz.asc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0b55ff0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tor-0.2.1.26.tar.gz
+tor-0.2.1.26.tar.gz.asc
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8b1e6f0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: tor
-NAME := tor
-SPECFILE = $(firstword $(wildcard *.spec))
-CVS ?= cvs
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { $(CVS) -Q -d $$(cat CVS/Root) checkout common &&
echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out
how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit a6e6e58151e596abd0f5ad25720381d3df2d2243
Author: ensc <ensc(a)fedoraproject.org>
Date: Tue Jun 1 17:32:42 2010 +0000
- updated to 0.2.1.26
- log to syslog as request by upstream (#532373#19)
- removed workaround to install lsb initscript because parts of the
underlying problem have been fixed in redhat-lsb and the remaining ones
were solved by previous commit
- removed $local_fs dependency in -lsb initscript to workaround buggy
redhat-lsb; $remote_fs should imply it and has been moved to
Should-Start:
diff --git a/.cvsignore b/.cvsignore
index 58aad7d..0b55ff0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.1.25.tar.gz
-tor-0.2.1.25.tar.gz.asc
+tor-0.2.1.26.tar.gz
+tor-0.2.1.26.tar.gz.asc
diff --git a/lastver b/lastver
index 51292f8..1f0bcc3 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.25
+0.2.1.26
diff --git a/sources b/sources
index aeb28c5..919c68f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f58540b3c5835ac4f5de1b02bbddc703 tor-0.2.1.25.tar.gz
-a5b9a9f51d54fade1f84a1d7d9c96403 tor-0.2.1.25.tar.gz.asc
+f7b30a144e1da41aa43f496bd47ffba7 tor-0.2.1.26.tar.gz
+c41c1bf61cb883303fb4cb8f7b477fae tor-0.2.1.26.tar.gz.asc
diff --git a/tor.lsb b/tor.lsb
index d364a10..48fb011 100755
--- a/tor.lsb
+++ b/tor.lsb
@@ -9,8 +9,8 @@
# Default-Stop: 0 1 2 6
# Short-Description: An Anonymizing overlay network for TCP
# Description: An Anonymizing overlay network for TCP
-# Required-Start: $network $remote_fs $local_fs
-# Should-Start: $syslog $time
+# Required-Start: $network
+# Should-Start: $syslog $time $remote_fs
### END INIT INFO
. /lib/lsb/init-functions
diff --git a/tor.spec b/tor.spec
index d9786df..0f5eff5 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,7 +12,7 @@
%{!?release_func:%global release_func()
%%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
Name: tor
-Version: 0.2.1.25
+Version: 0.2.1.26
Release: %release_func 1400
Group: System Environment/Daemons
License: BSD
@@ -150,6 +150,7 @@ daemon.
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
@@ -186,14 +187,7 @@ install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor.conf
%post lsb
-/usr/lib/lsb/install_initd %_initrddir/tor || {
- cat <<EOF >&2
-oouch... redhat-lsb is still broken. See the report
-https://bugzilla.redhat.com/show_bug.cgi?id=522053
-for details.
-EOF
- /sbin/chkconfig --add tor
-}
+/usr/lib/lsb/install_initd %_initrddir/tor
%preun lsb
test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
@@ -281,6 +275,16 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.26-1400
+- updated to 0.2.1.26
+- log to syslog as request by upstream (#532373#19)
+- removed workaround to install lsb initscript because parts of the
+ underlying problem have been fixed in redhat-lsb and the remaining
+ ones were solved by previous commit
+- removed $local_fs dependency in -lsb initscript to workaround
+ buggy redhat-lsb; $remote_fs should imply it and has been moved to
+ Should-Start:
+
* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
- created -doc subpackage and moved most (all) files from main into it
diff --git a/tor.sysv b/tor.sysv
index 9b61eed..c100aef 100755
--- a/tor.sysv
+++ b/tor.sysv
@@ -78,7 +78,9 @@ case $1 in
restart
fi
;;
+ (-*)
+ exit 2
(*)
- echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
+ echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
>&2
exit 3
esac
commit ca4ac6581d5366337f3815325370c1000b3cc927
Author: ensc <ensc(a)fedoraproject.org>
Date: Tue Jun 1 17:00:51 2010 +0000
created -doc subpackage and moved most (all) files from main into it
diff --git a/tor.spec b/tor.spec
index 06d17f7..d9786df 100644
--- a/tor.spec
+++ b/tor.spec
@@ -43,6 +43,13 @@ Requires(postun): /etc/logrotate.d
%{?FE_USERADD_REQ}
+%package doc
+Summary: Documentation for tor
+Group: System Environment/Daemons
+Requires: %name-core = %version-%release
+%{?noarch}
+
+
%package lsb
Summary: LSB initscripts for tor
Group: System Environment/Daemons
@@ -69,6 +76,8 @@ Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
+# This is for /sbin/service
+Requires(postun): initscripts
%{?noarch}
@@ -110,6 +119,12 @@ This package provides the "tor" program, which serves as
both a client
and a relay node.
+%description doc
+Tor is a connection-based low-latency anonymous communication system.
+
+This package provides documentation for "tor".
+
+
%description lsb
Tor is a connection-based low-latency anonymous communication system.
@@ -198,6 +213,12 @@ if [ $1 = 0 ] ; then
/sbin/chkconfig --del <script>
fi
+%postun sysv
+if [ "$1" -ge "1" ] ; then
+ /sbin/service <script> condrestart >/dev/null 2>&1 || :
+fi
+
+
%postun upstart
/usr/bin/killall -u %username -s INT tor 2>/dev/null || :
@@ -210,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
%files
+
+
+%files doc
%defattr(-,root,root,-)
%doc doc/HACKING
%doc doc/spec/*.txt
@@ -257,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+- created -doc subpackage and moved most (all) files from main into it
+
* Sun Mar 28 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
- added -sysv subpackage
commit 81fe605611b2094bed89336286fed19e71997aa2
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Mar 28 21:15:13 2010 +0000
initial draft for sysv stuff
diff --git a/tor.spec b/tor.spec
index e30fb75..06d17f7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -9,7 +9,7 @@
%global logdir %_var/log/%name
%{?with_noarch:%global noarch BuildArch: noarch}
-%{!?release_func:%global release_func() %1%{?dist}}
+%{!?release_func:%global release_func()
%%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
Name: tor
Version: 0.2.1.25
@@ -47,6 +47,7 @@ Requires(postun): /etc/logrotate.d
Summary: LSB initscripts for tor
Group: System Environment/Daemons
Provides: init(%name) = lsb
+Conflicts: init(%name) = sysv
Requires: %name-core = %version-%release
Source10: tor.lsb
Requires(pre): %name-core
@@ -56,6 +57,21 @@ Requires(preun): lsb-core-noarch
%{?noarch}
+%package sysv
+Summary: Tor initscripts for Red Hat's proprietary initsystem
+Group: System Environment/Daemons
+Provides: init(%name) = sysv
+Conflicts: init(%name) = lsb
+Requires: %name-core = %version-%release
+Source30: tor.sysv
+Requires(pre): %name-core
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+%{?noarch}
+
+
%package upstart
Summary: upstart initscripts for %name
Group: System Environment/Base
@@ -101,6 +117,13 @@ This package contains the LSB compliant initscripts to start the
"tor"
daemon.
+%description sysv
+Tor is a connection-based low-latency anonymous communication system.
+
+This package contains the initscripts to start the "tor" daemon with
+Red Hat's proprietary initsystem.
+
+
%description upstart
Tor is a connection-based low-latency anonymous communication system.
@@ -165,6 +188,16 @@ test "$1" != 0 || /usr/lib/lsb/remove_initd
%_initrddir/tor
test "$1" = 0 || env -i %_initrddir/tor try-restart &>/dev/null
+%post sysv
+# This adds the proper /etc/rc*.d links for the script
+/sbin/chkconfig --add <script>
+
+%preun sysv
+if [ $1 = 0 ] ; then
+ /sbin/service <script> stop >/dev/null 2>&1
+ /sbin/chkconfig --del <script>
+fi
+
%postun upstart
/usr/bin/killall -u %username -s INT tor 2>/dev/null || :
@@ -224,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Mar 28 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+- added -sysv subpackage
+
* Thu Mar 18 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.25-1400
- updated to 0.2.1.25
diff --git a/tor.sysv b/tor.sysv
new file mode 100755
index 0000000..9b61eed
--- /dev/null
+++ b/tor.sysv
@@ -0,0 +1,84 @@
+#!/bin/bash
+#
+# Init file for tor - An Anonymizing overlay network for TCP
+#
+# chkconfig: - 99 01
+# description: An Anonymizing overlay network for TCP
+#
+
+. /etc/rc.d/init.d/functions
+
+f=/etc/sysconfig/tor
+
+TOR_SHUTDOWN_WAIT=30
+TOR_OPTS=--quiet
+TOR_PIDFILE=/var/run/tor/tor.pid
+TOR_USER=toranon
+test ! -r "$f" || . "$f"
+
+prog="/usr/bin/tor"
+
+lockfile=/var/lock/subsys/tor
+pidfile=$TOR_PIDFILE
+
+start() {
+ echo -n $"Starting $prog: "
+ daemon --pidfile="$pidfile" $prog --PIDFile "$pidfile"
--RunAsDaemon 1 $TOR_OPTS || failure
+ rc=$?
+ test $rc -ne 0 || touch $lockfile
+ return $rc
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ if ! killproc -p "$pidfile" $prog -INT; then
+ failure
+ else
+ cnt=$TOR_SHUTDOWN_WAIT
+ while let '--cnt > 0' && killproc -p "$pidfile" $prog -0;
do
+ sleep 1
+ done
+
+ if test $cnt -ne 0 || killproc -p "$pidfile" $prog; then
+ success
+ else
+ failure
+ fi
+ fi
+
+ rm -f $pidfile $lockfile
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ echo -n $"Reloading $prog: "
+ killproc -p "$pidfile" $prog -HUP && success || failure || return
7
+}
+
+_status() {
+ status -p $pidfile $prog
+}
+
+case $1 in
+ (start|stop|reload|restart)
+ $1
+ ;;
+ (force-reload)
+ restart
+ ;;
+ (status)
+ _status
+ ;;
+ (condrestart|try-restart)
+ if _status &>/dev/null; then
+ restart
+ fi
+ ;;
+ (*)
+ echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
+ exit 3
+esac
commit 7a32f8a3a401d116ed65ab20ef57316129d3a278
Author: ensc <ensc(a)fedoraproject.org>
Date: Thu Mar 18 20:42:43 2010 +0000
updated to 0.2.1.25
diff --git a/.cvsignore b/.cvsignore
index a4c2861..58aad7d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.1.24.tar.gz
-tor-0.2.1.24.tar.gz.asc
+tor-0.2.1.25.tar.gz
+tor-0.2.1.25.tar.gz.asc
diff --git a/lastver b/lastver
index 1311435..51292f8 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.24
+0.2.1.25
diff --git a/sources b/sources
index 1451f52..aeb28c5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cb5629b2709ada82d34c22fef3ed77a9 tor-0.2.1.24.tar.gz
-1e5c15d95703280c85e801ff520cc99f tor-0.2.1.24.tar.gz.asc
+f58540b3c5835ac4f5de1b02bbddc703 tor-0.2.1.25.tar.gz
+a5b9a9f51d54fade1f84a1d7d9c96403 tor-0.2.1.25.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index d9f2ee5..e30fb75 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,8 +12,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.1.24
-Release: %release_func 1402
+Version: 0.2.1.25
+Release: %release_func 1400
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -224,6 +224,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 18 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.25-1400
+- updated to 0.2.1.25
+
* Wed Mar 3 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.24-1402
- removed /var/lib/tor-data dir (Chen Lei)
commit c985ebf41b3d7c4ec078eefee0c7e292cbf03b6c
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Mar 3 10:30:07 2010 +0000
removed /var/lib/tor-data dir (Chen Lei)
diff --git a/tor.spec b/tor.spec
index 3da02cf..d9f2ee5 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.1.24
-Release: %release_func 1401
+Release: %release_func 1402
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
-mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name,%_var/lib/tor-data}
+mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name}
install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
@@ -206,7 +206,6 @@ rm -rf $RPM_BUILD_ROOT
%_bindir/*
%_mandir/man1/*
%_datadir/tor
-%dir %_var/lib/tor-data
%exclude %_bindir/torify
%exclude %_mandir/man1/torify*
@@ -225,6 +224,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Mar 3 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.24-1402
+- removed /var/lib/tor-data dir (Chen Lei)
+
* Tue Mar 2 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.24-1401
- require tor-core, not tor in -upstart (thx to Dave Jones)
commit 7589c34f06de2d5d958a37d5279a931f64e24fad
Author: ensc <ensc(a)fedoraproject.org>
Date: Tue Mar 2 19:39:13 2010 +0000
require tor-core, not tor in -upstart (thx to Dave Jones)
diff --git a/tor.spec b/tor.spec
index 0c12f38..3da02cf 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.1.24
-Release: %release_func 1400
+Release: %release_func 1401
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -61,7 +61,7 @@ Summary: upstart initscripts for %name
Group: System Environment/Base
Source20: %name.upstart
Provides: init(%name) = upstart
-Requires: %name = %version-%release
+Requires: %name-core = %version-%release
Requires(pre): /etc/init
Requires(post): /usr/bin/killall
Requires(postun): /sbin/initctl
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Mar 2 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.24-1401
+- require tor-core, not tor in -upstart (thx to Dave Jones)
+
* Sat Feb 27 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.24-1400
- updated to 0.2.1.24
commit 77120ad5e188d8084dbef96328c3f71bbc50b6fa
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Feb 27 17:43:17 2010 +0000
updated to 0.2.1.24
diff --git a/.cvsignore b/.cvsignore
index 070acfa..a4c2861 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.1.23.tar.gz
-tor-0.2.1.23.tar.gz.asc
+tor-0.2.1.24.tar.gz
+tor-0.2.1.24.tar.gz.asc
diff --git a/lastver b/lastver
index 788297a..1311435 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.23
+0.2.1.24
diff --git a/sources b/sources
index 57dbd23..1451f52 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2e0bf3dbb83bbaadaa99d1dfe59c75f7 tor-0.2.1.23.tar.gz
-13e7eed0cc11c6a9c59e5282ea1bc75e tor-0.2.1.23.tar.gz.asc
+cb5629b2709ada82d34c22fef3ed77a9 tor-0.2.1.24.tar.gz
+1e5c15d95703280c85e801ff520cc99f tor-0.2.1.24.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 2385c72..0c12f38 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,8 +12,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.1.23
-Release: %release_func 1300
+Version: 0.2.1.24
+Release: %release_func 1400
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Feb 27 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.24-1400
+- updated to 0.2.1.24
+
* Mon Feb 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.23-1300
- updated to 0.2.1.23
commit decf0b3aa4ab0458c449ece00129360b2728ae71
Author: ensc <ensc(a)fedoraproject.org>
Date: Mon Feb 15 22:00:35 2010 +0000
updated to 0.2.1.23
diff --git a/.cvsignore b/.cvsignore
index 1ddfa1c..070acfa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.1.22.tar.gz
-tor-0.2.1.22.tar.gz.asc
+tor-0.2.1.23.tar.gz
+tor-0.2.1.23.tar.gz.asc
diff --git a/lastver b/lastver
index 7382cd9..788297a 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.22
+0.2.1.23
diff --git a/sources b/sources
index 7f12232..57dbd23 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-583501a989ed0c39e209b604c3671ecd tor-0.2.1.22.tar.gz
-a48d39716f9415a8753effc0556baaec tor-0.2.1.22.tar.gz.asc
+2e0bf3dbb83bbaadaa99d1dfe59c75f7 tor-0.2.1.23.tar.gz
+13e7eed0cc11c6a9c59e5282ea1bc75e tor-0.2.1.23.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 8a09701..2385c72 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,7 +12,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.1.22
+Version: 0.2.1.23
Release: %release_func 1300
Group: System Environment/Daemons
License: BSD
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.23-1300
+- updated to 0.2.1.23
+
* Thu Jan 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.22-1300
- updated to 0.2.1.22
commit ef90a3f28d78f656d1761672e089572950c8fb5a
Author: ensc <ensc(a)fedoraproject.org>
Date: Mon Feb 15 21:48:47 2010 +0000
fixed makefile
diff --git a/Makefile b/Makefile
index 71f6d93..8b1e6f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
# Makefile for source rpm: tor
NAME := tor
SPECFILE = $(firstword $(wildcard *.spec))
+CVS ?= cvs
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
@@ -11,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
+test -f CVS/Root && { $(CVS) -Q -d $$(cat CVS/Root) checkout common &&
echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out
how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
commit 904ac827cb17bb4bd7e3ef7b5f7d2ad32ae44d56
Author: ensc <ensc(a)fedoraproject.org>
Date: Thu Jan 21 21:23:33 2010 +0000
updated to updated to 0.2.1.22
diff --git a/.cvsignore b/.cvsignore
index d6d9d50..1ddfa1c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.1.21.tar.gz
-tor-0.2.1.21.tar.gz.asc
+tor-0.2.1.22.tar.gz
+tor-0.2.1.22.tar.gz.asc
diff --git a/lastver b/lastver
index 844f0b8..7382cd9 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.21
+0.2.1.22
diff --git a/sources b/sources
index 9ee63f3..7f12232 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-54f7a801d824cd9c13ce672d483926d6 tor-0.2.1.21.tar.gz
-45500572a467b5d69e88cf88826ceaee tor-0.2.1.21.tar.gz.asc
+583501a989ed0c39e209b604c3671ecd tor-0.2.1.22.tar.gz
+a48d39716f9415a8753effc0556baaec tor-0.2.1.22.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 6236faa..8a09701 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,7 +12,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.1.21
+Version: 0.2.1.22
Release: %release_func 1300
Group: System Environment/Daemons
License: BSD
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.22-1300
+- updated to 0.2.1.22
+
* Thu Dec 31 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.21-1300
- updated to 0.2.1.21
commit a208a5d28731caad1e376c0501d301785dfff6cc
Author: ensc <ensc(a)fedoraproject.org>
Date: Thu Dec 31 11:43:44 2009 +0000
updated to 0.2.1.21
diff --git a/.cvsignore b/.cvsignore
index a5d7612..d6d9d50 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.1.20.tar.gz
-tor-0.2.1.20.tar.gz.asc
+tor-0.2.1.21.tar.gz
+tor-0.2.1.21.tar.gz.asc
diff --git a/lastver b/lastver
index 97568fa..844f0b8 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.20
+0.2.1.21
diff --git a/sources b/sources
index 89adfcb..9ee63f3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0d62ee2332fdd95de43debac7435df19 tor-0.2.1.20.tar.gz
-41b665b9a8f80252b45accd3ebd8da00 tor-0.2.1.20.tar.gz.asc
+54f7a801d824cd9c13ce672d483926d6 tor-0.2.1.21.tar.gz
+45500572a467b5d69e88cf88826ceaee tor-0.2.1.21.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index f31008a..6236faa 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,8 +12,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.1.20
-Release: %release_func 1301
+Version: 0.2.1.21
+Release: %release_func 1300
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -225,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Dec 31 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.21-1300
+- updated to 0.2.1.21
+
* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1301
- updated -upstart to upstart 0.6.3
commit d0df459dae8ba604d5c611b79bd510067cf202cb
Author: ensc <ensc(a)fedoraproject.org>
Date: Thu Dec 10 21:33:40 2009 +0000
optimized upstart script and start on runlevel 345 only
diff --git a/tor.upstart b/tor.upstart
index 8a27cd4..91ab317 100644
--- a/tor.upstart
+++ b/tor.upstart
@@ -1,10 +1,8 @@
### Uncomment matching 'start' lines below.
-#start on starting local
+#start on runlevel [345] and starting local
-stop on (runlevel 0 or
- runlevel 1 or
- runlevel 6)
+stop on runlevel [!345]
limit nofile 4096
commit 3bf3fd8a38adf31cb167ea7e2b57bc5cec91bf41
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Dec 6 10:44:10 2009 +0000
use correct new for upstart script
diff --git a/tor.spec b/tor.spec
index f6e4821..f31008a 100644
--- a/tor.spec
+++ b/tor.spec
@@ -134,7 +134,7 @@ mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%
install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
-install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor
+install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor.conf
%pre core
commit afc380d0dfe3d04405018f1e6a0ce83fffc14e79
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Dec 6 10:42:26 2009 +0000
updated -upstart to upstart 0.6.3
diff --git a/tor.spec b/tor.spec
index e252d45..f6e4821 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.1.20
-Release: %release_func 1300
+Release: %release_func 1301
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -62,8 +62,7 @@ Group: System Environment/Base
Source20: %name.upstart
Provides: init(%name) = upstart
Requires: %name = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre): /etc/event.d
+Requires(pre): /etc/init
Requires(post): /usr/bin/killall
Requires(postun): /sbin/initctl
%{?noarch}
@@ -135,7 +134,7 @@ mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%
install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
-install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/event.d/tor
+install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/init/tor
%pre core
@@ -222,10 +221,13 @@ rm -rf $RPM_BUILD_ROOT
%files upstart
%defattr(-,root,root,-)
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
%changelog
+* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1301
+- updated -upstart to upstart 0.6.3
+
* Sat Nov 14 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1300
- updated URLs (#532373)
- removed (inactive) update mechanism for GeoIP data; this might
diff --git a/tor.upstart b/tor.upstart
index ad23aef..8a27cd4 100644
--- a/tor.upstart
+++ b/tor.upstart
@@ -2,9 +2,9 @@
#start on starting local
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 6
+stop on (runlevel 0 or
+ runlevel 1 or
+ runlevel 6)
limit nofile 4096
commit 92fd03318febd7e486f70b6f82068f79ca6466f7
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 22:52:25 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index 472dc9f..71f6d93 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ NAME := tor
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit 4b7acaa3b6be098a9194cc2b258b71a233fea04e
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Nov 22 10:41:28 2009 +0000
removed stanza from upstart script which waited for 'starting\ local';
wrongly named upstart events have been fixed in recent initscripts
(#501155)
diff --git a/tor.upstart b/tor.upstart
index 5ac6996..ad23aef 100644
--- a/tor.upstart
+++ b/tor.upstart
@@ -1,10 +1,5 @@
### Uncomment matching 'start' lines below.
-### 'starting\ local' and 'starting local' should be uncommented
-### together as former is required due to broken Fedora initscripts
-### and latter is the correct one
-
-#start on starting\ local
#start on starting local
stop on runlevel 0
commit 3ce3f3b4134e5bff366535ca96430c003c53fcd6
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Nov 15 11:40:58 2009 +0000
removed --enable-gcc-warnings
build fails with
| crypto.c: In function 'crypto_pk_write_key_to_string_impl': |
crypto.c:535: error: comparison of unsigned expression >= 0 is always
true
else
diff --git a/tor.spec b/tor.spec
index 19210b8..e252d45 100644
--- a/tor.spec
+++ b/tor.spec
@@ -119,7 +119,7 @@ EOF
%build
export LDFLAGS='-Wl,--as-needed'
-%configure --enable-gcc-warnings
+%configure
make %{?_smp_mflags}
make -C doc/design-paper tor-design.pdf
@@ -239,7 +239,6 @@ rm -rf $RPM_BUILD_ROOT
time; this fixes shutdown/restart problems when working as a server
(#532373)
- fixed initng related typo in logrotate script (#532373)
-- enabled --enable-gcc-warnings ./configure option (#532373)
- removed <linux/netfilter_ipv4.h> hack; it is fixed upstream and/or
in the kernel sources
- use %%postun, not %%post as a -upstart scriptlet and send INT, not
commit 37322212b1e306d54a46732035ac270dd228135f
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Nov 15 11:08:48 2009 +0000
updated
diff --git a/tor.lsb b/tor.lsb
index 53413bf..d364a10 100755
--- a/tor.lsb
+++ b/tor.lsb
@@ -48,9 +48,8 @@ stop() {
log_failure_msg
else
cnt=$TOR_SHUTDOWN_WAIT
- while test $cnt -gt 0 && killproc -p "$pidfile" $prog -0; do
+ while let '--cnt > 0' && killproc -p "$pidfile" $prog -0;
do
sleep 1
- let --cnt
done
if test $cnt -ne 0 || killproc -p "$pidfile" $prog; then
diff --git a/tor.spec b/tor.spec
index 44c295c..19210b8 100644
--- a/tor.spec
+++ b/tor.spec
@@ -228,15 +228,22 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Nov 14 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1300
- updated URLs (#532373)
-- removed (inactive) update mechanism for GeoIP data; this might reduce anonimity
(#532373)
-- use pidfile at various places in the LSB initscript to operate on the correct process
(#532373)
+- removed (inactive) update mechanism for GeoIP data; this might
+ reduce anonimity (#532373)
+- use the pidfile at various places in the LSB initscript to operate
+ on the correct process (#532373)
- set a higher 'nofile' limit in the upstart initscript to allow fast
relays; LSB users will have to add a 'ulimit -n' into /etc/sysconfig/tor
to get a similar effect (#532373)
+- let the LSB initscript wait until process exits within a certain
+ time; this fixes shutdown/restart problems when working as a server
+ (#532373)
+- fixed initng related typo in logrotate script (#532373)
+- enabled --enable-gcc-warnings ./configure option (#532373)
+- removed <linux/netfilter_ipv4.h> hack; it is fixed upstream and/or
+ in the kernel sources
- use %%postun, not %%post as a -upstart scriptlet and send INT, not
TERM signal to stop/restart daemon
-- let the LSB initscript wait until process within a certain time;
- this fixes shutdown/restart problems when working as a server (#532373)
* Sun Oct 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1
- updated to 0.2.1.20
commit fa9528a3e4fc3f561c758287375931988a8c3777
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Nov 14 20:47:08 2009 +0000
updated
diff --git a/netfilter-ipv4.h b/netfilter-ipv4.h
deleted file mode 100644
index e21a791..0000000
--- a/netfilter-ipv4.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <linux/types.h>
-#include_next <linux/netfilter_ipv4.h>
diff --git a/tor-0.2.1.19-geoippath.patch b/tor-0.2.1.19-geoippath.patch
deleted file mode 100644
index ccb6d03..0000000
--- a/tor-0.2.1.19-geoippath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tor-0.2.1.19/src/or/config.c
-===================================================================
---- tor-0.2.1.19.orig/src/or/config.c
-+++ tor-0.2.1.19/src/or/config.c
-@@ -218,7 +218,7 @@ static config_var_t _option_vars[] = {
- V(GeoIPFile, FILENAME, "<default>"),
- #else
- V(GeoIPFile, FILENAME,
-- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
-+ "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR
"geoip"),
- #endif
- OBSOLETE("Group"),
- V(HardwareAccel, BOOL, "0"),
diff --git a/tor.logrotate b/tor.logrotate
index 1b6e805..545bc69 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -4,8 +4,8 @@
sharedscripts
missingok
postrotate
- test ! -f /etc/init.d/tor || /etc/init.d/tor reload >/dev/null
2>/dev/null || :
- test ! -f /etc/initng/damon/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 /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 || :
endscript
}
diff --git a/tor.lsb b/tor.lsb
index 37ac992..53413bf 100755
--- a/tor.lsb
+++ b/tor.lsb
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Init file for tor - An Anonymizing overlay network for TCP
#
@@ -17,6 +17,7 @@
f=/etc/sysconfig/tor
+TOR_SHUTDOWN_WAIT=30
TOR_OPTS=--quiet
TOR_PIDFILE=/var/run/tor/tor.pid
TOR_USER=toranon
@@ -43,7 +44,22 @@ start() {
stop() {
echo -n $"Stopping $prog: "
- killproc $prog -INT && log_success_msg || log_failure_msg
+ if ! killproc -p "$pidfile" $prog -INT; then
+ log_failure_msg
+ else
+ cnt=$TOR_SHUTDOWN_WAIT
+ while test $cnt -gt 0 && killproc -p "$pidfile" $prog -0; do
+ sleep 1
+ let --cnt
+ done
+
+ if test $cnt -ne 0 || killproc -p "$pidfile" $prog; then
+ log_success_msg
+ else
+ log_failure_msg
+ fi
+ fi
+
rm -f $pidfile $lockfile
}
@@ -54,11 +70,11 @@ restart() {
reload() {
echo -n $"Reloading $prog: "
- killproc $prog -HUP && log_success_msg || log_failure_msg
+ killproc -p "$pidfile" $prog -HUP && log_success_msg ||
log_failure_msg
}
status() {
- pidofproc -p "$TOR_PIDFILE" "$prog" >/dev/null 2>&1
+ pidofproc -p "$pidfile" "$prog" >/dev/null 2>&1
rc=$?
case $rc in
(0) echo $"$prog is running";;
diff --git a/tor.spec b/tor.spec
index b5bcf3b..44c295c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.1.20
-Release: %release_func 1
+Release: %release_func 1300
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -25,13 +25,10 @@ Requires: %name-lsb = %version-%release
%package core
Summary: Core programs for tor
Group: System Environment/Daemons
-URL:
http://tor.eff.org
-Source0:
http://tor.eff.org/dist/%name-%version.tar.gz
-Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
+URL:
http://www.torproject.org
+Source0:
https://www.torproject.org/dist/%name-%version.tar.gz
+Source1:
https://www.torproject.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
-Source3: update-geoip
-Source4: netfilter-ipv4.h
-Patch1: tor-0.2.1.19-geoippath.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig ghostscript
@@ -111,26 +108,18 @@ Tor is a connection-based low-latency anonymous communication
system.
This package contains the upstart compliant initscripts to start the "tor"
daemon.
-
%prep
%setup -q
-%patch1 -p1 -b .geoippath
-
-install -p -m0644 %SOURCE3 .
sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!'
src/config/torrc.sample.in
cat <<EOF >>src/config/torrc.sample.in
User %username
EOF
-mkdir -p linux
-install -p -m0644 %SOURCE4 linux/netfilter_ipv4.h
-
%build
-export ac_cv_header_linux_netfilter_ipv4_h=yes
export LDFLAGS='-Wl,--as-needed'
-%configure
+%configure --enable-gcc-warnings
make %{?_smp_mflags}
make -C doc/design-paper tor-design.pdf
@@ -148,8 +137,6 @@ install -p -m0644 %SOURCE2
$RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/event.d/tor
-ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip
-
%pre core
%__fe_groupadd %uid -r %username &>/dev/null || :
@@ -179,8 +166,8 @@ test "$1" != 0 || /usr/lib/lsb/remove_initd %_initrddir/tor
test "$1" = 0 || env -i %_initrddir/tor try-restart &>/dev/null
-%post upstart
-/usr/bin/killall -u %username tor 2>/dev/null || :
+%postun upstart
+/usr/bin/killall -u %username -s INT tor 2>/dev/null || :
%preun upstart
test "$1" != "0" || /sbin/initctl -q stop tor || :
@@ -212,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README ChangeLog
%doc ReleaseNotes
-%doc update-geoip
%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%username,%username) %dir %homedir
@@ -222,7 +208,6 @@ rm -rf $RPM_BUILD_ROOT
%_mandir/man1/*
%_datadir/tor
%dir %_var/lib/tor-data
-%config(noreplace) %_var/lib/tor-data/geoip
%exclude %_bindir/torify
%exclude %_mandir/man1/torify*
@@ -241,6 +226,18 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 14 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1300
+- updated URLs (#532373)
+- removed (inactive) update mechanism for GeoIP data; this might reduce anonimity
(#532373)
+- use pidfile at various places in the LSB initscript to operate on the correct process
(#532373)
+- set a higher 'nofile' limit in the upstart initscript to allow fast
+ relays; LSB users will have to add a 'ulimit -n' into /etc/sysconfig/tor
+ to get a similar effect (#532373)
+- use %%postun, not %%post as a -upstart scriptlet and send INT, not
+ TERM signal to stop/restart daemon
+- let the LSB initscript wait until process within a certain time;
+ this fixes shutdown/restart problems when working as a server (#532373)
+
* Sun Oct 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1
- updated to 0.2.1.20
diff --git a/tor.upstart b/tor.upstart
index a5c5dd2..5ac6996 100644
--- a/tor.upstart
+++ b/tor.upstart
@@ -11,5 +11,7 @@ stop on runlevel 0
stop on runlevel 1
stop on runlevel 6
+limit nofile 4096
+
respawn
exec /usr/bin/tor --quiet
diff --git a/update-geoip b/update-geoip
deleted file mode 100644
index 6fd6d5d..0000000
--- a/update-geoip
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/bash
-# Copyright (C) 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <
http://www.gnu.org/licenses/>.
-
-### NOTE: this program is part of the Fedora 'tor' package. Hence, file
-### bugreports at
http://bugzilla.redhat.com, but *NOT* at upstream tor
-### webpage/maillists.
-
-
-URL=http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip
-: ${DESTDIR=/var/lib/tor-data}
-
-set -e
-d=$(mktemp -d -t tor-geoip.XXXXXX)
-trap "rm -rf $d" EXIT
-
-cd $d
-wget "$URL"
-unzip "$(basename "$URL")"
-
-date=$(stat -c '%Y' ip-to-country.csv)
-date=$(date +"%Y%m%dT%H%M%S" -d "1970-01-01 00:00:00 UTC $date
seconds")
-fname=geoip-$date
-
-test ! -e "$DESTDIR/$fname" || exit 0
-
-cut -d, -f1-3 < ip-to-country.csv | sed 's/"//g' > "$fname"
-rm -f "$DESTDIR/$fname"
-cp -p "$fname" "$DESTDIR/$fname"
-rm -f "$DESTDIR/geoip"
-ln -s "$fname" "$DESTDIR/geoip"
commit 30f82ed392e9e11753c1b60e023182a9a178b4b5
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Oct 25 20:53:09 2009 +0000
updated to 0.2.1.20
diff --git a/.cvsignore b/.cvsignore
index 352a6ea..a5d7612 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.1.19.tar.gz
-tor-0.2.1.19.tar.gz.asc
+tor-0.2.1.20.tar.gz
+tor-0.2.1.20.tar.gz.asc
diff --git a/lastver b/lastver
index b7a456e..97568fa 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.1.19
+0.2.1.20
diff --git a/sources b/sources
index b2f882e..89adfcb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2c0ca9bf5d0cfb771f4d6bec9c4360ca tor-0.2.1.19.tar.gz
-e31326ab92b82cb0b8b1b829f637c8ef tor-0.2.1.19.tar.gz.asc
+0d62ee2332fdd95de43debac7435df19 tor-0.2.1.20.tar.gz
+41b665b9a8f80252b45accd3ebd8da00 tor-0.2.1.20.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index a163be7..b5bcf3b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,8 +12,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.1.19
-Release: %release_func 2
+Version: 0.2.1.20
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Oct 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.20-1
+- updated to 0.2.1.20
+
* Sat Sep 12 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.19-2
- workaround bug in redhat-lsb (#522053)
commit 324f1e30d5490a6cac123ba86034ff67d85ed6da
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Sep 12 10:58:13 2009 +0000
workaround bug in redhat-lsb (#522053)
diff --git a/tor.spec b/tor.spec
index 8244972..a163be7 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.1.19
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -66,7 +66,7 @@ Source20: %name.upstart
Provides: init(%name) = upstart
Requires: %name = %version-%release
# implicates a conflict with upstart 0.5+
-Requires(pre): /etc/event.d
+Requires(pre): /etc/event.d
Requires(post): /usr/bin/killall
Requires(postun): /sbin/initctl
%{?noarch}
@@ -162,7 +162,14 @@ ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip
%post lsb
-/usr/lib/lsb/install_initd %_initrddir/tor
+/usr/lib/lsb/install_initd %_initrddir/tor || {
+ cat <<EOF >&2
+oouch... redhat-lsb is still broken. See the report
+https://bugzilla.redhat.com/show_bug.cgi?id=522053
+for details.
+EOF
+ /sbin/chkconfig --add tor
+}
%preun lsb
test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
@@ -234,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 12 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.19-2
+- workaround bug in redhat-lsb (#522053)
+
* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.2.1.19-1
- rebuilt with new openssl
commit a0a2c713b8039a91251e4268ad4caaedea22938c
Author: Tom Mrz <tmraz(a)fedoraproject.org>
Date: Fri Aug 21 16:12:23 2009 +0000
- rebuilt with new openssl
diff --git a/tor.spec b/tor.spec
index a7cdff5..8244972 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.1.19
-Release: %release_func 0
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -234,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.2.1.19-1
+- rebuilt with new openssl
+
* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.19-0
- updated to 0.2.1.19
- rediffed patches
commit 158f965b3d497d8d57e1b3f6b7065146313f08fc
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Aug 9 20:44:18 2009 +0000
- updated to 0.2.1.19
diff --git a/.cvsignore b/.cvsignore
index 944f224..352a6ea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.0.35.tar.gz
-tor-0.2.0.35.tar.gz.asc
+tor-0.2.1.19.tar.gz
+tor-0.2.1.19.tar.gz.asc
diff --git a/lastver b/lastver
index e0ae686..b7a456e 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.0.35
+0.2.1.19
diff --git a/sources b/sources
index 4835e65..b2f882e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d4841e1b4d54866495fd373e865b2d44 tor-0.2.0.35.tar.gz
-39b6934d8918f78aec986b9538546fa9 tor-0.2.0.35.tar.gz.asc
+2c0ca9bf5d0cfb771f4d6bec9c4360ca tor-0.2.1.19.tar.gz
+e31326ab92b82cb0b8b1b829f637c8ef tor-0.2.1.19.tar.gz.asc
diff --git a/tor-0.2.0.32-geoippath.patch b/tor-0.2.0.32-geoippath.patch
deleted file mode 100644
index 4de3bdb..0000000
--- a/tor-0.2.0.32-geoippath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c
---- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200
-+++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200
-@@ -202,7 +202,7 @@ static config_var_t _option_vars[] = {
- V(GeoIPFile, STRING, "<default>"),
- #else
- V(GeoIPFile, STRING,
-- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
-+ "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR
"geoip"),
- #endif
- OBSOLETE("Group"),
- V(HardwareAccel, BOOL, "0"),
diff --git a/tor-0.2.1.19-geoippath.patch b/tor-0.2.1.19-geoippath.patch
new file mode 100644
index 0000000..ccb6d03
--- /dev/null
+++ b/tor-0.2.1.19-geoippath.patch
@@ -0,0 +1,13 @@
+Index: tor-0.2.1.19/src/or/config.c
+===================================================================
+--- tor-0.2.1.19.orig/src/or/config.c
++++ tor-0.2.1.19/src/or/config.c
+@@ -218,7 +218,7 @@ static config_var_t _option_vars[] = {
+ V(GeoIPFile, FILENAME, "<default>"),
+ #else
+ V(GeoIPFile, FILENAME,
+- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
++ "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR
"geoip"),
+ #endif
+ OBSOLETE("Group"),
+ V(HardwareAccel, BOOL, "0"),
diff --git a/tor.spec b/tor.spec
index 0737cf0..a7cdff5 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,8 +12,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.0.35
-Release: %release_func 2
+Version: 0.2.1.19
+Release: %release_func 0
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -31,7 +31,7 @@ Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
Source3: update-geoip
Source4: netfilter-ipv4.h
-Patch1: tor-0.2.0.32-geoippath.patch
+Patch1: tor-0.2.1.19-geoippath.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig ghostscript
@@ -120,7 +120,6 @@ install -p -m0644 %SOURCE3 .
sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!'
src/config/torrc.sample.in
cat <<EOF >>src/config/torrc.sample.in
-Group %username
User %username
EOF
@@ -235,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.1.19-0
+- updated to 0.2.1.19
+- rediffed patches
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.0.35-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
commit deb6a8a2361231ccb4d51572d76dde104eb1a5fc
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Mon Jul 27 06:07:05 2009 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index bbb18b0..0737cf0 100644
--- a/tor.spec
+++ b/tor.spec
@@ -13,7 +13,7 @@
Name: tor
Version: 0.2.0.35
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.0.35-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Fri Jun 26 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.35-1
- updated to 0.2.0.35
- added '--quiet' to startup options (bug #495987)
commit 14aa17d44d257dbcaf50ff4f36a011ffca54b971
Author: ensc <ensc(a)fedoraproject.org>
Date: Fri Jun 26 19:15:24 2009 +0000
updated
diff --git a/tor.spec b/tor.spec
index 8cf2507..bbb18b0 100644
--- a/tor.spec
+++ b/tor.spec
@@ -186,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc doc/HACKING doc/TODO
+%doc doc/HACKING
%doc doc/spec/*.txt
%doc doc/design-paper/tor-design.pdf
%doc %lang(de) doc/website/*.de
@@ -194,6 +194,7 @@ rm -rf $RPM_BUILD_ROOT
%doc %lang(es) doc/website/*.es
%doc %lang(fr) doc/website/*.fr
%doc %lang(it) doc/website/*.it
+%doc %lang(ko) doc/website/*.ko
%doc %lang(pl) doc/website/*.pl
%doc %lang(pt) doc/website/*.pt
%doc %lang(ru) doc/website/*.ru
@@ -237,6 +238,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Jun 26 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.35-1
- updated to 0.2.0.35
- added '--quiet' to startup options (bug #495987)
+- updated %%doc entries
* Wed May 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-4
- made it easy to rebuild package in RHEL by adding a 'noarch'
commit 4883443095cfceab6ce6ebb4b8025b50a5ea1142
Author: ensc <ensc(a)fedoraproject.org>
Date: Fri Jun 26 08:05:11 2009 +0000
updated
diff --git a/.cvsignore b/.cvsignore
index 0f8ea56..944f224 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.0.34.tar.gz
-tor-0.2.0.34.tar.gz.asc
+tor-0.2.0.35.tar.gz
+tor-0.2.0.35.tar.gz.asc
diff --git a/lastver b/lastver
index 516a51e..e0ae686 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.0.34
+0.2.0.35
diff --git a/sources b/sources
index 7b51ef6..4835e65 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f20011be23d5a76988233df12c346f41 tor-0.2.0.34.tar.gz
-b62ccfa27e2f9128a88c3e7a0c3b0c47 tor-0.2.0.34.tar.gz.asc
+d4841e1b4d54866495fd373e865b2d44 tor-0.2.0.35.tar.gz
+39b6934d8918f78aec986b9538546fa9 tor-0.2.0.35.tar.gz.asc
diff --git a/tor.lsb b/tor.lsb
index 4bb76e3..37ac992 100755
--- a/tor.lsb
+++ b/tor.lsb
@@ -17,7 +17,7 @@
f=/etc/sysconfig/tor
-TOR_OPTS=
+TOR_OPTS=--quiet
TOR_PIDFILE=/var/run/tor/tor.pid
TOR_USER=toranon
test ! -r "$f" || . "$f"
diff --git a/tor.spec b/tor.spec
index 64e5cbc..8cf2507 100644
--- a/tor.spec
+++ b/tor.spec
@@ -12,8 +12,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.0.34
-Release: %release_func 4
+Version: 0.2.0.35
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -234,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 26 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.35-1
+- updated to 0.2.0.35
+- added '--quiet' to startup options (bug #495987)
+
* Wed May 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-4
- made it easy to rebuild package in RHEL by adding a 'noarch'
conditional to enable/disable noarch subpackages
diff --git a/tor.upstart b/tor.upstart
index 4724b9d..a5c5dd2 100644
--- a/tor.upstart
+++ b/tor.upstart
@@ -12,4 +12,4 @@ stop on runlevel 1
stop on runlevel 6
respawn
-exec /usr/bin/tor
+exec /usr/bin/tor --quiet
commit fbe5024a940243758daed7827c38075874f6dd4a
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed May 6 18:32:20 2009 +0000
updated
diff --git a/tor.spec b/tor.spec
index 0833c3b..64e5cbc 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,5 +1,6 @@
## This package understands the following switches:
%bcond_without fedora
+%bcond_without noarch
%global username toranon
@@ -7,11 +8,12 @@
%global homedir %_var/lib/%name
%global logdir %_var/log/%name
+%{?with_noarch:%global noarch BuildArch: noarch}
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
Version: 0.2.0.34
-Release: %release_func 3
+Release: %release_func 4
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -50,11 +52,11 @@ Group: System Environment/Daemons
Provides: init(%name) = lsb
Requires: %name-core = %version-%release
Source10: tor.lsb
-BuildArch: noarch
Requires(pre): %name-core
Requires(postun): lsb-core-noarch %name-core
Requires(post): lsb-core-noarch
Requires(preun): lsb-core-noarch
+%{?noarch}
%package upstart
@@ -67,7 +69,7 @@ Requires: %name = %version-%release
Requires(pre): /etc/event.d
Requires(post): /usr/bin/killall
Requires(postun): /sbin/initctl
-BuildArch: noarch
+%{?noarch}
%description
@@ -232,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed May 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-4
+- made it easy to rebuild package in RHEL by adding a 'noarch'
+ conditional to enable/disable noarch subpackages
+
* Sat Mar 7 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-3
- added -upstart subpackage (-lsb still wins by default as there exists
no end-user friendly solution for managing upstart initscripts)
commit 481b5f89cf19055fc265bee71151737ce064db95
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Mar 7 13:17:05 2009 +0000
updated
diff --git a/tor.spec b/tor.spec
index c23eb5a..0833c3b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.2.0.34
-Release: %release_func 2
+Release: %release_func 3
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -50,13 +50,26 @@ Group: System Environment/Daemons
Provides: init(%name) = lsb
Requires: %name-core = %version-%release
Source10: tor.lsb
-#BuildArch: noarch
+BuildArch: noarch
Requires(pre): %name-core
Requires(postun): lsb-core-noarch %name-core
Requires(post): lsb-core-noarch
Requires(preun): lsb-core-noarch
+%package upstart
+Summary: upstart initscripts for %name
+Group: System Environment/Base
+Source20: %name.upstart
+Provides: init(%name) = upstart
+Requires: %name = %version-%release
+# implicates a conflict with upstart 0.5+
+Requires(pre): /etc/event.d
+Requires(post): /usr/bin/killall
+Requires(postun): /sbin/initctl
+BuildArch: noarch
+
+
%description
Tor is a connection-based low-latency anonymous communication system.
@@ -90,6 +103,13 @@ This package contains the LSB compliant initscripts to start the
"tor"
daemon.
+%description upstart
+Tor is a connection-based low-latency anonymous communication system.
+
+This package contains the upstart compliant initscripts to start the "tor"
+daemon.
+
+
%prep
%setup -q
%patch1 -p1 -b .geoippath
@@ -125,6 +145,8 @@ mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%
install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
+install -pD -m 0644 %SOURCE20 $RPM_BUILD_ROOT/etc/event.d/tor
+
ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip
@@ -149,6 +171,13 @@ test "$1" != 0 || /usr/lib/lsb/remove_initd
%_initrddir/tor
test "$1" = 0 || env -i %_initrddir/tor try-restart &>/dev/null
+%post upstart
+/usr/bin/killall -u %username tor 2>/dev/null || :
+
+%preun upstart
+test "$1" != "0" || /sbin/initctl -q stop tor || :
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -197,7 +226,16 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,%username,%username) %dir %_var/run/%name
+%files upstart
+%defattr(-,root,root,-)
+%config(noreplace) /etc/event.d/*
+
+
%changelog
+* Sat Mar 7 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-3
+- added -upstart subpackage (-lsb still wins by default as there exists
+ no end-user friendly solution for managing upstart initscripts)
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.0.34-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/tor.upstart b/tor.upstart
new file mode 100644
index 0000000..4724b9d
--- /dev/null
+++ b/tor.upstart
@@ -0,0 +1,15 @@
+### Uncomment matching 'start' lines below.
+
+### 'starting\ local' and 'starting local' should be uncommented
+### together as former is required due to broken Fedora initscripts
+### and latter is the correct one
+
+#start on starting\ local
+#start on starting local
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 6
+
+respawn
+exec /usr/bin/tor
commit f1bcd511e5b600a8ff945b18e167cae1a546c7a8
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Feb 25 21:21:43 2009 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/tor.spec b/tor.spec
index d719aaf..c23eb5a 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.2.0.34
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.0.34-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Tue Feb 10 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-1
- updated to 0.2.0.34 (SECURITY: fixes DoS vulnerabilities)
commit ba9fc1bbfad4a045ae7af763a1f4b60efc7b6f4c
Author: ensc <ensc(a)fedoraproject.org>
Date: Mon Feb 9 23:49:29 2009 +0000
updated
diff --git a/.cvsignore b/.cvsignore
index c542277..0f8ea56 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.0.33.tar.gz
-tor-0.2.0.33.tar.gz.asc
+tor-0.2.0.34.tar.gz
+tor-0.2.0.34.tar.gz.asc
diff --git a/lastver b/lastver
index 60bc653..516a51e 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.0.33
+0.2.0.34
diff --git a/sources b/sources
index 99578f7..7b51ef6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9ad86a956b99b1ab007d459d74348960 tor-0.2.0.33.tar.gz
-b80d82fe493b1cc0ac7d1a72ee180b47 tor-0.2.0.33.tar.gz.asc
+f20011be23d5a76988233df12c346f41 tor-0.2.0.34.tar.gz
+b62ccfa27e2f9128a88c3e7a0c3b0c47 tor-0.2.0.34.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 009c98b..d719aaf 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,7 +10,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.0.33
+Version: 0.2.0.34
Release: %release_func 1
Group: System Environment/Daemons
License: BSD
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 10 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.34-1
+- updated to 0.2.0.34 (SECURITY: fixes DoS vulnerabilities)
+
* Thu Jan 22 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.33-1
- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
commit 4460497fc761e1a04046b33c79dc44090b91f4f3
Author: ensc <ensc(a)fedoraproject.org>
Date: Thu Jan 22 08:49:31 2009 +0000
updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
diff --git a/.cvsignore b/.cvsignore
index ca32890..c542277 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.0.32.tar.gz
-tor-0.2.0.32.tar.gz.asc
+tor-0.2.0.33.tar.gz
+tor-0.2.0.33.tar.gz.asc
diff --git a/lastver b/lastver
index 1a6dce0..60bc653 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.0.32
+0.2.0.33
diff --git a/sources b/sources
index 1078f54..99578f7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fd55489f7ad1ef53c0b0dac857696fc9 tor-0.2.0.32.tar.gz
-5df4502967a3cb3fe8e1c3bb57cf3426 tor-0.2.0.32.tar.gz.asc
+9ad86a956b99b1ab007d459d74348960 tor-0.2.0.33.tar.gz
+b80d82fe493b1cc0ac7d1a72ee180b47 tor-0.2.0.33.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 34595be..009c98b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.0.32
-Release: %release_func 2
+Version: 0.2.0.33
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 22 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.33-1
+- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
+
* Sun Jan 18 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.2.0.32-2
- rebuild with new openssl
commit 51f8f68e36508825c672cf088408fadfa28f9a6a
Author: Tom Mrz <tmraz(a)fedoraproject.org>
Date: Sun Jan 18 13:44:40 2009 +0000
- rebuild with new openssl
diff --git a/tor.spec b/tor.spec
index f94421d..34595be 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.2.0.32
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -198,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 18 2009 Tomas Mraz <tmraz(a)redhat.com> - 0.2.0.32-2
+- rebuild with new openssl
+
* Sun Dec 7 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.32-1
- updated to 0.2.0.32
- removed -setgroups patch; supplementary groups are now set upstream
commit be99b92f7b22e3da61c7e716f8fe559001da5fb9
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Dec 7 10:59:39 2008 +0000
updated
diff --git a/.cvsignore b/.cvsignore
index 30f9874..ca32890 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tor-0.2.0.30.tar.gz
-tor-0.2.0.30.tar.gz.asc
+tor-0.2.0.32.tar.gz
+tor-0.2.0.32.tar.gz.asc
diff --git a/lastver b/lastver
index d59bf14..1a6dce0 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.2.0.30
+0.2.0.32
diff --git a/sources b/sources
index 73cfaf2..1078f54 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d37b582ee35b4f69564b0635a449b5f6 tor-0.2.0.30.tar.gz
-6ae456c60864a1316600bf3ed504eaf7 tor-0.2.0.30.tar.gz.asc
+fd55489f7ad1ef53c0b0dac857696fc9 tor-0.2.0.32.tar.gz
+5df4502967a3cb3fe8e1c3bb57cf3426 tor-0.2.0.32.tar.gz.asc
diff --git a/tor-0.2.0.30-geoippath.patch b/tor-0.2.0.30-geoippath.patch
deleted file mode 100644
index 5c09c25..0000000
--- a/tor-0.2.0.30-geoippath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c
---- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200
-+++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200
-@@ -202,7 +202,7 @@ static config_var_t _option_vars[] = {
- V(GeoIPFile, STRING, "<default>"),
- #else
- V(GeoIPFile, STRING,
-- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
-+ "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR
"geoip"),
- #endif
- V(Group, STRING, NULL),
- V(HardwareAccel, BOOL, "0"),
diff --git a/tor-0.2.0.30-setgroups.patch b/tor-0.2.0.30-setgroups.patch
deleted file mode 100644
index 557fcea..0000000
--- a/tor-0.2.0.30-setgroups.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tor-0.2.0.30/src/common/compat.c.setgroups
-+++ tor-0.2.0.30/src/common/compat.c
-@@ -897,6 +897,11 @@ switch_id(const char *user, const char *
- return -1;
- }
-
-+ if (getgroups(0,0)!=0 && setgroups(0,0)!=0) {
-+ log_warn(LD_GENERAL,"Error setting groups: %s", strerror(errno));
-+ return -1;
-+ }
-+
- if (setgid(gr->gr_gid) != 0) {
- log_warn(LD_GENERAL,"Error setting to configured GID: %s",
- strerror(errno));
diff --git a/tor-0.2.0.32-geoippath.patch b/tor-0.2.0.32-geoippath.patch
new file mode 100644
index 0000000..4de3bdb
--- /dev/null
+++ b/tor-0.2.0.32-geoippath.patch
@@ -0,0 +1,12 @@
+diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c
+--- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200
++++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200
+@@ -202,7 +202,7 @@ static config_var_t _option_vars[] = {
+ V(GeoIPFile, STRING, "<default>"),
+ #else
+ V(GeoIPFile, STRING,
+- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
++ "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR
"geoip"),
+ #endif
+ OBSOLETE("Group"),
+ V(HardwareAccel, BOOL, "0"),
diff --git a/tor.spec b/tor.spec
index 52a63ee..f94421d 100644
--- a/tor.spec
+++ b/tor.spec
@@ -50,7 +50,7 @@ Group: System Environment/Daemons
Provides: init(%name) = lsb
Requires: %name-core = %version-%release
Source10: tor.lsb
-BuildArch: noarch
+#BuildArch: noarch
Requires(pre): %name-core
Requires(postun): lsb-core-noarch %name-core
Requires(post): lsb-core-noarch
commit 19c708bf6cc5947b9162d3fd9d0291b51541791c
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Dec 7 10:24:14 2008 +0000
updated
diff --git a/tor.spec b/tor.spec
index ad7a3c8..52a63ee 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,7 +10,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.2.0.30
+Version: 0.2.0.32
Release: %release_func 1
Group: System Environment/Daemons
License: BSD
@@ -29,8 +29,7 @@ Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
Source3: update-geoip
Source4: netfilter-ipv4.h
-Patch0: tor-0.2.0.30-setgroups.patch
-Patch1: tor-0.2.0.30-geoippath.patch
+Patch1: tor-0.2.0.32-geoippath.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig ghostscript
@@ -51,6 +50,7 @@ Group: System Environment/Daemons
Provides: init(%name) = lsb
Requires: %name-core = %version-%release
Source10: tor.lsb
+BuildArch: noarch
Requires(pre): %name-core
Requires(postun): lsb-core-noarch %name-core
Requires(post): lsb-core-noarch
@@ -92,7 +92,6 @@ daemon.
%prep
%setup -q
-%patch0 -p1 -b .setgroups
%patch1 -p1 -b .geoippath
install -p -m0644 %SOURCE3 .
@@ -199,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Dec 7 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.32-1
+- updated to 0.2.0.32
+- removed -setgroups patch; supplementary groups are now set upstream
+
* Sun Jul 20 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.30-1
- updated to 0.2.0.30; rediffed patches
- (re)enabled transparent proxy support by workarounding broken
commit 5b8e5303a56fca9fa78fe567500aba23bff61f53
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Jul 20 13:00:56 2008 +0000
rediffed patches
diff --git a/tor-0.1.1.26-setgroups.patch b/tor-0.1.1.26-setgroups.patch
deleted file mode 100644
index 7deee55..0000000
--- a/tor-0.1.1.26-setgroups.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tor-0.1.1.26/src/common/compat.c.setgroups 2006-09-24 19:47:57.000000000 +0200
-+++ tor-0.1.1.26/src/common/compat.c 2007-01-24 08:41:03.000000000 +0100
-@@ -526,6 +526,11 @@
- return -1;
- }
-
-+ if (getgroups(0,0)!=0 && setgroups(0,0)!=0) {
-+ log_warn(LD_GENERAL,"Error setting groups: %s", strerror(errno));
-+ return -1;
-+ }
-+
- if (setgid(gr->gr_gid) != 0) {
- log_warn(LD_GENERAL,"Error setting GID: %s", strerror(errno));
- return -1;
diff --git a/tor-0.2.0.30-setgroups.patch b/tor-0.2.0.30-setgroups.patch
new file mode 100644
index 0000000..557fcea
--- /dev/null
+++ b/tor-0.2.0.30-setgroups.patch
@@ -0,0 +1,14 @@
+--- tor-0.2.0.30/src/common/compat.c.setgroups
++++ tor-0.2.0.30/src/common/compat.c
+@@ -897,6 +897,11 @@ switch_id(const char *user, const char *
+ return -1;
+ }
+
++ if (getgroups(0,0)!=0 && setgroups(0,0)!=0) {
++ log_warn(LD_GENERAL,"Error setting groups: %s", strerror(errno));
++ return -1;
++ }
++
+ if (setgid(gr->gr_gid) != 0) {
+ log_warn(LD_GENERAL,"Error setting to configured GID: %s",
+ strerror(errno));
diff --git a/tor.spec b/tor.spec
index 659dd70..ad7a3c8 100644
--- a/tor.spec
+++ b/tor.spec
@@ -29,7 +29,7 @@ Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
Source3: update-geoip
Source4: netfilter-ipv4.h
-Patch0: tor-0.1.1.26-setgroups.patch
+Patch0: tor-0.2.0.30-setgroups.patch
Patch1: tor-0.2.0.30-geoippath.patch
BuildRoot: %_tmppath/%name-%version-%release-root
@@ -200,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Jul 20 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.30-1
-- updated to 0.2.0.30
+- updated to 0.2.0.30; rediffed patches
- (re)enabled transparent proxy support by workarounding broken
<linux/netfilter_ipv4.h> header
- moved the 'geoip' database to /var/lib/tor-data where it can be
commit 2e599d2e0b5509155024d82ecd1b2bb6f64c6181
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Jul 20 12:28:26 2008 +0000
- updated to 0.2.0.30
- (re)enabled transparent proxy support by workarounding broken
<linux/netfilter_ipv4.h> header
- moved the 'geoip' database to /var/lib/tor-data where it can be updated
periodically
- built with -Wl,--as-needed
diff --git a/tor.spec b/tor.spec
index c744aff..659dd70 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.19
-Release: %release_func 3
+Version: 0.2.0.30
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -27,8 +27,10 @@ URL:
http://tor.eff.org
Source0:
http://tor.eff.org/dist/%name-%version.tar.gz
Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
+Source3: update-geoip
+Source4: netfilter-ipv4.h
Patch0: tor-0.1.1.26-setgroups.patch
-Patch1: tor-0.1.2.16-open.patch
+Patch1: tor-0.2.0.30-geoippath.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig ghostscript
@@ -91,7 +93,9 @@ daemon.
%prep
%setup -q
%patch0 -p1 -b .setgroups
-%patch1 -p1 -b .open
+%patch1 -p1 -b .geoippath
+
+install -p -m0644 %SOURCE3 .
sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!'
src/config/torrc.sample.in
cat <<EOF >>src/config/torrc.sample.in
@@ -99,8 +103,13 @@ Group %username
User %username
EOF
+mkdir -p linux
+install -p -m0644 %SOURCE4 linux/netfilter_ipv4.h
+
%build
+export ac_cv_header_linux_netfilter_ipv4_h=yes
+export LDFLAGS='-Wl,--as-needed'
%configure
make %{?_smp_mflags}
make -C doc/design-paper tor-design.pdf
@@ -112,11 +121,13 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
-mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name}
+mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name,%_var/lib/tor-data}
install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
+ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip
+
%pre core
%__fe_groupadd %uid -r %username &>/dev/null || :
@@ -164,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README ChangeLog
%doc ReleaseNotes
+%doc update-geoip
%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%username,%username) %dir %homedir
@@ -171,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(0640,root,%username) %config(noreplace) %_sysconfdir/tor/torrc
%_bindir/*
%_mandir/man1/*
+%_datadir/tor
+%dir %_var/lib/tor-data
+%config(noreplace) %_var/lib/tor-data/geoip
%exclude %_bindir/torify
%exclude %_mandir/man1/torify*
@@ -184,6 +199,14 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jul 20 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.2.0.30-1
+- updated to 0.2.0.30
+- (re)enabled transparent proxy support by workarounding broken
+ <linux/netfilter_ipv4.h> header
+- moved the 'geoip' database to /var/lib/tor-data where it can be
+ updated periodically
+- built with -Wl,--as-needed
+
* Thu Jul 10 2008 Nikolay Vladimirov <nikolay(a)vladimiroff.com> - 0.1.2.19-3
- rebuild for new libevent
commit 6fdc6fda553371cba56b457fb7e957c7d3b6281a
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Jul 20 12:27:02 2008 +0000
obsoleted by 0.2.0.30
diff --git a/tor-0.1.2.16-open.patch b/tor-0.1.2.16-open.patch
deleted file mode 100644
index 63aa773..0000000
--- a/tor-0.1.2.16-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tor-0.1.2.16/src/common/util.c.open
-+++ tor-0.1.2.16/src/common/util.c
-@@ -2071,7 +2071,7 @@ finish_daemon(const char *desired_cwd)
- }
-
- nullfd = open("/dev/null",
-- O_CREAT | O_RDWR | O_APPEND);
-+ O_RDWR | O_APPEND);
- if (nullfd < 0) {
- log_err(LD_GENERAL,"/dev/null can't be opened. Exiting.");
- exit(1);
commit 985f94ad22a26927ca931b28ab9d831476485c1e
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Jul 20 12:25:33 2008 +0000
updated to 0.2.0.30
diff --git a/.cvsignore b/.cvsignore
index 4d844f3..30f9874 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-tor-*.tar.*
+tor-0.2.0.30.tar.gz
+tor-0.2.0.30.tar.gz.asc
diff --git a/lastver b/lastver
index 8d08b49..d59bf14 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.1.2.19
+0.2.0.30
diff --git a/sources b/sources
index 6e2bced..73cfaf2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4b3f9963b843010af5aa3bd6266d11e0 tor-0.1.2.19.tar.gz
-fa3ba84f22fcffd19cc029f15d30e941 tor-0.1.2.19.tar.gz.asc
+d37b582ee35b4f69564b0635a449b5f6 tor-0.2.0.30.tar.gz
+6ae456c60864a1316600bf3ed504eaf7 tor-0.2.0.30.tar.gz.asc
commit 795bfc44c413db450d45e86e8ef63d1568b68b59
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Jul 20 12:24:42 2008 +0000
initial checkin
diff --git a/netfilter-ipv4.h b/netfilter-ipv4.h
new file mode 100644
index 0000000..e21a791
--- /dev/null
+++ b/netfilter-ipv4.h
@@ -0,0 +1,2 @@
+#include <linux/types.h>
+#include_next <linux/netfilter_ipv4.h>
diff --git a/tor-0.2.0.30-geoippath.patch b/tor-0.2.0.30-geoippath.patch
new file mode 100644
index 0000000..5c09c25
--- /dev/null
+++ b/tor-0.2.0.30-geoippath.patch
@@ -0,0 +1,12 @@
+diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c
+--- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200
++++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200
+@@ -202,7 +202,7 @@ static config_var_t _option_vars[] = {
+ V(GeoIPFile, STRING, "<default>"),
+ #else
+ V(GeoIPFile, STRING,
+- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
++ "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR
"geoip"),
+ #endif
+ V(Group, STRING, NULL),
+ V(HardwareAccel, BOOL, "0"),
diff --git a/update-geoip b/update-geoip
new file mode 100644
index 0000000..6fd6d5d
--- /dev/null
+++ b/update-geoip
@@ -0,0 +1,42 @@
+#! /bin/bash
+# Copyright (C) 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <
http://www.gnu.org/licenses/>.
+
+### NOTE: this program is part of the Fedora 'tor' package. Hence, file
+### bugreports at
http://bugzilla.redhat.com, but *NOT* at upstream tor
+### webpage/maillists.
+
+
+URL=http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip
+: ${DESTDIR=/var/lib/tor-data}
+
+set -e
+d=$(mktemp -d -t tor-geoip.XXXXXX)
+trap "rm -rf $d" EXIT
+
+cd $d
+wget "$URL"
+unzip "$(basename "$URL")"
+
+date=$(stat -c '%Y' ip-to-country.csv)
+date=$(date +"%Y%m%dT%H%M%S" -d "1970-01-01 00:00:00 UTC $date
seconds")
+fname=geoip-$date
+
+test ! -e "$DESTDIR/$fname" || exit 0
+
+cut -d, -f1-3 < ip-to-country.csv | sed 's/"//g' > "$fname"
+rm -f "$DESTDIR/$fname"
+cp -p "$fname" "$DESTDIR/$fname"
+rm -f "$DESTDIR/geoip"
+ln -s "$fname" "$DESTDIR/geoip"
commit b1da098bf6fb4f8e6deef53479e95e72ee1a24a7
Author: Nikolay Vladimirov <turki(a)fedoraproject.org>
Date: Wed Jul 9 21:05:20 2008 +0000
Rebuild for new libevent
diff --git a/tor.spec b/tor.spec
index 8928eac..c744aff 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.2.19
-Release: %release_func 2
+Release: %release_func 3
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 10 2008 Nikolay Vladimirov <nikolay(a)vladimiroff.com> - 0.1.2.19-3
+- rebuild for new libevent
+
* Wed Feb 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.19-2
- added 'missingok' to logrotate script (#429402)
commit e98ad5b808efa2d86e73d3f1f494b5f0f0287d25
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Jun 21 15:21:33 2008 +0000
added 'missingok' to logrotate script (#429402)
diff --git a/tor.spec b/tor.spec
index b045f90..8928eac 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.2.19
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.19-2
+- added 'missingok' to logrotate script (#429402)
+
* Tue Feb 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.19-1
- updated to 0.1.2.19
- use file based BR for latex
commit b8b0eee8c8ede1261fc2c520836e863e1e706e35
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Jun 21 15:11:40 2008 +0000
removed CVS tags
diff --git a/Makefile b/Makefile
index 5a484d1..472dc9f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
# Makefile for source rpm: tor
-# $Id$
NAME := tor
SPECFILE = $(firstword $(wildcard *.spec))
commit 386745449b44cd7777ec0b8ac0a0cfd1ea269bc5
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Feb 13 12:13:04 2008 +0000
added 'missingok' to logrotate script (#429402)
diff --git a/tor.logrotate b/tor.logrotate
index dde0977..1b6e805 100644
--- a/tor.logrotate
+++ b/tor.logrotate
@@ -2,6 +2,7 @@
delaycompress
notifempty
sharedscripts
+ missingok
postrotate
test ! -f /etc/init.d/tor || /etc/init.d/tor reload >/dev/null
2>/dev/null || :
test ! -f /etc/initng/damon/tor.i || /sbin/ngc --restart daemon/tor >/dev/null
2>/dev/null || :
commit ae3a0182d522e1ebb33b0f8e940b6a0f9d470f38
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Feb 13 11:21:58 2008 +0000
- updated to 0.1.2.19
- use file based BR for latex
- improved 'status' method of initscript to return rc of 'pidofproc'
instead of doing further manual tests. Calling 'pidofproc' directly
instead of within a subshell should workaround #432254 too.
diff --git a/tor.spec b/tor.spec
index e40d884..b045f90 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.18
-Release: %release_func 4
+Version: 0.1.2.19
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -31,7 +31,9 @@ Patch0: tor-0.1.1.26-setgroups.patch
Patch1: tor-0.1.2.16-open.patch
BuildRoot: %_tmppath/%name-%version-%release-root
-BuildRequires: libevent-devel openssl-devel transfig tex(latex) texlive-texmf-fonts
ghostscript
+BuildRequires: libevent-devel openssl-devel transfig ghostscript
+BuildRequires: /usr/bin/latex
+BuildRequires: texlive-texmf-fonts
BuildRequires: fedora-usermgmt-devel
Provides: user(%username) = %uid
Provides: group(%username) = %uid
@@ -130,13 +132,11 @@ install -p -m0644 %SOURCE2
$RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
/usr/lib/lsb/install_initd %_initrddir/tor
%preun lsb
-test "$1" != 0 || {
- %_initrddir/tor stop &>/dev/null || :
- /usr/lib/lsb/remove_initd %_initrddir/tor
-}
+test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
+test "$1" != 0 || /usr/lib/lsb/remove_initd %_initrddir/tor
%postun lsb
-test "$1" = 0 || %_initrddir/tor try-restart &>/dev/null
+test "$1" = 0 || env -i %_initrddir/tor try-restart &>/dev/null
%clean
@@ -184,6 +184,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.19-1
+- updated to 0.1.2.19
+- use file based BR for latex
+- improved 'status' method of initscript to return rc of 'pidofproc'
+ instead of doing further manual tests. Calling 'pidofproc' directly
+ instead of within a subshell should workaround #432254 too.
+
* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18-4
- Update BuildRequires: tex(latex),
- BR: texlive-texmf-fonts seems also to be necessary
commit ce22243d37cf0542bc604f11c518559fc27b1d00
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Feb 13 11:20:03 2008 +0000
- cleaned up LSB comments
- improved 'status' method of initscript to return rc of 'pidofproc'
instead of doing further manual tests. Calling 'pidofproc' directly
instead of within a subshell should workaround #432254 too.
diff --git a/tor.lsb b/tor.lsb
index 0127004..4bb76e3 100755
--- a/tor.lsb
+++ b/tor.lsb
@@ -6,10 +6,11 @@
# description: An Anonymizing overlay network for TCP
#
### BEGIN INIT INFO
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: An Anonymizing overlay network for TCP
-# Description: An Anonymizing overlay network for TCP
-# Required-Start: $network $syslog $remote_fs $local_fs
+# Default-Stop: 0 1 2 6
+# Short-Description: An Anonymizing overlay network for TCP
+# Description: An Anonymizing overlay network for TCP
+# Required-Start: $network $remote_fs $local_fs
+# Should-Start: $syslog $time
### END INIT INFO
. /lib/lsb/init-functions
@@ -36,7 +37,7 @@ start() {
else
log_failure_msg
fi
-
+
return $rc
}
@@ -57,34 +58,25 @@ reload() {
}
status() {
- pids=$(pidofproc "$prog")
- if test -n "$pids"; then
- echo $"$prog is running"
- return 0
- fi
-
- if test -s $pidfile; then
- echo $"$prog is dead and /var/run pid file exists"
- return 1
- fi
-
- if test -f $lockfile; then
- echo $"$prog is dead and /var/lock lock file exists"
- return 2
- fi
+ pidofproc -p "$TOR_PIDFILE" "$prog" >/dev/null 2>&1
+ rc=$?
+ case $rc in
+ (0) echo $"$prog is running";;
+ (1) echo $"program is dead and /var/run pid file exists";;
+ (2) echo $"program is dead and /var/lock lock file exists";;
+ (3) echo $"program is not running";;
+ (4) echo $"program or service status is unknown";;
+ (*) echo $"status $rc of $prog";;
+ esac
- echo $"$prog is not running"
- return 3
+ return $rc
}
case $1 in
- (start)
- start
- ;;
- (stop)
- stop
+ (start|stop|reload|status|restart)
+ $1
;;
- (restart|force-reload)
+ (force-reload)
restart
;;
(condrestart|try-restart)
@@ -92,12 +84,6 @@ case $1 in
restart
fi
;;
- (reload)
- reload
- ;;
- (status)
- status
- ;;
(*)
echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
exit 3
commit 58e6635f388fa9562a602f45c896dbd3574399b1
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Feb 13 11:18:23 2008 +0000
updated to 0.1.2.19
diff --git a/lastver b/lastver
index 7921f1d..8d08b49 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.1.2.18
+0.1.2.19
diff --git a/sources b/sources
index bc00a5d..6e2bced 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6cfe65643f3874a9709f0c19e7c648e0 tor-0.1.2.18.tar.gz
-4f05a0ff3a9995689939726b96f143f2 tor-0.1.2.18.tar.gz.asc
+4b3f9963b843010af5aa3bd6266d11e0 tor-0.1.2.19.tar.gz
+fa3ba84f22fcffd19cc029f15d30e941 tor-0.1.2.19.tar.gz.asc
commit e740077d89f9347fb0975eb6c952e3048ca43838
Author: alexlan <alexlan(a)fedoraproject.org>
Date: Sat Jan 26 12:24:22 2008 +0000
- Update BuildRequires: tex(latex),
- BR: texlive-texmf-fonts seems also to be necessary
diff --git a/tor.spec b/tor.spec
index 8f0bd52..e40d884 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.2.18
-Release: %release_func 3
+Release: %release_func 4
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -31,7 +31,7 @@ Patch0: tor-0.1.1.26-setgroups.patch
Patch1: tor-0.1.2.16-open.patch
BuildRoot: %_tmppath/%name-%version-%release-root
-BuildRequires: libevent-devel openssl-devel transfig tetex-latex ghostscript
+BuildRequires: libevent-devel openssl-devel transfig tex(latex) texlive-texmf-fonts
ghostscript
BuildRequires: fedora-usermgmt-devel
Provides: user(%username) = %uid
Provides: group(%username) = %uid
@@ -184,7 +184,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18- 3
+* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18-4
+- Update BuildRequires: tex(latex),
+- BR: texlive-texmf-fonts seems also to be necessary
+
+* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18-3
- Rebuild for new libevent.
* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> -
0.1.2.18-2
commit 50e64c3f43849c86af3d8e1d47b94fdfbf79cb94
Author: alexlan <alexlan(a)fedoraproject.org>
Date: Sat Jan 26 11:17:35 2008 +0000
- Rebuild for new libevent.
diff --git a/tor.spec b/tor.spec
index 6ca5d87..8f0bd52 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.2.18
-Release: %release_func 2
+Release: %release_func 3
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18- 3
+- Rebuild for new libevent.
+
* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> -
0.1.2.18-2
- Rebuild for deps
commit bbc2d148a6b2a04125edb54a0be6265e6e5afeac
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Thu Dec 6 20:34:30 2007 +0000
- Rebuild for deps
diff --git a/tor.spec b/tor.spec
index 87a4449..6ca5d87 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.2.18
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> -
0.1.2.18-2
+- Rebuild for deps
+
* Tue Oct 30 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.18-1
- updated to 0.1.2.18
commit 740a459a08253fa7e1b02ed9295b25e0bcc32831
Author: ensc <ensc(a)fedoraproject.org>
Date: Tue Oct 30 08:30:53 2007 +0000
updated to 0.1.2.18
diff --git a/lastver b/lastver
index 82c4595..7921f1d 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.1.2.17
+0.1.2.18
diff --git a/sources b/sources
index 13a2c2d..bc00a5d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ef8fc7f45d167875c337063d437c9832 tor-0.1.2.17.tar.gz
-0328e4132787a0a8a2181bb7fcf420a7 tor-0.1.2.17.tar.gz.asc
+6cfe65643f3874a9709f0c19e7c648e0 tor-0.1.2.18.tar.gz
+4f05a0ff3a9995689939726b96f143f2 tor-0.1.2.18.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 710f683..87a4449 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,7 +10,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.17
+Version: 0.1.2.18
Release: %release_func 1
Group: System Environment/Daemons
License: BSD
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 30 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.18-1
+- updated to 0.1.2.18
+
* Fri Aug 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.17-1
- updated to 0.1.2.17
commit 43e271e9d1e4f5ab3692d9c26d7fececbd2f4a17
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Sep 1 14:45:26 2007 +0000
initial checkin
diff --git a/lastver b/lastver
new file mode 100644
index 0000000..82c4595
--- /dev/null
+++ b/lastver
@@ -0,0 +1 @@
+0.1.2.17
diff --git a/verinfo b/verinfo
new file mode 100644
index 0000000..b84a6ba
--- /dev/null
+++ b/verinfo
@@ -0,0 +1,2 @@
+http://tor.eff.org/dist/
+tor-([^-]*?)\.tar\.
commit cbea9b1e47beccf009517921eb3ebc947b08464c
Author: ensc <ensc(a)fedoraproject.org>
Date: Fri Aug 31 18:22:16 2007 +0000
updated to 0.1.2.17
diff --git a/sources b/sources
index e2bd65a..13a2c2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f340777b3f6c3175de976856d2d2e4be tor-0.1.2.16.tar.gz
-18472a51c6e5c6ac49d3c3eb48f531a6 tor-0.1.2.16.tar.gz.asc
+ef8fc7f45d167875c337063d437c9832 tor-0.1.2.17.tar.gz
+0328e4132787a0a8a2181bb7fcf420a7 tor-0.1.2.17.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 747767f..710f683 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.16
-Release: %release_func 2
+Version: 0.1.2.17
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.17-1
+- updated to 0.1.2.17
+
* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.16-2
- fixed open(2) issue
commit 1f89aa3be666adb17f7183f064ab46acf667d4ed
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Aug 25 15:43:37 2007 +0000
fixed open(2) issue
diff --git a/tor-0.1.2.16-open.patch b/tor-0.1.2.16-open.patch
new file mode 100644
index 0000000..63aa773
--- /dev/null
+++ b/tor-0.1.2.16-open.patch
@@ -0,0 +1,11 @@
+--- tor-0.1.2.16/src/common/util.c.open
++++ tor-0.1.2.16/src/common/util.c
+@@ -2071,7 +2071,7 @@ finish_daemon(const char *desired_cwd)
+ }
+
+ nullfd = open("/dev/null",
+- O_CREAT | O_RDWR | O_APPEND);
++ O_RDWR | O_APPEND);
+ if (nullfd < 0) {
+ log_err(LD_GENERAL,"/dev/null can't be opened. Exiting.");
+ exit(1);
diff --git a/tor.spec b/tor.spec
index ecbf0a6..747767f 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.2.16
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -28,6 +28,7 @@ Source0:
http://tor.eff.org/dist/%name-%version.tar.gz
Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
Patch0: tor-0.1.1.26-setgroups.patch
+Patch1: tor-0.1.2.16-open.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig tetex-latex ghostscript
@@ -88,6 +89,7 @@ daemon.
%prep
%setup -q
%patch0 -p1 -b .setgroups
+%patch1 -p1 -b .open
sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!'
src/config/torrc.sample.in
cat <<EOF >>src/config/torrc.sample.in
@@ -182,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.16-2
+- fixed open(2) issue
+
* Fri Aug 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.16-1
- updated to 0.1.2.16 (SECURITY)
commit 17039a97160a1dd1e66b59683b51bdb72a00d137
Author: ensc <ensc(a)fedoraproject.org>
Date: Thu Aug 2 23:11:33 2007 +0000
updated to 0.1.2.16 (SECURITY)
diff --git a/sources b/sources
index d89edab..e2bd65a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-14fdb2772bd1f5f66a24fe59d84af68a tor-0.1.2.15.tar.gz.asc
-fe74a7a305d9c466c253f17cdbf06257 tor-0.1.2.15.tar.gz
+f340777b3f6c3175de976856d2d2e4be tor-0.1.2.16.tar.gz
+18472a51c6e5c6ac49d3c3eb48f531a6 tor-0.1.2.16.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 1f8abb5..ecbf0a6 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,7 +10,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.15
+Version: 0.1.2.16
Release: %release_func 1
Group: System Environment/Daemons
License: BSD
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.16-1
+- updated to 0.1.2.16 (SECURITY)
+
* Sat Jul 28 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.15-1
- updated to 0.1.2.15
commit 03d84ae69fd7f9dba1800cc25cb5f762cf16fca3
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Jul 28 08:44:19 2007 +0000
updated to 0.1.2.15
diff --git a/sources b/sources
index 4c016d3..d89edab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dc93a52f9c12ec7fe73b3905a28f09ec tor-0.1.2.14.tar.gz
-fad2d737ce664bb5781e966909f9e696 tor-0.1.2.14.tar.gz.asc
+14fdb2772bd1f5f66a24fe59d84af68a tor-0.1.2.15.tar.gz.asc
+fe74a7a305d9c466c253f17cdbf06257 tor-0.1.2.15.tar.gz
diff --git a/tor.spec b/tor.spec
index fd06cd9..1f8abb5 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,7 +10,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.14
+Version: 0.1.2.15
Release: %release_func 1
Group: System Environment/Daemons
License: BSD
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jul 28 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.15-1
+- updated to 0.1.2.15
+
* Sat May 26 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.14-1
- updated to 0.1.2.14
commit 9a4d761a302f48ffa9db6983cbf36b1057aece98
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat May 26 10:36:05 2007 +0000
updated to 0.1.2.14
diff --git a/sources b/sources
index 211d008..4c016d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-db54abdddf7eb5859b6e1bdf5f7ece00 tor-0.1.2.13.tar.gz
-e261bcace664399f7468ce38accdc5f0 tor-0.1.2.13.tar.gz.asc
+dc93a52f9c12ec7fe73b3905a28f09ec tor-0.1.2.14.tar.gz
+fad2d737ce664bb5781e966909f9e696 tor-0.1.2.14.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 6ba049c..fd06cd9 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.13
-Release: %release_func 0
+Version: 0.1.2.14
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat May 26 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.14-1
+- updated to 0.1.2.14
+
* Wed Apr 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.13-1
- updated to 0.1.2.13
- minor cleanups; especially in the %%doc section
commit d8551b370a1b3c1ae475cc9fa99d5e74823f1d45
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Apr 25 18:56:15 2007 +0000
version 0.1.2.13
diff --git a/sources b/sources
index 72d3ed2..211d008 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0667df7a1f670bee5163b607aea172ba tor-0.1.1.26.tar.gz
-485823262baf0244453b79bf2ddf13be tor-0.1.1.26.tar.gz.asc
+db54abdddf7eb5859b6e1bdf5f7ece00 tor-0.1.2.13.tar.gz
+e261bcace664399f7468ce38accdc5f0 tor-0.1.2.13.tar.gz.asc
commit 126c378cd8c6fd8b93fb4b46ee6469e21a745dfd
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Apr 25 18:47:54 2007 +0000
- updated to 0.1.2.13
- minor cleanups; especially in the %%doc section
diff --git a/tor.spec b/tor.spec
index 190972a..6ba049c 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.1.26
-Release: %release_func 4
+Version: 0.1.2.13
+Release: %release_func 0
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -144,20 +144,24 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc doc/HACKING doc/TODO
-%doc doc/*.txt
+%doc doc/spec/*.txt
%doc doc/design-paper/tor-design.pdf
+%doc %lang(de) doc/website/*.de
%doc %lang(en) doc/website/*.en
%doc %lang(es) doc/website/*.es
%doc %lang(fr) doc/website/*.fr
%doc %lang(it) doc/website/*.it
+%doc %lang(pl) doc/website/*.pl
%doc %lang(pt) doc/website/*.pt
%doc %lang(ru) doc/website/*.ru
+%doc %lang(zh-cn) doc/website/*.zh-cn
%doc doc/website/*.css
%files core
%defattr(-,root,root,-)
-%doc AUTHORS INSTALL LICENSE README ChangeLog
+%doc AUTHORS LICENSE README ChangeLog
+%doc ReleaseNotes
%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%username,%username) %dir %homedir
@@ -178,6 +182,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.2.13-1
+- updated to 0.1.2.13
+- minor cleanups; especially in the %%doc section
+
* Sun Apr 8 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-4
- rebuilt for (yet another) new libevent
commit f5249f3b6f04b58ab9a06c7f483f69f01202b643
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Apr 8 11:20:25 2007 +0000
rebuilt for (yet another) new libevent
diff --git a/tor.spec b/tor.spec
index f7ba04a..190972a 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.1.26
-Release: %release_func 3
+Release: %release_func 4
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -178,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Apr 8 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-4
+- rebuilt for (yet another) new libevent
+
* Mon Feb 26 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-3
- rebuilt for new libevent
commit 632808c1d62f197546654166043ae8aeb4093eca
Author: ensc <ensc(a)fedoraproject.org>
Date: Mon Feb 26 10:46:23 2007 +0000
rebuilt for new libevent
diff --git a/tor.spec b/tor.spec
index 78cee11..f7ba04a 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.1.26
-Release: %release_func 2
+Release: %release_func 3
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -178,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 26 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-3
+- rebuilt for new libevent
+
* Wed Jan 24 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-2
- updated -setgroups patch (#224090, thx to Sami Farin)
commit 36321bd916e59191ff2afa8cc18e27b19b1fb2d8
Author: ensc <ensc(a)fedoraproject.org>
Date: Wed Jan 24 07:46:49 2007 +0000
updated -setgroups patch (#224090, thx to Sami Farin)
diff --git a/tor-0.1.0.15-setgroups.patch b/tor-0.1.0.15-setgroups.patch
deleted file mode 100644
index f2e53b4..0000000
--- a/tor-0.1.0.15-setgroups.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- tor-0.1.0.15/src/common/compat.c.setgroups 2005-06-09 06:12:12.000000000 +0200
-+++ tor-0.1.0.15/src/common/compat.c 2005-12-10 12:22:34.000000000 +0100
-@@ -432,6 +432,11 @@
- return -1;
- }
-
-+ if (getgroups(0,0)!=0 && setgroups(0,0)!=0) {
-+ log_fn(LOG_ERR,"Error setting groups: %s", strerror(errno));
-+ return -1;
-+ }
-+
- if (setgid(gr->gr_gid) != 0) {
- log_fn(LOG_ERR,"Error setting GID: %s", strerror(errno));
- return -1;
diff --git a/tor-0.1.1.26-setgroups.patch b/tor-0.1.1.26-setgroups.patch
new file mode 100644
index 0000000..7deee55
--- /dev/null
+++ b/tor-0.1.1.26-setgroups.patch
@@ -0,0 +1,14 @@
+--- tor-0.1.1.26/src/common/compat.c.setgroups 2006-09-24 19:47:57.000000000 +0200
++++ tor-0.1.1.26/src/common/compat.c 2007-01-24 08:41:03.000000000 +0100
+@@ -526,6 +526,11 @@
+ return -1;
+ }
+
++ if (getgroups(0,0)!=0 && setgroups(0,0)!=0) {
++ log_warn(LD_GENERAL,"Error setting groups: %s", strerror(errno));
++ return -1;
++ }
++
+ if (setgid(gr->gr_gid) != 0) {
+ log_warn(LD_GENERAL,"Error setting GID: %s", strerror(errno));
+ return -1;
diff --git a/tor.spec b/tor.spec
index 12c5e50..78cee11 100644
--- a/tor.spec
+++ b/tor.spec
@@ -11,7 +11,7 @@
Name: tor
Version: 0.1.1.26
-Release: %release_func 1
+Release: %release_func 2
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -27,7 +27,7 @@ URL:
http://tor.eff.org
Source0:
http://tor.eff.org/dist/%name-%version.tar.gz
Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
-Patch0: tor-0.1.0.15-setgroups.patch
+Patch0: tor-0.1.1.26-setgroups.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig tetex-latex ghostscript
@@ -178,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 24 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-2
+- updated -setgroups patch (#224090, thx to Sami Farin)
+
* Sun Dec 17 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-1
- updated to 0.1.1.26 (SECURITY)
- do not turn on logging by default; it's easier to say "we do not log
commit fffdcadb3c5439645ac5044ad635d97410069634
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Dec 17 12:53:51 2006 +0000
added missing file
diff --git a/sources b/sources
index 859d482..72d3ed2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
0667df7a1f670bee5163b607aea172ba tor-0.1.1.26.tar.gz
+485823262baf0244453b79bf2ddf13be tor-0.1.1.26.tar.gz.asc
commit 1ed7ca994a4ca4ce8744a601c33c3dd0577094b7
Author: ensc <ensc(a)fedoraproject.org>
Date: Sun Dec 17 12:48:40 2006 +0000
- updated to 0.1.1.26 (SECURITY)
- do not turn on logging by default; it's easier to say "we do not log
anything" to the police instead of enumerating the logged event classes
and trying to explain that they do not contain any valuable information
diff --git a/sources b/sources
index 3e41f81..859d482 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-28dea6a77a43b6e421e1bd7b2cc3d940 tor-0.1.1.24.tar.gz
-217c02c37858cf6048ba2b0a99d76014 tor-0.1.1.24.tar.gz.asc
+0667df7a1f670bee5163b607aea172ba tor-0.1.1.26.tar.gz
diff --git a/tor.spec b/tor.spec
index a714b28..12c5e50 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,7 +10,7 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.1.24
+Version: 0.1.1.26
Release: %release_func 1
Group: System Environment/Daemons
License: BSD
@@ -89,8 +89,7 @@ daemon.
%setup -q
%patch0 -p1 -b .setgroups
-sed -i -e 's!^\# *\(Log notice file \)!\1!;
- s!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!'
src/config/torrc.sample.in
+sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!'
src/config/torrc.sample.in
cat <<EOF >>src/config/torrc.sample.in
Group %username
User %username
@@ -179,6 +178,16 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Dec 17 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.26-1
+- updated to 0.1.1.26 (SECURITY)
+- do not turn on logging by default; it's easier to say "we do not log
+ anything" to the police instead of enumerating the logged event
+ classes and trying to explain that they do not contain any valuable
+ information
+
+* Sun Nov 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.25-1
+- updated to 0.1.1.25
+
* Thu Oct 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.24-1
- updated to 0.1.1.24
commit 32066439e42ef463b85e1f47007b466a78ab289b
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Oct 7 12:06:16 2006 +0000
cleanups; removed old *.asc file
diff --git a/tor-0.1.1.23.tar.gz.asc b/tor-0.1.1.23.tar.gz.asc
deleted file mode 100644
index ee0dc6d..0000000
--- a/tor-0.1.1.23.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQBEzRjG61qJaiiYi/URAqUOAJ9HUsuk00JEtr3Yzq2MCPTg6IQfGwCeOis8
-2ZmqcR//ifBxovaU1ly7cRE=
-=9xg3
------END PGP SIGNATURE-----
commit 965ed048c535182050d7152e2e157f14e052522c
Author: ensc <ensc(a)fedoraproject.org>
Date: Thu Oct 5 06:29:54 2006 +0000
updated to 0.1.1.24
diff --git a/.cvsignore b/.cvsignore
index 281d8b9..4d844f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tor-0.1.1.23.tar.gz
+tor-*.tar.*
diff --git a/sources b/sources
index 44add29..3e41f81 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-33ce7155f545c4d30cb846d7017cc6c2 tor-0.1.1.23.tar.gz
+28dea6a77a43b6e421e1bd7b2cc3d940 tor-0.1.1.24.tar.gz
+217c02c37858cf6048ba2b0a99d76014 tor-0.1.1.24.tar.gz.asc
diff --git a/tor.spec b/tor.spec
index 2311135..a714b28 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.1.23
-Release: %release_func 5
+Version: 0.1.1.24
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Oct 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.24-1
+- updated to 0.1.1.24
+
* Sat Sep 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-5
- updated to recent fedora-usermgmt
- minor cleanups
commit c1d09ab6b26455282f6744f200f476b81805f275
Author: ensc <ensc(a)fedoraproject.org>
Date: Sat Sep 30 16:25:17 2006 +0000
- updated to recent fedora-usermgmt
- minor cleanups
- require only 'lsb-core-noarch' instead of whole 'lsb'
diff --git a/tor.spec b/tor.spec
index ebe8591..2311135 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,8 +1,9 @@
-## $Id$
-
## This package understands the following switches:
+%bcond_without fedora
+
%global username toranon
+%global uid 19
%global homedir %_var/lib/%name
%global logdir %_var/log/%name
@@ -10,7 +11,7 @@
Name: tor
Version: 0.1.1.23
-Release: %release_func 4
+Release: %release_func 5
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -27,25 +28,28 @@ Source0:
http://tor.eff.org/dist/%name-%version.tar.gz
Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
Patch0: tor-0.1.0.15-setgroups.patch
-BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
+BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig tetex-latex ghostscript
+BuildRequires: fedora-usermgmt-devel
+Provides: user(%username) = %uid
+Provides: group(%username) = %uid
Requires: init(%name)
-Requires(pre): fedora-usermgmt /etc/logrotate.d
-Requires(postun): fedora-usermgmt /etc/logrotate.d
+Requires(pre): /etc/logrotate.d
+Requires(postun): /etc/logrotate.d
+%{?FE_USERADD_REQ}
%package lsb
Summary: LSB initscripts for tor
Group: System Environment/Daemons
Provides: init(%name) = lsb
-Requires: lsb
Requires: %name-core = %version-%release
Source10: tor.lsb
Requires(pre): %name-core
-Requires(postun): lsb %name-core
-Requires(post): lsb
-Requires(preun): lsb
+Requires(postun): lsb-core-noarch %name-core
+Requires(post): lsb-core-noarch
+Requires(preun): lsb-core-noarch
%description
@@ -112,14 +116,13 @@ install -p -m0644 %SOURCE2
$RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
%pre core
-/usr/sbin/fedora-groupadd 19 -r %username &>/dev/null || :
-/usr/sbin/fedora-useradd 19 -r -s /sbin/nologin -M -d %homedir \
- -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
-test "$1" != 0 || /usr/sbin/fedora-userdel %username &>/dev/null || :
-test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
+%__fe_userdel %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
%post lsb
@@ -176,6 +179,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-5
+- updated to recent fedora-usermgmt
+- minor cleanups
+- require only 'lsb-core-noarch' instead of whole 'lsb'
+
* Tue Sep 26 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-4
- first FE release (review #175433)
commit 3959dc52f765257fd4d56e02841a5a8c4e3a2822
Author: ensc <ensc(a)fedoraproject.org>
Date: Tue Sep 26 06:32:21 2006 +0000
first FE release (review #175433)
diff --git a/tor.spec b/tor.spec
index 7092d23..ebe8591 100644
--- a/tor.spec
+++ b/tor.spec
@@ -10,7 +10,7 @@
Name: tor
Version: 0.1.1.23
-Release: %release_func 3
+Release: %release_func 4
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 26 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-4
+- first FE release (review #175433)
+
* Mon Sep 25 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-3
- removed '.have-lsb' and related logic in logrotate script; check for
existence of the corresponding initscript instead of
commit d243e33c46483bdbb9b8a857d1eac2713cdd54c9
Author: ensc <ensc(a)fedoraproject.org>
Date: Tue Sep 26 06:27:27 2006 +0000
auto-import tor-0.1.1.23-3.fc5x on branch devel from
tor-0.1.1.23-3.fc5x.src.rpm
diff --git a/.cvsignore b/.cvsignore
index e69de29..281d8b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+tor-0.1.1.23.tar.gz
diff --git a/sources b/sources
index e69de29..44add29 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+33ce7155f545c4d30cb846d7017cc6c2 tor-0.1.1.23.tar.gz
diff --git a/tor-0.1.0.15-setgroups.patch b/tor-0.1.0.15-setgroups.patch
new file mode 100644
index 0000000..f2e53b4
--- /dev/null
+++ b/tor-0.1.0.15-setgroups.patch
@@ -0,0 +1,14 @@
+--- tor-0.1.0.15/src/common/compat.c.setgroups 2005-06-09 06:12:12.000000000 +0200
++++ tor-0.1.0.15/src/common/compat.c 2005-12-10 12:22:34.000000000 +0100
+@@ -432,6 +432,11 @@
+ return -1;
+ }
+
++ if (getgroups(0,0)!=0 && setgroups(0,0)!=0) {
++ log_fn(LOG_ERR,"Error setting groups: %s", strerror(errno));
++ return -1;
++ }
++
+ if (setgid(gr->gr_gid) != 0) {
+ log_fn(LOG_ERR,"Error setting GID: %s", strerror(errno));
+ return -1;
diff --git a/tor-0.1.1.23.tar.gz.asc b/tor-0.1.1.23.tar.gz.asc
new file mode 100644
index 0000000..ee0dc6d
--- /dev/null
+++ b/tor-0.1.1.23.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQBEzRjG61qJaiiYi/URAqUOAJ9HUsuk00JEtr3Yzq2MCPTg6IQfGwCeOis8
+2ZmqcR//ifBxovaU1ly7cRE=
+=9xg3
+-----END PGP SIGNATURE-----
diff --git a/tor.logrotate b/tor.logrotate
new file mode 100644
index 0000000..dde0977
--- /dev/null
+++ b/tor.logrotate
@@ -0,0 +1,10 @@
+/var/log/tor/*.log {
+ delaycompress
+ notifempty
+ sharedscripts
+ postrotate
+ test ! -f /etc/init.d/tor || /etc/init.d/tor reload >/dev/null
2>/dev/null || :
+ test ! -f /etc/initng/damon/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 || :
+ endscript
+}
diff --git a/tor.lsb b/tor.lsb
new file mode 100755
index 0000000..0127004
--- /dev/null
+++ b/tor.lsb
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Init file for tor - An Anonymizing overlay network for TCP
+#
+# chkconfig: - 99 01
+# description: An Anonymizing overlay network for TCP
+#
+### BEGIN INIT INFO
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: An Anonymizing overlay network for TCP
+# Description: An Anonymizing overlay network for TCP
+# Required-Start: $network $syslog $remote_fs $local_fs
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+f=/etc/sysconfig/tor
+
+TOR_OPTS=
+TOR_PIDFILE=/var/run/tor/tor.pid
+TOR_USER=toranon
+test ! -r "$f" || . "$f"
+
+prog="/usr/bin/tor"
+
+lockfile=/var/lock/subsys/tor
+pidfile=$TOR_PIDFILE
+
+start() {
+ echo -n $"Starting $prog: "
+
+ start_daemon $prog --PIDFile "$pidfile" --RunAsDaemon 1 $TOR_OPTS
+ rc=$?
+ if test $rc -eq 0 && touch $lockfile; then
+ log_success_msg
+ else
+ log_failure_msg
+ fi
+
+ return $rc
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc $prog -INT && log_success_msg || log_failure_msg
+ rm -f $pidfile $lockfile
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ echo -n $"Reloading $prog: "
+ killproc $prog -HUP && log_success_msg || log_failure_msg
+}
+
+status() {
+ pids=$(pidofproc "$prog")
+ if test -n "$pids"; then
+ echo $"$prog is running"
+ return 0
+ fi
+
+ if test -s $pidfile; then
+ echo $"$prog is dead and /var/run pid file exists"
+ return 1
+ fi
+
+ if test -f $lockfile; then
+ echo $"$prog is dead and /var/lock lock file exists"
+ return 2
+ fi
+
+ echo $"$prog is not running"
+ return 3
+}
+
+case $1 in
+ (start)
+ start
+ ;;
+ (stop)
+ stop
+ ;;
+ (restart|force-reload)
+ restart
+ ;;
+ (condrestart|try-restart)
+ if [ -f $lockfile ]; then
+ restart
+ fi
+ ;;
+ (reload)
+ reload
+ ;;
+ (status)
+ status
+ ;;
+ (*)
+ echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
+ exit 3
+esac
diff --git a/tor.spec b/tor.spec
new file mode 100644
index 0000000..7092d23
--- /dev/null
+++ b/tor.spec
@@ -0,0 +1,242 @@
+## $Id$
+
+## This package understands the following switches:
+
+%global username toranon
+%global homedir %_var/lib/%name
+%global logdir %_var/log/%name
+
+%{!?release_func:%global release_func() %1%{?dist}}
+
+Name: tor
+Version: 0.1.1.23
+Release: %release_func 3
+Group: System Environment/Daemons
+License: BSD
+Summary: Anonymizing overlay network for TCP (The onion router)
+URL:
http://tor.eff.org
+Requires: %name-core = %version-%release
+Requires: %name-lsb = %version-%release
+
+
+%package core
+Summary: Core programs for tor
+Group: System Environment/Daemons
+URL:
http://tor.eff.org
+Source0:
http://tor.eff.org/dist/%name-%version.tar.gz
+Source1:
http://tor.eff.org/dist/%name-%version.tar.gz.asc
+Source2: tor.logrotate
+Patch0: tor-0.1.0.15-setgroups.patch
+BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
+
+BuildRequires: libevent-devel openssl-devel transfig tetex-latex ghostscript
+Requires: init(%name)
+Requires(pre): fedora-usermgmt /etc/logrotate.d
+Requires(postun): fedora-usermgmt /etc/logrotate.d
+
+
+%package lsb
+Summary: LSB initscripts for tor
+Group: System Environment/Daemons
+Provides: init(%name) = lsb
+Requires: lsb
+Requires: %name-core = %version-%release
+Source10: tor.lsb
+Requires(pre): %name-core
+Requires(postun): lsb %name-core
+Requires(post): lsb
+Requires(preun): lsb
+
+
+%description
+Tor is a connection-based low-latency anonymous communication system.
+
+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.
+
+
+%description core
+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.
+
+
+%description lsb
+Tor is a connection-based low-latency anonymous communication system.
+
+This package contains the LSB compliant initscripts to start the "tor"
+daemon.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .setgroups
+
+sed -i -e 's!^\# *\(Log notice file \)!\1!;
+ s!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!'
src/config/torrc.sample.in
+cat <<EOF >>src/config/torrc.sample.in
+Group %username
+User %username
+EOF
+
+
+%build
+%configure
+make %{?_smp_mflags}
+make -C doc/design-paper tor-design.pdf
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
+
+mkdir -p
$RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name}
+
+install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
+install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
+
+
+%pre core
+/usr/sbin/fedora-groupadd 19 -r %username &>/dev/null || :
+/usr/sbin/fedora-useradd 19 -r -s /sbin/nologin -M -d %homedir \
+ -c 'tor anonymizing user' -g %username %username &>/dev/null || :
+
+
+%postun core
+test "$1" != 0 || /usr/sbin/fedora-userdel %username &>/dev/null || :
+test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
+
+
+%post lsb
+/usr/lib/lsb/install_initd %_initrddir/tor
+
+%preun lsb
+test "$1" != 0 || {
+ %_initrddir/tor stop &>/dev/null || :
+ /usr/lib/lsb/remove_initd %_initrddir/tor
+}
+
+%postun lsb
+test "$1" = 0 || %_initrddir/tor try-restart &>/dev/null
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc doc/HACKING doc/TODO
+%doc doc/*.txt
+%doc doc/design-paper/tor-design.pdf
+%doc %lang(en) doc/website/*.en
+%doc %lang(es) doc/website/*.es
+%doc %lang(fr) doc/website/*.fr
+%doc %lang(it) doc/website/*.it
+%doc %lang(pt) doc/website/*.pt
+%doc %lang(ru) doc/website/*.ru
+%doc doc/website/*.css
+
+
+%files core
+%defattr(-,root,root,-)
+%doc AUTHORS INSTALL LICENSE README ChangeLog
+%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/*
+
+%exclude %_bindir/torify
+%exclude %_mandir/man1/torify*
+%exclude %_sysconfdir/tor/tor-tsocks.conf
+
+
+%files lsb
+ %defattr(-,root,root,-)
+ %config %_initrddir/*
+ %attr(0755,%username,%username) %dir %_var/run/%name
+
+
+%changelog
+* Mon Sep 25 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-3
+- removed '.have-lsb' and related logic in logrotate script; check for
+ existence of the corresponding initscript instead of
+- fixed bare '%%' in changelog section
+
+* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-2
+- simplified things yet more and removed tsocks/torify too
+- build -lsb unconditionally
+
+* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-1
+- simplified spec file and removed -initng and -minit stuff
+
+* Sun Aug 13 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.23-0
+- updated to 0.1.1.23
+
+* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.22-0
+- updated to 0.1.1.22
+
+* Tue Jun 13 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.21-0
+- updated to 0.1.1.21
+
+* Wed May 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.1.20-0
+- updated to 0.1.1.20; adjusted %%doc file-list
+- added (optional) -tsocks subpackage
+- use the more modern %%bcond_with* for specifying optional features
+
+* Sun Feb 19 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.17-0
+- updated to 0.1.0.17
+
+* Mon Jan 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.16-0.1
+- renamed the current main-package into a '-core' subpackage and
+ created a new main-package which requires both the 'tor-core'
+ subpackage and this with the current default init-method. This
+ allows 'yum install tor' to work better; because yum is not very
+ smart, the old packaging might install unwanted packages else.
+
+* Wed Jan 4 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.16-0
+- updated to 0.1.0.16
+
+* Fri Dec 23 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.11
+- reworked the 'setgroups' patch so that 'tor' survives a SIGHUP
+- (re)added the 'reload' functionality to the lsb initscript and use
+ it in logrotate
+
+* Fri Dec 23 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.8
+- added ChangeLog to %%doc
+- made torrc not world-readable
+- added logrotate script
+
+* Thu Dec 22 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.4
+- updated initng scripts to initng-0.4.8 syntax
+- tweaked some Requires(...):
+- added ghostscript BuildRequires:
+- install initng scripts into the correct dir
+
+* Thu Dec 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.2
+- use relative UID of 19 instead of 18 due to conflicts with the
+ 'munin' package
+
+* Wed Dec 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1.1
+- added -minit subpackage
+
+* Sat Dec 10 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -
0.1.0.15-1
+- initial build
commit 3b90c330de23a67615ee07f4113ad2f55d1dbc57
Author: ensc <ensc(a)fedoraproject.org>
Date: Tue Sep 26 06:25:00 2006 +0000
Setup of module tor
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5a484d1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# Makefile for source rpm: tor
+# $Id$
+NAME := tor
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29