summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap')
-rw-r--r--source/ap/linuxdoc-tools/ChangeLog.txt10
-rwxr-xr-xsource/ap/linuxdoc-tools/arm/build2
-rwxr-xr-xsource/ap/linuxdoc-tools/linuxdoc-tools.build60
-rw-r--r--source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.13-letter.patch24
-rwxr-xr-xsource/ap/linuxdoc-tools/sources/source.download39
-rwxr-xr-xsource/ap/linuxdoc-tools/trackbuild.linuxdoc-tools8
-rwxr-xr-xsource/ap/mc/mc.SlackBuild2
-rwxr-xr-xsource/ap/pamixer/pamixer.SlackBuild2
-rw-r--r--source/ap/slackpkg/README.md5
-rw-r--r--source/ap/slackpkg/files/ChangeLog6
-rw-r--r--source/ap/slackpkg/files/core-functions.sh3
-rw-r--r--source/ap/slackpkg/files/mirrors-x86.sample2
-rw-r--r--source/ap/slackpkg/files/mirrors-x86_64.sample2
-rwxr-xr-xsource/ap/slackpkg/slackpkg.SlackBuild2
-rwxr-xr-xsource/ap/squashfs-tools/squashfs-tools.SlackBuild2
-rw-r--r--source/ap/squashfs-tools/squashfs-tools.glibc228.diff20
16 files changed, 89 insertions, 100 deletions
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt
index 0dbdf9303..b5e57dc7d 100644
--- a/source/ap/linuxdoc-tools/ChangeLog.txt
+++ b/source/ap/linuxdoc-tools/ChangeLog.txt
@@ -1,3 +1,13 @@
+Thu Aug 12 10:02:06 BST 2021
+ linuxdoc-tools 0.9.82, build 1.
+ Stuart Winter <mozes@slackware.com>
+ * Upgraded to linuxdoc-tools 0.9.82
+ No longer apply patch to set default page size to 'letter'
+ since the patch no longer applies. I think it's unlikely that this
+ change in default setting will cause any issues.
+ * Upgraded to asciidoc-9.1.0
+ * Upgraded to gtk-doc-1.33.2
+
Wed Jan 29 09:11:40 GMT 2020
linuxdoc-tools 0.9.73, build 5.
Stuart Winter <mozes@slackware.com>
diff --git a/source/ap/linuxdoc-tools/arm/build b/source/ap/linuxdoc-tools/arm/build
index 0cb7c95b0..708dd6997 100755
--- a/source/ap/linuxdoc-tools/arm/build
+++ b/source/ap/linuxdoc-tools/arm/build
@@ -9,7 +9,7 @@ source /usr/share/slackdev/buildkit.sh
# Package metadata:
export PKGNAM=linuxdoc-tools
-export VERSION=${VERSION:-0.9.73}
+export VERSION=${VERSION:-0.9.82}
export BUILD=${BUILD:-1}
export PKGSERIES=${PKGSERIES:-ap}
export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.txz
diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build
index 32ecd3ce7..7b3962fbb 100755
--- a/source/ap/linuxdoc-tools/linuxdoc-tools.build
+++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build
@@ -23,7 +23,7 @@
LINUXDOCTOOLSVER=$PKGVERSION
# Bundled package versions:
-ASCIIDOCVER=8.6.10
+ASCIIDOCVER=9.1.0
DSSSLSTYLESHEETSVER=1.79 # docbook-dsssl-*.tar.xz (plus -doc- source archive), not SRPM.
XSLSTYLESHEETSVER=1.79.2 # docbook-style-xsl-*src.rpm ("DocBook XSL Stylesheets" in our ChangeLog.txt)
DOCBOOKUTILSVER=0.6.14
@@ -31,7 +31,7 @@ SGMLDTD3VER=3.1
SGMLDTD4VER=4.5
XMLDTDVER=4.5
GNOMEDOCUTILSVER=0.20.10
-GTKDOCVER=1.32
+GTKDOCVER=1.33.2
SGMLSPLVER=1.03ii
OPENJADEVER=1.3.2
OPENSPVER=1.5.2
@@ -53,11 +53,11 @@ case $ARCH in
export LIBDIRSUFFIX="64"
export HOSTTARGET=""
;;
- i?86) export SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- export LIBDIRSUFFIX=""
+ riscv) export SLKCFLAGS="-O2"
+ export LIBDIRSUFFIX="64"
export HOSTTARGET=""
;;
- s390) export SLKCFLAGS="-O2"
+ i?86) export SLKCFLAGS="-O2 -march=i586 -mtune=i686"
export LIBDIRSUFFIX=""
export HOSTTARGET=""
;;
@@ -80,8 +80,8 @@ cd $TMP
rm -rf asciidoc
mkdir asciidoc && cd asciidoc
rpm2cpio $CWD/sources/asciidoc-${ASCIIDOCVER}*.src.rpm | cpio -div || exit 1
-tar xvf asciidoc-py3-*.tar.*z
-cd asciidoc-py3-*/ || exit 1
+tar xvf asciidoc-py-*.tar.*z
+cd asciidoc-py-*/ || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -90,17 +90,13 @@ find . \
-exec chmod 644 {} \;
# Apply patches:
-#
# Assemble patch list from spec file:
# egrep '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}'
-for i in \
- \
- asciidoc-python3.patch \
- asciidoc-python3-a2x-decode-fix.patch \
- asciidoc-python3-deprecation-warning.patch \
- \
- ; do patch -p1 --verbose < ../${i} || exit 1
-done || exit 1
+#for i in \
+# \
+# \
+# ; do patch -p1 --verbose < ../${i} || exit 1
+#done || exit 1
# Configure:
autoreconf -v
@@ -341,6 +337,7 @@ find . -name config.sub -print0 | xargs -0i cp -favv /usr/share/libtool/build-au
# This is configured not to build the documentation. If anybody really needs
# it, let me know and I'll adjust the build script - it's just a PITA to
# get working.
+CXXFLAGS="-fno-lifetime-dse" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -777,6 +774,8 @@ find . \
# Assemble patch list from spec file (and see individual level-2 patch outside of 'for' loop below):
# egrep '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}'
# Apply patches:
+# Note: 'docbook-style-xsl-non-recursive-string-subst.patch' is applied separately
+# as it needs a different patch level.
for i in \
\
docbook-xsl-pagesetup.patch \
@@ -953,7 +952,7 @@ cd $TMP
mkdir linuxdoc-tools && cd linuxdoc-tools
#rpm2cpio $CWD/sources/linuxdoc-tools-${LINUXDOCTOOLSVER}*.src.rpm | cpio -div || exit 1
#tar xvf linuxdoc-tools_$LINUXDOCTOOLSVER.tar.gz
-tar xvf $CWD/sources/linuxdoc-tools_$LINUXDOCTOOLSVER.tar.xz
+tar xvf $CWD/sources/linuxdoc-tools_$LINUXDOCTOOLSVER.tar.?z
cd linuxdoc-tools-$LINUXDOCTOOLSVER || exit 1
chown -R root:root .
@@ -971,8 +970,10 @@ export PATH=$( echo $PATH | sed -e 's?:/usr/share/texmf/bin??g' -e 's?/usr/share
# Apply patches (these were originally taken from the Fedora SRPM but broken out later
# when the 'original' source from Debian began to be used)
+# We used to apply 'linuxdoc-tools-0.9.13-letter.patch.xz' but it won't apply to the
+# latest linuxdoc-tools source. It simply changed the default page size to 'Letter'.
+# Probably not too much to worry about there.
for i in \
- linuxdoc-tools-0.9.13-letter.patch.xz \
linuxdoc-tools-0.9.20-lib64.patch.xz ; do
xzcat $CWD/sources/$i | patch -p1 || exit 1
done || exit 1
@@ -1118,19 +1119,30 @@ for i in \
done || exit 1
# Configure:
+mkdir meson-build
+pushd meson-build
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CPPFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man || exit 1
+meson setup \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ .. || exit 1
# Build:
-make || exit 1
+"${NINJA:=ninja}" $NUMJOBS --verbose || exit 1
# Install:
-make install || exit 1
+DESTDIR=/ $NINJA install --verbose || exit 1
+popd
# Copy docs:
mkdir -vpm755 /usr/doc/gtk-doc-$GTKDOCVER
diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.13-letter.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.13-letter.patch
deleted file mode 100644
index 232d1307c..000000000
--- a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.13-letter.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm.letter Mon Nov 26 16:09:37 2001
-+++ linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm Mon Nov 26 16:09:49 2001
-@@ -108,7 +108,7 @@
- { option => "pass", type => "s", short => "P" }
- ];
- $global->{backend} = "linuxdoc";
-- $global->{papersize} = "a4";
-+ $global->{papersize} = "letter";
- $global->{language} = "en";
- $global->{charset} = "ascii";
- $global->{style} = "";
---- linuxdoc-tools-0.9.13/man/linuxdoc.1.letter Mon Nov 26 16:10:04 2001
-+++ linuxdoc-tools-0.9.13/man/linuxdoc.1 Mon Nov 26 16:10:42 2001
-@@ -46,8 +46,8 @@
- format, but just output the usage of this suites.
- Available formats are: html, info, latex, lyx, rtf, txt, check.
- .IP "--papersize=\fIsize\fR, -p
--Set the paper size. Default is ``a4'' (European 297x210mm paper).
--You may also specify ``letter'' size.
-+Set the paper size. Default is ``letter''.
-+You may also specify ``a4'' size (European 297x210mm paper).
- .IP "--language=\fIlang\fR, -l"
- Specify the language of the document (this may change which style
- files are used for formatting by a back end). The default language is
diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download
index bb27334ef..f51a3dbbd 100755
--- a/source/ap/linuxdoc-tools/sources/source.download
+++ b/source/ap/linuxdoc-tools/sources/source.download
@@ -17,7 +17,7 @@
# https://packages.debian.org/sid/linuxdoc-tools
#
# This provides things such as sgml2txt.
-wget -c http://deb.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.73.orig.tar.gz
+wget http://deb.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.82.orig.tar.gz
# We're taking some patches from here - now separated out:
#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.68-3.fc19.src.rpm
@@ -27,7 +27,7 @@ wget -c http://deb.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0
#
# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/
#
-wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/opensp-1.5.2-33.fc31.src.rpm
+wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/opensp-1.5.2-38.fc35.src.rpm
# OpenJade:
# http://openjade.sourceforge.net/
@@ -45,7 +45,7 @@ wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everythin
#
# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/
#
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/sgml-common-0.6.3-53.fc31.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/sgml-common-0.6.3-57.fc35.src.rpm
# http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html
# Check versions:
@@ -58,7 +58,7 @@ wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1
#
# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/
#
-wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-utils-0.6.14-48.fc31.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-utils-0.6.14-53.fc35.src.rpm
#
#
@@ -70,7 +70,7 @@ wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everyt
#
# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/
#
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-10.fc31.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-15.fc35.src.rpm
# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook.html
wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
@@ -85,7 +85,7 @@ wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
#
# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/
#
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-20.fc32.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-26.fc35.src.rpm
# gtk-doc:
# There aren't any patches taken from the SRPM, but you can check the version used in Fedora
@@ -93,17 +93,11 @@ wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everythin
#
# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/
#
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.32-2.fc32.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.33.2-4.fc35.src.rpm
+https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.32-2.fc32.src.rpm
#wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gtk-doc/1.21/gtk-doc-1.21.tar.xz
# http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0
-# sgmlspl
-# http://www.cs.indiana.edu/~asengupt/sgml/SGMLSpm/DOC/HTML/sgmlspl/sgmlspl.html
-# http://packages.debian.org/search?keywords=sgmlspl&searchon=names&suite=all&section=all
-# There's nothing in the FTP download site at this time, so I'll take it from Debian.
-wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz
-wget -c http://http.debian.net/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-36.debian.tar.xz
-
# xmlto
# https://fedorahosted.org/releases/x/m/xmlto
# wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2
@@ -118,16 +112,25 @@ wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everythin
# Also http://asciidoc.org/
# Taken some patches from Fedora.
#
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-8.6.10-0.13.20180605git986f99d.fc32.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-9.1.0-3.fc35.src.rpm
# docbook2X:
#
# Pre-requisite PERL modules for docbook2X:
# https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/
#
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-NamespaceSupport-1.12-9.fc31.src.rpm
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-Base-1.09-9.fc31.src.rpm
-wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-1.02-2.fc31.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-NamespaceSupport-1.12-15.fc35.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-1.02-8.fc35.src.rpm
+wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-Base-1.09-15.fc35.src.rpm
+
+
+
+# sgmlspl
+# http://www.cs.indiana.edu/~asengupt/sgml/SGMLSpm/DOC/HTML/sgmlspl/sgmlspl.html
+# http://packages.debian.org/search?keywords=sgmlspl&searchon=names&suite=all&section=all
+# There's nothing in the FTP download site at this time, so I'll take it from Debian.
+wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz
+wget -c http://http.debian.net/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-36.debian.tar.xz
#
#http://packages.debian.org/sid/docbook2x
diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
index 2ba2d8f47..ff31fa6af 100755
--- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
+++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools
@@ -21,6 +21,10 @@
# Package info:
PKGNAM=linuxdoc-tools
+export PKGVERSION=0.9.82 # use the version of linuxdoc-tools as the package version.
+BUILD=${BUILD:-1}
+PKGEXT=${PKGEXT:-txz}
+
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -31,10 +35,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-export PKGVERSION=0.9.73 # use the version of linuxdoc-tools as the package version.
-BUILD=${BUILD:-9}
-PKGEXT=${PKGEXT:-txz}
-
export CWD=$PWD
export PKGSTORE=/tmp
export TMP=/tmp/build-$PKGNAM/
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild
index 5f8ba10d4..f4f74a83f 100755
--- a/source/ap/mc/mc.SlackBuild
+++ b/source/ap/mc/mc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mc
VERSION=${VERSION:-$(echo mc-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild
index ad39298dc..2309960c3 100755
--- a/source/ap/pamixer/pamixer.SlackBuild
+++ b/source/ap/pamixer/pamixer.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pamixer
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/ap/slackpkg/README.md b/source/ap/slackpkg/README.md
new file mode 100644
index 000000000..ea4bf2a93
--- /dev/null
+++ b/source/ap/slackpkg/README.md
@@ -0,0 +1,5 @@
+Slackpkg is a tool for installing or upgrading packages through a network.
+You can make a minimal installation of Slackware Linux and then install
+additional packages from a Slackware mirror.
+
+Releases are available from [slackpkg.org](https://slackpkg.org/).
diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index aa6dba543..8f875390a 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 16 02:14:02 UTC 2021
+---------------
+ - Release 15.0.7
+ - Remove ftp://spout.ussg.indiana.edu from mirrorlist
+ - Allow "slackpkg help" to work after slackpkg is upgraded (JK Wood)
+
Tue Jul 6 03:01:40 UTC 2021
---------------
- Release 15.0.6
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index ea38f2992..1a5062774 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -242,7 +242,7 @@ ONE mirror in ${CONF}/mirrors and run:\n\n\
\t# slackpkg update\n\n\
You can see more information about slackpkg functions in slackpkg manpage."
cleanup
- elif [ "$CMD" != "new-config" ]; then
+ elif [ "$CMD" != "new-config" ] && [ "$CMD" != "help" ]; then
echo -e "\
\nThe package list is missing.\n\
Before you install|upgrade|reinstall anything you need to run:\n\n\
@@ -347,6 +347,7 @@ use slackpkg.\n"
elif ! [ -f ${WORKDIR}/CHECKSUMS.md5 ] && \
[ "$CMD" != "update" ] && \
[ "$CMD" != "new-config" ] && \
+ [ "$CMD" != "help" ] && \
[ "$CHECKMD5" = "on" ]; then
echo -e "\n\
No CHECKSUMS.md5 found! Please disable md5sums checking\n\
diff --git a/source/ap/slackpkg/files/mirrors-x86.sample b/source/ap/slackpkg/files/mirrors-x86.sample
index 5ede5cbcd..4c07dd721 100644
--- a/source/ap/slackpkg/files/mirrors-x86.sample
+++ b/source/ap/slackpkg/files/mirrors-x86.sample
@@ -198,7 +198,6 @@
# http://slackware.mirrors.pair.com/slackware-15.0/
# ftp://slackware.mirrors.tds.net/pub/slackware/slackware-15.0/
# http://slackware.mirrors.tds.net/pub/slackware/slackware-15.0/
-# ftp://spout.ussg.indiana.edu/linux/slackware/slackware-15.0/
# http://spout.ussg.indiana.edu/linux/slackware/slackware-15.0/
# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-15.0/
# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-15.0/
@@ -371,7 +370,6 @@
# http://slackware.mirrors.pair.com/slackware-current/
# ftp://slackware.mirrors.tds.net/pub/slackware/slackware-current/
# http://slackware.mirrors.tds.net/pub/slackware/slackware-current/
-# ftp://spout.ussg.indiana.edu/linux/slackware/slackware-current/
# http://spout.ussg.indiana.edu/linux/slackware/slackware-current/
# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-current/
# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-current/
diff --git a/source/ap/slackpkg/files/mirrors-x86_64.sample b/source/ap/slackpkg/files/mirrors-x86_64.sample
index e66828a41..4f7d8e8bc 100644
--- a/source/ap/slackpkg/files/mirrors-x86_64.sample
+++ b/source/ap/slackpkg/files/mirrors-x86_64.sample
@@ -196,7 +196,6 @@
# http://slackware.mirrors.pair.com/slackware64-15.0/
# ftp://slackware.mirrors.tds.net/pub/slackware/slackware64-15.0/
# http://slackware.mirrors.tds.net/pub/slackware/slackware64-15.0/
-# ftp://spout.ussg.indiana.edu/linux/slackware/slackware64-15.0/
# http://spout.ussg.indiana.edu/linux/slackware/slackware64-15.0/
# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-15.0/
# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-15.0/
@@ -363,7 +362,6 @@
# http://slackware.mirrors.pair.com/slackware64-current/
# ftp://slackware.mirrors.tds.net/pub/slackware/slackware64-current/
# http://slackware.mirrors.tds.net/pub/slackware/slackware64-current/
-# ftp://spout.ussg.indiana.edu/linux/slackware/slackware64-current/
# http://spout.ussg.indiana.edu/linux/slackware/slackware64-current/
# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-current/
# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-current/
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 3ad02540f..76c0347f4 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=slackpkg
-VERSION=${VERSION:-15.0.6}
+VERSION=${VERSION:-15.0.7}
ARCH="noarch"
BUILD=${BUILD:-1}
diff --git a/source/ap/squashfs-tools/squashfs-tools.SlackBuild b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
index 3431421fd..65f274986 100755
--- a/source/ap/squashfs-tools/squashfs-tools.SlackBuild
+++ b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=squashfs-tools
VERSION=${VERSION:-$( echo squashfs-tools*.tar.?z | cut -d- -f3- | rev | cut -f3- -d . | rev )}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/squashfs-tools/squashfs-tools.glibc228.diff b/source/ap/squashfs-tools/squashfs-tools.glibc228.diff
deleted file mode 100644
index 305a118d2..000000000
--- a/source/ap/squashfs-tools/squashfs-tools.glibc228.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./squashfs-tools/unsquashfs.c.orig 2018-09-13 16:02:16.000000000 -0500
-+++ ./squashfs-tools/unsquashfs.c 2018-09-18 19:03:26.607071388 -0500
-@@ -36,6 +36,7 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <sys/sysmacros.h>
- #include <limits.h>
- #include <ctype.h>
-
---- ./squashfs-tools/mksquashfs.c.orig 2018-09-13 16:02:16.000000000 -0500
-+++ ./squashfs-tools/mksquashfs.c 2018-09-18 19:03:26.605071388 -0500
-@@ -44,6 +44,7 @@
- #include <setjmp.h>
- #include <sys/types.h>
- #include <sys/mman.h>
-+#include <sys/sysmacros.h>
- #include <pthread.h>
- #include <regex.h>
- #include <sys/wait.h>
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-28 13:32:42 +0000