diff options
Diffstat (limited to 'source/ap')
34 files changed, 603 insertions, 599 deletions
diff --git a/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch b/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch deleted file mode 100644 index 82e9f5a22..000000000 --- a/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5edf86dcebd2ab55a4a7221db77e10676723bbb1 Mon Sep 17 00:00:00 2001 -From: piterpunk <piterpunk@slackware.com> -Date: Mon, 8 Feb 2021 18:22:33 -0300 -Subject: [PATCH] Allow new-config after slackpkg upgrade itself - -Signed-off-by: Robby Workman <rworkman@slackware.com> ---- - files/core-functions.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/files/core-functions.sh b/files/core-functions.sh -index dcbceae..9816458 100644 ---- a/files/core-functions.sh -+++ b/files/core-functions.sh -@@ -345,6 +345,7 @@ use slackpkg.\n" - CHECKMD5=off - elif ! [ -f ${ROOT}/${WORKDIR}/CHECKSUMS.md5 ] && \ - [ "$CMD" != "update" ] && \ -+ [ "$CMD" != "new-config" ] && \ - [ "$CHECKMD5" = "on" ]; then - echo -e "\n\ - No CHECKSUMS.md5 found! Please disable md5sums checking\n\ --- -2.30.0 - diff --git a/source/ap/slackpkg/doinst.sh b/source/ap/slackpkg/doinst.sh index 87799a3c2..02790a48e 100644 --- a/source/ap/slackpkg/doinst.sh +++ b/source/ap/slackpkg/doinst.sh @@ -25,6 +25,9 @@ copy_mirror_file() { arm*) SRCMIRROR=mirrors-arm.sample ;; + aarch64) + SRCMIRROR=mirrors-aarch64.sample + ;; *) SRCMIRROR=mirrors-x86.sample ;; diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog index f4b43eaee..46971acd0 100644 --- a/source/ap/slackpkg/files/ChangeLog +++ b/source/ap/slackpkg/files/ChangeLog @@ -1,3 +1,39 @@ +Sun Mar 14 15:17:21 UTC 2021 +--------------- + - Re-release slackpkg-15.0.1 (no package generated yet anyway) + - Modifiy blacklist regex line ending + +Sat Mar 13 03:30:01 UTC 2021 +--------------- + - Release slackpkg-15.0.1 + - Tweak default blacklist file's help text (thanks, dive) + - Fix display of blacklisted packages + - Tweaks to slack-desc + - Note that kernel-headers should not be blacklisted + - Added Lithuania mirrors (Totoro-kun on LQ) + - Fix exit code for pending updates (dive) + - Avoid matching txz/tgz etc extension when blacklisting (dive) + - Use https for all slackpkg homepage links + - Update mirror files (14.2 -> 15.0) + - Add blacklist to search option + - Move applyblacklist to end of makelist() + - Clarify how to blacklist duplicate packages + - Fix new-config dialog + - Reduce false positives in DOUBLEFILES detection + - Remove spaces in awk. + - More blacklisting fixups (see full commit msg) + - Escape plus signs in blacklist regex + - Convert ${ROOT}/${WORKDIR} > ${WORKDIR} (dive) + - Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists (dive) + - Further fixup/enhancement to blacklisting issues + - Fix "slackpkg blacklist" so that it shows blacklist again + - Fixup internal blacklist handling + - Use ERE for sanity_check() function (David Woodfall) + - Remove "slackpkg blacklist" from manual pages + - Fix aaa_elflibs --> aaa_libraries in sample blacklist file (mozes) + - Split aarch64 and arm mirrors into separate files (mozes) + - Allow new-config after slackpkg upgrade itself (PiterPUNK) + Wed Feb 3 04:40:10 UTC 2021 --------------- - Release slackpkg-15.0 (yes, jump from 2.84_beta12 to 15.0) diff --git a/source/ap/slackpkg/files/blacklist.new b/source/ap/slackpkg/files/blacklist.new index 34cf0d105..e1ddd2b9f 100644 --- a/source/ap/slackpkg/files/blacklist.new +++ b/source/ap/slackpkg/files/blacklist.new @@ -3,12 +3,12 @@ # This is a blacklist file. Any packages listed here won't be # upgraded, removed, or installed by slackpkg. -# aaa_elflibs should NOT be blacklisted! +# aaa_libraries should NOT be blacklisted! # # You can blacklist using regular expressions. # -# Don't use *full* regex here, because all of the following will be checked -# for the regex: series, name, version, arch, build, and fullname. +# All of the following will be checked for the regex: +# Package series, name, version, arch, build, and fullname # When blacklisting packages, you can use extended regex on package names # (such as xorg-.* instead of xorg-server, xorg-docs, etc), and a trailing # slash for package series ("n/", "ap/", "xap/", etc). @@ -29,7 +29,8 @@ # DON'T put any space(s) before or after the package name or regex. # # Automated upgrade of kernel packages may not be wanted in some situations; -# uncomment the lines below if that fits your circumstances: +# uncomment the lines below if that fits your circumstances, but note that +# kernel-headers should *not* be blacklisted: # #kernel-generic.* #kernel-huge.* diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh index dcbceae04..9591d652a 100644 --- a/source/ap/slackpkg/files/core-functions.sh +++ b/source/ap/slackpkg/files/core-functions.sh @@ -7,7 +7,7 @@ # Clean-up tmp and lock files # function cleanup() { - local retval=0 + local retval=${PENDING_UPDATES:-0} [ "$SPINNING" = "off" ] || tput cnorm if [ -e $TMPDIR/error.log ]; then retval=1 @@ -62,7 +62,7 @@ spinning() { function system_setup() { # Create $WORKDIR just in case - mkdir -p "${ROOT}/${WORKDIR}" + mkdir -p "${WORKDIR}" # Set LOCAL if mirror isn't through network # If mirror is through network, select the command to fetch @@ -161,8 +161,12 @@ function system_setup() { mkdir $TEMPLATEDIR fi + # Create initial blacklist of single package names from regexps in + # ${CONF}/blacklist. + mkregex_blacklist + SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv) - CHECKSUMSFILE=${ROOT}/${WORKDIR}/CHECKSUMS.md5 + CHECKSUMSFILE=${WORKDIR}/CHECKSUMS.md5 KERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null) DIALOG_MAXARGS=${DIALOG_MAXARGS:-19500} echo "$0 $VERSION - Slackware Linux $SLACKWARE_VERSION" > $TMPDIR/timestamp @@ -197,7 +201,7 @@ ARCH values\n" # Check if the config files are updated to the new slackpkg version # - if [ "${ROOT}/${WORKDIR}" = "" ]; then + if [ "${WORKDIR}" = "" ]; then echo -e "\ \nYou need to upgrade your slackpkg.conf.\n\ This is a new slackpkg version and many changes happened in config files.\n\ @@ -234,7 +238,7 @@ the problem.\n" # Checking if is the first time running slackpkg # - if ! [ -f ${ROOT}/${WORKDIR}/pkglist ] && [ "$CMD" != "update" ]; then + if ! [ -f ${WORKDIR}/pkglist ] && [ "$CMD" != "update" ]; then if [ "$SOURCE" = "" ]; then echo -e "\ \nThis appears to be the first time you have run slackpkg.\n\ @@ -271,7 +275,7 @@ mirrors uncommented is not valid syntax. cleanup fi MIRROR_VERSION=$(echo $SOURCE|sed "s/.*-//;s/.$//") - if [ "$MIRROR_VERSION" = "current" ] && [ ! -f ${ROOT}/${WORKDIR}/current ]; then + if [ "$MIRROR_VERSION" = "current" ] && [ ! -f ${WORKDIR}/current ]; then echo -n " You have selected a mirror for Slackware -current in ${CONF}/mirrors, but Slackware version $SLACKWARE_VERSION appears to be installed. @@ -283,7 +287,7 @@ Is this really what you want? To confirm your choice, press Y, else press N. Then, press Enter: " read current if [ "$current" = "Y" ] || [ "$current" = "y" ]; then - touch ${ROOT}/${WORKDIR}/current + touch ${WORKDIR}/current echo -n " Slackpkg will not show this warning again unless you remove the ${WORKDIR}/current file. @@ -293,7 +297,7 @@ ${WORKDIR}/current file. cleanup fi fi - [ ! "$MIRROR_VERSION" = "current" ] && rm -f ${ROOT}/${WORKDIR}/current + [ ! "$MIRROR_VERSION" = "current" ] && rm -f ${WORKDIR}/current # It will check if the mirror selected are ftp.slackware.com # if set to "ftp.slackware.com" tell the user to choose another @@ -343,8 +347,9 @@ use slackpkg.\n" # if ! [ $(which md5sum 2>/dev/null) ]; then CHECKMD5=off - elif ! [ -f ${ROOT}/${WORKDIR}/CHECKSUMS.md5 ] && \ + elif ! [ -f ${WORKDIR}/CHECKSUMS.md5 ] && \ [ "$CMD" != "update" ] && \ + [ "$CMD" != "new-config" ] && \ [ "$CHECKMD5" = "on" ]; then echo -e "\n\ No CHECKSUMS.md5 found! Please disable md5sums checking\n\ @@ -582,8 +587,37 @@ function listpkgname() { cut -f1 -d\ | uniq > ${TMPDIR}/dpkg } +# Create a blacklist of single package names from regexps in original blacklist +# any sets such as kde/ are converted to single package names in the process +# the final list will be used by 'applyblacklist' later. +function mkregex_blacklist() { + # Check that we have the files we need + if [ ! -f ${WORKDIR}/pkglist ] || [ ! -f ${CONF}/blacklist ];then + return 1 + fi + + # Create tmp blacklist in a more usable format + sed -E "s,(^[[:blank:]]+|[[:blank:]]+$),, + /(^#|^$)/d + s,^, , + s,$, , + s,^ (extra|pasture|patches|slackware(|64)|testing)/ $,^\1 , + s,^ ([^/]+)/ $, \\\.\\\/$PKGMAIN\\\/\1\$, + " ${CONF}/blacklist > ${TMPDIR}/blacklist.tmp + + # Filter server and local package lists through blacklist + ( cat ${WORKDIR}/pkglist + printf "%s\n" $ROOT/var/log/packages/* | + awk -f /usr/libexec/slackpkg/pkglist.awk + ) | cut -d\ -f1-7 | grep -E -f ${TMPDIR}/blacklist.tmp | + awk '{print $2}' | sort -u | sed "s,[+],[+],g + s,$,-[^-]+-($ARCH|noarch|fw)-[^-]+,g" > ${TMPDIR}/blacklist +} + +# Blacklist filter +# function applyblacklist() { - grep -vE -f ${TMPDIR}/blacklist + grep -vxE -f ${TMPDIR}/blacklist } # Function to make install/reinstall/upgrade lists @@ -595,22 +629,14 @@ function makelist() { INPUTLIST=$@ - grep -vE "(^#|^[[:blank:]]*$)" ${ROOT}/${CONF}/blacklist | \ - sed -E " - s,^, , - s,$, , - s,^\s(extra|pasture|patches|slackware(|64)|testing)\s$,\1 , - s,^\s(tgz|txz)\s$, \1, - s,^\s([^/]*)/\s$, ./$PKGMAIN/\1 , - " \ - > ${TMPDIR}/blacklist - if echo $CMD | grep -q install ; then - ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist + ls -1 $ROOT/var/log/packages/* | + awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist else - ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist + ls -1 $ROOT/var/log/packages/* | + awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist fi - cat ${ROOT}/${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist + cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist touch ${TMPDIR}/waiting @@ -707,7 +733,7 @@ function makelist() { done ;; install-new) - for i in $(awk -f /usr/libexec/slackpkg/install-new.awk ${ROOT}/${WORKDIR}/ChangeLog.txt |\ + for i in $(awk -f /usr/libexec/slackpkg/install-new.awk ${WORKDIR}/ChangeLog.txt |\ sort -u ) dialog aaa_terminfo fontconfig \ ntfs-3g ghostscript wqy-zenhei-font-ttf \ xbacklight xf86-video-geode ; do @@ -744,8 +770,8 @@ function makelist() { if [ "$CMD" = "file-search" ]; then # Search filelist.gz for possible matches for i in ${PRIORITY[@]}; do - if [ -e ${ROOT}/${WORKDIR}/${i}-filelist.gz ]; then - PKGS="$(zegrep -w "${INPUTLIST}" ${ROOT}/${WORKDIR}/${i}-filelist.gz | \ + if [ -e ${WORKDIR}/${i}-filelist.gz ]; then + PKGS="$(zegrep -w "${INPUTLIST}" ${WORKDIR}/${i}-filelist.gz | \ cut -d\ -f 1 | awk -F'/' '{print $NF}')" for FULLNAME in $PKGS ; do NAME=$(cutpkg ${FULLNAME}) @@ -757,8 +783,13 @@ function makelist() { done else for i in ${PRIORITY[@]}; do - PKGS=$(grep "^${i}.*${PATTERN}" \ - ${TMPDIR}/pkglist | cut -f6 -d\ ) + + # Test for search pattern in blacklist first + grep -q "^${PATTERN}$" ${TMPDIR}/blacklist && continue + + PKGS=$( cut -d\ -f1-7 ${TMPDIR}/pkglist | + grep "^${i}.*${PATTERN}" | cut -f6 -d\ ) + for FULLNAME in $PKGS ; do NAME=$(cutpkg ${FULLNAME}) @@ -769,9 +800,14 @@ function makelist() { done fi rm -f $PKGNAMELIST + rm ${TMPDIR}/waiting + + echo -e "DONE\n" + # We need to return early before the blacklist + return ;; esac - LIST=$(echo -e $LIST | tr \ "\n" | uniq ) + LIST=$( printf "%s\n" $LIST | applyblacklist | uniq ) rm ${TMPDIR}/waiting @@ -832,7 +868,14 @@ function searchlist() { echo "[${STATUS}] - ${INSTPKG}" else STATUS=" upgrade " - echo "[${STATUS}] - ${INSTPKG} --> ${RAWNAME}" + INSTPKG=$( printf "$INSTPKG" | tr '\n' ' ' ) + + if echo "$INSTPKG" | grep -q ' '; then + printf "%s - %s / %s\n --> %s\n" \ + "[${STATUS}]" ${INSTPKG} ${RAWNAME} + else + echo "[${STATUS}] - ${INSTPKG} --> ${RAWNAME}" + fi fi else echo "[${STATUS}] - ${RAWNAME}" @@ -986,12 +1029,12 @@ function getpkg() { # Check if anything has changed. If so, return 1, else 0 if no change. function checkchangelog() { - if ! [ -e ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc ]; then - touch ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc + if ! [ -e ${WORKDIR}/CHECKSUMS.md5.asc ]; then + touch ${WORKDIR}/CHECKSUMS.md5.asc fi - if ! [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then - touch ${ROOT}/${WORKDIR}/ChangeLog.txt + if ! [ -e ${WORKDIR}/ChangeLog.txt ]; then + touch ${WORKDIR}/ChangeLog.txt fi # First we will download CHECKSUMS.md5.asc since it is a very small @@ -1005,7 +1048,7 @@ function checkchangelog() Please check your mirror and try again." cleanup fi - if diff --brief ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc ; then + if diff --brief ${WORKDIR}/CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc ; then return 0 else return 1 @@ -1092,10 +1135,10 @@ Please check your mirror and try again." ISOK=$(checkmd5 ${TMPDIR}/FILELIST.TXT) fi if [ "$ISOK" = "1" ]; then - if ! [ -e ${ROOT}/${WORKDIR}/LASTUPDATE ]; then - echo "742868196" > ${ROOT}/${WORKDIR}/LASTUPDATE + if ! [ -e ${WORKDIR}/LASTUPDATE ]; then + echo "742868196" > ${WORKDIR}/LASTUPDATE fi - LASTUPDATE=$(cat ${ROOT}/${WORKDIR}/LASTUPDATE) + LASTUPDATE=$(cat ${WORKDIR}/LASTUPDATE) ACTUALDATE=$(date -d "$(head -1 $TMPDIR/FILELIST.TXT)" "+%s") if [ $ACTUALDATE -lt $LASTUPDATE ]; then echo -e "\ @@ -1107,7 +1150,7 @@ Please check your mirror and try again." fi echo fi - echo $ACTUALDATE > ${ROOT}/${WORKDIR}/LASTUPDATE + echo $ACTUALDATE > ${WORKDIR}/LASTUPDATE else rm $TMPDIR/FILELIST.TXT fi @@ -1146,10 +1189,10 @@ Please check your mirror and try again." grep "\.t[blxg]z$" $FILELIST| \ awk -f /usr/libexec/slackpkg/pkglist.awk |\ sed -e 's/^M//g' > ${TMPDIR}/pkglist - cp ${TMPDIR}/pkglist ${ROOT}/${WORKDIR}/pkglist + cp ${TMPDIR}/pkglist ${WORKDIR}/pkglist # Create the slackware tree under TEMP directory - for i in $( cut -f7 -d\ ${ROOT}/${WORKDIR}/pkglist | sort -u ) ; do + for i in $( cut -f7 -d\ ${WORKDIR}/pkglist | sort -u ) ; do if ! [ -d ${ROOT}/${TEMP}/${i} ]; then mkdir -p ${ROOT}/${TEMP}/${i} fi @@ -1165,11 +1208,11 @@ Please check your mirror and try again." bunzip2 -c $TMPDIR/${i}-MANIFEST.bz2 | awk -f /usr/libexec/slackpkg/filelist.awk | \ gzip > ${TMPDIR}/${i}-filelist.gz done - cp ${TMPDIR}/*-filelist.gz ${ROOT}/${WORKDIR}/ + cp ${TMPDIR}/*-filelist.gz ${WORKDIR}/ - if [ -r ${ROOT}/${WORKDIR}/filelist.gz ]; then - rm ${ROOT}/${WORKDIR}/filelist.gz - ln -s ${ROOT}/${WORKDIR}/${MAIN}-filelist.gz ${ROOT}/${WORKDIR}/filelist.gz + if [ -r ${WORKDIR}/filelist.gz ]; then + rm ${WORKDIR}/filelist.gz + ln -s ${WORKDIR}/${MAIN}-filelist.gz ${WORKDIR}/filelist.gz fi # Concatenate PACKAGE.TXT files @@ -1178,20 +1221,20 @@ Please check your mirror and try again." for i in $DIRS; do cat $TMPDIR/${i}-PACKAGES.TXT >> $TMPDIR/PACKAGES.TXT done - cp $TMPDIR/PACKAGES.TXT ${ROOT}/${WORKDIR}/PACKAGES.TXT + cp $TMPDIR/PACKAGES.TXT ${WORKDIR}/PACKAGES.TXT if [ -e $TMPDIR/CHECKSUMS.md5 ]; then - cp $TMPDIR/CHECKSUMS.md5 ${ROOT}/${WORKDIR}/CHECKSUMS.md5 2>/dev/null + cp $TMPDIR/CHECKSUMS.md5 ${WORKDIR}/CHECKSUMS.md5 2>/dev/null fi if [ -e $TMPDIR/CHECKSUMS.md5.asc ]; then cp $TMPDIR/CHECKSUMS.md5.asc \ - ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc 2>/dev/null + ${WORKDIR}/CHECKSUMS.md5.asc 2>/dev/null fi # Finally, copy ChangeLog.txt if [ -e $TMPDIR/ChangeLog.txt ]; then cp $TMPDIR/ChangeLog.txt \ - ${ROOT}/${WORKDIR}/ChangeLog.txt 2>/dev/null + ${WORKDIR}/ChangeLog.txt 2>/dev/null fi } @@ -1214,60 +1257,42 @@ function sanity_check() { mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME} done - ls -1 $ROOT/var/log/packages/ | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \ - batchcutpkg | sort > $TMPDIR/list1 - cat $TMPDIR/list1 | uniq > $TMPDIR/list2 - FILES="$(diff $TMPDIR/list1 $TMPDIR/list2 | grep '<' | cut -f2 -d\ )" - if [ "$FILES" != "" ]; then - for i in $FILES ; do - grep -qx "${i}" ${CONF}/blacklist && continue - DOUBLEFILES="$DOUBLEFILES $i" - done - unset FILES - fi + DOUBLEFILES=$( ls -1 $ROOT/var/log/packages/ | + batchcutpkg | uniq -D | sort -u | sed "s,[+],[+],g" | + xargs -I '{}' find $ROOT/var/log/packages/ -regextype awk -regex \ + ".*/{}-[^-]+-($ARCH|noarch|fw)-[^-]+" | awk -F/ '{print $NF}' | + applyblacklist ) rm ${TMPDIR}/waiting echo -e "DONE" if [ "$DOUBLEFILES" != "" ]; then echo -e "\ -You have a broken $ROOT/var/log/packages/ - with two versions of the same package.\n\ -The list of packages duplicated in your machine is shown below, but don't\n\ -worry about this list - when you select your action, slackpkg will show a\n\ -better list:\n" - for i in $DOUBLEFILES ; do - ls -1 $ROOT/var/log/packages/ |\ - egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-" - done +You have a broken $ROOT/var/log/packages/ - with multiple versions of the same package.\n\ +The list of packages duplicated in your machine is shown below:\n" + printf "%s\n" $DOUBLEFILES + echo -ne "\n\ -You can (R)emove, or (I)gnore these packages.\n\ +You can (R)emove one or more of, or (I)gnore these packages.\n\ Select your action (R/I): " read ANSWER echo case "$ANSWER" in R|r) - for i in $DOUBLEFILES ; do - FILE=$(ls -1 $ROOT/var/log/packages/ |\ - egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-") - FILES="$FILES $FILE" - done - showlist "$FILES" remove + showlist "$DOUBLEFILES" remove remove_pkg ;; *) - echo -e "\n\ -Remove or blacklist the affected packages in order for slackpkg to work properly.\n" + echo "Remove one or more of OR blacklist the affected packages in order +for slackpkg to work properly. +" + echo "To blacklist the affected packages, edit /etc/slackpkg/blacklist" cleanup ;; esac fi } -function blacklist_pkg() { - echo -e "\nThis function no longer adds packages to your blacklist.\n\ -As of slackpkg 15.0, you will need to edit ${CONF}/blacklist instead.\n" -} - function remove_pkg() { local i @@ -1367,7 +1392,7 @@ generate_template() { [ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting & for i in $ROOT/var/log/packages/* ; do PKGNAME=$( cutpkg $(basename $i)) - grep -q " $PKGNAME " ${ROOT}/${WORKDIR}/pkglist && \ + grep -q " $PKGNAME " ${WORKDIR}/pkglist && \ echo $PKGNAME >> $TMPDIR/$TEMPLATE.work done rm $TMPDIR/waiting diff --git a/source/ap/slackpkg/files/cutpkg.awk b/source/ap/slackpkg/files/cutpkg.awk index 62aaad737..d4cc57cf6 100644 --- a/source/ap/slackpkg/files/cutpkg.awk +++ b/source/ap/slackpkg/files/cutpkg.awk @@ -1,8 +1,6 @@ OFS="-" { if ( NF > 3 ) { NF=NF-3 - print $0 - } else { - print $0 } } +1 diff --git a/source/ap/slackpkg/files/manpages-l10n/de.slackpkg b/source/ap/slackpkg/files/manpages-l10n/de.slackpkg index f724dfd1f..286a105f0 100644 --- a/source/ap/slackpkg/files/manpages-l10n/de.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/de.slackpkg @@ -10,7 +10,7 @@ Linuxpaketen .SH ZUSAMMENFASSUNG \fBslackpkg\fP \fB[OPTIONEN]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIMUSTER\fP\fB|\fP\fIDATEI\fP\fB}\fP \fBslackpkg [OPTIONEN] {clean\-system|upgrade\-all|install\-new}\fP @@ -222,16 +222,6 @@ Mit der Aktion "remove" können Sie installierte Pakete entfernen. Beispiel: wird alle Pakete mit "kde" im Namen entfernen. .TP 5 -\fBblacklist\fP -.br -Mit dieser Aktion können Sie gewissen Pakete auf die "Blacklist" setzen. -.br -Pakete, die in der "Blacklist" sind, werden bei Aktionen wie "install", -"upgrade" oder "remove" ignoriert. Um Pakete auf die "Blacklist" zu setzten -oder sie von dieser zu entfernen, bearbeiten Sie bitte die Datei -/etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Mit dieser Aktion lädt Slackpkg Pakete herunter, installiert sie aber diff --git a/source/ap/slackpkg/files/manpages-l10n/el.slackpkg b/source/ap/slackpkg/files/manpages-l10n/el.slackpkg index 85355fe9c..51841a374 100644 --- a/source/ap/slackpkg/files/manpages-l10n/el.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/el.slackpkg @@ -10,7 +10,7 @@ Slackware Linux .SH ΣΥΝΟΨΗ \fBslackpkg\fP \fB[ΕΠΙΛΟΓΕΣ]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIΠΡΟΤΥΠΟ\fP\fB|\fP\fIΑΡΧΕΙΟ\fP\fB}\fP \fBslackpkg [ΕΠΙΛΟΓΕΣ] {clean\-system|upgrade\-all|install\-new}\fP @@ -230,15 +230,6 @@ Slackware. θα αφαιρέσει όλα τα πακέτα με το "kde" στο όνομά τους. .TP 5 -\fBblacklist\fP -.br -Με την ενέργεια αυτή, μπορείτε να βάλετε στη "μαύρη λίστα" ορισμένα πακέτα. -.br -Τα ανεπιθύμητα πακέτα δεν θα εγκατασταθούν, αναβαθμιστούν ή αφαιρεθούν από -το slackpkg. Εάν θέλετε να αφαιρέσετε κάποιο πακέτο από τη μαύρη λίστα, -παρακαλούμε να επεξεργαστείτε το /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Η δράση αυτή λέει στο slackpkg να κατεβάσει τα πακέτα, αλλά όχι να τα diff --git a/source/ap/slackpkg/files/manpages-l10n/es.slackpkg b/source/ap/slackpkg/files/manpages-l10n/es.slackpkg index 98e24d0d4..435eec446 100644 --- a/source/ap/slackpkg/files/manpages-l10n/es.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/es.slackpkg @@ -10,7 +10,7 @@ Slackware Linux .SH SINOPSIS \fBslackpkg\fP \fB[OPCIONES]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIPATRÓN\fP\fB|\fP\fIARCHIVO\fP\fB}\fP \fBslackpkg [OPCIONES] {clean\-system|upgrade\-all|install\-new}\fP @@ -217,15 +217,6 @@ Con "remove", es posible eliminar ciertos paquetes instalados. Por ejemplo: eliminará todos los paquetes con "kde" en su nombre. .TP 5 -\fBblacklist\fP -.br -Con esta acción, se pueden agregar ciertos paquetes a una "lista negra". -.br -Los paquetes en la lista negra no serán instalados, actualizados o -eliminados por slackpkg. Si necesita eliminar algún paquete de la lista -negra, por favor edite /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Esta acción hace que slackpkg descargue los paquetes, pero no los diff --git a/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg b/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg index 740da9746..87ed95e9b 100644 --- a/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg @@ -9,7 +9,7 @@ .SH اختصار \fBslackpkg\fP \fB[گزینه ها]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIفایل\fP\fB|\fP\fIالگو\fP\fB}\fP \fBslackpkg [گزینه ها] {clean\-system|upgrade\-all|install\-new}\fP @@ -210,15 +210,6 @@ install استفاده کنید که باعث نصب آخرین نسخه رسم تمام پکیج هایی که عبارت "kde" در نام آنها وجود دارد، حذف خواهند شد. .TP 5 -\fBblacklist\fP -.br -با این عملیات، شما می توانید پکیج های خاصی را وارد لیست سیاه کنید. -.br -پکیج هایی که وارد لیست سیاه شده اند بوسیله slackpkg نصب، ارتقاء و حذف -نخواهند شد. اگر می خواهید برخی پکیج ها را از لیست سیاه خارج کنید، فایل واقع -در مسیر etc/slackpkg/blacklist/ را تدوین کنید. - -.TP 5 \fBdownload\fP .br با استفاده از این گزینه slackpkg پکیج را دانلود می کند اما آن را نصب نمی diff --git a/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg b/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg index e7b11c8f2..6850a2049 100644 --- a/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg @@ -9,7 +9,7 @@ .SH SYNOPSIS \fBslackpkg\fP \fB[OPTIONS]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIMOTIF\fP\fB|\fP\fIFICHIER\fP\fB}\fP \fBslackpkg [OPTIONS] {clean\-system|upgrade\-all|install\-new}\fP @@ -224,16 +224,6 @@ Avec "remove" vous pouvez enlever des paquets installés. Par exemple : enlèvera tous les paquets avec "kde" dans leur nom. .TP 5 -\fBblacklist\fP -.br -Avec cette fonction vous pouvez "blacklister" (mettre en liste noire) -certains paquets. -.br -Les paquets en liste noire ne seront pas installés, mis à niveau ou enlevés -par slackpkg. Si vous voulez enlever un paquet de la liste noire, merci -d'éditer le fichier /etc/slackpkg/blacklist à cet effet. - -.TP 5 \fBdownload\fP .br Cette action indique à slackpkg de télé\-charger les paquets, mais de ne pas diff --git a/source/ap/slackpkg/files/manpages-l10n/id.slackpkg b/source/ap/slackpkg/files/manpages-l10n/id.slackpkg index 048af070a..741202f6b 100644 --- a/source/ap/slackpkg/files/manpages-l10n/id.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/id.slackpkg @@ -9,7 +9,7 @@ .SH SINOPSIS \fBslackpkg\fP \fB[OPTIONS]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIPOLA\fP\fB|\fP\fIFILE\fP\fB}\fP \fBslackpkg [OPTIONS] {clean\-system|upgrade\-all|install\-new}\fP @@ -213,15 +213,6 @@ contoh: akan menghapus semua paket dengan "kde" sebagai namanya. .TP 5 -\fBblacklist\fP -.br -Dengan aksi ini, Anda bisa mem\-"blacklist" paket tertentu. -.br -Paket yang di\-blacklist tidak akan diinstall, diupgrade, atau dihapus oleh -slackpkg. Jika Anda ingin menghapus beberapa paket dari daftar blacklist, -silahkan mengedit /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Aksi ini memberitahu slackpkg untuk mendownload paket, tetapi tidak diff --git a/source/ap/slackpkg/files/manpages-l10n/it.slackpkg b/source/ap/slackpkg/files/manpages-l10n/it.slackpkg index 0d9db3fbd..1f6744901 100644 --- a/source/ap/slackpkg/files/manpages-l10n/it.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/it.slackpkg @@ -10,7 +10,7 @@ Slackware Linux .SH SINOSSI \fBslackpkg\fP \fB[OPZIONI]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fISCHEMA\fP\fB|\fP\fIFILE\fP\fB}\fP \fBslackpkg [OPZIONI] {clean\-system|upgrade\-all|install\-new}\fP @@ -216,15 +216,6 @@ Con remove, puoi rimuovere i pacchetti installati. Per esempio: rimuoverà tutti i pacchetti con "kde" nel loro nome. .TP 5 -\fBblacklist\fP -.br -Con questa azione, puoi mettere in una "listanera" certi pacchetti. -.br -I pacchetti della lista nera non saranno installati, aggiornati o rimossi -con slackpkg. Se vuoi eliminare i pacchetti dalla lista nera, per favore -modifica il file /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Questa azione dice a slackpkg di scaricare il pacchetto, ma senza diff --git a/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg b/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg index 412fb72fa..64b82f208 100644 --- a/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg @@ -9,7 +9,7 @@ Linux .SH SAMMENDRAG -\fBslackpkg\fP \fB[VALG]\fP \fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fBslackpkg\fP \fB[VALG]\fP \fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fITEKST\fP\fB|\fP\fIFIL\fP\fB}\fP \fBslackpkg [VALG] {clean\-system|upgrade\-all|install\-new}\fP @@ -211,15 +211,6 @@ remove kan fjerne pakker som er installert. For eksempel: vil fjerne alle pakker som inkluderer "kde" i sitt navn. .TP 5 -\fBblacklist\fP -.br -Denne handlingen lar deg "svarteliste" visse pakker. -.br -Pakker som er svartelistet vil ikke bli installert, oppgradert eller fjernet -av slackpkg. Hvis du vil fjerne pakker fra svartelisten kan du gjøre dette i -/etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Denne handlingen lar slackpkg laste ned pakkene, men installerer dem diff --git a/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg b/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg index 931c33d1a..0e22f64d5 100644 --- a/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg @@ -10,7 +10,7 @@ pakketten .SH SYNOPSIS \fBslackpkg\fP \fB[OPTIES]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIPATROON\fP\fB|\fP\fIBESTAND\fP\fB}\fP \fBslackpkg [OPTIES] {clean\-system|upgrade\-all|install\-new}\fP @@ -221,16 +221,6 @@ verwijderen. Bijvoorbeeld: zal alle pakketten verwijderen met "kde" in hun naam. .TP 5 -\fBblacklist\fP -.br -Met deze actie kun je bepaalde pakketten op een "zwarte lijst" zetten. -.br -Pakketten op de zwarte lijst zullen niet worden geïnstalleerd, opgewaardeerd -of verwijderd door slackpkg. Als je een pakket wilt verwijderen uit de -zwarte lijst, moet je het bestand /etc/slackpkg/blacklist handmatig -aanpassen. - -.TP 5 \fBdownload\fP .br Deze actie laat slackpkg de pakketten downloaden maar niet installeren. Ze diff --git a/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg b/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg index fd0b39d98..e79275f80 100644 --- a/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg @@ -10,7 +10,7 @@ Slackware Linux. .SH STRESZCZENIE \fBslackpkg\fP \fB[OPCJE]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fICIĄG\fP\fB|\fP\fIPLIK\fP\fB}\fP \fBslackpkg [OPCJE] {clean\-system|upgrade\-all|install\-new}\fP @@ -213,15 +213,6 @@ Z remove, możesz usunąć pewne zainstalowane pakiety. Na przykład: usunie wszystkie pakiety zawierające "kde" w swojej nazwie. .TP 5 -\fBblacklist\fP -.br -Ta funkcja pozwala na zablokowanie (blacklist) danych pakietów. -.br -Zablokowane pakiety nie będą instalowane, aktualizowane, ani usuwane przez -slackpkg. Jeśli chcesz usunąć pakiet z listy zablokowanych pakietów, musisz -edytować /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Opcja pozwala na pobranie pakietów bez ich instalacji. Będą one umieszczone diff --git a/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg b/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg index c10b2cd2d..0b106fc13 100644 --- a/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg @@ -10,7 +10,7 @@ Slackware Linux .SH SINOPSE \fBslackpkg\fP \fB[OPÇÕES]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIPADRÃO\fP\fB|\fP\fIARQUIVO\fP\fB}\fP \fBslackpkg [OPÇÕES] {clean\-system|upgrade\-all|install\-new}\fP @@ -217,15 +217,6 @@ Com remove, você pode remover alguns pacotes instalados. Como um exemplo: removerá todos os pacotes com "kde" em seu nome. .TP 5 -\fBblacklist\fP -.br -Com essa ação, você pode colocar em "blacklist" certos pacotes. -.br -Pacotes em blacklist não serão instalados, atualizados ou removidos por meio -do slackpkg. Se você quiser remover algum pacote que esteja na blacklist, -por favor edite /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Esta ação diz ao slackpkg para baixar os pacotes, mas não instalá\-los. Eles diff --git a/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg b/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg index 2997331ac..31ae57e72 100644 --- a/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg @@ -9,7 +9,7 @@ .SH SINOPSE \fBslackpkg\fP \fB[OPÇÕES]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIPADRÃO\fP\fB|\fP\fIFICHEIRO\fP\fB}\fP \fBslackpkg [OPÇÕES] {clean\-system|upgrade\-all|install\-new}\fP @@ -215,15 +215,6 @@ Com remove, você pode remover certos pacotes instalados. Como um exemplo: removerá todos os pacotes com "kde" no seu nome. .TP 5 -\fBblacklist\fP -.br -Com esta ação, você pode colocar na "blacklist" certos pacotes. -.br -Pacotes colocados na blacklist não serão instalados, atualizados ou -removidos pelo slackpkg. Se você quiser remover algum pacote da blacklist, -por favor edite o /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Esta ação diz ao slackpkg para transferir os pacotes, mas não diff --git a/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg b/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg index a4244a170..d8139d977 100644 --- a/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg @@ -10,7 +10,7 @@ Linux .SH СИНТАКСИС \fBslackpkg\fP \fB[ОПЦИИ]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIОБРАЗЕЦ\fP\fB|\fP\fIФАЙЛ\fP\fB}\fP \fBslackpkg [ОПЦИИ] {clean\-system|upgrade\-all|install\-new}\fP @@ -210,15 +210,6 @@ file\-search, можно увидеть, установлены пакеты и удалит пакеты, содержащие в имени "kde". .TP 5 -\fBblacklist\fP -.br -Добавляет указанные пакеты в "черный список". -.br -Пакеты из "черного списка" не могут быть установлены, обновлены или удалены -с помощью slackpkg. Для удаления пакетов из "черного списка" отредактируйте -/etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Загружает, но не устанавливает пакеты. Они будут помещены в diff --git a/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg b/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg index a8e435dee..2ea366da9 100644 --- a/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg @@ -9,7 +9,7 @@ .SH ÖVERSIKT \fBslackpkg\fP \fB[ALTERNATIV]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIMÖNSTER\fP\fB|\fP\fIFIL\fP\fB}\fP \fBslackpkg [ALTERNATIV] {clean\-system|upgrade\-all|install\-new}\fP @@ -213,15 +213,6 @@ Med remove, kan du ta bort vissa installerade paket. Som ett exempel: kommer att ta bort alla paket med "kde" i sitt namn. .TP 5 -\fBblacklist\fP -.br -Med den här åtgärden kan du "svartlista" vissa paket. -.br -Svartlistade paket kommer inte att installeras, uppgraderas, eller tas bort -av slackpkg. Om du vill ta bort vissa paket från svartlistan, vänligen -redigera /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Denna åtgärd talar om för slackpkg att hämta paketen, men inte att diff --git a/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg b/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg index 29cee71a7..05e0178c7 100644 --- a/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg @@ -9,7 +9,7 @@ .SH ÖZET \fBslackpkg\fP \fB[SEÇİMLER]\fP -\fB{install|remove|search|upgrade|reinstall|blacklist}\fP +\fB{install|remove|search|upgrade|reinstall}\fP \fB{\fP\fIKALIP\fP\fB|\fP\fIDOSYA\fP\fB}\fP \fBslackpkg [SEÇİMLER] {clean\-system|upgrade\-all|install\-new}\fP @@ -210,15 +210,6 @@ remove il, belirli kurulu paketleri kaldırabilirsiniz. Örneğin: isminde "kde" olan tüm paketleri kaldıracaktır. .TP 5 -\fBblacklist\fP -.br -Bu eylemle, belirli paketlerden "karaliste" oluşturabilirsiniz. -.br -Karaliste paketleri slackpkg tarafından kurulmaz, yükseltilmez ya da -kaldırılmaz. Bazı paketleri kara listeden çıkartmak isterseniz lütfen -/etc/slackpkg/blacklist dosyasını düzenleyiniz. - -.TP 5 \fBdownload\fP .br Bu eylem slackpkg'ye paketi indirmesini fakat kurmamasını diff --git a/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg b/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg index 1d03e0e6e..d69dd0b4e 100644 --- a/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg +++ b/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg @@ -216,15 +216,6 @@ slackpkg. буде вилучено пакунки що містять "kde" у своїй назві. .TP 5 -\fBblacklist\fP -.br -Цією командою ви можете створити "чорний список" деяких пакунків. -.br -Пакунки з "чорного списку" не можуть бути встановлені, оновлені або вилучені -за допомогою slackpkg. Якщо вам потрібно вилучити декілька пакунків з -чорного списку, спочатку вилучіть їх з /etc/slackpkg/blacklist. - -.TP 5 \fBdownload\fP .br Ця команда вкаже slackpkg стягнути пакунки, але не встановлювати їх. Вони diff --git a/source/ap/slackpkg/files/mirrors-aarch64.sample b/source/ap/slackpkg/files/mirrors-aarch64.sample new file mode 100644 index 000000000..db48c08a9 --- /dev/null +++ b/source/ap/slackpkg/files/mirrors-aarch64.sample @@ -0,0 +1,68 @@ +# mirrors - List of Slackware Linux mirrors. +# +# SlackPkg - An Automated packaging tool for Slackware Linux +# Copyright (C) 2003-2011 Roberto F. Batista, Evaldo Gardenali +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Project Page: https://slackpkg.org/ +# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com +# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br +# +# END OF LEGAL NOTICE +# +# +# You only need to select one mirror and uncomment it. +# ONLY ONE mirror can be uncommented. +# +# You can use a mirror not included in this file. Many people have mirrors +# in their local networks. +# +# Slackpkg only needs to point to the directory that contains +# "ChangeLog.txt", and don't forget the trailing slash. +# +#---------------------------------------------------------------- +# Local CD/DVD drive +#---------------------------------------------------------------- +#cdrom://media/cdrom/ +# +#---------------------------------------------------------------- +# Local Directory +#---------------------------------------------------------------- +#file://path/to/some/directory/ +# +#---------------------------------------------------------------- +# Local CD/DVD drive +#---------------------------------------------------------------- +#cdrom://media/cdrom/ +# +#---------------------------------------------------------------- +# Local Directory +#---------------------------------------------------------------- +#file://path/to/some/directory/ +# + +#---------------------------------------------------------------- +# Slackware AArch64 (ARM64) current: 64bit armv8 +#---------------------------------------------------------------- +#http://slackware.uk/slackwarearm/slackwareaarch64-current/ +#http://ftp.halifax.rwth-aachen.de/slackwarearm/slackwareaarch64-current/ +#http://ftp.slackware.pl/pub/slackwarearm/slackwareaarch64-current/ +#https://mirror.slackbuilds.org/slackwarearm/slackwareaarch64-current/ +#https://slackware.absolutehosting.net/pub/slackwarearm/slackwareaarch64-current/ +# +# Use this as the default if you don't know which to pick: +#http://ftp.arm.slackware.com/slackwarearm/slackwareaarch64-current/ +# diff --git a/source/ap/slackpkg/files/mirrors-arm.sample b/source/ap/slackpkg/files/mirrors-arm.sample index b26736bd8..c81ce21e3 100644 --- a/source/ap/slackpkg/files/mirrors-arm.sample +++ b/source/ap/slackpkg/files/mirrors-arm.sample @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br # @@ -74,17 +74,6 @@ #https://mirror.slackbuilds.org/slackwarearm/slackwarearm-current/ #https://slackware.absolutehosting.net/pub/slackwarearm/slackwarearm-current/ # +# Use this as the default if you don't know which to pick: #http://ftp.arm.slackware.com/slackwarearm/slackwarearm-current/ # - -#---------------------------------------------------------------- -# Slackware AArch64 (ARM64) current: 64 bit armv8 -#---------------------------------------------------------------- -#http://slackware.uk/slackwarearm/slackwareaarch64-current/ -#http://ftp.halifax.rwth-aachen.de/slackwarearm/slackwareaarch64-current/ -#http://ftp.slackware.pl/pub/slackwarearm/slackwareaarch64-current/ -#https://mirror.slackbuilds.org/slackwarearm/slackwareaarch64-current/ -#https://slackware.absolutehosting.net/pub/slackwarearm/slackwareaarch64-current/ -# -#http://ftp.arm.slackware.com/slackwarearm/slackwareaarch64-current/ -# diff --git a/source/ap/slackpkg/files/mirrors-s390.sample b/source/ap/slackpkg/files/mirrors-s390.sample index 03cad827d..e5a3fbc55 100644 --- a/source/ap/slackpkg/files/mirrors-s390.sample +++ b/source/ap/slackpkg/files/mirrors-s390.sample @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br # diff --git a/source/ap/slackpkg/files/mirrors-x86.sample b/source/ap/slackpkg/files/mirrors-x86.sample index b72dd80e3..5ede5cbcd 100644 --- a/source/ap/slackpkg/files/mirrors-x86.sample +++ b/source/ap/slackpkg/files/mirrors-x86.sample @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br # @@ -46,10 +46,10 @@ # file://path/to/some/directory/ # #---------------------------------------------------------------- -# Slackware-14.2 +# Slackware-15.0 #---------------------------------------------------------------- # USE MIRRORS.SLACKWARE.COM (DO NOT USE FTP - ONLY HTTP FINDS A NEARBY MIRROR) -https://mirrors.slackware.com/slackware/slackware-14.2/ +# https://mirrors.slackware.com/slackware/slackware-15.0/ # # # Here are some individual mirrors that can be used instead of the @@ -57,148 +57,151 @@ https://mirrors.slackware.com/slackware/slackware-14.2/ # list is not guaranteed to be up-to-date # # AUSTRALIA (AU) -# ftp://ftp.cc.swin.edu.au/slackware/slackware-14.2/ -# http://ftp.cc.swin.edu.au/slackware/slackware-14.2/ -# ftp://ftp.iinet.net.au/pub/slackware/slackware-14.2/ -# http://ftp.iinet.net.au/pub/slackware/slackware-14.2/ -# ftp://mirror.as24220.net/pub/slackware/slackware-14.2/ -# http://mirror.as24220.net/pub/slackware/slackware-14.2/ -# ftp://mirror.internode.on.net/.pub2/slackware/slackware-14.2/ -# http://mirror.internode.on.net/pub/slackware/slackware-14.2/ +# ftp://ftp.cc.swin.edu.au/slackware/slackware-15.0/ +# http://ftp.cc.swin.edu.au/slackware/slackware-15.0/ +# ftp://ftp.iinet.net.au/pub/slackware/slackware-15.0/ +# http://ftp.iinet.net.au/pub/slackware/slackware-15.0/ +# ftp://mirror.as24220.net/pub/slackware/slackware-15.0/ +# http://mirror.as24220.net/pub/slackware/slackware-15.0/ +# ftp://mirror.internode.on.net/.pub2/slackware/slackware-15.0/ +# http://mirror.internode.on.net/pub/slackware/slackware-15.0/ # AUSTRIA (AT) -# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware-14.2/ +# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware-15.0/ # BELARUS (BY) -# ftp://mirror.datacenter.by/pub/slackware/slackware-14.2/ -# http://mirror.datacenter.by/pub/slackware/slackware-14.2/ +# ftp://mirror.datacenter.by/pub/slackware/slackware-15.0/ +# http://mirror.datacenter.by/pub/slackware/slackware-15.0/ # BRAZIL (BR) -# ftp://ftp.slackware-brasil.com.br/slackware-14.2/ -# http://ftp.slackware-brasil.com.br/slackware-14.2/ +# ftp://ftp.slackware-brasil.com.br/slackware-15.0/ +# http://ftp.slackware-brasil.com.br/slackware-15.0/ # BULGARIA (BG) -# ftp://mirrors.unixsol.org/slackware/slackware-14.2/ -# http://mirrors.unixsol.org/slackware/slackware-14.2/ +# ftp://mirrors.unixsol.org/slackware/slackware-15.0/ +# http://mirrors.unixsol.org/slackware/slackware-15.0/ # CANADA (CA) -# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware-14.2/ -# http://mirror.csclub.uwaterloo.ca/slackware/slackware-14.2/ -# ftp://mirror.its.dal.ca/slackware/slackware-14.2/ -# http://mirror.its.dal.ca/slackware/slackware-14.2/ +# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware-15.0/ +# http://mirror.csclub.uwaterloo.ca/slackware/slackware-15.0/ +# ftp://mirror.its.dal.ca/slackware/slackware-15.0/ +# http://mirror.its.dal.ca/slackware/slackware-15.0/ # CHINA (CN) -# http://mirrors.163.com/slackware/slackware-14.2/ -# http://mirrors.ustc.edu.cn/slackware/slackware-14.2/ +# http://mirrors.163.com/slackware/slackware-15.0/ +# http://mirrors.ustc.edu.cn/slackware/slackware-15.0/ # COSTA RICA (CR) -# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-14.2/ -# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-14.2/ +# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/ +# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/ # CZECH REPUBLIC (CZ) -# ftp://odysseus.linux.cz/pub/linux/slackware/slackware-14.2/ -# http://odysseus.linux.cz/pub/linux/slackware/slackware-14.2/ +# ftp://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/ +# http://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/ # DENMARK (DK) -# ftp://mirrors.dotsrc.org/slackware/slackware-14.2/ -# https://mirrors.dotsrc.org/slackware/slackware-14.2/ +# ftp://mirrors.dotsrc.org/slackware/slackware-15.0/ +# https://mirrors.dotsrc.org/slackware/slackware-15.0/ # FINLAND (FI) -# ftp://elektroni.phys.tut.fi/slackware-14.2/ +# ftp://elektroni.phys.tut.fi/slackware-15.0/ # FRANCE (FR) -# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-14.2/ -# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-14.2/ +# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-15.0/ +# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-15.0/ # GERMANY (DE) -# ftp://ftp.gwdg.de/pub/linux/slackware/slackware-13.2/ -# http://ftp.gwdg.de/pub/linux/slackware/slackware-14.2/ -# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-14.2/ -# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-14.2/ -# ftp://ftp.zimt.uni-siegen.de/pub/slackware/slackware-14.2/ -# http://ftp.zimt.uni-siegen.de/slackware/slackware-14.2/ -# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware-14.2/ -# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware-14.2/ +# ftp://ftp.gwdg.de/pub/linux/slackware/slackware-15.0/ +# http://ftp.gwdg.de/pub/linux/slackware/slackware-15.0/ +# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-15.0/ +# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-15.0/ +# ftp://ftp.zimt.uni-siegen.de/pub/slackware/slackware-15.0/ +# http://ftp.zimt.uni-siegen.de/slackware/slackware-15.0/ +# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware-15.0/ +# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware-15.0/ # GREECE (GR) -# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-14.2/ -# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-14.2/ -# ftp://ftp.otenet.gr/pub/linux/slackware/slackware-14.2/ -# http://ftp.otenet.gr/linux/slackware/slackware-14.2/ -# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-14.2/ -# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-14.2/ +# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-15.0/ +# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-15.0/ +# ftp://ftp.otenet.gr/pub/linux/slackware/slackware-15.0/ +# http://ftp.otenet.gr/linux/slackware/slackware-15.0/ +# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-15.0/ +# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-15.0/ # INDONESIA (ID) -# http://kambing.ui.ac.id/slackware/slackware-14.2/ -# https://repo.ukdw.ac.id/slackware/slackware-14.2/ +# http://kambing.ui.ac.id/slackware/slackware-15.0/ +# https://repo.ukdw.ac.id/slackware/slackware-15.0/ # IRELAND (IE) -# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-14.2/ -# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-14.2/ +# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-15.0/ +# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-15.0/ # ITALY (IT) -# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware-14.2/ -# http://ba.mirror.garr.it/mirrors/Slackware/slackware-14.2/ +# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware-15.0/ +# http://ba.mirror.garr.it/mirrors/Slackware/slackware-15.0/ # JAPAN (JP) -# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-14.2/ -# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-14.2/ -# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-14.2/ -# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-14.2/ -# ftp://riksun.riken.go.jp/Linux/slackware/slackware-14.2/ -# http://riksun.riken.go.jp/Linux/slackware/slackware-14.2/ +# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/ +# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/ +# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/ +# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/ +# ftp://riksun.riken.go.jp/Linux/slackware/slackware-15.0/ +# http://riksun.riken.go.jp/Linux/slackware/slackware-15.0/ +# LITHUANIA (LT) +# http://mirrors.atviras.lt/slackware/slackware-15.0/ +# https://mirrors.atviras.lt/slackware/slackware-15.0/ # NETHERLANDS (NL) -# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware-14.2/ -# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware-14.2/ -# ftp://mirror.nl.leaseweb.net/slackware/slackware-14.2/ -# http://mirror.nl.leaseweb.net/slackware/slackware-14.2/ +# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware-15.0/ +# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware-15.0/ +# ftp://mirror.nl.leaseweb.net/slackware/slackware-15.0/ +# http://mirror.nl.leaseweb.net/slackware/slackware-15.0/ # NORWAY (NO) -# ftp://ftp.slackware.no/slackware/slackware-14.2/ -# http://ftp.slackware.no/slackware/slackware-14.2/ +# ftp://ftp.slackware.no/slackware/slackware-15.0/ +# http://ftp.slackware.no/slackware/slackware-15.0/ # POLAND (PL) -# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-14.2/ -# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-14.2/ -# ftp://ftp.slackware.pl/pub/slackware/slackware-14.2/ -# http://ftp.slackware.pl/pub/slackware/slackware-14.2/ -# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-14.2/ -# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-14.2/ -# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-14.2/ -# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-14.2/ +# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/ +# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/ +# ftp://ftp.slackware.pl/pub/slackware/slackware-15.0/ +# http://ftp.slackware.pl/pub/slackware/slackware-15.0/ +# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-15.0/ +# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-15.0/ +# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/ +# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/ # RUSSIA (RU) -# http://mirror.rol.ru/slackware/slackware-14.2/ -# ftp://mirror.yandex.ru/slackware/slackware-14.2/ -# http://mirror.yandex.ru/slackware/slackware-14.2/ +# http://mirror.rol.ru/slackware/slackware-15.0/ +# ftp://mirror.yandex.ru/slackware/slackware-15.0/ +# http://mirror.yandex.ru/slackware/slackware-15.0/ # SOUTH AFRICA (ZA) -# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-14.2/ -# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-14.2/ -# ftp://ftp.wa.co.za/pub/slackware/slackware-14.2/ -# http://ftp.wa.co.za/pub/slackware/slackware-14.2/ -# ftp://slackware.mirror.ac.za/slackware-14.2/ -# http://slackware.mirror.ac.za/slackware-14.2/ +# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-15.0/ +# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-15.0/ +# ftp://ftp.wa.co.za/pub/slackware/slackware-15.0/ +# http://ftp.wa.co.za/pub/slackware/slackware-15.0/ +# ftp://slackware.mirror.ac.za/slackware-15.0/ +# http://slackware.mirror.ac.za/slackware-15.0/ # SWEDEN (SE) -# ftp://ftp.sunet.se/mirror/slackware.com/slackware-14.2/ -# http://ftp.sunet.se/mirror/slackware.com/slackware-14.2/ +# ftp://ftp.sunet.se/mirror/slackware.com/slackware-15.0/ +# http://ftp.sunet.se/mirror/slackware.com/slackware-15.0/ # SWITZERLAND (CH) -# https://mirror.init7.net/slackware/slackware-14.2/ +# https://mirror.init7.net/slackware/slackware-15.0/ # TAIWAN (TW) -# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-14.2/ -# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-14.2/ -# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware-14.2/ -# http://ftp.twaren.net/Linux/Slackware/slackware-14.2/ +# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-15.0/ +# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-15.0/ +# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware-15.0/ +# http://ftp.twaren.net/Linux/Slackware/slackware-15.0/ # TURKEY (TR) -# ftp://ftp.linux.org.tr/slackware/slackware-14.2/ -# http://ftp.linux.org.tr/slackware/slackware-14.2/ +# ftp://ftp.linux.org.tr/slackware/slackware-15.0/ +# http://ftp.linux.org.tr/slackware/slackware-15.0/ # UKRAINE (UA) -# ftp://mirrors.mithril.org.ua/linux/slackware/slackware-14.2/ -# http://mirrors.mithril.org.ua/linux/slackware/slackware-14.2/ +# ftp://mirrors.mithril.org.ua/linux/slackware/slackware-15.0/ +# http://mirrors.mithril.org.ua/linux/slackware/slackware-15.0/ # UNITED KINGDOM (UK) -# http://slackware.uk/slackware/slackware-14.2/ -# ftp://slackware.uk/slackware/slackware-14.2/ -# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-14.2/ -# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-14.2/ -# ftp://mirror.bytemark.co.uk/slackware/slackware-14.2/ -# http://mirror.bytemark.co.uk/slackware/slackware-14.2/ +# http://slackware.uk/slackware/slackware-15.0/ +# ftp://slackware.uk/slackware/slackware-15.0/ +# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-15.0/ +# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-15.0/ +# 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-14.2/ -# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware-14.2/ -# ftp://mirrors.easynews.com/linux/slackware/slackware-14.2/ -# http://mirrors.easynews.com/linux/slackware/slackware-14.2/ -# ftp://mirrors.us.kernel.org/slackware/slackware-14.2/ -# http://mirrors.us.kernel.org/slackware/slackware-14.2/ -# ftp://mirrors.xmission.com/slackware/slackware-14.2/ -# http://mirrors.xmission.com/slackware/slackware-14.2/ -# https://mirror.slackbuilds.org/slackware/slackware-14.2/ -# http://slackware.cs.utah.edu/pub/slackware/slackware-14.2/ -# http://slackware.mirrors.pair.com/slackware-14.2/ -# ftp://slackware.mirrors.tds.net/pub/slackware/slackware-14.2/ -# http://slackware.mirrors.tds.net/pub/slackware/slackware-14.2/ -# ftp://spout.ussg.indiana.edu/linux/slackware/slackware-14.2/ -# http://spout.ussg.indiana.edu/linux/slackware/slackware-14.2/ -# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-14.2/ -# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-14.2/ +# 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/ +# 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/ # #---------------------------------------------------------------- # Slackware-current @@ -296,6 +299,9 @@ https://mirrors.slackware.com/slackware/slackware-14.2/ # http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-current/ # ftp://riksun.riken.go.jp/Linux/slackware/slackware-current/ # http://riksun.riken.go.jp/Linux/slackware/slackware-current/ +# LITHUANIA (LT) +# http://mirrors.atviras.lt/slackware/slackware-current/ +# https://mirrors.atviras.lt/slackware/slackware-current/ # NETHERLANDS (NL) # ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware-current/ # http://ftp.nluug.nl/os/Linux/distr/slackware/slackware-current/ diff --git a/source/ap/slackpkg/files/mirrors-x86_64.sample b/source/ap/slackpkg/files/mirrors-x86_64.sample index aa1742823..e66828a41 100644 --- a/source/ap/slackpkg/files/mirrors-x86_64.sample +++ b/source/ap/slackpkg/files/mirrors-x86_64.sample @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br # @@ -46,10 +46,10 @@ # file://path/to/some/directory/ # #---------------------------------------------------------------- -# Slackware64-14.2 +# Slackware64-15.0 #---------------------------------------------------------------- # USE MIRRORS.SLACKWARE.COM (DO NOT USE FTP - ONLY HTTP FINDS A NEARBY MIRROR) -https://mirrors.slackware.com/slackware/slackware64-14.2/ +# https://mirrors.slackware.com/slackware/slackware64-15.0/ # # # Here are some individual mirrors that can be used instead of the @@ -57,146 +57,149 @@ https://mirrors.slackware.com/slackware/slackware64-14.2/ # list is not guaranteed to be up-to-date # # AUSTRALIA (AU) -# ftp://ftp.cc.swin.edu.au/slackware/slackware64-14.2/ -# http://ftp.cc.swin.edu.au/slackware/slackware64-14.2/ -# ftp://ftp.iinet.net.au/pub/slackware/slackware64-14.2/ -# http://ftp.iinet.net.au/pub/slackware/slackware64-14.2/ -# ftp://mirror.as24220.net/pub/slackware/slackware64-14.2/ -# http://mirror.as24220.net/pub/slackware/slackware64-14.2/ -# ftp://mirror.internode.on.net/.pub2/slackware/slackware64-14.2/ -# http://mirror.internode.on.net/pub/slackware/slackware64-14.2/ +# ftp://ftp.cc.swin.edu.au/slackware/slackware64-15.0/ +# http://ftp.cc.swin.edu.au/slackware/slackware64-15.0/ +# ftp://ftp.iinet.net.au/pub/slackware/slackware64-15.0/ +# http://ftp.iinet.net.au/pub/slackware/slackware64-15.0/ +# ftp://mirror.as24220.net/pub/slackware/slackware64-15.0/ +# http://mirror.as24220.net/pub/slackware/slackware64-15.0/ +# ftp://mirror.internode.on.net/.pub2/slackware/slackware64-15.0/ +# http://mirror.internode.on.net/pub/slackware/slackware64-15.0/ # AUSTRIA (AT) -# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware64-14.2/ +# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware64-15.0/ # BELARUS (BY) -# ftp://mirror.datacenter.by/pub/slackware/slackware64-14.2/ -# http://mirror.datacenter.by/pub/slackware/slackware64-14.2/ +# ftp://mirror.datacenter.by/pub/slackware/slackware64-15.0/ +# http://mirror.datacenter.by/pub/slackware/slackware64-15.0/ # BRAZIL (BR) -# ftp://ftp.slackware-brasil.com.br/slackware64-14.2/ -# http://ftp.slackware-brasil.com.br/slackware64-14.2/ +# ftp://ftp.slackware-brasil.com.br/slackware64-15.0/ +# http://ftp.slackware-brasil.com.br/slackware64-15.0/ # BULGARIA (BG) -# ftp://mirrors.unixsol.org/slackware/slackware64-14.2/ -# http://mirrors.unixsol.org/slackware/slackware64-14.2/ +# ftp://mirrors.unixsol.org/slackware/slackware64-15.0/ +# http://mirrors.unixsol.org/slackware/slackware64-15.0/ # CANADA (CA) -# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware64-14.2/ -# http://mirror.csclub.uwaterloo.ca/slackware/slackware64-14.2/ -# ftp://mirror.its.dal.ca/slackware/slackware64-14.2/ -# http://mirror.its.dal.ca/slackware/slackware64-14.2/ +# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware64-15.0/ +# http://mirror.csclub.uwaterloo.ca/slackware/slackware64-15.0/ +# ftp://mirror.its.dal.ca/slackware/slackware64-15.0/ +# http://mirror.its.dal.ca/slackware/slackware64-15.0/ # CHINA (CN) -# http://mirrors.163.com/slackware/slackware64-14.2/ -# http://mirrors.ustc.edu.cn/slackware/slackware64-14.2/ +# http://mirrors.163.com/slackware/slackware64-15.0/ +# http://mirrors.ustc.edu.cn/slackware/slackware64-15.0/ # COSTA RICA (CR) -# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-14.2/ -# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-14.2/ +# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/ +# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/ # CZECH REPUBLIC (CZ) -# ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-14.2/ -# http://odysseus.linux.cz/pub/linux/slackware/slackware64-14.2/ +# ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/ +# http://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/ # DENMARK (DK) -# ftp://mirrors.dotsrc.org/slackware/slackware64-14.2/ -# https://mirrors.dotsrc.org/slackware/slackware64-14.2/ +# ftp://mirrors.dotsrc.org/slackware/slackware64-15.0/ +# https://mirrors.dotsrc.org/slackware/slackware64-15.0/ # FINLAND (FI) -# ftp://elektroni.phys.tut.fi/slackware64-14.2/ +# ftp://elektroni.phys.tut.fi/slackware64-15.0/ # FRANCE (FR) -# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-14.2/ -# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-14.2/ +# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-15.0/ +# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-15.0/ # GERMANY (DE) -# ftp://ftp.gwdg.de/pub/linux/slackware/slackware64-14.2/ -# http://ftp.gwdg.de/pub/linux/slackware/slackware64-14.2/ -# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-14.2/ -# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-14.2/ -# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware64-14.2/ -# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware64-14.2/ +# ftp://ftp.gwdg.de/pub/linux/slackware/slackware64-15.0/ +# http://ftp.gwdg.de/pub/linux/slackware/slackware64-15.0/ +# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-15.0/ +# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-15.0/ +# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware64-15.0/ +# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware64-15.0/ # GREECE (GR) -# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-14.2/ -# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-14.2/ -# ftp://ftp.otenet.gr/pub/linux/slackware/slackware64-14.2/ -# http://ftp.otenet.gr/linux/slackware/slackware64-14.2/ -# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-14.2/ -# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-14.2/ +# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-15.0/ +# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-15.0/ +# ftp://ftp.otenet.gr/pub/linux/slackware/slackware64-15.0/ +# http://ftp.otenet.gr/linux/slackware/slackware64-15.0/ +# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-15.0/ +# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-15.0/ # INDONESIA (ID) -# http://kambing.ui.ac.id/slackware/slackware64-14.2/ -# https://repo.ukdw.ac.id/slackware/slackware64-14.2/ +# http://kambing.ui.ac.id/slackware/slackware64-15.0/ +# https://repo.ukdw.ac.id/slackware/slackware64-15.0/ # IRELAND (IE) -# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-14.2/ -# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-14.2/ +# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-15.0/ +# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-15.0/ # ITALY (IT) -# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware64-14.2/ -# http://ba.mirror.garr.it/mirrors/Slackware/slackware64-14.2/ +# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware64-15.0/ +# http://ba.mirror.garr.it/mirrors/Slackware/slackware64-15.0/ # JAPAN (JP) -# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-14.2/ -# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-14.2/ -# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-14.2/ -# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-14.2/ -# ftp://riksun.riken.go.jp/Linux/slackware/slackware64-14.2/ -# http://riksun.riken.go.jp/Linux/slackware/slackware64-14.2/ +# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/ +# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/ +# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/ +# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/ +# ftp://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/ +# http://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/ +# LITHUANIA (LT) +# http://mirrors.atviras.lt/slackware/slackware64-15.0/ +# https://mirrors.atviras.lt/slackware/slackware64-15.0/ # NETHERLANDS (NL) -# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware64-14.2/ -# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-14.2/ -# ftp://mirror.nl.leaseweb.net/slackware/slackware64-14.2/ -# http://mirror.nl.leaseweb.net/slackware/slackware64-14.2/ +# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware64-15.0/ +# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-15.0/ +# ftp://mirror.nl.leaseweb.net/slackware/slackware64-15.0/ +# http://mirror.nl.leaseweb.net/slackware/slackware64-15.0/ # NORWAY (NO) -# ftp://ftp.slackware.no/slackware/slackware64-14.2/ -# http://ftp.slackware.no/slackware/slackware64-14.2/ +# ftp://ftp.slackware.no/slackware/slackware64-15.0/ +# http://ftp.slackware.no/slackware/slackware64-15.0/ # POLAND (PL) -# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-14.2/ -# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-14.2/ -# ftp://ftp.slackware.pl/pub/slackware/slackware64-14.2/ -# http://ftp.slackware.pl/pub/slackware/slackware64-14.2/ -# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-14.2/ -# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-14.2/ -# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-14.2/ -# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-14.2/ +# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/ +# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/ +# ftp://ftp.slackware.pl/pub/slackware/slackware64-15.0/ +# http://ftp.slackware.pl/pub/slackware/slackware64-15.0/ +# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-15.0/ +# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-15.0/ +# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/ +# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/ # RUSSIA (RU) -# http://mirror.rol.ru/slackware/slackware64-14.2/ -# ftp://mirror.yandex.ru/slackware/slackware64-14.2/ -# http://mirror.yandex.ru/slackware/slackware64-14.2/ +# http://mirror.rol.ru/slackware/slackware64-15.0/ +# ftp://mirror.yandex.ru/slackware/slackware64-15.0/ +# http://mirror.yandex.ru/slackware/slackware64-15.0/ # SOUTH AFRICA (ZA) -# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-14.2/ -# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-14.2/ -# ftp://ftp.wa.co.za/pub/slackware/slackware64-14.2/ -# http://ftp.wa.co.za/pub/slackware/slackware64-14.2/ -# ftp://slackware.mirror.ac.za/slackware64-14.2/ -# http://slackware.mirror.ac.za/slackware64-14.2/ +# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-15.0/ +# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-15.0/ +# ftp://ftp.wa.co.za/pub/slackware/slackware64-15.0/ +# http://ftp.wa.co.za/pub/slackware/slackware64-15.0/ +# ftp://slackware.mirror.ac.za/slackware64-15.0/ +# http://slackware.mirror.ac.za/slackware64-15.0/ # SWEDEN (SE) -# ftp://ftp.sunet.se/mirror/slackware.com/slackware64-14.2/ -# http://ftp.sunet.se/mirror/slackware.com/slackware64-14.2/ +# ftp://ftp.sunet.se/mirror/slackware.com/slackware64-15.0/ +# http://ftp.sunet.se/mirror/slackware.com/slackware64-15.0/ # SWITZERLAND (CH) -# https://mirror.init7.net/slackware/slackware64-14.2/ +# https://mirror.init7.net/slackware/slackware64-15.0/ # TAIWAN (TW) -# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-14.2/ -# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-14.2/ -# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware64-14.2/ -# http://ftp.twaren.net/Linux/Slackware/slackware64-14.2/ +# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-15.0/ +# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-15.0/ +# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware64-15.0/ +# http://ftp.twaren.net/Linux/Slackware/slackware64-15.0/ # TURKEY (TR) -# ftp://ftp.linux.org.tr/slackware/slackware64-14.2/ -# http://ftp.linux.org.tr/slackware/slackware64-14.2/ +# ftp://ftp.linux.org.tr/slackware/slackware64-15.0/ +# http://ftp.linux.org.tr/slackware/slackware64-15.0/ # UKRAINE (UA) -# ftp://mirrors.mithril.org.ua/linux/slackware/slackware64-14.2/ -# http://mirrors.mithril.org.ua/linux/slackware/slackware64-14.2/ +# ftp://mirrors.mithril.org.ua/linux/slackware/slackware64-15.0/ +# http://mirrors.mithril.org.ua/linux/slackware/slackware64-15.0/ # UNITED KINGDOM (UK) -# http://slackware.uk/slackware/slackware64-14.2/ -# ftp://slackware.uk/slackware/slackware64-14.2/ -# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-14.2/ -# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-14.2/ -# ftp://mirror.bytemark.co.uk/slackware/slackware64-14.2/ -# http://mirror.bytemark.co.uk/slackware/slackware64-14.2/ +# http://slackware.uk/slackware/slackware64-15.0/ +# ftp://slackware.uk/slackware/slackware64-15.0/ +# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-15.0/ +# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-15.0/ +# 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-14.2/ -# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware64-14.2/ -# ftp://mirrors.easynews.com/linux/slackware/slackware64-14.2/ -# http://mirrors.easynews.com/linux/slackware/slackware64-14.2/ -# ftp://mirrors.us.kernel.org/slackware/slackware64-14.2/ -# http://mirrors.us.kernel.org/slackware/slackware64-14.2/ -# ftp://mirrors.xmission.com/slackware/slackware64-14.2/ -# http://mirrors.xmission.com/slackware/slackware64-14.2/ -# https://mirror.slackbuilds.org/slackware/slackware64-14.2/ -# http://slackware.cs.utah.edu/pub/slackware/slackware64-14.2/ -# http://slackware.mirrors.pair.com/slackware64-14.2/ -# ftp://slackware.mirrors.tds.net/pub/slackware/slackware64-14.2/ -# http://slackware.mirrors.tds.net/pub/slackware/slackware64-14.2/ -# ftp://spout.ussg.indiana.edu/linux/slackware/slackware64-14.2/ -# http://spout.ussg.indiana.edu/linux/slackware/slackware64-14.2/ -# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-14.2/ -# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-14.2/ +# 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/ +# 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/ # #---------------------------------------------------------------- # Slackware64-current @@ -292,6 +295,9 @@ https://mirrors.slackware.com/slackware/slackware64-14.2/ # http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-current/ # ftp://riksun.riken.go.jp/Linux/slackware/slackware64-current/ # http://riksun.riken.go.jp/Linux/slackware/slackware64-current/ +# LITHUANIA (LT) +# http://mirrors.atviras.lt/slackware/slackware64-current/ +# https://mirrors.atviras.lt/slackware/slackware64-current/ # NETHERLANDS (NL) # ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware64-current/ # http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/ diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh index 593c47b0f..a9f86f80e 100644 --- a/source/ap/slackpkg/files/post-functions.sh +++ b/source/ap/slackpkg/files/post-functions.sh @@ -124,6 +124,10 @@ runvimdiff() { } looknew() { + local ROWS SIZE FILES PROMPTTEXT TEXTLINES MAXROWS + local newcount f n fn + f=0 + n=0 # with ONLY_NEW_DOTNEW set, slackpkg will search only for # .new files installed in actual slackpkg's execution @@ -133,59 +137,108 @@ looknew() { ONLY_NEW_DOTNEW="" fi - echo -e "\nSearching for NEW configuration files" - FILES=$(find ${ROOT}/etc ${ROOT}/var/yp ${ROOT}/usr/share/vim -name "*.new" ${ONLY_NEW_DOTNEW} \ + printf "%s\n" "Searching for NEW configuration files..." + + FILES=$( find \ + ${ROOT}/etc \ + ${ROOT}/var/yp \ + ${ROOT}/usr/share/vim \ + -name "*.new" \ + ${ONLY_NEW_DOTNEW} \ -not -name "rc.inet1.conf.new" \ -not -name "group.new" \ -not -name "passwd.new" \ -not -name "shadow.new" \ - -not -name "gshadow.new" 2>/dev/null | sort 2>/dev/null) - if [ "$FILES" != "" ]; then - newcount=$(echo "$FILES" | wc -l) - echo -ne "\n\ -Some packages had new configuration files installed ($newcount new files):\n\n" + -not -name "gshadow.new" 2>/dev/null | + sort -V 2>/dev/null ) - SIZE=$(stty size) + if [ -n "$FILES" ]; then + newcount=$( echo "$FILES" | wc -l ) + SIZE=$( stty size ) ROWS=${SIZE% *} - LISTMAX=$((ROWS-20)) - if [ $newcount -le $LISTMAX ]; then - echo -e "$FILES" - else - F=0 - for FN in $FILES; do - F=$((F+1)) - echo "$FN" - - if [ $F -ge $LISTMAX ]; then - F=0 - echo -ne "\nPress SPACE for more, ENTER to skip" - IFS=$'\n' read -rn 1 junk - echo -e "\n" - - if [ "$junk" = " " ]; then - continue - elif [ "$junk" = "" ]; then - break - fi - fi - done - fi - - echo -ne "\n\ -You have four choices: + # Set here so we can count the No. of lines + PROMPTTEXT="\n\ +What do you want (K/O/R/P)? (K)eep the old files and consider .new files later (O)verwrite all old files with the new ones" - [ "$ORIG_BACKUPS" != "off" ] && echo -ne ". The + + [ "$ORIG_BACKUPS" != "off" ] && PROMPTTEXT+=". The old files will be stored with the suffix .orig" - echo -e "\n\n\ + + PROMPTTEXT+="\n\n\ (R)emove all .new files - (P)rompt K, O, R selection for every single file + (P)rompt K, O, R selection for every single file\n" + + printf "%s %s\n\n" "Some packages had new configuration" \ + "files installed ($newcount new files):" + + # No. of prompt etc. lines to print. + TEXTLINES=$(( $( printf %b "$PROMPTTEXT" | wc -l ) + 3 )) + + if [ $(( newcount + TEXTLINES )) -lt $ROWS ]; then + # All files will fit on screen. + printf "%s\n" "$FILES" + else + # Won't all fit, so scroll a screenfull at a time. + # No. of lines minus 'Searching for' + 'Press SPACE...' + MAXROWS=$(( ROWS - 5 )) + + for fn in $FILES; do + junk=" " + f=$(( f + 1 )) + n=$(( n + 1 )) + echo "$fn" + + # Stop printing at bottom of screen + if [ $f -ge $MAXROWS ]; then + + # No. of lines minus 'Press SPACE...' + MAXROWS=$(( ROWS - 2 )) + f=0 + IFS=$( printf "\n" ) read -rn 1 -p " + Press SPACE for more, ENTER to skip" junk + + # Enter pressed + if [ -z "$junk" ]; then + tput -S <<EOF + cuu 1 + el 2 + cuu 1 + el 2 +EOF + break + else + # Space pressed + printf "\n" + tput -S <<EOF + cuu 1 + el 2 + cuu 1 + el 2 +EOF + fi + fi + done + + # Final prompt to stop list scrolling off the top + if [ ! -z "$junk" ] && [ $f -ne 0 ]; then + IFS=$( printf "\n" ) read -rn 1 -p " + Press any key to continue" junk + printf "\n" + tput -S <<EOF + cuu 1 + el 2 + cuu 1 + el 2 +EOF + fi + fi -What do you want (K/O/R/P)?" + printf %b "$PROMPTTEXT" answer case $ANSWER in K|k) @@ -238,7 +291,9 @@ What do you want (K/O/R/P)?" break ;; *) - echo "OK! Your choice is nothing! slackpkg will Keep the old files for you to deal with later" + echo " +OK! Your choice is nothing! slackpkg will Keep the old files \ +for you to deal with later" ;; esac else diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg index 49a123764..2553191dc 100644 --- a/source/ap/slackpkg/files/slackpkg +++ b/source/ap/slackpkg/files/slackpkg @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br # @@ -52,7 +52,10 @@ fi VERSION=@VERSION@ PATH=/bin:/usr/bin:/sbin:/usr/sbin SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ ) -CONF=${CONF:-/etc/slackpkg} + +[ -z "$ROOT" ] && CONF=${CONF:-/etc/slackpkg} +[ -n "$ROOT" ] && CONF=${CONF:-"${ROOT}/etc/slackpkg"} + SOURCE=$(sed -n ' # Remove leading and trailing blanks s/^[[:blank:]]*// @@ -68,6 +71,7 @@ SOURCE=$(sed -n ' \@^https\{0,1\}://@p \@^ftps\{0,1\}://@p' $CONF/mirrors) . $CONF/slackpkg.conf +WORKDIR=${ROOT}/${WORKDIR} ERROR="" # Set temporary directory @@ -238,6 +242,10 @@ while [ -n "$1" ] ; do fi shift $# ;; + blacklist) + CMD=$1 + shift $# + ;; update) CMD=$1 shift @@ -324,12 +332,13 @@ case "$CMD" in echo "Slackpkg: No updated packages since last check." else echo "Slackpkg: Updated packages are available since last check." >&2 + PENDING_UPDATES=1 fi ;; show-changelog) # display changelog and exit - if [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then - $MORECMD ${ROOT}/${WORKDIR}/ChangeLog.txt + if [ -e ${WORKDIR}/ChangeLog.txt ]; then + $MORECMD ${WORKDIR}/ChangeLog.txt else echo "ChangeLog.txt file not found. Aborting" fi @@ -472,17 +481,11 @@ case "$CMD" in fi ;; blacklist) - # - # If blacklist is called without package name, list - # all blacklisted packages - if [ "$INPUTLIST" = "" ]; then - echo -e "Packages in blacklist:\n" - grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD - cleanup - fi - - # As of 15.0, this function just runs /bin/false and exits with a comment - blacklist_pkg + echo -e "Edit /etc/slackpkg/blacklist to add or remove packages." + echo -e "" + echo -e "Packages in blacklist:\n" + grep -v "^#" $CONF/blacklist | $MORECMD + echo -e "" ;; file-search) PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g') @@ -523,7 +526,7 @@ case "$CMD" in if ( found != 1 ) { print \"No packages found! Try:\n\n\tslackpkg search $PATTERN\n\nand choose one (and ONLY one package).\n\" } - }" ${ROOT}/${WORKDIR}/PACKAGES.TXT 2>/dev/null + }" ${WORKDIR}/PACKAGES.TXT 2>/dev/null ;; new-config) POSTINST=on @@ -597,7 +600,7 @@ esac # That options don't change configurations files and, if # someone remove the kernel, i hope he knows what is doing. # -for i in check-updates remove search file-search update info \ +for i in check-updates remove search file-search update info blacklist \ clean-system download generate-template remove-template; do if [ "$CMD" = "$i" ]; then POSTINST=off diff --git a/source/ap/slackpkg/files/slackpkg.8 b/source/ap/slackpkg/files/slackpkg.8 index b1baa45d3..ab36202e4 100644 --- a/source/ap/slackpkg/files/slackpkg.8 +++ b/source/ap/slackpkg/files/slackpkg.8 @@ -1,4 +1,4 @@ -.TH SLACKPKG 8 "March 22, 2018" slackpkg-2.82.2 "" +.TH SLACKPKG 8 "March 12, 2021" slackpkg-15.0.1 "" .SH NAME .B slackpkg \- Automated tool for managing Slackware Linux packages @@ -6,7 +6,7 @@ .SH SYNOPSIS .B slackpkg .B [OPTIONS] -.B {install|remove|search|file-search|download|upgrade|reinstall|blacklist} +.B {install|remove|search|file-search|download|upgrade|reinstall} .BI { PATTERN | FILE } .B slackpkg [OPTIONS] {clean-system|upgrade-all|install-new} @@ -226,15 +226,6 @@ With remove, you can remove certain installed packages. As an example: will remove all packages with "kde" in their name. .TP 5 -.B blacklist -.br -With this action, you can "blacklist" certain packages. -.br -Blacklisted packages will not be installed, upgraded, or removed by slackpkg. -If you want to remove some package from the black list, please edit -/etc/slackpkg/blacklist. - -.TP 5 .B download .br This action tells slackpkg to download the packages, but not to install them. diff --git a/source/ap/slackpkg/files/slackpkg.conf.5 b/source/ap/slackpkg/files/slackpkg.conf.5 index 529bfba71..e8ca95d81 100644 --- a/source/ap/slackpkg/files/slackpkg.conf.5 +++ b/source/ap/slackpkg/files/slackpkg.conf.5 @@ -1,4 +1,4 @@ -.TH SLACKPKG.CONF 5 "Oct 2017" slackpkg-2.82.2 "" +.TH SLACKPKG.CONF 5 "March 2021" slackpkg-15.0.1 "" .SH NAME .B slackpkg.conf \- Configuration data for slackpkg diff --git a/source/ap/slackpkg/files/slackpkg.conf.new b/source/ap/slackpkg/files/slackpkg.conf.new index fb6ae1ddc..cbc845da3 100644 --- a/source/ap/slackpkg/files/slackpkg.conf.new +++ b/source/ap/slackpkg/files/slackpkg.conf.new @@ -21,7 +21,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Project Page: http://slackpkg.org/ +# Project Page: https://slackpkg.org/ # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br diff --git a/source/ap/slackpkg/slack-desc b/source/ap/slackpkg/slack-desc index 5aecad48f..6fb6bb076 100644 --- a/source/ap/slackpkg/slack-desc +++ b/source/ap/slackpkg/slack-desc @@ -14,6 +14,6 @@ slackpkg: official Slackware package repository. With it, you can also slackpkg: search in the Slackware Package database and find which package slackpkg: has the selected file. slackpkg: -slackpkg: Slackpkg DOESN'T replace the Slackware pkgtools. Actually, -slackpkg: Slackpkg uses the pkgtools for install/upgrade/remove functions. +slackpkg: Slackpkg DOES NOT replace the Slackware pkgtools; actually, +slackpkg: Slackpkg uses pkgtools for the install/upgrade/remove functions. slackpkg: diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 2c945b317..788eb52d4 100755 --- a/source/ap/slackpkg/slackpkg.SlackBuild +++ b/source/ap/slackpkg/slackpkg.SlackBuild @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=slackpkg -VERSION=${VERSION:-15.0} +VERSION=${VERSION:-15.0.1} ARCH="noarch" -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -113,11 +113,6 @@ chmod 644 $PKG/usr/doc/slackpkg-$VERSION/* mkdir -pv $PKG/var/lib/slackpkg mkdir -pv $PKG/var/cache/packages -# Allow new-config after slackpkg upgrade itself: -( cd $PKG/usr/libexec/slackpkg - cat $CWD/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch | patch -p2 --verbose || exit 1 -) || exit 1 - mkdir -p $PKG/install cat $CWD/doinst.sh | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc |