diff options
| author |   Maxim Koltsov <maksbotan@gentoo.org> | 2014-09-14 12:51:58 +0000 |
|---|---|---|
| committer | Maxim Koltsov <maksbotan@gentoo.org> | 2014-09-14 12:51:58 +0000 |
| commit | 1f8656d6364cd88f7323cc00edf277959cc772a8 (patch) | |
| tree | f2ae45afcdf4442910fa2daadff9baccd4f6bba5 /app-text | |
| parent | Remove older unstable versions and fix bug #522562 (diff) | |
| download | gentoo-2-1f8656d6364cd88f7323cc00edf277959cc772a8.tar.gz gentoo-2-1f8656d6364cd88f7323cc00edf277959cc772a8.tar.bz2 gentoo-2-1f8656d6364cd88f7323cc00edf277959cc772a8.zip | |
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)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/wgetpaste/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch | 28 | ||||
| -rw-r--r-- | app-text/wgetpaste/wgetpaste-2.25-r2.ebuild (renamed from app-text/wgetpaste/wgetpaste-2.25-r1.ebuild) | 2 |
3 files changed, 23 insertions, 15 deletions
diff --git a/app-text/wgetpaste/ChangeLog b/app-text/wgetpaste/ChangeLog index e414f5419f68..fddba0870b23 100644 --- a/app-text/wgetpaste/ChangeLog +++ b/app-text/wgetpaste/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/wgetpaste # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/ChangeLog,v 1.140 2014/09/07 10:47:21 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/ChangeLog,v 1.141 2014/09/14 12:51:58 maksbotan Exp $ + +*wgetpaste-2.25-r2 (14 Sep 2014) + + 14 Sep 2014; Maxim Koltsov <maksbotan@gentoo.org> +wgetpaste-2.25-r2.ebuild, + -wgetpaste-2.25-r1.ebuild, files/wgetpaste-2.25-pinnwand.patch: + Fix bpaste as they use SSL by default, bug #521854 comment 6 *wgetpaste-2.25-r1 (07 Sep 2014) diff --git a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch index cd1a5a2ccff7..64a23e4fd944 100644 --- a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch +++ b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch @@ -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 + } + diff --git a/app-text/wgetpaste/wgetpaste-2.25-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r2.ebuild index 92d03a8c890c..515a26079171 100644 --- a/app-text/wgetpaste/wgetpaste-2.25-r1.ebuild +++ b/app-text/wgetpaste/wgetpaste-2.25-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/wgetpaste-2.25-r1.ebuild,v 1.1 2014/09/07 10:47:21 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/wgetpaste-2.25-r2.ebuild,v 1.1 2014/09/14 12:51:58 maksbotan Exp $ EAPI="5" |