From 9ec807270408426f344cc14e5c3d82368d5c1d09 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 6 Jul 2021 20:44:20 +0000 Subject: Tue Jul 6 20:44:20 UTC 2021 ap/mc-4.8.26-x86_64-3.txz: Rebuilt. Rebuilt with --enable-aspell. Thanks to Ressy and bassmadrigal. ap/slackpkg-15.0.6-noarch-1.txz: Upgraded. Fix getting gpg key on ARM ; use only www.slackware.com. Remove support for Slackintosh project - it's dead, Jim. Thanks to Robby Workman. d/python-setuptools-57.1.0-x86_64-1.txz: Upgraded. kde/bluedevil-5.22.3-x86_64-1.txz: Upgraded. kde/breeze-5.22.3-x86_64-1.txz: Upgraded. kde/breeze-grub-5.22.3-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.22.3-x86_64-1.txz: Upgraded. kde/digikam-7.2.0-x86_64-4.txz: Rebuilt. Recompiled against opencv-4.5.3. kde/drkonqi-5.22.3-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.22.3-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.22.3-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.22.3-x86_64-1.txz: Upgraded. kde/kdecoration-5.22.3-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.22.3-x86_64-1.txz: Upgraded. kde/kgamma5-5.22.3-x86_64-1.txz: Upgraded. kde/khotkeys-5.22.3-x86_64-1.txz: Upgraded. kde/kinfocenter-5.22.3-x86_64-1.txz: Upgraded. kde/kio-extras-21.04.2-x86_64-2.txz: Rebuilt. Recompiled against kdsoap-2.0.0. kde/kmenuedit-5.22.3-x86_64-1.txz: Upgraded. kde/kscreen-5.22.3-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.22.3-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.22.3-x86_64-1.txz: Upgraded. kde/ksystemstats-5.22.3-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.22.3-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.22.3-x86_64-1.txz: Upgraded. kde/kwayland-server-5.22.3-x86_64-1.txz: Upgraded. kde/kwin-5.22.3-x86_64-1.txz: Upgraded. kde/kwrited-5.22.3-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.22.3-x86_64-1.txz: Upgraded. kde/libkscreen-5.22.3-x86_64-1.txz: Upgraded. kde/libksysguard-5.22.3-x86_64-1.txz: Upgraded. kde/milou-5.22.3-x86_64-1.txz: Upgraded. kde/oxygen-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-disks-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-integration-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-nm-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-pa-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-vault-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.22.3-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.22.3-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.22.3-x86_64-1.txz: Upgraded. kde/powerdevil-5.22.3-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.22.3-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.22.3-x86_64-1.txz: Upgraded. kde/systemsettings-5.22.3-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.22.3-x86_64-1.txz: Upgraded. l/kdsoap-2.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/opencv-4.5.3-x86_64-1.txz: Upgraded. Changed ABI. n/getmail-6.18.1-x86_64-1.txz: Upgraded. t/texlive-2021.210418-x86_64-1.txz: Upgraded. Thanks to Johannes Schoepfer. --- source/ap/slackpkg/files/ChangeLog | 6 ++++++ source/ap/slackpkg/files/core-functions.sh | 30 +++++++++++++++--------------- source/ap/slackpkg/slackpkg.SlackBuild | 2 +- 3 files changed, 22 insertions(+), 16 deletions(-) (limited to 'source/ap/slackpkg') diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog index 08608ae58..aa6dba543 100644 --- a/source/ap/slackpkg/files/ChangeLog +++ b/source/ap/slackpkg/files/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 6 03:01:40 UTC 2021 +--------------- + - Release 15.0.6 + - Fix getting gpg key on ARM ; use only www.slackware.com + - Remove support for Slackintosh project - it's dead, Jim + Sat Jun 5 03:54:45 UTC 2021 --------------- - Release 15.0.5 diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh index 69f80620f..ea38f2992 100644 --- a/source/ap/slackpkg/files/core-functions.sh +++ b/source/ap/slackpkg/files/core-functions.sh @@ -137,11 +137,6 @@ function system_setup() { SLACKKEY=${SLACKKEY:-"Slackware ARM (Slackware ARM Linux Project) "} PKGMAIN=${PKGMAIN:-slackware} ;; - powerpc|ppc) - ARCH=powerpc - SLACKKEY=${SLACKKEY:-"Slackintosh-Project Sign "} - PKGMAIN=${PKGMAIN:-slackintosh} - ;; *) ARCH=none ;; @@ -555,19 +550,23 @@ function checkgpg() { gpg --verify ${1}.asc ${1} 2>/dev/null && echo "1" || echo "0" } +# Fetch $SLACKKEY from a trusted source function get_gpg_key() { - if ping -c 1 slackware.com &>/dev/null; then - echo -e "\t\t\tGetting key from https://www.slackware.com/infra/keys/GPG-KEY" - $DOWNLOADER $TMPDIR/gpgkey https://www.slackware.com/infra/keys/GPG-KEY &>/dev/null - elif ping -c 1 mirrors.slackware.com &>/dev/null; then - echo -e "\t\t\tGetting key from https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY" - $DOWNLOADER $TMPDIR/gpgkey https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY &>/dev/null + if ping -c 1 www.slackware.com &>/dev/null; then + if printf "$ARCH" | grep -q -e "arm" -e "aarch64" &>/dev/null ; then + echo -e "\t\t\tGetting key from https://www.slackware.com/infra/keys/arm/GPG-KEY" + $DOWNLOADER $TMPDIR/gpgkey https://www.slackware.com/infra/keys/arm/GPG-KEY &>/dev/null + # Backup: https://arm.slackware.com/keys/GPG-KEY + else + echo -e "\t\t\tGetting key from https://www.slackware.com/infra/keys/GPG-KEY" + $DOWNLOADER $TMPDIR/gpgkey https://www.slackware.com/infra/keys/GPG-KEY &>/dev/null + # Backup: https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY + fi else echo -e "\ -slackpkg is unable to get the Slackware GPG key from either\n\ -slackware.com or mirrors.slackware.com; if you trust the\n\ -source you have configured in /etc/slackpkg/mirrors, slackpkg\n\ -can import the GPG key from that source.\n\ +slackpkg is unable to get the Slackware GPG key from www.slackware.com\n\ +If you trust the source you have configured in /etc/slackpkg/mirrors,\n\ +slackpkg can import the GPG key from that source.\n\ The source currently in use is:\n\ \t ${SOURCE}\n\ Do you want to import the GPG key from this source? (YES|NO)\n" @@ -584,6 +583,7 @@ Do you want to import the GPG key from this source? (YES|NO)\n" fi } +# Import $SLACKKEY function import_gpg_key() { mkdir -p ~/.gnupg gpg --yes --batch --delete-key "$SLACKKEY" &>/dev/null diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 60dcf16e6..3ad02540f 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.5} +VERSION=${VERSION:-15.0.6} ARCH="noarch" BUILD=${BUILD:-1} -- cgit v1.2.3-65-gdbad