From b41a05ce497d5ecc682cf46ce61aa2215193f9f6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 15:23:10 +0200 Subject: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs). Bug 20765 is solved since we build all Python packages using option "--single-version-externally-managed". * gnu/packages/bioinformatics.scm (pbtranscript-tofu): Remove configure-flags. (pepr): remove phase "disable-egg-generation". * gnu/packages/pdf.scm (reportlab): Remove configure-flags. * gnu/packages/python.scm (python-sphinx-rtd-theme, python2-elib.intl, python-pkgconfig, python-pytest-pep8, python-pytest-flakes): Remove configure-flags. (python-pillow) remove phase "disable-egg-generation". (python-libarchive-c) Remove patching setup.cfg. * gnu/packages/statistics.scm (python-patsy): remove phase "prevent-generation-of-egg-archive". * gnu/packages/tls.scm (python-acme): remove phase "disable-egg-compression". * gnu/packages/tor.scm (onionshare): Remove configure-flags. --- gnu/packages/tor.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e6fbf6e005..fe079fb104 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -208,11 +208,7 @@ (define-public onionshare ;; After all the patching we run the tests after installing. ;; This is also a known issue: ;; https://github.com/micahflee/onionshare/issues/284 - (lambda _ (zero? (system* "nosetests" "test"))))) - ;; can't compress the egg because it expects to find all the resources - ;; inside the egg as though it were a folder. - #:configure-flags '("--single-version-externally-managed" "--root=/") - )) + (lambda _ (zero? (system* "nosetests" "test"))))))) (native-inputs `(("python-nose" ,python-nose))) (inputs -- cgit v1.2.3 From 12ed023fb708a54458f72973c9e48cbbc359b4cf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 3 Dec 2016 22:56:39 +0200 Subject: gnu: tor: Update to 0.2.8.10. * gnu/packages/tor.scm (tor): Update to 0.2.8.10. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index fe079fb104..9b461aa170 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -39,14 +39,14 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.2.8.9") + (version "0.2.8.10") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "05jkvhbgyq81fcmk1xpl3yw97ljj5sg9pngl27zlmgl7p0xjfp1z")))) + "0kcw9hq4xz8p91xwyhjfry5p1dmn7vvnhpfz66vl9gsfndbqr2y8")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) ; for tests -- cgit v1.2.3 From 256470325bb520afc4452993a8f29a31e0c99107 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 8 Dec 2016 20:30:48 +0200 Subject: gnu: tor: Update to 0.2.8.11. * gnu/packages/tor.scm (tor): Update to 0.2.8.11. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 9b461aa170..6d5994bf36 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -39,14 +39,14 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.2.8.10") + (version "0.2.8.11") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0kcw9hq4xz8p91xwyhjfry5p1dmn7vvnhpfz66vl9gsfndbqr2y8")))) + "1cvaviamvmajzpdgjn2k1rk3g9ywl1c4ygs5157gvnkyl6zs1pks")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) ; for tests -- cgit v1.2.3 From e5a12fba82df0c05de15bbbdf5b011d178e087e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Dec 2016 13:11:40 +0200 Subject: gnu: onionshare: Update to 0.9.2 (fixes CVE-2016-5026). * gnu/packages/tor.scm (onionshare): Update to 0.9.2. [source]: Remove patch. [arguments]: Update substitutions for new version. * gnu/packages/patches/onionshare-fix-install-paths.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/onionshare-fix-install-paths.patch | 39 ---------------------- gnu/packages/tor.scm | 38 +++++++++------------ 3 files changed, 15 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/onionshare-fix-install-paths.patch (limited to 'gnu/packages/tor.scm') diff --git a/gnu/local.mk b/gnu/local.mk index fae868bfdb..a06f359435 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -743,7 +743,6 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ %D%/packages/patches/ocaml-findlib-make-install.patch \ %D%/packages/patches/ola-readdir-r.patch \ - %D%/packages/patches/onionshare-fix-install-paths.patch \ %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openjpeg-CVE-2016-5157.patch \ %D%/packages/patches/openjpeg-CVE-2016-7163.patch \ diff --git a/gnu/packages/patches/onionshare-fix-install-paths.patch b/gnu/packages/patches/onionshare-fix-install-paths.patch deleted file mode 100644 index 721b89f04b..0000000000 --- a/gnu/packages/patches/onionshare-fix-install-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7afdd3366711a0c508bfb9323af8f4268ab77c9b Mon Sep 17 00:00:00 2001 -From: Efraim Flashner -Date: Thu, 21 Jul 2016 13:22:45 +0300 -Subject: [PATCH] patch - ---- - setup.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 8ae56fe..8b245c9 100644 ---- a/setup.py -+++ b/setup.py -@@ -91,15 +91,15 @@ setup( - include_package_data=True, - scripts=['install/scripts/onionshare', 'install/scripts/onionshare-gui'], - data_files=[ -- (os.path.join(sys.prefix, 'share/applications'), ['install/onionshare.desktop']), -- (os.path.join(sys.prefix, 'share/appdata'), ['install/onionshare.appdata.xml']), -- (os.path.join(sys.prefix, 'share/pixmaps'), ['install/onionshare80.xpm']), -- (os.path.join(sys.prefix, 'share/onionshare'), [ -+ ('share/applications', ['install/onionshare.desktop']), -+ ('share/appdata', ['install/onionshare.appdata.xml']), -+ ('share/pixmaps', ['install/onionshare80.xpm']), -+ ('share/onionshare', [ - 'resources/version.txt', - 'resources/wordlist.txt' - ]), -- (os.path.join(sys.prefix, 'share/onionshare/images'), images), -- (os.path.join(sys.prefix, 'share/onionshare/locale'), locale), -- (os.path.join(sys.prefix, 'share/onionshare/html'), html) -+ ('share/onionshare/images', images), -+ ('share/onionshare/locale', locale), -+ ('share/onionshare/html', html) - ] - ) --- -2.9.1 - diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 6d5994bf36..92644fed2e 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -138,7 +138,7 @@ (define-public privoxy (define-public onionshare (package (name "onionshare") - (version "0.9") + (version "0.9.2") (source (origin (method url-fetch) @@ -147,8 +147,7 @@ (define-public onionshare (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0pc3xbq379415s0i0y6rz02hay20zbvgra1jmg4mgrl9vbdr8zmw")) - (patches (search-patches "onionshare-fix-install-paths.patch")))) + "02iv7dg15da57gy3zvfchnwwpr21n1gva7mqwpwr958ni2034smk")))) (build-system python-build-system) (arguments `(#:phases @@ -157,25 +156,17 @@ (define-public onionshare (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (onionshare (string-append out "/share/onionshare"))) - (substitute* - "install/pyinstaller.spec" - ;; inform onionshare where the 'resources' files are installed - (("../resources") onionshare)) - (substitute* - "onionshare/strings.py" + (substitute* "onionshare/strings.py" ;; correct the locale directory (("helpers.get_resource_path\\('locale'\\)") (string-append "'" onionshare "/locale'"))) - (substitute* - "onionshare/helpers.py" + (substitute* "onionshare/helpers.py" ;; correct the location of version.txt - (("/usr") out) (("get_resource_path\\('version.txt'\\)") (string-append "'" onionshare "/version.txt'")) (("get_resource_path\\('wordlist.txt'\\)") (string-append "'" onionshare "/wordlist.txt'"))) - (substitute* - "onionshare/web.py" + (substitute* "onionshare/web.py" ;; fix the location of the html files (("helpers.get_resource_path\\('html/denied.html'\\)") (string-append "'" onionshare "/html/denied.html'")) @@ -183,25 +174,26 @@ (define-public onionshare (string-append "'" onionshare "/html/404.html'")) (("helpers.get_resource_path\\('html/index.html'\\)") (string-append "'" onionshare "/html/index.html'"))) - (substitute* - "onionshare_gui/file_selection.py" + (substitute* "onionshare_gui/file_selection.py" + ;; fancy box image in the GUI (("helpers.get_resource_path\\('images/drop_files.png'\\)") (string-append "'" onionshare "/images/drop_files.png'"))) - (substitute* - "onionshare_gui/server_status.py" + (substitute* "onionshare_gui/server_status.py" (("helpers.get_resource_path\\('images/server_stopped.png'\\)") (string-append "'" onionshare "/images/server_stopped.png'")) (("helpers.get_resource_path\\('images/server_working.png'\\)") (string-append "'" onionshare "/images/server_working.png'")) (("helpers.get_resource_path\\('images/server_started.png'\\)") (string-append "'" onionshare "/images/server_started.png'"))) - (substitute* - "onionshare_gui/onionshare_gui.py" + (substitute* "onionshare_gui/onionshare_gui.py" + ;; for the icon on the GUI (("helpers.get_resource_path\\('images/logo.png'\\)") (string-append "'" onionshare "/images/logo.png'"))) - (substitute* - "install/onionshare.desktop" - (("/usr") out)) + (substitute* '("setup.py" "onionshare/helpers.py") + (("sys.prefix,") (string-append "'" out "',"))) + (substitute* "setup.py" + ;; for the nautilus plugin + (("/usr/share/nautilus") "share/nautilus")) #t))) (delete 'check) (add-before 'strip 'tests -- cgit v1.2.3 From fc9286d03a79837d70d8f209521d73f6b18d171b Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 15 Dec 2016 10:37:21 +0000 Subject: gnu: tor: Recommend torsocks. * gnu/packages/tor.scm (tor)[description]: Recommend torsocks. Signed-off-by: Kei Kebreau --- gnu/packages/tor.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 92644fed2e..031c23a610 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -54,9 +54,6 @@ (define-public tor `(("zlib" ,zlib) ("openssl" ,openssl) ("libevent" ,libevent))) - - ;; TODO: Recommend `torsocks' since `torify' needs it. - (home-page "https://www.torproject.org/") (synopsis "Anonymous network router to improve privacy on the Internet") (description @@ -66,7 +63,11 @@ (define-public tor visit, and it prevents the sites you visit from learning your physical location. Tor works with many of your existing applications, including web browsers, instant messaging clients, remote login, and other -applications based on the TCP protocol.") +applications based on the TCP protocol. +To @code{torify} applications (to take measures to ensure that an application, +which has not been designed for use with Tor such as ssh, will use only Tor for +internet connectivity, and also ensures that there are no leaks from DNS, UDP or +the application layer) you need to install @code{torsocks}.") (license bsd-3))) (define-public torsocks -- cgit v1.2.3 From 55b2756906b87f091ea6bd88e6e056a5e5089afb Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 17 Dec 2016 16:13:31 -0500 Subject: gnu: tor: split description into two parts for easier reading. * gnu/packages/tor.scm (tor)[description]: Split it. --- gnu/packages/tor.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 031c23a610..707c0c9703 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -64,6 +64,7 @@ (define-public tor location. Tor works with many of your existing applications, including web browsers, instant messaging clients, remote login, and other applications based on the TCP protocol. + To @code{torify} applications (to take measures to ensure that an application, which has not been designed for use with Tor such as ssh, will use only Tor for internet connectivity, and also ensures that there are no leaks from DNS, UDP or -- cgit v1.2.3 From 08703721590d897ef8f87849887604c100eb561b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 20 Dec 2016 03:55:38 +0200 Subject: gnu: tor: Update to 0.2.9.8. * gnu/packages/tor.scm (tor): Update to 0.2.9.8. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/tor.scm') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 707c0c9703..6f26f404be 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -39,14 +39,14 @@ (define-module (gnu packages tor) (define-public tor (package (name "tor") - (version "0.2.8.11") + (version "0.2.9.8") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "1cvaviamvmajzpdgjn2k1rk3g9ywl1c4ygs5157gvnkyl6zs1pks")))) + "0sklgmx4nikcfhqd606kvpwy1l8840w24ikli1xjjx25739k7pgv")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) ; for tests -- cgit v1.2.3