diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 22:33:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 22:33:28 +0200 |
| commit | c01ef97594a8b06e884906a5efbdfacf8ba33dc3 (patch) | |
| tree | 828b4711c6ad71ab8fc9b6fc8f23f80979c5fe9b /gnu/packages/tor.scm | |
| parent | 86d02fa8010c053ba980e4c39373b9bf8af0561d (diff) | |
| parent | 4b8b4418e609b5e0bfb6efbc11ac28deaa437e80 (diff) | |
| download | patches-c01ef97594a8b06e884906a5efbdfacf8ba33dc3.tar patches-c01ef97594a8b06e884906a5efbdfacf8ba33dc3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tor.scm')
| -rw-r--r-- | gnu/packages/tor.scm | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e2123557c1..e44bab54a0 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages compression) #:use-module (gnu packages pcre) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages autotools) @@ -44,25 +45,28 @@ (define-public tor (package (name "tor") - (version "0.3.0.11") + (version "0.3.1.7") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "1hjhxkkrx04ydiddhwb3z2xb0vkcwmn1x8jsdcp6kd6i1qa0fp1a")))) + "13y0v4zfla0vziy9kkahmhrwylv32ianjikcr46mwbxvji4dvx8x")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gcc-hardening" "--enable-linker-hardening"))) (native-inputs - `(("python" ,python-2))) ; for tests + `(("pkg-config" ,pkg-config) + ("python" ,python-2))) ; for tests (inputs `(("zlib" ,zlib) ("openssl" ,openssl) ("libevent" ,libevent) - ("libseccomp", libseccomp))) + ("libseccomp" ,libseccomp) + ("xz" ,xz) + ("zstd" ,zstd))) (home-page "https://www.torproject.org/") (synopsis "Anonymous network router to improve privacy on the Internet") (description @@ -134,13 +138,13 @@ rejects UDP traffic from the application you're using.") #:configure-flags (list (string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc/privoxy")) - #:phases (alist-cons-after - 'unpack 'autoconf - (lambda _ - ;; Unfortunately, this is not a tarball produced by - ;; "make dist". - (zero? (system* "autoreconf" "-vfi"))) - %standard-phases) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autoconf + (lambda _ + ;; Unfortunately, this is not a tarball produced by + ;; "make dist". + (zero? (system* "autoreconf" "-vfi"))))) #:tests? #f)) (inputs `(("w3m" ,w3m) |