accessibility/wgetpaste: Updated for version 2.33.

Signed-off-by: B. Watson <urchlay@slackware.uk>

5 files changed, 110 insertions, 88 deletions

diff --git a/accessibility/wgetpaste/README b/accessibility/wgetpaste/README
index 748b245ebb..3e82f06732 100644
--- a/accessibility/wgetpaste/README
+++ b/accessibility/wgetpaste/README
@@ -3,11 +3,18 @@ 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.
+If you want to use the -N option, install ansifilter.
 
 Notes:
 
-- The "codepad" and "gists" services are currently broken. The
-  "dpaste" (default) and "bpaste" services work as of 20201024.
+- These services worked as of 20231220:
+  0x0, dpaste, sprunge, bpaste (the default).
 
-- There is a new release of wgetpaste (2.30), but *all* the services
-  are broken in 2.30, so it's useless to upgrade.
+- These services are broken (or were, when I tested on 20231220):
+  codepad, ix_io.
+
+- The gists (github) and snippets (gitlab) services are untested,
+  because they require a user account and authentication tokens in
+  wgetpaste.conf. The SlackBuild maintainer doesn't have nor want
+  to create accounts on these sites. If you try them, let me know
+  if they work, and I'll update this README with the results.
diff --git a/accessibility/wgetpaste/wgetpaste.1 b/accessibility/wgetpaste/wgetpaste.1
index 31a5bed25b..21073eeb17 100644
--- a/accessibility/wgetpaste/wgetpaste.1
+++ b/accessibility/wgetpaste/wgetpaste.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "WGETPASTE 1"
-.TH WGETPASTE 1 "2015-01-25" "2.25" "SlackBuilds.org"
+.TH WGETPASTE 1 "2023-12-20" "2.33" "SlackBuilds.org"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -83,73 +83,76 @@ wgetpaste \- Command\-line interface to various pastebin sites
 wgetpaste [options] [file[s]]
 .SH "OPTIONS"
 .IX Header "OPTIONS"
-.IP "\-l, \-\-language \s-1LANG\s0" 4
-.IX Item "-l, --language LANG"
+.IP "\fB\-l\fR, \fB\-\-language\fR \fIlang\fR" 4
+.IX Item "-l, --language lang"
 set language (defaults to \*(L"Plain Text\*(R")
-.IP "\-d, \-\-description \s-1DESCRIPTION\s0" 4
-.IX Item "-d, --description DESCRIPTION"
+.IP "\fB\-d\fR, \fB\-\-description\fR \fIdescription\fR" 4
+.IX Item "-d, --description description"
 set description (defaults to \*(L"stdin\*(R" or filename)
-.IP "\-n, \-\-nick \s-1NICK\s0" 4
-.IX Item "-n, --nick NICK"
+.IP "\fB\-n\fR, \fB\-\-nick\fR \fInick\fR" 4
+.IX Item "-n, --nick nick"
 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"dpaste\*(R")
-.IP "\-e, \-\-expiration \s-1EXPIRATION\s0" 4
-.IX Item "-e, --expiration EXPIRATION"
+.IP "\fB\-s\fR, \fB\-\-service\fR \fIservice\fR" 4
+.IX Item "-s, --service service"
+set service to use (defaults to \fIbpaste\fR)
+.IP "\fB\-e\fR, \fB\-\-expiration\fR \fIexpiration\fR" 4
+.IX Item "-e, --expiration expiration"
 set when it should expire (defaults to \*(L"1 month\*(R")
-.IP "\-S, \-\-list\-services" 4
+.IP "\fB\-S\fR, \fB\-\-list\-services\fR" 4
 .IX Item "-S, --list-services"
 list supported pastebin services
-.IP "\-L, \-\-list\-languages" 4
+.IP "\fB\-L\fR, \fB\-\-list\-languages\fR" 4
 .IX Item "-L, --list-languages"
 list languages supported by the specified service
-.IP "\-E, \-\-list\-expiration" 4
+.IP "\fB\-E\fR, \fB\-\-list\-expiration\fR" 4
 .IX Item "-E, --list-expiration"
 list expiration setting supported by the specified service
-.IP "\-u, \-\-tinyurl \s-1URL\s0" 4
-.IX Item "-u, --tinyurl URL"
+.IP "\fB\-u\fR, \fB\-\-tinyurl\fR \fIurl\fR" 4
+.IX Item "-u, --tinyurl url"
 convert input url to tinyurl
-.IP "\-c, \-\-command \s-1COMMAND\s0" 4
-.IX Item "-c, --command COMMAND"
+.IP "\fB\-c\fR, \fB\-\-command\fR \fIcommand\fR" 4
+.IX Item "-c, --command command"
 paste \s-1COMMAND\s0 and the output of \s-1COMMAND\s0
-.IP "\-i, \-\-info" 4
+.IP "\fB\-i\fR, \fB\-\-info\fR" 4
 .IX Item "-i, --info"
 append the output of `wgetpaste_info`
-.IP "\-I, \-\-info\-only" 4
+.IP "\fB\-I\fR, \fB\-\-info\-only\fR" 4
 .IX Item "-I, --info-only"
 paste the output of `wgetpaste_info` only
-.IP "\-x, \-\-xcut" 4
+.IP "\fB\-x\fR, \fB\-\-xcut\fR" 4
 .IX Item "-x, --xcut"
-read input from clipboard (requires xclip)
-.IP "\-X, \-\-xpaste" 4
+read input from clipboard (requires \fBxclip\fR(1))
+.IP "\fB\-X\fR, \fB\-\-xpaste\fR" 4
 .IX Item "-X, --xpaste"
-write resulting url to the X primary selection buffer (requires xclip)
-.IP "\-C, \-\-xclippaste" 4
+write resulting url to the X primary selection buffer (requires \fBxclip\fR(1))
+.IP "\fB\-C\fR, \fB\-\-xclippaste\fR" 4
 .IX Item "-C, --xclippaste"
-write resulting url to the X clipboard selection buffer (requires xclip)
-.IP "\-r, \-\-raw" 4
+write resulting url to the X clipboard selection buffer (requires \fBxclip\fR(1))
+.IP "\fB\-N\fR, \fB\-\-no\-ansi\fR" 4
+.IX Item "-N, --no-ansi"
+strip \s-1ANSI\s0 codes such as colors before pasting (requires \fBansifilter\fR(1))
+.IP "\fB\-r\fR, \fB\-\-raw\fR" 4
 .IX Item "-r, --raw"
 show url for the raw paste (no syntax highlighting or html)
-.IP "\-t, \-\-tee" 4
+.IP "\fB\-t\fR, \fB\-\-tee\fR" 4
 .IX Item "-t, --tee"
 use tee to show what is being pasted
-.IP "\-v, \-\-verbose" 4
+.IP "\fB\-v\fR, \fB\-\-verbose\fR" 4
 .IX Item "-v, --verbose"
 show wget stderr output if no url is received
-.IP "\-\-completions" 4
+.IP "\fB\-\-completions\fR" 4
 .IX Item "--completions"
-emit output suitable for shell completions (only affects \-\-list\-*)
-.IP "\-\-debug" 4
+emit output suitable for shell completions (only affects \fB\-\-list\-*\fR)
+.IP "\fB\-\-debug\fR" 4
 .IX Item "--debug"
-be *very* verbose (implies \-v)
-.IP "\-h, \-\-help" 4
+be *very* verbose (implies \fB\-v\fR)
+.IP "\fB\-h\fR, \fB\-\-help\fR" 4
 .IX Item "-h, --help"
 show this help
-.IP "\-g, \-\-ignore\-configs" 4
+.IP "\fB\-g\fR, \fB\-\-ignore\-configs\fR" 4
 .IX Item "-g, --ignore-configs"
 ignore /etc/wgetpaste.conf, ~/.wgetpaste.conf etc.
-.IP "\-\-version" 4
+.IP "\fB\-\-version\fR" 4
 .IX Item "--version"
 show version information
 .PP
@@ -164,9 +167,11 @@ HEADER_gists=\*(L"Authorization: token 1234abc56789...\*(R"
 .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
+\&\fBwgetpaste\fR might stop working with that site. Currently (December
+2023), the \fI0x0\fR, \fIdpaste\fR, \fIsprunge\fR, \fIbpaste\fR (default) services
+are working, the \fIcodepad\fR and \fIix_io\fR services are not working,
+and \fIgists\fR and \fIsnippets\fR are untested because they require user
+account creation.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Copyright (c) 2007 Bo Ørsted Andresen <bo.andresen@zlin.dk>
diff --git a/accessibility/wgetpaste/wgetpaste.SlackBuild b/accessibility/wgetpaste/wgetpaste.SlackBuild
index 4f86a2d819..e389a1a8d2 100644
--- a/accessibility/wgetpaste/wgetpaste.SlackBuild
+++ b/accessibility/wgetpaste/wgetpaste.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20231220 bkw: update for v2.33. at least half of the services
+# are working again, so update README and man page.
+
 # 20230704 bkw: BUILD=2
 # - Add doc dir. WTF was I smoking?
 
@@ -43,7 +46,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wgetpaste
-VERSION=${VERSION:-2.29}
+VERSION=${VERSION:-2.33}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -67,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $OUTPUT $PKG/usr/bin $PKG/etc/$PRGNAM.d $PKG/usr/man/man1 $PKG/$ZSHDIR
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
@@ -80,6 +83,7 @@ sed -i \
   -e 's,emerge --info,wgetpaste_info,g' \
   -e 's,emerge x11-misc/,install ,g' \
   -e 's,x11-misc/,,g' \
+  -e 's,app-text/,,g' \
   -e '/^INFO_ARGS/s,"[^"]*","",' \
 $PRGNAM
 
@@ -87,7 +91,7 @@ $PRGNAM
 ##  -e '/^DEFAULT_SERVICE/s,bpaste,dpaste,' \
 ## Set default paste service to something that works,
 ## since bpaste has stopped working.
-# no longer needed as the default is now poundpython, per upstream.
+# no longer needed as bpaste has started working again.
 
 # No 'make install', do it manually:
 install -groot -oroot -m0755 $PRGNAM $PKG/usr/bin
diff --git a/accessibility/wgetpaste/wgetpaste.info b/accessibility/wgetpaste/wgetpaste.info
index 1ccac3adfc..8b0d750065 100644
--- a/accessibility/wgetpaste/wgetpaste.info
+++ b/accessibility/wgetpaste/wgetpaste.info
@@ -1,8 +1,8 @@
 PRGNAM="wgetpaste"
-VERSION="2.29"
+VERSION="2.33"
 HOMEPAGE="http://wgetpaste.zlin.dk/"
-DOWNLOAD="http://wgetpaste.zlin.dk/wgetpaste-2.29.tar.bz2"
-MD5SUM="70be5a4f279c74000cebf926c12f4179"
+DOWNLOAD="https://github.com/zlin/wgetpaste/archive/2.33/wgetpaste-2.33.tar.gz"
+MD5SUM="3f004fd6ef89e9de664e5530fcbca126"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/accessibility/wgetpaste/wgetpaste.pod b/accessibility/wgetpaste/wgetpaste.pod
index ae98dbd487..75b8ec0a83 100644
--- a/accessibility/wgetpaste/wgetpaste.pod
+++ b/accessibility/wgetpaste/wgetpaste.pod
@@ -1,5 +1,5 @@
 # pod source for wgetpaste man page. Convert with:
-# pod2man --stderr -s1 -cSlackBuilds.org -r2.25 -u wgetpaste.pod > wgetpaste.1
+# pod2man --stderr -s1 -cSlackBuilds.org -r2.33 -u wgetpaste.pod > wgetpaste.1
 
 =pod
 
@@ -17,95 +17,99 @@ wgetpaste [options] [file[s]]
 
 =over 4
 
-=item -l, --language LANG
+=item B<-l>, B<--language> I<lang>
 
 set language (defaults to "Plain Text")
 
-=item -d, --description DESCRIPTION
+=item B<-d>, B<--description> I<description>
 
 set description (defaults to "stdin" or filename)
 
-=item -n, --nick NICK
+=item B<-n>, B<--nick> I<nick>
 
 set nick (defaults to your username)
 
-=item -s, --service SERVICE
+=item B<-s>, B<--service> I<service>
 
-set service to use (defaults to "dpaste")
+set service to use (defaults to I<bpaste>)
 
-=item -e, --expiration EXPIRATION
+=item B<-e>, B<--expiration> I<expiration>
 
 set when it should expire (defaults to "1 month")
 
-=item -S, --list-services
+=item B<-S>, B<--list-services>
 
 list supported pastebin services
 
-=item -L, --list-languages
+=item B<-L>, B<--list-languages>
 
 list languages supported by the specified service
 
-=item -E, --list-expiration
+=item B<-E>, B<--list-expiration>
 
 list expiration setting supported by the specified service
 
-=item -u, --tinyurl URL
+=item B<-u>, B<--tinyurl> I<url>
 
 convert input url to tinyurl
 
-=item -c, --command COMMAND
+=item B<-c>, B<--command> I<command>
 
 paste COMMAND and the output of COMMAND
 
-=item -i, --info
+=item B<-i>, B<--info>
 
 append the output of `wgetpaste_info`
 
-=item -I, --info-only
+=item B<-I>, B<--info-only>
 
 paste the output of `wgetpaste_info` only
 
-=item -x, --xcut
+=item B<-x>, B<--xcut>
 
-read input from clipboard (requires xclip)
+read input from clipboard (requires B<xclip>(1))
 
-=item -X, --xpaste
+=item B<-X>, B<--xpaste>
 
-write resulting url to the X primary selection buffer (requires xclip)
+write resulting url to the X primary selection buffer (requires B<xclip>(1))
 
-=item -C, --xclippaste
+=item B<-C>, B<--xclippaste>
 
-write resulting url to the X clipboard selection buffer (requires xclip)
+write resulting url to the X clipboard selection buffer (requires B<xclip>(1))
 
-=item -r, --raw
+=item B<-N>, B<--no-ansi>
+
+strip ANSI codes such as colors before pasting (requires B<ansifilter>(1))
+
+=item B<-r>, B<--raw>
 
 show url for the raw paste (no syntax highlighting or html)
 
-=item -t, --tee
+=item B<-t>, B<--tee>
 
 use tee to show what is being pasted
 
-=item -v, --verbose
+=item B<-v>, B<--verbose>
 
 show wget stderr output if no url is received
 
-=item --completions
+=item B<--completions>
 
-emit output suitable for shell completions (only affects --list-*)
+emit output suitable for shell completions (only affects B<--list-*>)
 
-=item --debug
+=item B<--debug>
 
-be *very* verbose (implies -v)
+be *very* verbose (implies B<-v>)
 
-=item -h, --help
+=item B<-h>, B<--help>
 
 show this help
 
-=item -g, --ignore-configs
+=item B<-g>, B<--ignore-configs>
 
 ignore /etc/wgetpaste.conf, ~/.wgetpaste.conf etc.
 
-=item --version
+=item B<--version>
 
 show version information
 
@@ -123,9 +127,11 @@ HEADER_gists="Authorization: token 1234abc56789..."
 
 B<wgetpaste> works by hard-coding URLs and CGI parameters into
 the script. This means that if a paste service's web site changes,
-B<wgetpaste> might stop working with that site. Currently (January 2015),
-the B<ca> (http://pastebin.ca) and B<bpaste> (http://bpaste.net) services
-are broken, and the others have been tested and work OK.
+B<wgetpaste> might stop working with that site. Currently (December
+2023), the I<0x0>, I<dpaste>, I<sprunge>, I<bpaste> (default) services
+are working, the I<codepad> and I<ix_io> services are not working,
+and I<gists> and I<snippets> are untested because they require user
+account creation.
 
 =head1 AUTHOR