From 57c0e909752d93fad6803bc287b2c629c92b939a Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 27 Jan 2015 00:20:11 +0700 Subject: accessibility/wgetpaste: Change default pastebin. Signed-off-by: Willy Sudiarto Raharjo --- accessibility/wgetpaste/README | 3 +++ accessibility/wgetpaste/wgetpaste.1 | 11 +++++++-- accessibility/wgetpaste/wgetpaste.SlackBuild | 35 +++++++++++++++++++++------- accessibility/wgetpaste/wgetpaste.example | 2 +- accessibility/wgetpaste/wgetpaste.pod | 10 +++++++- 5 files changed, 49 insertions(+), 12 deletions(-) (limited to 'accessibility') diff --git a/accessibility/wgetpaste/README b/accessibility/wgetpaste/README index 8022215af0..9fdbf4ad6c 100644 --- a/accessibility/wgetpaste/README +++ b/accessibility/wgetpaste/README @@ -3,3 +3,6 @@ wgetpaste (command-line interface to various pastebins) See /etc/wgetpaste.conf.sample for config options. If you want to use the -x, -X, -C options to wgetpaste, install xclip. + +Please note: the "ca" and "bpaste" services are currently broken. The +default "dpaste" service works as of 20150125. diff --git a/accessibility/wgetpaste/wgetpaste.1 b/accessibility/wgetpaste/wgetpaste.1 index 5a5d0aa294..d232592d17 100644 --- a/accessibility/wgetpaste/wgetpaste.1 +++ b/accessibility/wgetpaste/wgetpaste.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "WGETPASTE 1" -.TH WGETPASTE 1 "2014-08-18" "2.25" "SlackBuilds.org" +.TH WGETPASTE 1 "2015-01-25" "2.25" "SlackBuilds.org" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -94,7 +94,7 @@ set description (defaults to \*(L"stdin\*(R" or filename) set nick (defaults to your username) .IP "\-s, \-\-service \s-1SERVICE\s0" 4 .IX Item "-s, --service SERVICE" -set service to use (defaults to \*(L"bpaste\*(R") +set service to use (defaults to \*(L"dpaste\*(R") .IP "\-e, \-\-expiration \s-1EXPIRATION\s0" 4 .IX Item "-e, --expiration EXPIRATION" set when it should expire (defaults to \*(L"1 month\*(R") @@ -160,6 +160,13 @@ per user in any of ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf. An additional http header can be passed by setting HEADER_${\s-1SERVICE\s0} in any of the configuration files mentioned above. For example, authenticating with github gist: HEADER_gists=\*(L"Authorization: token 1234abc56789...\*(R" +.SH "BUGS" +.IX Header "BUGS" +\&\fBwgetpaste\fR works by hard-coding URLs and \s-1CGI\s0 parameters into +the script. This means that if a paste service's web site changes, +\&\fBwgetpaste\fR might stop working with that site. Currently (January 2015), +the \fBca\fR (http://pastebin.ca) and \fBbpaste\fR (http://bpaste.net) services +are broken, and the others have been tested and work \s-1OK.\s0 .SH "AUTHOR" .IX Header "AUTHOR" Copyright (c) 2007 Bo Ørsted Andresen diff --git a/accessibility/wgetpaste/wgetpaste.SlackBuild b/accessibility/wgetpaste/wgetpaste.SlackBuild index 6dc2c2472e..0577cd1c46 100644 --- a/accessibility/wgetpaste/wgetpaste.SlackBuild +++ b/accessibility/wgetpaste/wgetpaste.SlackBuild @@ -10,9 +10,24 @@ # - Updated to 2.25. # - Rewrote man page in pod. +# 20150124 bkw: +# - Changed the default service from bpaste to dpaste, since bpaste +# seems to have stopped working. +# - Get rid of zlin.dk service, as it's gone away. +# - Tested all services. As of this writing, these services work: +# dpaste codepad gists poundpython +# These do NOT work: +# bpaste ca +# I haven't tried very hard to get the non-working ones to work, let me know +# if you manage it. I notice ca has captchas now, so it'll likely never +# work with a script. +# - Documented non-working services in man page. +# - Replaced no_gentooisms.diff with some sed stuff. +# - Bumped BUILD to 2. + PRGNAM=wgetpaste VERSION=${VERSION:-2.25} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} ARCH=noarch @@ -39,19 +54,23 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# x11-misc/xclip => xclip -# 'emerge --info' => wgetpaste_info -patch -p1 < $CWD/no_gentooisms.diff +# Un-gentoo-ize the help and error messages, use wgetpaste_info for the +# -i and -I options. Set default paste service to something that works, +# since bpaste has stopped working. +sed -i \ + -e '/^DEFAULT_SERVICE/s,bpaste,dpaste,' \ + -e 's,emerge --info,wgetpaste_info,g' \ + -e 's,emerge x11-misc/,install ,g' \ + -e 's,x11-misc/,,g' \ + -e '/^INFO_ARGS/s,"[^"]*","",' \ +$PRGNAM install -groot -oroot -m0755 $PRGNAM $PKG/usr/bin install -groot -oroot -m0644 _$PRGNAM $PKG/$ZSHDIR install -groot -oroot -m0644 $CWD/$PRGNAM.example $PKG/etc/$PRGNAM.conf.sample install -groot -oroot -m0755 $CWD/${PRGNAM}_info $PKG/usr/bin -# Add zlin.dk service, operated by the wgetpaste author -install -groot -oroot -m0644 $CWD/zlin.conf $PKG/etc/$PRGNAM.d/ - -# Man page made by help2man and edited slightly +# Man page made from --help output, by way of POD. gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz mkdir -p $PKG/install diff --git a/accessibility/wgetpaste/wgetpaste.example b/accessibility/wgetpaste/wgetpaste.example index 9aface37da..9ca05e4782 100644 --- a/accessibility/wgetpaste/wgetpaste.example +++ b/accessibility/wgetpaste/wgetpaste.example @@ -6,7 +6,7 @@ DEFAULT_NICK=zlin # change the default service -DEFAULT_SERVICE="zlin" +DEFAULT_SERVICE="dpaste" # change default language for the ca and the osl services DEFAULT_LANGUAGE_ca="Bash" diff --git a/accessibility/wgetpaste/wgetpaste.pod b/accessibility/wgetpaste/wgetpaste.pod index d716d8bd38..5f3c37213c 100644 --- a/accessibility/wgetpaste/wgetpaste.pod +++ b/accessibility/wgetpaste/wgetpaste.pod @@ -31,7 +31,7 @@ set nick (defaults to your username) =item -s, --service SERVICE -set service to use (defaults to "bpaste") +set service to use (defaults to "dpaste") =item -e, --expiration EXPIRATION @@ -119,6 +119,14 @@ An additional http header can be passed by setting HEADER_${SERVICE} in any of t configuration files mentioned above. For example, authenticating with github gist: HEADER_gists="Authorization: token 1234abc56789..." +=head1 BUGS + +B works by hard-coding URLs and CGI parameters into +the script. This means that if a paste service's web site changes, +B might stop working with that site. Currently (January 2015), +the B (http://pastebin.ca) and B (http://bpaste.net) services +are broken, and the others have been tested and work OK. + =head1 AUTHOR Copyright (c) 2007 Bo Ørsted Andresen -- cgit v1.2.3