maksbotan 14/09/14 12:51:58 Modified: wgetpaste-2.25-pinnwand.patch Log: Fix bpaste as they use SSL by default, bug #521854 comment 6 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Revision Changes Path 1.2 app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch?r1=1.1&r2=1.2 Index: wgetpaste-2.25-pinnwand.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wgetpaste-2.25-pinnwand.patch 7 Sep 2014 10:47:21 -0000 1.1 +++ wgetpaste-2.25-pinnwand.patch 14 Sep 2014 12:51:58 -0000 1.2 @@ -1,24 +1,19 @@ ---- wgetpaste.old 2014-08-16 07:10:02.376075629 -0400 -+++ wgetpaste 2014-08-31 16:02:46.996001592 -0400 -@@ -14,12 +14,14 @@ E=$'\e' - N=$'\n' - +--- /var/tmp/portage/app-text/wgetpaste-2.25-r1/work/wgetpaste-2.25/wgetpaste 2014-05-23 20:51:44.000000000 +0400 ++++ /usr/bin/wgetpaste 2014-09-14 16:46:21.345261294 +0400 +@@ -16,8 +16,10 @@ ### services SERVICES="bpaste ca codepad dpaste gists poundpython" # bpaste -ENGINE_bpaste=lodgeit +-URL_bpaste="http://bpaste.net/"; +ENGINE_bpaste=pinnwand - URL_bpaste="http://bpaste.net/"; ++URL_bpaste="https://bpaste.net/"; +DEFAULT_EXPIRATION_bpaste="1week" +DEFAULT_LANGUAGE_bpaste="text" # ca ENGINE_ca=ca URL_ca="http://pastebin.ca/"; - SIZE_ca="1024000 1%MB" - # codepad -@@ -141,10 +143,66 @@ objective-c objective-j ocaml ooc perl p - ragel-c ragel-cpp ragel-d ragel-java ragel-objc ragel-ruby raw rconsole rebol redcode rst rhtml rb \ - rbcon splus sass scala scheme smalltalk smarty sql sqlite3 squidconf tcl tcsh tex diff vala vb.net \ +@@ -143,6 +145,62 @@ vim xml xml+cheetah xml+django xml+evoque xml+mako xml+myghty xml+php xml+erb xml+smarty xslt yaml" POST_lodgeit="submit=Paste! % % language % % code" REGEX_RAW_lodgeit='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|' @@ -81,5 +76,12 @@ ### errors die() { - echo "$@" >&2 - exit 1 +@@ -514,7 +572,7 @@ + sed -n -e "${!regex}" <<< "$*" + else + [[ needstdout = $1 ]] && return 1 +- sed -n -e 's|^.*Location: \(http://[^ ]*\).*$|\1|p' <<< "$*" ++ sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*" + fi + } +
