update to 0.4.5.12

This commit is contained in:
Sergey Zhemoytel 2022-05-28 23:51:43 +03:00
parent 8ed3b252f3
commit 33223485ba
3 changed files with 33 additions and 18 deletions

View file

@ -1,13 +1,2 @@
removed_sources:
tor-0.2.8.12.tar.gz: a93ce42f2e16ea1b92c693f60ed94c4e9f5071bc
tor-0.2.8.6.tar.gz: 4b1fa511f40fc8ddb1709aaccb7197e0771a4b61
tor-0.2.8.9.tar.gz: fab0cb618bea15d19428dd820403ba3267b17b06
tor-0.2.9.10.tar.gz: c3dbf92bab07d0043e3d1959385c0eb110bd2443
tor-0.2.9.9.tar.gz: 031bc77666a761ae7bc88cdade8187a3e3758d69
tor-0.3.0.7.tar.gz: a8c52e943f05761a9687ee84aff1c3a9c9bf3c33
tor-0.3.0.9.tar.gz: 48c6d037d030056256ba6dd8adcc1142613d05d0
tor-0.3.2.10.tar.gz: 3fda950a95186cc82f8e465bda9dceb7108c329c
tor-0.3.2.9.tar.gz: 62c7d15b04c63c19453af7b2c39d638cb49b652e
tor-0.3.3.6.tar.gz: db556291f551dd8e2e5164fbe9d515fa525bc053
sources:
tor-0.3.3.9.tar.gz: e150441d63d7c7ef05d7d4e4a61acfdb4c6b3010
tor-0.4.5.12.tar.gz: 4dfe46442cdc7aa07ac89d66ff16ac46f7e7c2d4

20
tor-fix-build.patch Normal file
View file

@ -0,0 +1,20 @@
*** src/feature/dirclient/dirclient.c.orig 2021-10-06 22:45:19.000000000 +0300
--- src/feature/dirclient/dirclient.c 2021-12-26 03:13:52.719851014 +0300
***************
*** 1959,1966 ****
/* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
if (!plausible && !new_body) {
! const int LOG_INTERVAL = 3600;
! static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,
--- 1959,1965 ----
/* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
if (!plausible && !new_body) {
! static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,

View file

@ -2,7 +2,7 @@
Summary: Anonymizing overlay network for TCP (The onion router)
Name: tor
Version: 0.4.1.6
Version: 0.4.5.12
Release: 1
License: BSD
Group: Networking/Other
@ -13,15 +13,19 @@ Source3: %{name}.sysconfig
Source4: %{name}.service
Source5: %{name}-tmpfiles.conf
Source100: %{name}.rpmlintrc
# see https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/398
Patch0: %{name}-fix-build.patch
BuildRequires: autoconf2.5
BuildRequires: ghostscript
BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(openssl)
#BuildRequires: openssl-devel
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libzstd)
BuildRequires: pkgconfig(libzstd)
Buildrequires: pkgconfig(nss)
Requires: openssl
Requires: tsocks
Requires(pre,post,preun,postun): rpm-helper
@ -55,7 +59,7 @@ for high-stakes anonymity.
%{_bindir}/tor
%{_bindir}/torify
%{_bindir}/tor-resolve
%{_bindir}/tor-gencert
#{_bindir}/tor-gencert
%{_bindir}/tor-print-ed-signing-cert
%{_unitdir}/%{name}.service
%{_tmpfilesdir}/%{name}.conf
@ -92,11 +96,13 @@ rm -f %{_localstatedir}/%{name}/fingerprint
%prep
%setup -q
#patch0 -p0
%build
%configure2_5x --enable-zstd \
--enable-systemd
%configure2_5x --enable-systemd \
--enable-lzma \
--enable-zstd \
--enable-nss
%make
%install