summaryrefslogtreecommitdiff
path: root/source/ap/slackpkg
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-12-13 20:10:04 +0000
committerEric Hameleers <alien@slackware.com>2021-12-14 08:59:53 +0100
commitb88e2bb09498e9b75508b99af4e497cdf3dd4416 (patch)
treede2b5ca79f57d6a505661bb3471c9ed998b78da9 /source/ap/slackpkg
parentd17e0f6ea08590e21d572a2f9fab8d3785ce348a (diff)
downloadcurrent-b88e2bb09498e9b75508b99af4e497cdf3dd4416.tar.gz
Mon Dec 13 20:10:04 UTC 202120211213201004
ap/slackpkg-15.0.9-noarch-1.txz: Upgraded. files/mirrors-x86*: Remove bad mirrors from list (Emmet Ford) Automatically rebuild package lists if missing (Piter PUNK) xap/seamonkey-2.53.10.1-x86_64-1.txz: Upgraded. This update contains security fixes and improvements. For more information, see: https://www.seamonkey-project.org/releases/seamonkey2.53.10.1 (* Security fix *) xap/xsnow-3.4.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/slackpkg')
-rw-r--r--source/ap/slackpkg/files/ChangeLog6
-rw-r--r--source/ap/slackpkg/files/core-functions.sh9
-rw-r--r--source/ap/slackpkg/files/mirrors-x86.sample15
-rw-r--r--source/ap/slackpkg/files/mirrors-x86_64.sample16
-rw-r--r--source/ap/slackpkg/files/slackpkg3
-rwxr-xr-xsource/ap/slackpkg/slackpkg.SlackBuild2
6 files changed, 12 insertions, 39 deletions
diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index d61aa208..0dffa771 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 13 00:27:34 UTC 2021
+---------------
+ - Release 15.0.9
+ - files/mirrors-x86*: Remove bad mirrors from list (Emmet Ford)
+ - Automatically rebuild package lists if missing (Piter PUNK)
+
Sun Oct 24 19:44:21 CDT 2021
---------------
- Release 15.0.8
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 5969ffcc..463a1905 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -243,11 +243,9 @@ ONE mirror in ${CONF}/mirrors and run:\n\n\
You can see more information about slackpkg functions in slackpkg manpage."
cleanup
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\
-\t# slackpkg update\n"
- cleanup
+ updatefilelists
+ mkregex_blacklist
+ UPDATED=1
fi
fi
@@ -1083,6 +1081,7 @@ Please check your mirror and try again."
function updatefilelists()
{
+ echo "Updating the package lists..."
if checkchangelog ; then
echo -e "\
\n\t\tNo changes in ChangeLog.txt between your last update and now.\n\
diff --git a/source/ap/slackpkg/files/mirrors-x86.sample b/source/ap/slackpkg/files/mirrors-x86.sample
index 4c07dd72..0d14b201 100644
--- a/source/ap/slackpkg/files/mirrors-x86.sample
+++ b/source/ap/slackpkg/files/mirrors-x86.sample
@@ -185,22 +185,15 @@
# ftp://mirror.bytemark.co.uk/slackware/slackware-15.0/
# http://mirror.bytemark.co.uk/slackware/slackware-15.0/
# UNITED STATES (US)
-# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware-15.0/
# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware-15.0/
-# ftp://mirrors.easynews.com/linux/slackware/slackware-15.0/
-# http://mirrors.easynews.com/linux/slackware/slackware-15.0/
-# ftp://mirrors.us.kernel.org/slackware/slackware-15.0/
# http://mirrors.us.kernel.org/slackware/slackware-15.0/
# ftp://mirrors.xmission.com/slackware/slackware-15.0/
# http://mirrors.xmission.com/slackware/slackware-15.0/
# https://mirror.slackbuilds.org/slackware/slackware-15.0/
# http://slackware.cs.utah.edu/pub/slackware/slackware-15.0/
# 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/
# 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/
#
#----------------------------------------------------------------
# Slackware-current
@@ -357,19 +350,11 @@
# ftp://slackware.mirrors.uk2.net/pub/slackware/slackware-current/
# http://slackware.mirrors.uk2.net/slackware-current/
# UNITED STATES (US)
-# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware-current/
# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware-current/
-# ftp://mirrors.easynews.com/linux/slackware/slackware-current/
-# http://mirrors.easynews.com/linux/slackware/slackware-current/
-# ftp://mirrors.us.kernel.org/slackware/slackware-current/
# http://mirrors.us.kernel.org/slackware/slackware-current/
# ftp://mirrors.xmission.com/slackware/slackware-current/
# http://mirrors.xmission.com/slackware/slackware-current/
# https://mirror.slackbuilds.org/slackware/slackware-current/
# http://slackware.cs.utah.edu/pub/slackware/slackware-current/
-# 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/
# 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 4f7d8e8b..21d3c4b7 100644
--- a/source/ap/slackpkg/files/mirrors-x86_64.sample
+++ b/source/ap/slackpkg/files/mirrors-x86_64.sample
@@ -183,22 +183,14 @@
# ftp://mirror.bytemark.co.uk/slackware/slackware64-15.0/
# http://mirror.bytemark.co.uk/slackware/slackware64-15.0/
# UNITED STATES (US)
-# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware64-15.0/
# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware64-15.0/
-# ftp://mirrors.easynews.com/linux/slackware/slackware64-15.0/
-# http://mirrors.easynews.com/linux/slackware/slackware64-15.0/
-# ftp://mirrors.us.kernel.org/slackware/slackware64-15.0/
# http://mirrors.us.kernel.org/slackware/slackware64-15.0/
# ftp://mirrors.xmission.com/slackware/slackware64-15.0/
# http://mirrors.xmission.com/slackware/slackware64-15.0/
# https://mirror.slackbuilds.org/slackware/slackware64-15.0/
# http://slackware.cs.utah.edu/pub/slackware/slackware64-15.0/
-# 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/
# 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/
#
#----------------------------------------------------------------
# Slackware64-current
@@ -349,19 +341,11 @@
# ftp://mirror.bytemark.co.uk/slackware/slackware64-current/
# http://mirror.bytemark.co.uk/slackware/slackware64-current/
# UNITED STATES (US)
-# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware64-current/
# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware64-current/
-# ftp://mirrors.easynews.com/linux/slackware/slackware64-current/
-# http://mirrors.easynews.com/linux/slackware/slackware64-current/
-# ftp://mirrors.us.kernel.org/slackware/slackware64-current/
# http://mirrors.us.kernel.org/slackware/slackware64-current/
# ftp://mirrors.xmission.com/slackware/slackware64-current/
# http://mirrors.xmission.com/slackware/slackware64-current/
# https://mirror.slackbuilds.org/slackware/slackware64-current/
# http://slackware.cs.utah.edu/pub/slackware/slackware64-current/
-# 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/
# 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/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index de02d051..9fc7f5d4 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -328,7 +328,7 @@ case "$CMD" in
check-updates)
# output to stdout if no change, or stderr if changes. Will cause
# cron jobs to notify system admin
- if checkchangelog 1>/dev/null 2>/dev/null ; then
+ if checkchangelog 1>/dev/null 2>/dev/null && [ "$UPDATED" != "1" ] ; then
echo "Slackpkg: No updated packages since last check."
else
echo "Slackpkg: Updated packages are available since last check." >&2
@@ -356,7 +356,6 @@ case "$CMD" in
cleanup
fi
fi
- echo "Updating the package lists..."
updatefilelists
;;
install)
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 0cc9b56d..ccb24650 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.8}
+VERSION=${VERSION:-15.0.9}
ARCH="noarch"
BUILD=${BUILD:-1}