diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/tor.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
| download | guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/tor.scm')
| -rw-r--r-- | gnu/packages/tor.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index f5f5fe7374..e2ce7afe9d 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -155,7 +155,7 @@ rejects UDP traffic from the application you're using.") (define-public privoxy (package (name "privoxy") - (version "3.0.28") + (version "3.0.29") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/ijbswa/Sources/" @@ -163,7 +163,7 @@ rejects UDP traffic from the application you're using.") version "-stable-src.tar.gz")) (sha256 (base32 - "0jl2yav1qzqnaqnnx8i6i53ayckkimcrs3l6ryvv7bda6v08rmxm")))) + "17a8fbdyb0ixc0wwq68fg7xn7l6n7jq67njpq93psmxgzng0dii5")))) (build-system gnu-build-system) (arguments '(;; The default 'sysconfdir' is $out/etc; change that to @@ -171,7 +171,9 @@ rejects UDP traffic from the application you're using.") #:configure-flags (list (string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc/privoxy") - "--localstatedir=/var") + "--localstatedir=/var" + "--with-brotli" + "--with-openssl") #:tests? #f ; no test suite #:phases (modify-phases %standard-phases @@ -193,8 +195,10 @@ rejects UDP traffic from the application you're using.") (("^logfile") "#logfile"))) #t))))) (inputs - `(("w3m" ,w3m) + `(("brotli" ,brotli) + ("openssl" ,openssl) ("pcre" ,pcre) + ("w3m" ,w3m) ("zlib" ,zlib))) (native-inputs `(("autoconf" ,autoconf) @@ -249,7 +253,7 @@ networks.") (native-inputs `(("python-pytest" ,python-pytest))) (inputs - `(("python-pycrypto" ,python-pycrypto) + `(("python-pycryptodome" ,python-pycryptodome) ("python-flask" ,python-flask) ("python-flask-httpauth" ,python-flask-httpauth) ("python-nautilus" ,python-nautilus) |