From 57ea4dfca1212687213a2db8cd47addf85e2ea3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2020 03:01:33 +0200 Subject: gnu: wgetpaste: Fix historical confusion. * gnu/packages/wget.scm (wgetpaste)[arguments]: Fix the reversed substitution and clarify its purpose. --- gnu/packages/wget.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index d7ac9e0c12..0c6d27471b 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -94,12 +94,12 @@ (define-public wgetpaste (modify-phases %standard-phases (delete 'configure) (delete 'build) - (add-after 'unpack 'remove-dead-paste-site - ;; This phase is adaped from the following patch: - ;; https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/wgetpaste/files/wgetpaste-remove-dead.patch + (add-after 'unpack 'change-unfriendly-default (lambda _ (substitute* "wgetpaste" - (("-bpaste") "-dpaste")) ; dpaste blocks tor users + ;; dpaste blocks Tor users. Use a better default. + (("DEFAULT_SERVICE:-dpaste") + "DEFAULT_SERVICE-bpaste")) #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 1b0755012b38fded6059c10849dc16e3e50ed8b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2020 03:09:39 +0200 Subject: gnu: wgetpaste: Use HTTPS home page. * gnu/packages/wget.scm (wgetpaste)[source, home-page]: Use HTTPS. --- gnu/packages/wget.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index 0c6d27471b..b3a3982bec 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -80,7 +80,7 @@ (define-public wgetpaste (source (origin (method url-fetch) - (uri (string-append "http://wgetpaste.zlin.dk/wgetpaste-" + (uri (string-append "https://wgetpaste.zlin.dk/wgetpaste-" version ".tar.bz2")) (sha256 (base32 @@ -128,7 +128,7 @@ (define-public wgetpaste (inputs `(("wget" ,wget) ("xclip" ,xclip))) - (home-page "http://wgetpaste.zlin.dk/") + (home-page "https://wgetpaste.zlin.dk/") (synopsis "Script that automates pasting to a number of pastebin services") (description "@code{wgetpaste} is an extremely simple command-line interface to various -- cgit v1.2.3 From 7b88396febe35e05bb4f67ed609204c8533314d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2020 03:10:07 +0200 Subject: gnu: wgetpaste: Update to 2.30. * gnu/packages/wget.scm (wgetpaste): Update to 2.30. --- gnu/packages/wget.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/wget.scm') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index b3a3982bec..a8345da818 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -76,15 +76,14 @@ (define-public wget (define-public wgetpaste (package (name "wgetpaste") - (version "2.29") + (version "2.30") (source (origin (method url-fetch) (uri (string-append "https://wgetpaste.zlin.dk/wgetpaste-" version ".tar.bz2")) (sha256 - (base32 - "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22")))) + (base32 "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 30714da09a50bf20780e9903104e29c930da855a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 Sep 2020 04:28:05 +0200 Subject: gnu: wgetpaste: Update bpaste URL & regular expressions. * gnu/packages/wget.scm (wgetpaste)[source]: Add patch. * gnu/packages/patches/wgetpaste-update-bpaste.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/wgetpaste-update-bpaste.patch | 27 ++++++++++++++++++++++ gnu/packages/wget.scm | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/wgetpaste-update-bpaste.patch (limited to 'gnu/packages/wget.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 3db43f1bf5..67cc13d35e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1656,6 +1656,7 @@ dist_patch_DATA = \ %D%/packages/patches/webkitgtk-share-store.patch \ %D%/packages/patches/webkitgtk-bind-all-fonts.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ + %D%/packages/patches/wgetpaste-update-bpaste.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/patches/wgetpaste-update-bpaste.patch b/gnu/packages/patches/wgetpaste-update-bpaste.patch new file mode 100644 index 0000000000..f92a0c17ed --- /dev/null +++ b/gnu/packages/patches/wgetpaste-update-bpaste.patch @@ -0,0 +1,27 @@ +From: Tobias Geerinckx-Rice +Date: Tue, 01 Sep 2020 04:23:25 +0200 +Subject: [PATCH] Update bpaste URL & regular expressions. + +diff -Naur wgetpaste-2.30/wgetpaste wgetpaste-2.30a/wgetpaste +--- wgetpaste-2.30/wgetpaste 2020-07-31 23:56:05.000000000 +0200 ++++ wgetpaste-2.30a/wgetpaste 2020-09-01 04:22:37.499898403 +0200 +@@ -16,7 +16,7 @@ + SERVICES="codepad bpaste dpaste gists snippets" + # bpaste + ENGINE_bpaste=pinnwand +-URL_bpaste="https://bpaste.net/" ++URL_bpaste="https://bpa.st/" + DEFAULT_EXPIRATION_bpaste="1week" + DEFAULT_LANGUAGE_bpaste="text" + # codepad +@@ -194,8 +194,8 @@ + xml+velocity xml xquery xslt xtend yaml" + EXPIRATIONS_pinnwand="1day 1week 1month never" + POST_pinnwand="submit=Paste! % % lexer expiry % code" +-REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1" +-REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|' ++REGEX_LOC_pinnwand="\(/[^ ]*\).*$|https://bpa.st\1" ++REGEX_RAW_pinnwand='s|^\(https\?://[^/]*\)\(/[^ ]*/\?\)$|\1/raw\2|' + + ### errors + die() { diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index a8345da818..7950b3b729 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -83,7 +83,8 @@ (define-public wgetpaste (uri (string-append "https://wgetpaste.zlin.dk/wgetpaste-" version ".tar.bz2")) (sha256 - (base32 "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73")))) + (base32 "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73")) + (patches (search-patches "wgetpaste-update-bpaste.patch")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3