misc/ciso: Updated for version 1.0.2_2.

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

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

5 files changed, 31 insertions, 76 deletions

diff --git a/misc/ciso/ciso.1 b/misc/ciso/ciso.1
index 47d61eace6fcf..c5bf285fade05 100644
--- a/misc/ciso/ciso.1
+++ b/misc/ciso/ciso.1
@@ -27,15 +27,13 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" 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"
+.TH "CISO" 1 "2024-10-04" "1.0.2" "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
@@ -79,7 +77,7 @@ 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.
+See the file /usr/doc/ciso\-1.0.2/license for license information.
 .SH AUTHORS
 .sp
 \fBciso\fP was written by BOOSTER.
diff --git a/misc/ciso/ciso.SlackBuild b/misc/ciso/ciso.SlackBuild
index 12b0356f312c2..997666149dd99 100644
--- a/misc/ciso/ciso.SlackBuild
+++ b/misc/ciso/ciso.SlackBuild
@@ -7,6 +7,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20241004 bkw:
+# - update for v1.0.2_2.
+# - apply Debian's patches (get rid of my own).
+# - update man page.
+
 # 20220126 bkw: BUILD=3
 # - take over maintenance.
 # - rework -p0 patches into one -p1 patch.
@@ -17,11 +22,18 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ciso
-VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.0.2_2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+SRCVER=${VERSION%_*} # e.g. 1.0.2_2 => 1.0.2
+DEBVER=${VERSION#*_} # e.g. 1.0.2_2 => 2
+
+# 20241004 bkw: for whatever reason, the Debianized source tarball's
+# top directory isn't $PRGNAM-$VERSION as it normally is.
+SRCDIR=${SRCDIR:-jamie-ciso-34d5813}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -54,25 +66,23 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCDIR
+tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.gz
+cd $SRCDIR
+tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz
 chown -R root:root .
 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.
-
-patch -p1 < $CWD/compilefix.diff
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
 
 mkdir -p $PKG/usr/bin
-make CFLAGS="$SLKCFLAGS -Wl,-s"
+make CFLAGS="$SLKCFLAGS" LDFLAGS="-Wl,-s"
 make install DESTDIR=$PKG
 
 # 20220126 bkw: man page explains WTF a CSO image is (I didn't know).
+# 20241004 bkw: debian/ has a man page, but mine is better.
 mkdir -p $PKG/usr/man/man1
 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
diff --git a/misc/ciso/ciso.info b/misc/ciso/ciso.info
index fab0861594b2a..cc618b106e04c 100644
--- a/misc/ciso/ciso.info
+++ b/misc/ciso/ciso.info
@@ -1,8 +1,10 @@
 PRGNAM="ciso"
-VERSION="1.0.0"
+VERSION="1.0.2_2"
 HOMEPAGE="https://sourceforge.net/projects/ciso/"
-DOWNLOAD="https://downloads.sourceforge.net/project/ciso/ciso/1.0.0/ciso-1.0.0.tar.gz"
-MD5SUM="6091333f30fd61852d7d629b937aee34"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/c/ciso/ciso_1.0.2.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/c/ciso/ciso_1.0.2-2.debian.tar.xz"
+MD5SUM="a44e893746725e1ac8269ed1e9a3d740 \
+        39f3dd719b3a179edf7b673f74b195f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/ciso/ciso.rst b/misc/ciso/ciso.rst
index 6b2eb9c12fb7b..ee2ae32dbdc55 100644
--- a/misc/ciso/ciso.rst
+++ b/misc/ciso/ciso.rst
@@ -1,8 +1,7 @@
 .. 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
+.. |version| replace:: 1.0.2
 .. |date| date::
 
 ====
diff --git a/misc/ciso/compilefix.diff b/misc/ciso/compilefix.diff
deleted file mode 100644
index 2c8d689c9a6ba..0000000000000
--- a/misc/ciso/compilefix.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-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                        */