system/unar: Updated for version 1.10.3.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

7 files changed, 188 insertions, 62 deletions

diff --git a/system/unar/Extra/lsar.1 b/system/unar/Extra/lsar.1
new file mode 100644
index 0000000000..73ac7afa24
--- /dev/null
+++ b/system/unar/Extra/lsar.1
@@ -0,0 +1,59 @@
+.TH LSAR 1 2011-09-26 "The Unarchiver" "User Commands"
+.SH NAME
+lsar \- list archive file contents
+.SH SYNOPSIS
+.B lsar
+[\fIOPTION\fR]... \fIARCHIVE\fR...
+.SH DESCRIPTION
+List the contents of \fIARCHIVE\fRs.
+.SH OPTIONS
+.TP
+.BR \-l ", " \-long
+Print more information about each file in the archive.
+.TP
+.BR \-L ", " \-verylong
+Print all available information about each file in the archive.
+.TP
+.BR \-t ", " \-test
+Test the integrity of the files in the archive, if possible.
+.TP
+.BR \-p ", " \-password " \fIPASSWORD"
+The password to use for decrypting protected archives.
+.TP
+.BR \-e ", " \-encoding " \fIENCODING"
+The encoding to use for filenames in the archive, when it is not
+known.  If not specified, the program attempts to auto-detect the
+encoding used.  Use "help" or "list" as the argument to give a listing
+of all supported encodings.
+.TP
+.BR \-E ", " \-password\-encoding " \fIENCODING"
+The encoding to use for the password for the archive, when it is not
+known.  If not specified, then either the encoding given by the
+\-encoding option or the auto-detected encoding is used.
+.TP
+.BR \-pe ", " \-print\-encoding
+Print the auto-detected encoding and the confidence factor after the
+file list.
+.TP
+.BR \-i ", " \-indexes
+Instead of specifying the files to list as filenames or wildcard
+patterns, specify them as indexes.
+.TP
+.BR \-j ", " \-json
+Print the listing in JSON format.
+.TP
+.BR \-ja ", " \-json\-ascii
+Print the listing in JSON format, encoded as pure ASCII text.
+.TP
+.BR \-nr ", " \-no\-recursion
+Do not attempt to list the contents of archives contained in other
+archives.  For instance, when listing a .tar.gz file, only list
+the .tar file and not its contents.
+.TP
+.BR \-h ", " \-help
+Display help information.
+.TP
+.BR \-v ", " \-version
+Print version and exit.
+.SH SEE ALSO
+.BR unar (1)
diff --git a/system/unar/Extra/lsar.bash_completion b/system/unar/Extra/lsar.bash_completion
new file mode 100644
index 0000000000..14b5dee6d3
--- /dev/null
+++ b/system/unar/Extra/lsar.bash_completion
@@ -0,0 +1,16 @@
+__lsar()
+{
+	local cur prev opts
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	opts="--long --verylong --test --password ---encoding --password-encoding \
+		--print-encoding --indexes --json --json-ascii --no-recursion --help \
+		--version"
+	if [[ ${cur} == -* ]] ; then
+		COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+		return 0
+	fi
+}
+
+complete -o bashdefault -A file -F __lsar  lsar
+
diff --git a/system/unar/Extra/unar.1 b/system/unar/Extra/unar.1
new file mode 100644
index 0000000000..3b3758f37b
--- /dev/null
+++ b/system/unar/Extra/unar.1
@@ -0,0 +1,77 @@
+.TH unar 1 2011-09-26 "The Unarchiver" "User Commands"
+.SH NAME
+unar \- extract archive file contents
+.SH SYNOPSIS
+.B unar
+[\fIOPTION\fR]... \fIARCHIVE\fR [\fIFILE\fR]...
+.SH DESCRIPTION
+Extract \fIFILE\fRs or the contents of \fIARCHIVE\fR.
+.SH OPTIONS
+.TP
+.BR \-o ", " \-output\-directory " \fIDIRECTORY"
+The directory to write the contents of the archive to.  Defaults to
+the current directory.
+.TP
+.BR \-f ", " \-force\-overwrite
+Always overwrite files when a file to be unpacked already exists on
+disk.  By default, the program asks the user if possible, otherwise
+skips the file.
+.TP
+.BR \-r ", " \-force\-rename
+Always rename files when a file to be unpacked already exists on disk.
+.TP
+.BR \-s ", " \-force\-skip
+Always skip files when a file to be unpacked already exists on disk.
+.TP
+.BR \-d ", " \-force\-directory
+Always create a containing directory for the contents of the unpacked
+archive.  By default, a directory is created if there is more than one
+top-level file or folder.
+.TP
+.BR \-D ", " \-no\-directory
+Never create a containing directory for the contents of the unpacked
+archive.
+.TP
+.BR \-p ", " \-password " \fIPASSWORD"
+The password to use for decrypting protected archives.
+.TP
+.BR \-e ", " \-encoding " \fIENCODING"
+The encoding to use for filenames in the archive, when it is not
+known.  If not specified, the program attempts to auto-detect the
+encoding used.  Use "help" or "list" as the argument to give a listing
+of all supported encodings.
+.TP
+.BR \-E ", " \-password\-encoding " \fIENCODING"
+The encoding to use for the password for the archive, when it is not
+known.  If not specified, then either the encoding given by the
+\-encoding option or the auto-detected encoding is used.
+.TP
+.BR \-i ", " \-indexes
+Instead of specifying the files to list as filenames or wildcard
+patterns, specify them as indexes, as output by lsar.
+.TP
+.BR \-nr ", " \-no\-recursion
+Do not attempt to extract archives contained in other archives. For
+instance, when unpacking a .tar.gz file, only unpack the .tar file and
+not its contents.
+.TP
+.BR \-t ", " \-copy\-time
+Copy the file modification time from the archive file to the
+containing directory, if one is created.
+.TP
+.BR \-k ", " "\-forks visible" | hidden | skip
+How to handle Mac OS resource forks.  \fBvisible\fR creates
+AppleDouble files with the extension ".rsrc", \fBhidden\fR creates
+AppleDouble files with the prefix "._", and \fBskip\fR discards all
+resource forks.  Defaults to \fBvisible\fR.
+.TP
+.BR \-q ", " \-quiet
+Run in quiet mode.
+.TP
+.BR \-v ", " \-version
+Print version and exit.
+.TP
+.BR \-h ", " \-help
+Display help information.
+.SH SEE ALSO
+.BR lsar (1)
diff --git a/system/unar/Extra/unar.bash_completion b/system/unar/Extra/unar.bash_completion
new file mode 100644
index 0000000000..06fe66f567
--- /dev/null
+++ b/system/unar/Extra/unar.bash_completion
@@ -0,0 +1,23 @@
+__unar()
+{
+	local cur prev opts
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	opts="--output-directory --force-overwrite --force-rename --force-skip \
+		--force-directory --no-directory --password --encoding \
+		--password-encoding --indexes --no-recursion --copy-time \
+		--no-quarantine --forks --quiet --help --version"
+	if [[ ${prev} == "--forks" ]] ; then
+		local forksopts
+		forksopts="fork visible hidden skip"
+		COMPREPLY=( $(compgen -W "${forksopts}" -- ${cur}) )
+		return 0
+	elif [[ ${cur} == -* ]] ; then
+		COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+		return 0
+	fi
+}
+
+complete -o bashdefault -A file -F __unar  unar
+
diff --git a/system/unar/document-undocumented-options.patch b/system/unar/document-undocumented-options.patch
deleted file mode 100644
index 3e7a5342f5..0000000000
--- a/system/unar/document-undocumented-options.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Document undocumented options
- lsar's -L and -v options and unar's -v option are not documented in
- their respective manual pages, so do so.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/unar/+bug/1393321
-Bug: https://code.google.com/p/theunarchiver/issues/detail?id=352
-Author: Matt Kraai <kraai@ftbfs.org>
-Last-Update: 2014-12-15
-
-Index: unar/Extra/lsar.1
-===================================================================
---- unar.orig/Extra/lsar.1	2014-12-15 07:00:54.285823351 -0800
-+++ unar/Extra/lsar.1	2014-12-15 07:01:24.095917401 -0800
-@@ -11,6 +11,9 @@
- .BR \-l ", " \-long
- Print more information about each file in the archive.
- .TP
-+.BR \-L ", " \-verylong
-+Print all available information about each file in the archive.
-+.TP
- .BR \-t ", " \-test
- Test the integrity of the files in the archive, if possible.
- .TP
-@@ -49,5 +52,8 @@
- .TP
- .BR \-h ", " \-help
- Display help information.
-+.TP
-+.BR \-v ", " \-version
-+Print version and exit.
- .SH SEE ALSO
- .BR unar (1)
-Index: unar/Extra/unar.1
-===================================================================
---- unar.orig/Extra/unar.1	2014-12-15 07:00:54.285823351 -0800
-+++ unar/Extra/unar.1	2014-12-15 07:01:24.095917401 -0800
-@@ -68,6 +68,9 @@
- .BR \-q ", " \-quiet
- Run in quiet mode.
- .TP
-+.BR \-v ", " \-version
-+Print version and exit.
-+.TP
- .BR \-h ", " \-help
- Display help information.
- .SH SEE ALSO
diff --git a/system/unar/unar.SlackBuild b/system/unar/unar.SlackBuild
index 61017e129a..a2c7d2dfcc 100644
--- a/system/unar/unar.SlackBuild
+++ b/system/unar/unar.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for <appname>
 
-# Copyright 2016-2017 Alexander Verbovetsky, Moscow, Russia
+# Copyright 2016-2019 Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unar
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-1.10.3}
+SVERSION=${SVERSION:-1.10.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,10 +56,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf "The Unarchiver" $PRGNAM-$VERSION
-unzip "$CWD/$PRGNAM$VERSION"_src.zip
-mv "The Unarchiver" $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf XADMaster UniversalDetector
+unzip $CWD/unar-sources-$SVERSION.zip
+cd XADMaster
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,25 +70,21 @@ export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export OBJCFLAGS="$SLKCFLAGS"
 
-cd XADMaster
 make -f Makefile.linux
 
 mkdir -p $PKG/usr/bin
 install -m 0755 -o root -g root lsar unar $PKG/usr/bin/
 
-cd ../Extra
-patch -p2 < $CWD/document-undocumented-options.patch
 mkdir -p $PKG/usr/man/man1
-install -m 0644 -o root -g root lsar.1 unar.1 $PKG/usr/man/man1
+install -m 0644 -o root -g root $CWD/Extra/lsar.1 $CWD/Extra/unar.1 \
+  $PKG/usr/man/man1
 
 mkdir -p $PKG/usr/share/bash-completion/completions
-install -m 0644 -o root -g root unar.bash_completion \
+install -m 0644 -o root -g root $CWD/Extra/unar.bash_completion \
   $PKG/usr/share/bash-completion/completions/unar
-install -m 0644 -o root -g root lsar.bash_completion \
+install -m 0644 -o root -g root $CWD/Extra/lsar.bash_completion \
   $PKG/usr/share/bash-completion/completions/lsar
 
-cd ..
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/system/unar/unar.info b/system/unar/unar.info
index 70c0b95762..4f25f6e538 100644
--- a/system/unar/unar.info
+++ b/system/unar/unar.info
@@ -1,8 +1,8 @@
 PRGNAM="unar"
-VERSION="1.10.1"
+VERSION="1.10.3"
 HOMEPAGE="https://theunarchiver.com/command-line"
-DOWNLOAD="http://downloads.sourceforge.net/slackbuildsdirectlinks/unar1.10.1_src.zip"
-MD5SUM="8fb16cf42ee2832d63ff378fd049e08c"
+DOWNLOAD="https://github.com/MacPaw/XADMaster/releases/download/v1.10.4/unar-sources-1.10.4.zip"
+MD5SUM="d3a3733239ebeff7d249d4ad5efd1e84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnustep-base"