misc/ciso: New maintainer, add man page.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

9 files changed, 250 insertions, 70 deletions

diff --git a/misc/ciso/README b/misc/ciso/README
index f6abc53f7e..e537efed35 100644
--- a/misc/ciso/README
+++ b/misc/ciso/README
@@ -1 +1,4 @@
-Ciso is a small tool to compress your psp iso to cso format.
+ciso (compress/decompress CSO images)
+
+ciso is a small tool to compress PlayStation Portable ISO images to
+CSO (compressed ISO) format, or decompress a CSO to an ISO.
diff --git a/misc/ciso/ciso.1 b/misc/ciso/ciso.1
new file mode 100644
index 0000000000..47d61eace6
--- /dev/null
+++ b/misc/ciso/ciso.1
@@ -0,0 +1,93 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "CISO" 1 "2022-01-26" "1.0.0" "SlackBuilds.org"
+.SH NAME
+ciso \- compress/decompress CSO images
+.\" RST source for ciso(1) man page. Convert with:
+.
+.\" rst2man.py ciso.rst > ciso.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+ciso \fIlevel\fP \fIinput\-file\fP \fIoutput\-file\fP
+.SH DESCRIPTION
+.sp
+CSO (compressed ISO) images are used with the Sony Playstation
+Portable game console.
+.sp
+\fBciso\fP compresses ISO images to CSO, or decompresses CSO to ISO. This
+is lossless compression.
+.sp
+To compress, set \fIlevel\fP to a number between 1 (least compression,
+fastest) and 9 (most compression, slowest). Example:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ciso 5 something.iso something.cso
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+To decompress, set \fIlevel\fP to 0 (zero). Example:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+ciso 0 something.cso something.iso
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+All 3 arguments are required. With missing arguments, \fBciso\fP will
+print its built\-in usage message and exit.
+.sp
+The CSO images produced by \fIciso\fP are "version 1". For more information
+on the CSO image format, see: \fI\%https://en.wikipedia.org/wiki/.CSO\fP
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/ciso\-1.0.0/license for license information.
+.SH AUTHORS
+.sp
+\fBciso\fP was written by BOOSTER.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The \fBciso\fP homepage: \fI\%https://sourceforge.net/projects/ciso/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/misc/ciso/ciso.SlackBuild b/misc/ciso/ciso.SlackBuild
index 0262b5bddc..b42d03a0b2 100644
--- a/misc/ciso/ciso.SlackBuild
+++ b/misc/ciso/ciso.SlackBuild
@@ -2,31 +2,23 @@
 
 # Slackware build script for ciso
 
-# Copyright 2008-2009  Tarantino Antonino <metrofox9@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written by Tarantino Antonino.
+# Modified and now maintained by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220126 bkw: BUILD=3
+# - take over maintenance.
+# - rework -p0 patches into one -p1 patch.
+# - add man page.
+# - actually use SLKCFLAGS.
+# - fix banner so it shows the right version number.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ciso
 VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +30,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -69,26 +58,28 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod 644 *
+
+# Patch does this:
+# - fix x86_64 build.
+# - add missing includes.
+# - add CFLAGS support to Makefile.
+# - make the banner show the actual version number.
 
-# Patching the source for compiling better on x64 arch and for avoiding warnings during compilation
-patch -p0 < $CWD/ciso.h.patch
-patch -p0 < $CWD/fix_includes.patch
+patch -p1 < $CWD/compilefix.diff
 
 mkdir -p $PKG/usr/bin
-make CC="gcc $SLKCFLAGS"
+make CFLAGS="$SLKCFLAGS -Wl,-s"
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220126 bkw: man page explains WTF a CSO image is (I didn't know).
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp license $PKG/usr/doc/$PRGNAM-$VERSION
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a license $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/ciso/ciso.h.patch b/misc/ciso/ciso.h.patch
deleted file mode 100644
index ff8fc16dd1..0000000000
--- a/misc/ciso/ciso.h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ciso.h~	2006-11-03 21:53:02.000000000 +0100
-+++ ciso.h	2010-06-27 13:54:03.148928062 +0200
-@@ -28,9 +28,9 @@
- typedef struct ciso_header

- {

- 	unsigned char magic[4];			/* +00 : 'C','I','S','O'                 */

--	unsigned long header_size;		/* +04 : header size (==0x18)            */

-+	uint32_t header_size;		/* +04 : header size (==0x18)            */

- 	unsigned long long total_bytes;	/* +08 : number of original data size    */

--	unsigned long block_size;		/* +10 : number of compressed block size */

-+	uint32_t block_size;		/* +10 : number of compressed block size */

- 	unsigned char ver;				/* +14 : version 01                      */

- 	unsigned char align;			/* +15 : align of index value            */

- 	unsigned char rsv_06[2];		/* +16 : reserved                        */

diff --git a/misc/ciso/ciso.info b/misc/ciso/ciso.info
index b110bb025e..24a4525d07 100644
--- a/misc/ciso/ciso.info
+++ b/misc/ciso/ciso.info
@@ -6,5 +6,5 @@ MD5SUM="6091333f30fd61852d7d629b937aee34"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Tarantino Antonino"
-EMAIL="metrofox9@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/misc/ciso/ciso.rst b/misc/ciso/ciso.rst
new file mode 100644
index 0000000000..6b2eb9c12f
--- /dev/null
+++ b/misc/ciso/ciso.rst
@@ -0,0 +1,66 @@
+.. RST source for ciso(1) man page. Convert with:
+..   rst2man.py ciso.rst > ciso.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.0.0
+.. |date| date::
+
+====
+ciso
+====
+
+------------------------------
+compress/decompress CSO images
+------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+ciso *level* *input-file* *output-file*
+
+DESCRIPTION
+===========
+
+CSO (compressed ISO) images are used with the Sony Playstation
+Portable game console.
+
+**ciso** compresses ISO images to CSO, or decompresses CSO to ISO. This
+is lossless compression.
+
+To compress, set *level* to a number between 1 (least compression,
+fastest) and 9 (most compression, slowest). Example::
+
+  ciso 5 something.iso something.cso
+
+To decompress, set *level* to 0 (zero). Example::
+
+  ciso 0 something.cso something.iso
+
+All 3 arguments are required. With missing arguments, **ciso** will
+print its built-in usage message and exit.
+
+The CSO images produced by *ciso* are "version 1". For more information
+on the CSO image format, see: https://en.wikipedia.org/wiki/.CSO
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/ciso-|version|/license for license information.
+
+AUTHORS
+=======
+
+**ciso** was written by BOOSTER.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The **ciso** homepage: https://sourceforge.net/projects/ciso/
diff --git a/misc/ciso/compilefix.diff b/misc/ciso/compilefix.diff
new file mode 100644
index 0000000000..2c8d689c9a
--- /dev/null
+++ b/misc/ciso/compilefix.diff
@@ -0,0 +1,54 @@
+diff -Naur ciso-1.0.0/Makefile ciso-1.0.0.patched/Makefile
+--- ciso-1.0.0/Makefile	2006-11-03 15:13:32.000000000 -0500
++++ ciso-1.0.0.patched/Makefile	2022-01-26 13:07:45.226989171 -0500
+@@ -8,10 +8,10 @@
+ 
+ all : ciso
+ ciso : ciso.o
+-	gcc -o ciso ciso.o -lz
++	gcc $(CFLAGS) -o ciso ciso.o -lz
+ 
+ ciso.o : ciso.c
+-	gcc -o ciso.o -c ciso.c
++	gcc $(CFLAGS) -o ciso.o -c ciso.c
+ 
+ install :
+ 	$(INSTALL) -m 755 ciso $(USRBINDIR)/ciso
+diff -Naur ciso-1.0.0/ciso.c ciso-1.0.0.patched/ciso.c
+--- ciso-1.0.0/ciso.c	2006-11-03 15:53:29.000000000 -0500
++++ ciso-1.0.0.patched/ciso.c	2022-01-26 13:10:25.148974634 -0500
+@@ -22,8 +22,10 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <zlib.h>               /* /usr(/local)/include/zlib.h */
+ #include <zconf.h>
++#include <string.h>
+ 
+ #include "ciso.h"
+ 
+@@ -401,7 +403,7 @@
+ 	int level;
+ 	int result;
+ 
+-	fprintf(stderr, "Compressed ISO9660 converter Ver.1.01 by BOOSTER\n");
++	fprintf(stderr, "Compressed ISO9660 converter Ver.1.0.0 by BOOSTER\n");
+ 
+ 	if (argc != 4)
+ 	{
+diff -Naur ciso-1.0.0/ciso.h ciso-1.0.0.patched/ciso.h
+--- ciso-1.0.0/ciso.h	2006-11-03 15:53:02.000000000 -0500
++++ ciso-1.0.0.patched/ciso.h	2022-01-26 11:39:19.537471479 -0500
+@@ -28,9 +28,9 @@
+ typedef struct ciso_header

+ {

+ 	unsigned char magic[4];			/* +00 : 'C','I','S','O'                 */

+-	unsigned long header_size;		/* +04 : header size (==0x18)            */

++	uint32_t header_size;		/* +04 : header size (==0x18)            */

+ 	unsigned long long total_bytes;	/* +08 : number of original data size    */

+-	unsigned long block_size;		/* +10 : number of compressed block size */

++	uint32_t block_size;		/* +10 : number of compressed block size */

+ 	unsigned char ver;				/* +14 : version 01                      */

+ 	unsigned char align;			/* +15 : align of index value            */

+ 	unsigned char rsv_06[2];		/* +16 : reserved                        */

diff --git a/misc/ciso/fix_includes.patch b/misc/ciso/fix_includes.patch
deleted file mode 100644
index 3ba61e5628..0000000000
--- a/misc/ciso/fix_includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ciso.c~	2010-06-16 13:02:45.044863179 +0200
-+++ ciso.c	2010-06-16 13:02:13.348862969 +0200
-@@ -22,8 +22,10 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <zlib.h>               /* /usr(/local)/include/zlib.h */
- #include <zconf.h>
-+#include <string.h>
- 
- #include "ciso.h"
- 
diff --git a/misc/ciso/slack-desc b/misc/ciso/slack-desc
index 034e66f537..8d944a8df4 100644
--- a/misc/ciso/slack-desc
+++ b/misc/ciso/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-ciso: ciso (Compress ISOs)
+ciso: ciso (compress/decompress CSO images)
 ciso:
-ciso: Ciso is a small tool to compress your psp iso to cso format.
+ciso: ciso is a small tool to compress PlayStation Portable ISO images to
+ciso: CSO (compressed ISO) format, or decompress a CSO to an ISO.
 ciso:
-ciso: Homepage: http://www.ciso.tenshu.fr
 ciso:
 ciso:
 ciso: