11 files changed, 10 insertions, 186 deletions
diff --git a/source/ap/cdrdao/cdrdao-1.2.3-format.patch b/source/ap/cdrdao/cdrdao-1.2.3-format.patch
deleted file mode 100644
index cba986c1..00000000
--- a/source/ap/cdrdao/cdrdao-1.2.3-format.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -up wrk/pccts/antlr/fset2.c.wrk wrk/pccts/antlr/fset2.c
---- wrk/pccts/antlr/fset2.c.wrk	2013-12-05 11:33:33.561962126 +0100
-+++ wrk/pccts/antlr/fset2.c	2013-12-05 11:33:52.009105807 +0100
-@@ -2210,7 +2210,7 @@ void MR_backTraceReport()
-       if (p->ntype != nToken) continue;
-       tn=(TokNode *)p;
-       if (depth != 0) fprintf(stdout," ");
--      fprintf(stdout,TerminalString(tn->token));
-+      fprintf(stdout,"%s",TerminalString(tn->token));
-       depth++;
-       if (! MR_AmbAidMultiple) {
-         if (set_nil(tn->tset)) {
-diff -up wrk/pccts/antlr/gen.c.wrk wrk/pccts/antlr/gen.c
---- wrk/pccts/antlr/gen.c.wrk	2013-12-05 11:26:36.384714088 +0100
-+++ wrk/pccts/antlr/gen.c	2013-12-05 11:29:41.894158536 +0100
-@@ -3866,7 +3866,7 @@ int file;
- /* MR10 */    _gen(" *  ");
- /* MR10 */    for (i=0 ; i < Save_argc ; i++) {
- /* MR10 */      _gen(" ");
--/* MR10 */      _gen(Save_argv[i]);
-+/* MR10 */      _gen1("%s",Save_argv[i]);
- /* MR10 */    };
- 	_gen("\n");
- 	_gen(" *\n");
-diff -up wrk/pccts/antlr/lex.c.wrk wrk/pccts/antlr/lex.c
---- wrk/pccts/antlr/lex.c.wrk	2013-12-05 11:15:51.912722340 +0100
-+++ wrk/pccts/antlr/lex.c	2013-12-05 11:19:04.039210441 +0100
-@@ -706,7 +706,7 @@ FILE *output;
- /* MR26 */			if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break;
- /* MR26 */		}
- /* MR26 */	}
--/* MR26 */	fprintf(output,strBetween(pSymbol, t, pSeparator));
-+/* MR26 */	fprintf(output,"%s",strBetween(pSymbol, t, pSeparator));
- 
-     *q = p;
-     return (*pSeparator  == 0);
-@@ -771,7 +771,7 @@ FILE *f;
- 				  &pValue,
- 				  &pSeparator,
- 				  &nest);
--	fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
-+	fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
- }
- 
- /* check to see if string e is a word in string s */
-@@ -852,9 +852,9 @@ int i;
- 					  &pSeparator,
- 					  &nest);
- 		fprintf(f,"\t");
--		fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
-+		fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
- 		fprintf(f," ");
--		fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator));
-+		fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator));
- 		fprintf(f,";\n");
-     }
- 	fprintf(f,"};\n");
diff --git a/source/ap/cdrdao/cdrdao-1.2.3-helpmansync.patch b/source/ap/cdrdao/cdrdao-1.2.3-helpmansync.patch
deleted file mode 100644
index 3c200887..00000000
--- a/source/ap/cdrdao/cdrdao-1.2.3-helpmansync.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up cdrdao-1.2.3/dao/cdrdao.man.helpmansync cdrdao-1.2.3/dao/cdrdao.man
---- cdrdao-1.2.3/dao/cdrdao.man.helpmansync	2012-10-08 15:54:01.598543254 +0200
-+++ cdrdao-1.2.3/dao/cdrdao.man	2012-10-08 16:01:11.439957988 +0200
-@@ -3,7 +3,7 @@
- cdrdao \- reads and writes CDs in disc-at-once mode
- .SH SYNOPSIS
- .B cdrdao
--.RB { show-toc|read-toc|read-cd|read-cddb|show-data|read-test|disk-info|msinfo|unlock|simulate|write|copy|blank }
-+.RB { show-toc|toc-info|toc-size|read-toc|read-cd|read-cddb|show-data|read-test|disk-info|discid|msinfo|drive-info|unlock|scanbus|simulate|write|copy|blank }
- .RB [ --device
- .IR device ]
- .RB [ --source-device
-@@ -77,6 +77,12 @@ The first argument must be one of the fo
- .BI show-toc
- Print out a summary about what will be written to the CD-R.  
- .TP
-+.BI toc-info
-+Prints out short toc-file summary.
-+.TP
-+.BI toc-size
-+Prints total number of blocks for toc.
-+.TP
- .BI read-toc
- Analyze each track of the inserted CD and create a
- .I toc-file
-@@ -122,10 +128,16 @@ Shows information about the inserted CD-
- it will also print the start of the last and current session which is
- used by mkisofs to create an image for a second or higher session.
- .TP
-+.BI discid
-+Prints out CDDB information.
-+.TP
- .BI msinfo
- Shows information required for creating multi session disks with
- mkisofs. The output is meant for processing by scripts.
- .TP
-+.BI drive-info
-+Shows drive information.
-+.TP
- .BI unlock
- Tries to unlock the recorder device after a failed write or simulation
- run. If you cannot eject the CD after a cdrdao run try this command.
-@@ -139,6 +151,9 @@ blanking operation. Use option
- .BI --speed
- to select another blanking speed.
- .TP
-+.BI scanbus
-+Scan for devices.
-+.TP
- .BI simulate
- Like
- .BI write
diff --git a/source/ap/cdrdao/cdrdao-1.2.3-stat.patch b/source/ap/cdrdao/cdrdao-1.2.3-stat.patch
deleted file mode 100644
index 5a68e713..00000000
--- a/source/ap/cdrdao/cdrdao-1.2.3-stat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc
---- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat	2010-01-20 20:11:36.000000000 +0100
-+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc	2010-01-20 20:14:07.000000000 +0100
-@@ -19,6 +19,9 @@
- 
- #include <config.h>
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/source/ap/cdrdao/cdrdao.SlackBuild b/source/ap/cdrdao/cdrdao.SlackBuild
index ee83fc3b..22b7926d 100755
--- a/source/ap/cdrdao/cdrdao.SlackBuild
+++ b/source/ap/cdrdao/cdrdao.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cdrdao
-VERSION=1.2.3
-BUILD=${BUILD:-4}
+VERSION=1.2.4
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -71,12 +71,6 @@ rm -rf cdrdao-$VERSION
 tar xvf $CWD/cdrdao-$VERSION.tar.?z* || exit 1
 cd cdrdao-$VERSION || exit 1
 
-zcat $CWD/cdrdao-1.2.3-stat.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/cdrdao.narrowing.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/cdrdao-1.2.3-format.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/cdrdao-1.2.3-helpmansync.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/cdrdao.bitrate_table.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -89,7 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --without-xdao \
+  --mandir=/usr/man \
   --without-scglib \
   --with-ogg-support \
   --with-mp3-support \
diff --git a/source/ap/cdrdao/cdrdao.bitrate_table.diff b/source/ap/cdrdao/cdrdao.bitrate_table.diff
deleted file mode 100644
index bc5fe0fe..00000000
--- a/source/ap/cdrdao/cdrdao.bitrate_table.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./utils/toc2mp3.cc.orig	2003-02-22 04:16:56.000000000 -0600
-+++ ./utils/toc2mp3.cc	2018-02-03 00:37:19.081854469 -0600
-@@ -143,8 +143,8 @@
- 
-   message(0, "LAME encoder version: %s", get_lame_version());
-   message(0, "Supported bit rates: ");
--  for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) {
--    message(0, "%d ", bitrate_table[1][i]);
-+  for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) {
-+    message(0, "%d ", lame_get_bitrate(1, i));
-   }
-   message(0, "");
- }
-@@ -238,8 +238,8 @@
-   lame_global_flags *lf;
-   int bitrateOk = 0;
- 
--  for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) {
--    if (bitrate == bitrate_table[1][i])
-+  for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) {
-+    if (bitrate == lame_get_bitrate(1, i))
-       bitrateOk = 1;
-   }
- 
diff --git a/source/ap/cdrdao/cdrdao.narrowing.diff b/source/ap/cdrdao/cdrdao.narrowing.diff
deleted file mode 100644
index ddca7946..00000000
--- a/source/ap/cdrdao/cdrdao.narrowing.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From fb14cd15702cbd4bf811a5f7a5edea00c7ac2b66 Mon Sep 17 00:00:00 2001
-From: root <hexumg@gmail.com>
-Date: Fri, 8 Jan 2016 00:34:43 +0300
-Subject: [PATCH] CdrDriver.cc:498:64: Fix narrowing conversion error
-
----
- dao/CdrDriver.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dao/CdrDriver.cc b/dao/CdrDriver.cc
-index ee89620..4d1edda 100644
---- a/dao/CdrDriver.cc
-+++ b/dao/CdrDriver.cc
-@@ -495,7 +495,7 @@ unsigned char CdrDriver::syncPattern[12] = {
-   0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0
- };
-
--char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
-+char CdrDriver::REMOTE_MSG_SYNC_[4] = { '\xff', '\x00', '\xff', '\x00' };
-
-
- /* Maps a string to the corresponding driver option value
---
-2.6.4
diff --git a/source/ap/dash/dash.SlackBuild b/source/ap/dash/dash.SlackBuild
index b2ca27b2..543771e1 100755
--- a/source/ap/dash/dash.SlackBuild
+++ b/source/ap/dash/dash.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dash
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/ap/diffstat/diffstat.SlackBuild b/source/ap/diffstat/diffstat.SlackBuild
index 3381075d..e7ac4589 100755
--- a/source/ap/diffstat/diffstat.SlackBuild
+++ b/source/ap/diffstat/diffstat.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=diffstat
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -63,7 +63,7 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
diff --git a/source/ap/diffstat/diffstat.url b/source/ap/diffstat/diffstat.url
index d7ae75f2..a755313e 100644
--- a/source/ap/diffstat/diffstat.url
+++ b/source/ap/diffstat/diffstat.url
@@ -1 +1 @@
-ftp://invisible-island.net/diffstat/diffstat-1.61.tgz
+ftp://invisible-island.net/diffstat/
diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild
index e61b143f..4f1cb01d 100755
--- a/source/ap/rpm/rpm.SlackBuild
+++ b/source/ap/rpm/rpm.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rpm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
index 52dc9f68..f8869fb8 100755
--- a/source/ap/sqlite/sqlite.SlackBuild
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sqlite
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # First, convert the .zip file if needed:
 if ls *.zip 1> /dev/null 2> /dev/null ; then