summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/pkgtools/pkgtools.SlackBuild2
-rw-r--r--source/a/pkgtools/scripts/installpkg4
-rw-r--r--source/a/pkgtools/scripts/removepkg2
-rw-r--r--source/a/pkgtools/scripts/upgradepkg2
-rw-r--r--source/a/tar/slack-desc4
-rw-r--r--source/ap/slackpkg/files/ChangeLog62
-rw-r--r--source/ap/slackpkg/files/core-functions.sh100
-rw-r--r--source/ap/slackpkg/files/mirrors-arm.sample2
-rw-r--r--source/ap/slackpkg/files/pkglist.awk2
-rw-r--r--source/ap/slackpkg/files/post-functions.sh47
-rw-r--r--source/ap/slackpkg/files/slackpkg43
-rwxr-xr-xsource/ap/slackpkg/slackpkg.SlackBuild9
-rw-r--r--source/d/git/git-2.17.0.tar.signbin566 -> 0 bytes
-rw-r--r--source/d/git/git-2.17.1.tar.signbin0 -> 566 bytes
-rwxr-xr-xsource/d/git/git.SlackBuild2
-rwxr-xr-xsource/d/rust/rust.SlackBuild2
-rw-r--r--source/d/rust/rust.url2
-rw-r--r--source/k/kernel-configs/config-generic-4.14.47 (renamed from source/k/kernel-configs/config-generic-4.14.44)2
-rw-r--r--source/k/kernel-configs/config-generic-4.14.47.x64 (renamed from source/k/kernel-configs/config-generic-4.14.44.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-4.14.47-smp (renamed from source/k/kernel-configs/config-generic-smp-4.14.44-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-4.14.47 (renamed from source/k/kernel-configs/config-huge-4.14.44)6
-rw-r--r--source/k/kernel-configs/config-huge-4.14.47.x64 (renamed from source/k/kernel-configs/config-huge-4.14.44.x64)6
-rw-r--r--source/k/kernel-configs/config-huge-smp-4.14.47-smp (renamed from source/k/kernel-configs/config-huge-smp-4.14.44-smp)6
-rw-r--r--source/k/linux-4.14.44.tar.sign16
-rw-r--r--source/k/linux-4.14.47.tar.sign16
-rwxr-xr-xsource/l/fftw/fftw.SlackBuild6
-rwxr-xr-xsource/l/imagemagick/imagemagick.SlackBuild2
-rw-r--r--source/n/gnupg2/slack-desc2
-rw-r--r--source/n/network-scripts/0001-no_hostname_in_networkmanager_conf.diff13
-rw-r--r--source/n/network-scripts/0002-set_broadcast_address_and_flush_ip_after_if_down.diff22
-rw-r--r--source/n/network-scripts/0003-netconfig-typos-and-set-NM-default.diff165
-rw-r--r--source/n/network-scripts/manpages/rc.inet1.81
-rw-r--r--source/n/network-scripts/manpages/rc.inet1.conf.514
-rwxr-xr-xsource/n/network-scripts/network-scripts.SlackBuild11
-rw-r--r--source/n/network-scripts/scripts/netconfig62
-rw-r--r--source/n/network-scripts/scripts/rc.inet140
-rw-r--r--source/n/network-scripts/scripts/rc.inet1.conf5
-rwxr-xr-xsource/n/ulogd/ulogd.SlackBuild4
-rw-r--r--source/n/ulogd/ulogd.logrotate7
-rw-r--r--source/x/x11/build/xorg-server2
-rw-r--r--source/x/x11/patch/xorg-server.patch1
-rw-r--r--source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff12
-rw-r--r--source/xap/network-manager-applet/fix-double-free.diff13
-rwxr-xr-xsource/xap/network-manager-applet/network-manager-applet.SlackBuild5
44 files changed, 365 insertions, 363 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 5ee4d1d2..81f8e0a6 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
# *** UPDATE THESE WITH EACH BUILD:
VERSION=15.0
ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-13}
+BUILD=${BUILD:-14}
# 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
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index 87a7f57a..453e391e 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -126,7 +126,7 @@ fi
# screen corruption (from multiple dialogs) and install script collisions
# (from multiple scripts trying to work on the same files) in the case of
# parallel instances of installpkg.
-INSTLOCKDIR=${INSTLOCKDIR:-/run/installpkg-lock}
+INSTLOCKDIR=${INSTLOCKDIR:-/run/lock/pkgtools}
if [ ! -d $INSTLOCKDIR ]; then
mkdir -p $INSTLOCKDIR
fi
@@ -545,7 +545,7 @@ EOF
fi
elif [ "$MODE" = "terse" ]; then # emit a single description line
( flock 9 || exit 11
- printf "%-$(expr $TERSELENGTH - 7)s %-6s\n" "$(echo $shortname: $(echo $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) $(echo " $(printf '.%.0s' {1..256})")) | cut -b1-$(expr $TERSELENGTH - 7))" "$(printf "[%4s]" $UNCOMPRESSED)"
+ printf "%-$(expr $TERSELENGTH - 7)s %-6s\n" "$(echo $shortname: $(echo $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) $(echo " $(printf '.%.0s' {1..256})")) | cut -b1-$(expr $TERSELENGTH - 7))" "$(printf "[%4s]" $UNCOMPRESSED)" | cut -b 1-${TERSELENGTH}
) 9> $INSTLOCKDIR/dialog.lock
elif [ "$MODE" = "infobox" ]; then # install infobox package
( flock 9 || exit 11
diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg
index 14af10f3..81b2a6be 100644
--- a/source/a/pkgtools/scripts/removepkg
+++ b/source/a/pkgtools/scripts/removepkg
@@ -146,7 +146,7 @@ PRES_DIR=$TMP/preserved_packages
# Lock directory for ldconfig... share it with installpkg so that upgradepkg
# becomes properly ldconfig-locked, too.
-INSTLOCKDIR=${INSTLOCKDIR:-/run/installpkg-lock}
+INSTLOCKDIR=${INSTLOCKDIR:-/run/lock/pkgtools}
if [ ! -d $INSTLOCKDIR ]; then
mkdir -p $INSTLOCKDIR
fi
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index f943f936..bb150483 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -113,7 +113,7 @@ fi
# Create a lockfile directory if it doesn't exist. We can use it to prevent
# output line collisions in --terse mode.
-INSTLOCKDIR=${INSTLOCKDIR:-/run/upgradepkg-lock}
+INSTLOCKDIR=${INSTLOCKDIR:-/run/lock/pkgtools}
if [ ! -d $INSTLOCKDIR ]; then
mkdir -p $INSTLOCKDIR
fi
diff --git a/source/a/tar/slack-desc b/source/a/tar/slack-desc
index 05cc1f7d..2314ce9a 100644
--- a/source/a/tar/slack-desc
+++ b/source/a/tar/slack-desc
@@ -13,7 +13,7 @@ tar: and extract files from an archive file known as a tarfile. A tarfile
tar: may be made on a tape drive, however, it is also common to write a
tar: tarfile to a normal file.
tar:
-tar: Slackware's package system uses tarfiles compressed with GNU gzip.
-tar:
+tar: Slackware's package system uses tarfiles compressed with bzip2, gzip,
+tar: lzip, or xz.
tar:
tar:
diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index 774be506..464a74cf 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,4 +1,66 @@
+Thu May 24 07:24:01 UTC 2018
+---------------
+ - 2.83.0
+ - tweaks to build script
+
+Wed Apr 4 07:14:01 UTC 2018
+---------------
+ - 2.83.0beta2
+ - tweak handling of new kernel prompts
+ - mandoc lint fixes
+
+Wed Apr 4 01:06:05 UTC 2018
+---------------
+ - 2.83.0beta1 (yes, jump from 2.82.3betas)
+ - fix stray stuff in vimdiff prompt
+ - sort .new files list from looknew() (thanks to Eduard Rozenberg)
+ - make sure user is aware of kernel update (require keypress)
+ - respect $ROOT in looknew() (thanks to burdi01 on LQ)
+ - inform user that the warning about a -current mirror
+ only occurs once, and also point the location of the
+ file to remove if they want the warning back
+ - don't offer to run lilo if initrd is in lilo.conf
+
+Sat Jan 6 23:54:27 UTC 2018
+---------------
+ - 2.82.3beta5
+ - minor tweaks to slack-desc
+ - check for existence of /etc/lilo.conf too before offering
+ to run lilo after kernel upgrades
+ - make sure user actually wants to run lilo (fix answer
+ handling)
+ - warn user and require confirmation the first time a -current
+ mirror is selected (thanks to Didier Spaier)
+ - improve handling of SOURCE from /etc/slackpkg/mirrors; e.g.
+ don't fail if trailing slash is accidentally omitted
+ (thanks to Didier Spaier)
+
+Fri Jan 5 03:24:31 UTC 2018
+---------------
+ - 2.82.3beta4
+ - Abort if system date is near epoch (needed on ARM)
+
+Tue Jan 2 22:24:50 CST 2018
+---------------
+ - 2.82.3beta3
+ - included some more fixups for respecting $ROOT
+ (thanks to burdi01 on LQ)
+ - use correct GPG key for Slackware ARM
+ - update sample mirror list for Slackware ARM
+
+Thu Nov 9 04:03:07 UTC 2017
+---------------
+ - 2.82.3beta2
+ - Fix error in patch application for vimdiff addition
+ (thanks to David Allen)
+
+Wed Nov 8 00:45:00 UTC 2017
+---------------
+ - 2.82.3beta1
+ - Add an option to use vimdiff for comparing changes in .new files
+ (thanks to David Allen)
+
Sun Oct 10 07:48:13 UTC 2017
---------------
- Updated mirrors-x86*.sample to remove dead mirrors and clarify
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 919bf80b..667667cf 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -58,6 +58,9 @@ spinning() {
#
function system_setup() {
+ # Create $WORKDIR just in case
+ mkdir -p "${ROOT}/${WORKDIR}"
+
# Set LOCAL if mirror isn't through network
# If mirror is through network, select the command to fetch
# files and packages from there.
@@ -123,7 +126,7 @@ function system_setup() {
;;
arm*)
ARCH=arm[v5tel]*
- SLACKKEY=${SLACKKEY:-"ARMedslack Security (ARMedslack Linux Project Security) <security@armedslack.org>"}
+ SLACKKEY=${SLACKKEY:-"Slackware ARM (Slackware ARM Linux Project) <mozes@slackware.com>"}
PKGMAIN=${PKGMAIN:-slackware}
;;
powerpc|ppc)
@@ -151,7 +154,7 @@ function system_setup() {
fi
SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv)
- CHECKSUMSFILE=$WORKDIR/CHECKSUMS.md5
+ CHECKSUMSFILE=${ROOT}/${WORKDIR}/CHECKSUMS.md5
KERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null)
DIALOG_MAXARGS=${DIALOG_MAXARGS:-19500}
echo "$0 $VERSION - Slackware Linux $SLACKWARE_VERSION" > $TMPDIR/timestamp
@@ -186,7 +189,7 @@ ARCH values\n"
# Check if the config files are updated to the new slackpkg version
#
- if [ "$WORKDIR" = "" ]; then
+ if [ "${ROOT}/${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\
@@ -223,7 +226,7 @@ the problem.\n"
# Checking if is the first time running slackpkg
#
- if ! [ -f ${WORKDIR}/pkglist ] && [ "$CMD" != "update" ]; then
+ if ! [ -f ${ROOT}/${WORKDIR}/pkglist ] && [ "$CMD" != "update" ]; then
if [ "$SOURCE" = "" ]; then
echo -e "\
\nThis appears to be the first time you have run slackpkg.\n\
@@ -250,16 +253,39 @@ Before you install|upgrade|reinstall anything you need to run:\n\n\
Please edit that file and uncomment ONE mirror. Slackpkg\n\
only works with ONE mirror selected.\n"
cleanup
- else
- COUNT=$(echo $SOURCE | wc -w | tr -d " ")
- if [ "$COUNT" != "1" ]; then
- echo -e "\n\
-Slackpkg only works with ONE mirror selected. Please edit your\n\
-${CONF}/mirrors and comment all but one line - two or more\n\
-mirrors uncommented is not valid syntax.\n"
+ fi
+ if echo $SOURCE|grep -q " "; then
+ echo "
+Slackpkg only works with ONE mirror selected. Please edit your
+${CONF}/mirrors and comment all but one line - two or more
+mirrors uncommented is not valid syntax.
+"
+ cleanup
+ fi
+ MIRROR_VERSION=$(echo $SOURCE|sed "s/.*-//;s/.$//")
+ if [ "$MIRROR_VERSION" = "current" ] && [ ! -f ${ROOT}/${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.
+
+Slackware -current is the development (i.e. unstable) tree.
+
+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
+ echo -n "
+Slackpkg will not show this warning again unless you remove the
+${WORKDIR}/current file.
+"
+ sleep 1
+ else
cleanup
fi
fi
+ [ ! "$MIRROR_VERSION" = "current" ] && rm -f ${ROOT}/${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
@@ -309,7 +335,7 @@ use slackpkg.\n"
#
if ! [ $(which md5sum 2>/dev/null) ]; then
CHECKMD5=off
- elif ! [ -f ${WORKDIR}/CHECKSUMS.md5 ] && \
+ elif ! [ -f ${ROOT}/${WORKDIR}/CHECKSUMS.md5 ] && \
[ "$CMD" != "update" ] && \
[ "$CHECKMD5" = "on" ]; then
echo -e "\n\
@@ -564,7 +590,7 @@ function makelist() {
else
ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist
fi
- cat ${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist
+ cat ${ROOT}/${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist
touch ${TMPDIR}/waiting
@@ -666,7 +692,7 @@ function makelist() {
done
;;
install-new)
- for i in $(awk -f /usr/libexec/slackpkg/install-new.awk ${WORKDIR}/ChangeLog.txt |\
+ for i in $(awk -f /usr/libexec/slackpkg/install-new.awk ${ROOT}/${WORKDIR}/ChangeLog.txt |\
sort -u ) dialog aaa_terminfo fontconfig \
ntfs-3g ghostscript wqy-zenhei-font-ttf \
xbacklight xf86-video-geode ; do
@@ -703,8 +729,8 @@ function makelist() {
if [ "$CMD" = "file-search" ]; then
# Search filelist.gz for possible matches
for i in ${PRIORITY[@]}; do
- if [ -e ${WORKDIR}/${i}-filelist.gz ]; then
- PKGS="$(zegrep -w "${INPUTLIST}" ${WORKDIR}/${i}-filelist.gz | \
+ if [ -e ${ROOT}/${WORKDIR}/${i}-filelist.gz ]; then
+ PKGS="$(zegrep -w "${INPUTLIST}" ${ROOT}/${WORKDIR}/${i}-filelist.gz | \
cut -d\ -f 1 | awk -F'/' '{print $NF}')"
for FULLNAME in $PKGS ; do
NAME=$(cutpkg ${FULLNAME})
@@ -846,7 +872,7 @@ function getpkg() {
PKGNAME=( $(grep -m 1 -- "[[:space:]]${1/%.t[blxg]z/}[[:space:]]" ${TMPDIR}/pkglist) )
NAMEPKG=${PKGNAME[5]}.${PKGNAME[7]}
FULLPATH=${PKGNAME[6]}
- CACHEPATH=${TEMP}/${FULLPATH}
+ CACHEPATH=${ROOT}/${TEMP}/${FULLPATH}
# Create destination dir if it isn't there
if ! [ -d $CACHEPATH ]; then
@@ -944,8 +970,8 @@ function getpkg() {
#
function checkchangelog()
{
- if ! [ -e ${WORKDIR}/ChangeLog.txt ]; then
- touch ${WORKDIR}/ChangeLog.txt
+ if ! [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then
+ touch ${ROOT}/${WORKDIR}/ChangeLog.txt
fi
echo -e "\tDownloading..."
@@ -961,7 +987,7 @@ Please check your mirror and try again."
cleanup
fi
- if diff --brief ${WORKDIR}/ChangeLog.txt $TMPDIR/ChangeLog.txt ; then
+ if diff --brief ${ROOT}/${WORKDIR}/ChangeLog.txt $TMPDIR/ChangeLog.txt ; then
return 0
else
return 1
@@ -980,7 +1006,7 @@ function updatefilelists()
fi
fi
echo
- cp ${TMPDIR}/ChangeLog.txt ${WORKDIR}/ChangeLog.txt
+ cp ${TMPDIR}/ChangeLog.txt ${ROOT}/${WORKDIR}/ChangeLog.txt
#
# Download MANIFEST, FILELIST.TXT and CHECKSUMS.md5
@@ -1036,10 +1062,10 @@ function updatefilelists()
ISOK=$(checkmd5 ${TMPDIR}/FILELIST.TXT)
fi
if [ "$ISOK" = "1" ]; then
- if ! [ -e $WORKDIR/LASTUPDATE ]; then
- echo "742868196" > $WORKDIR/LASTUPDATE
+ if ! [ -e ${ROOT}/${WORKDIR}/LASTUPDATE ]; then
+ echo "742868196" > ${ROOT}/${WORKDIR}/LASTUPDATE
fi
- LASTUPDATE=$(cat $WORKDIR/LASTUPDATE)
+ LASTUPDATE=$(cat ${ROOT}/${WORKDIR}/LASTUPDATE)
ACTUALDATE=$(date -d "$(head -1 $TMPDIR/FILELIST.TXT)" "+%s")
if [ $ACTUALDATE -lt $LASTUPDATE ]; then
echo -e "\
@@ -1051,7 +1077,7 @@ function updatefilelists()
fi
echo
fi
- echo $ACTUALDATE > $WORKDIR/LASTUPDATE
+ echo $ACTUALDATE > ${ROOT}/${WORKDIR}/LASTUPDATE
else
rm $TMPDIR/FILELIST.TXT
fi
@@ -1090,12 +1116,12 @@ function updatefilelists()
grep "\.t[blxg]z$" $FILELIST| \
awk -f /usr/libexec/slackpkg/pkglist.awk |\
sed -e 's/^M//g' > ${TMPDIR}/pkglist
- cp ${TMPDIR}/pkglist ${WORKDIR}/pkglist
+ cp ${TMPDIR}/pkglist ${ROOT}/${WORKDIR}/pkglist
# Create the slackware tree under TEMP directory
- for i in $( cut -f7 -d\ ${WORKDIR}/pkglist | sort -u ) ; do
- if ! [ -d ${TEMP}/${i} ]; then
- mkdir -p ${TEMP}/${i}
+ for i in $( cut -f7 -d\ ${ROOT}/${WORKDIR}/pkglist | sort -u ) ; do
+ if ! [ -d ${ROOT}/${TEMP}/${i} ]; then
+ mkdir -p ${ROOT}/${TEMP}/${i}
fi
done
@@ -1109,11 +1135,11 @@ function updatefilelists()
bunzip2 -c $TMPDIR/${i}-MANIFEST.bz2 | awk -f /usr/libexec/slackpkg/filelist.awk | \
gzip > ${TMPDIR}/${i}-filelist.gz
done
- cp ${TMPDIR}/*-filelist.gz ${WORKDIR}/
+ cp ${TMPDIR}/*-filelist.gz ${ROOT}/${WORKDIR}/
- if [ -r ${WORKDIR}/filelist.gz ]; then
- rm ${WORKDIR}/filelist.gz
- ln -s ${WORKDIR}/${MAIN}-filelist.gz ${WORKDIR}/filelist.gz
+ if [ -r ${ROOT}/${WORKDIR}/filelist.gz ]; then
+ rm ${ROOT}/${WORKDIR}/filelist.gz
+ ln -s ${ROOT}/${WORKDIR}/${MAIN}-filelist.gz ${ROOT}/${WORKDIR}/filelist.gz
fi
# Concatenate PACKAGE.TXT files
@@ -1122,15 +1148,15 @@ function updatefilelists()
for i in $DIRS; do
cat $TMPDIR/${i}-PACKAGES.TXT >> $TMPDIR/PACKAGES.TXT
done
- cp $TMPDIR/PACKAGES.TXT ${WORKDIR}/PACKAGES.TXT
+ cp $TMPDIR/PACKAGES.TXT ${ROOT}/${WORKDIR}/PACKAGES.TXT
if [ -e $TMPDIR/CHECKSUMS.md5 ]; then
- cp $TMPDIR/CHECKSUMS.md5 $WORKDIR/CHECKSUMS.md5 2>/dev/null
+ cp $TMPDIR/CHECKSUMS.md5 ${ROOT}/${WORKDIR}/CHECKSUMS.md5 2>/dev/null
fi
if [ -e $TMPDIR/CHECKSUMS.md5.asc ]; then
cp $TMPDIR/CHECKSUMS.md5.asc \
- $WORKDIR/CHECKSUMS.md5.asc 2>/dev/null
+ ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc 2>/dev/null
fi
}
@@ -1312,7 +1338,7 @@ generate_template() {
[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
for i in $ROOT/var/log/packages/* ; do
PKGNAME=$( cutpkg $(basename $i))
- grep -q " $PKGNAME " ${WORKDIR}/pkglist && \
+ grep -q " $PKGNAME " ${ROOT}/${WORKDIR}/pkglist && \
echo $PKGNAME >> $TMPDIR/$TEMPLATE.work
done
rm $TMPDIR/waiting
diff --git a/source/ap/slackpkg/files/mirrors-arm.sample b/source/ap/slackpkg/files/mirrors-arm.sample
index 8a42d7b9..ee5bd81c 100644
--- a/source/ap/slackpkg/files/mirrors-arm.sample
+++ b/source/ap/slackpkg/files/mirrors-arm.sample
@@ -61,6 +61,7 @@
#ftp://ftp.slackware.pl/pub/slackwarearm/slackwarearm-x.x/
#ftp://mirrors.vbi.vt.edu/linux/slackwarearm/slackwarearm-x.x/
#ftp://mirror.slackbuilds.org/pub/slackwarearm/slackwarearm-x.x/
+#ftp://slackware.absolutehosting.net/pub/slackwarearm/slackwarearm-x.x/
#
#ftp://ftp.arm.slackware.com/slackwarearm/slackwarearm-x.x/
#
@@ -73,6 +74,7 @@
#ftp://ftp.slackware.pl/pub/slackwarearm/slackwarearm-current/
#ftp://mirrors.vbi.vt.edu/linux/slackwarearm/slackwarearm-current/
#ftp://mirror.slackbuilds.org/pub/slackwarearm/slackwarearm-current/
+#ftp://slackware.absolutehosting.net/pub/slackwarearm/slackwarearm-current/
#
#ftp://ftp.arm.slackware.com/slackwarearm/slackwarearm-current/
diff --git a/source/ap/slackpkg/files/pkglist.awk b/source/ap/slackpkg/files/pkglist.awk
index 5a0c18e8..9b4b1bcf 100644
--- a/source/ap/slackpkg/files/pkglist.awk
+++ b/source/ap/slackpkg/files/pkglist.awk
@@ -3,7 +3,7 @@
fs=FS
FS="/" ; OFS="/"
$0=INPUT
- if ( $2 != "var" ) {
+ if ( $(NF-3) != "var" ) {
DIR=$2
FULLPACK=$NF
} else {
diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index c286e7af..b5fecd39 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -111,6 +111,18 @@ removeold() {
rm $i
}
+runvimdiff() {
+ BASENAME=$(basename $i .new)
+ FILEPATH=$(dirname $i)
+ FULLNAME="${FILEPATH}/${BASENAME}"
+
+ if [ -e ${FULLNAME} ]; then
+ vimdiff ${FULLNAME} ${FULLNAME}.new
+ else
+ echo "file $FULLNAME doesn't exist"
+ fi
+}
+
looknew() {
# with ONLY_NEW_DOTNEW set, slackpkg will search only for
@@ -122,12 +134,12 @@ looknew() {
fi
echo -e "\nSearching for NEW configuration files"
- FILES=$(find /etc /var/yp /usr/share/vim -name "*.new" ${ONLY_NEW_DOTNEW} \
+ 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)
+ -not -name "gshadow.new" 2>/dev/null | sort 2>/dev/null)
if [ "$FILES" != "" ]; then
echo -e "\n\
Some packages had new configuration files installed.
@@ -166,7 +178,7 @@ What do you want (K/O/R/P)?"
GOEX=0
while [ $GOEX -eq 0 ]; do
echo
- showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge"
+ showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff"
read ANSWER
case $ANSWER in
O|o)
@@ -183,6 +195,9 @@ What do you want (K/O/R/P)?"
M|m)
mergenew $1
;;
+ V|v)
+ runvimdiff $1
+ ;;
K|k|*)
GOEX=1
;;
@@ -203,19 +218,25 @@ What do you want (K/O/R/P)?"
lookkernel() {
NEWKERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null)
if [ "$KERNELMD5" != "$NEWKERNELMD5" ]; then
- if [ -x /sbin/lilo ]; then
+ if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && grep -q initrd /etc/lilo.conf ; then
+ echo -e "\n
+Your kernel image was updated, and your /etc/lilo.conf indicates
+the use of an initrd for at least one of your kernels. Be sure to
+regenerate the initrd for the new kernel and handle any needed
+updates to your bootloader.
+"
+ elif [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] ; then
echo -e "\n
-Your kernel image was updated. We highly recommend you run: lilo
-Do you want slackpkg to run lilo now? (Y/n)"
- answer
- if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
- /sbin/lilo
- fi
+Your kernel image was updated. Be sure to handle any needed updates
+to your bootloader (possibly as simple as running /sbin/lilo).
+"
else
echo -e "\n
-Your kernel image was updated and lilo is not found on your system.
-You may need to adjust your boot manager (like GRUB) to boot appropriate
-kernel."
+Your kernel image was updated, and lilo does not appear to be used on
+your system. You may need to adjust your boot manager (like GRUB) to
+boot the appropriate kernel (after generating an initrd if required)."
fi
+ echo -e "Press any key to continue...\n "
+ read _junk
fi
}
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 4fcdd61a..67864930 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -22,6 +22,23 @@
# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
#
+# Ensure that we're not at the epoch. slackpkg breaks with GPG checks when
+# the date is so far in the past:
+if [ $( date +%s ) -le 1437841588 ]; then
+cat <<"EOF"
+Error: Your system date is wrong. slackpkg requires that the date be correct
+so that the package signatures can be verified.
+
+The date may be incorrect because you have a system such as a Raspberry Pi that
+does does not have an RTC (Real Time Clock), or that the correct date was unable
+to be read from the RTC due to a driver bug, or a missing driver.
+
+You may wish to set up NTP on your system:
+http://docs.slackware.com/howtos:network_services:ntp
+
+EOF
+ exit 1
+fi
#========================================================================
#
@@ -30,22 +47,36 @@
#
# CONF = configuration directory
-# SOURCE = A mirror of Slackware. Source can be sett by editing $CONF/mirrors
+# SOURCE = A mirror of Slackware. Source can be set by editing $CONF/mirrors
#
VERSION=@VERSION@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ )
CONF=${CONF:-/etc/slackpkg}
-SOURCE=$(sed -e 's/^[[:blank:]]*//' $CONF/mirrors | grep -m1 -e "^\([a-z]\)")
+SOURCE=$(sed -n '
+ # Remove leading and trailing blanks
+ s/^[[:blank:]]*//
+ s/[[:blank:]]*$//
+ # Only one token is allowed per line
+ /[[:blank:]]/d
+ # A single solidus should end the URI
+ s,[/]*$,/,
+ # Print the lines beginning with one of the URI schemes we look for
+ \@^file://@p
+ \@^cdrom://@p
+ \@^local://@p
+ \@^https\{0,1\}://@p
+ \@^ftps\{0,1\}://@p' $CONF/mirrors)
. $CONF/slackpkg.conf
ERROR=""
# Set temporary directory
#
-TMPDIR=$(mktemp -p /tmp -d slackpkg.XXXXXX 2>/dev/null)
+mkdir -p ${ROOT}/tmp
+TMPDIR=$(mktemp -p ${ROOT}/tmp -d slackpkg.XXXXXX 2>/dev/null)
if [ $? -ne 0 ]; then
- TMPDIR="/tmp/slackpkg.${RANDOM}"
- mkdir -m 700 $TMPDIR || TMPDIR="FAILED"
+ TMPDIR="${ROOT}/tmp/slackpkg.${RANDOM}"
+ mkdir -p -m 700 $TMPDIR || TMPDIR="FAILED"
fi
#
@@ -485,7 +516,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\"
}
- }" ${WORKDIR}/PACKAGES.TXT 2>/dev/null
+ }" ${ROOT}/${WORKDIR}/PACKAGES.TXT 2>/dev/null
;;
new-config)
POSTINST=on
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 733ae5e0..e9a4bb38 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -23,14 +23,15 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=slackpkg
-VERSION=2.82.2
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.83.0}
+ARCH="noarch"
+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
# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-noarch-$BUILD.txz"
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
exit 0
fi
@@ -123,5 +124,5 @@ zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.s
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/d/git/git-2.17.0.tar.sign b/source/d/git/git-2.17.0.tar.sign
deleted file mode 100644
index e0bd837b..00000000
--- a/source/d/git/git-2.17.0.tar.sign
+++ /dev/null
Binary files differ
diff --git a/source/d/git/git-2.17.1.tar.sign b/source/d/git/git-2.17.1.tar.sign
new file mode 100644
index 00000000..dfeb9615
--- /dev/null
+++ b/source/d/git/git-2.17.1.tar.sign
Binary files differ
diff --git a/source/d/git/git.SlackBuild b/source/d/git/git.SlackBuild
index b652b50c..cd85e92e 100755
--- a/source/d/git/git.SlackBuild
+++ b/source/d/git/git.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=git
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 1d2f3fb2..68cf3cf7 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rust
SRCNAM="${PKGNAM}c"
-VERSION=${VERSION:-1.26.0}
+VERSION=${VERSION:-1.26.1}
BUILD=${BUILD:-1}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url
index 64e6e863..be83fa51 100644
--- a/source/d/rust/rust.url
+++ b/source/d/rust/rust.url
@@ -1,5 +1,5 @@
# Source code (repacked to .tar.xz):
-lftpget https://static.rust-lang.org/dist/rustc-1.26.0-src.tar.gz
+lftpget https://static.rust-lang.org/dist/rustc-1.26.1-src.tar.gz
gzip -d rustc-*tar.gz
plzip -n 6 -9 -v rustc-*tar
diff --git a/source/k/kernel-configs/config-generic-4.14.44 b/source/k/kernel-configs/config-generic-4.14.47
index 3e056f72..b8c6a065 100644
--- a/source/k/kernel-configs/config-generic-4.14.44
+++ b/source/k/kernel-configs/config-generic-4.14.47
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.44 Kernel Configuration
+# Linux/x86 4.14.47 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-generic-4.14.44.x64 b/source/k/kernel-configs/config-generic-4.14.47.x64
index 04933de4..32303cf4 100644
--- a/source/k/kernel-configs/config-generic-4.14.44.x64
+++ b/source/k/kernel-configs/config-generic-4.14.47.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.44 Kernel Configuration
+# Linux/x86 4.14.47 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-generic-smp-4.14.44-smp b/source/k/kernel-configs/config-generic-smp-4.14.47-smp
index 9ab07216..98da18df 100644
--- a/source/k/kernel-configs/config-generic-smp-4.14.44-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.14.47-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.44 Kernel Configuration
+# Linux/x86 4.14.47 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.44 b/source/k/kernel-configs/config-huge-4.14.47
index 141f1f4d..a601d662 100644
--- a/source/k/kernel-configs/config-huge-4.14.44
+++ b/source/k/kernel-configs/config-huge-4.14.47
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.44 Kernel Configuration
+# Linux/x86 4.14.47 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2177,7 +2177,7 @@ CONFIG_SCSI_MVSAS=y
# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_MVSAS_TASKLET is not set
CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_DPT_I2O=y
CONFIG_SCSI_ADVANSYS=y
CONFIG_SCSI_ARCMSR=y
CONFIG_SCSI_ESAS2R=m
@@ -2214,7 +2214,7 @@ CONFIG_SCSI_EATA=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=y
CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_ISCI=y
CONFIG_SCSI_GENERIC_NCR5380=m
CONFIG_SCSI_IPS=y
CONFIG_SCSI_INITIO=y
diff --git a/source/k/kernel-configs/config-huge-4.14.44.x64 b/source/k/kernel-configs/config-huge-4.14.47.x64
index 7751211f..623d8b0e 100644
--- a/source/k/kernel-configs/config-huge-4.14.44.x64
+++ b/source/k/kernel-configs/config-huge-4.14.47.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.44 Kernel Configuration
+# Linux/x86 4.14.47 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2217,7 +2217,7 @@ CONFIG_SCSI_MVSAS=y
# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_MVSAS_TASKLET is not set
CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_DPT_I2O=y
CONFIG_SCSI_ADVANSYS=y
CONFIG_SCSI_ARCMSR=y
CONFIG_SCSI_ESAS2R=m
@@ -2254,7 +2254,7 @@ CONFIG_SCSI_EATA=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=y
CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_ISCI=y
CONFIG_SCSI_IPS=y
CONFIG_SCSI_INITIO=y
CONFIG_SCSI_INIA100=y
diff --git a/source/k/kernel-configs/config-huge-smp-4.14.44-smp b/source/k/kernel-configs/config-huge-smp-4.14.47-smp
index 2cef0836..e5795394 100644
--- a/source/k/kernel-configs/config-huge-smp-4.14.44-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.14.47-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.44 Kernel Configuration
+# Linux/x86 4.14.47 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2224,7 +2224,7 @@ CONFIG_SCSI_MVSAS=y
# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_MVSAS_TASKLET is not set
CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_DPT_I2O=y
CONFIG_SCSI_ADVANSYS=y
CONFIG_SCSI_ARCMSR=y
CONFIG_SCSI_ESAS2R=m
@@ -2261,7 +2261,7 @@ CONFIG_SCSI_EATA=y
CONFIG_SCSI_EATA_MAX_TAGS=16
CONFIG_SCSI_FUTURE_DOMAIN=y
CONFIG_SCSI_GDTH=y
-CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_ISCI=y
CONFIG_SCSI_GENERIC_NCR5380=m
CONFIG_SCSI_IPS=y
CONFIG_SCSI_INITIO=y
diff --git a/source/k/linux-4.14.44.tar.sign b/source/k/linux-4.14.44.tar.sign
deleted file mode 100644
index 51896415..00000000
--- a/source/k/linux-4.14.44.tar.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlsIGzIACgkQONu9yGCS
-aT6qkhAAl0G+gSCeSnPv4z4MjtM+C9D24cu1UmE91EGpx7ndOL2urRZyrwFKLIzr
-WjckTsk4ti40MBI0zG0fajsQWkb3GS9+J+ZxObZjR8sfVOKB37eqaNNaUGVGBLBe
-5Vsm5NlMev4B65dJVJdhDPlTgcjGUbvxc5ounfQo66PVl0vJYjUhF1E+GDgzXAgJ
-if0S7rsv8mLqRz/HscKP9L2MsfsV+V9v1PIw16lJ8nDNOqgJT5JPJZNWy9dP8x2h
-2wcaXiSoEz2Ip3QynXPja3zXOHSCliMsVl1/p4TZ+L8gj04XBLMCY1FGDRqzNfQm
-ZwMh7gkpnu7H7mH8VThnyxKlZRx0bSIpMztwcvx9YcN5SYr1vU6h69qTiiNmt8yb
-iEgL8w0FkoF1gaiwYPRaZGP2R1022KAhIbHQgBOVEVteYEMAyiHsao+JtV75D7Rk
-wOeq/37jB3T071AQKMOe6Mo2tu+o/gZDNG3e87YptmiV1A8nlUQRJUav1hy0CVUp
-4p87LwySSOzlccf0/La30TwWWGOe0nca4oIVaCFGnpuLYvjaNtWAsub+NxrrEbrc
-ww4jC8y4RFO0xC9S2yLjpegYShDBgmcRI1OmZWZr1WKYbWx7wrI3AKyJwecQq06K
-FrKjscDR6umXflW+r9w/4FAfzefLaI6asOMfhiZfqw3VFSP3qp8=
-=KyVc
------END PGP SIGNATURE-----
diff --git a/source/k/linux-4.14.47.tar.sign b/source/k/linux-4.14.47.tar.sign
new file mode 100644
index 00000000..831aa2aa
--- /dev/null
+++ b/source/k/linux-4.14.47.tar.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlsPCm0ACgkQONu9yGCS
+aT6kSg//bFgSINKTh70Lfc1W/BsvVWHu0iW722ZkkKMozxLvOgUykAVLVtdg9y6P
+d5Nm1foFCoDezVc+iNqRyyZRyQGsLBR6SG3QA6nFgFxrlmA2MXokrx+ymNcK69MA
+unXnjpd5gguq9SNdKSlvmVLyKvOVCZlcZ+nc00wyw5oSTV584Zqe1pHysL1LLcBR
+08n4gdLfOptID8IajcgFYvujx7MvjuQYWfOxzu6VgiqoLd4VzW3xRFKjmoS5Ltua
+bJWCrr4N3AMcJCy10/2NWz+90zYAoZEJlTxgIEegV9+hE4GAuaguXTCKTMXAzNvA
+D/JerlfPU27YZbgNfndYuQdRONokxzjGIb1ktcCpDw8Gkzk3crhLot1aYpLbdQ92
+SrPOXJAxezVSyDHmyOLGvVBXR9/7Mz0XNoip3m8nViy/McD11hGYkiFFVFryVqs7
+uPTCnCk77ShbusljLUBA9hQvaTSCHJ92a/3xvLee0sO57pFFPYNrGTvO9tQjyiP3
+FptKo5c2Yu/oLDAXlMlEaNUH2Ii+IPwe9PdaFtEwrQkyGNSul8UgFyVZNwniFFRz
+P/LEp2E9oB+ajEmpVbGjJWOlv1h65nBzH4CyWbkCo38oeEAPU/YPHEpSWiVESWQT
+cx9ZiP9rz0quivjZn41DMIG0bs4jVrXW1TjDDyr5wHsyrMMy6Vo=
+=NyZS
+-----END PGP SIGNATURE-----
diff --git a/source/l/fftw/fftw.SlackBuild b/source/l/fftw/fftw.SlackBuild
index 9f360111..77a15549 100755
--- a/source/l/fftw/fftw.SlackBuild
+++ b/source/l/fftw/fftw.SlackBuild
@@ -25,8 +25,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=fftw
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -f 2- -d - | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2- -d - | rev | cut -f 3- -d . | rev)}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
# Automatically determine the architecture we're building on:
@@ -73,7 +73,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-st .
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index 4dd249c0..84277bac 100755
--- a/source/l/imagemagick/imagemagick.SlackBuild
+++ b/source/l/imagemagick/imagemagick.SlackBuild
@@ -32,7 +32,7 @@ BUILD=${BUILD:-1}
# This is a bit messy, so we'll explain it well. :-)
# This is the version number used in the source tarball filename
-FILEVER=6.9.9-42
+FILEVER=$(echo ImageMagick-*.tar.?z | cut -f 2- -d - | rev | cut -f 3- -d . | rev)
# This is the base version number, which is needed to cd into the source tree.
# Normally this is the same as $FILEVER, but allow setting it here if needed.
diff --git a/source/n/gnupg2/slack-desc b/source/n/gnupg2/slack-desc
index 015fbbba..77f4bd04 100644
--- a/source/n/gnupg2/slack-desc
+++ b/source/n/gnupg2/slack-desc
@@ -14,6 +14,6 @@ gnupg2: an advanced key management facility and is compliant with the proposed
gnupg2: OpenPGP Internet standard as described in RFC2440 and the S/MIME
gnupg2: standard as described by several RFCs.
gnupg2:
-gnupg2: GnuPG 2.0 is the stable version of GnuPG integrating support for
+gnupg2: GnuPG 2.x is the stable version of GnuPG integrating support for
gnupg2: OpenPGP and S/MIME. It does not conflict with an installed 1.4.x
gnupg2: OpenPGP-only version.
diff --git a/source/n/network-scripts/0001-no_hostname_in_networkmanager_conf.diff b/source/n/network-scripts/0001-no_hostname_in_networkmanager_conf.diff
deleted file mode 100644
index 8ce7600c..00000000
--- a/source/n/network-scripts/0001-no_hostname_in_networkmanager_conf.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./netconfig.orig 2017-11-26 13:34:37.652627697 -0600
-+++ ./netconfig 2018-02-15 20:01:26.844174383 -0600
-@@ -362,10 +362,6 @@
-
- # Write the hostname with domain to /etc/HOSTNAME:
- echo $HOSTNM.$DOMAIN > etc/HOSTNAME
--# Also make sure the hostname is written to /etc/NetworkManager/NetworkManager.conf:
--if [ -w etc/NetworkManager/NetworkManager.conf ]; then
-- sed -i "s/^hostname=.*$/hostname=$HOSTNM/g" etc/NetworkManager/NetworkManager.conf
--fi
-
- dialog --title "CONFIGURATION TYPE FOR '$HOSTNM.$DOMAIN'" \
- --default-item DHCP \
diff --git a/source/n/network-scripts/0002-set_broadcast_address_and_flush_ip_after_if_down.diff b/source/n/network-scripts/0002-set_broadcast_address_and_flush_ip_after_if_down.diff
deleted file mode 100644
index e963115d..00000000
--- a/source/n/network-scripts/0002-set_broadcast_address_and_flush_ip_after_if_down.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./rc.inet1.orig 2017-11-26 22:48:14.650274588 -0600
-+++ ./rc.inet1 2018-02-15 20:42:45.731997047 -0600
-@@ -215,8 +215,8 @@
- else # bring up interface using a static IP address
- if [ -n "${IPADDR[$i]}" ]; then # skip unconfigured interfaces
- # Set up the network card:
-- echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}" | $LOGGER
-- /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}
-+ echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}" | $LOGGER
-+ /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}
- if /sbin/ip link show dev ${1} | grep -wq "state DOWN" ; then
- /sbin/ip link set dev ${1} up # Bring up interface
- fi
-@@ -268,6 +268,8 @@
- if [ -n "${BRNICS[$i]}" ]; then
- br_close $i
- fi
-+ # Flush the address from the interface:
-+ ip address flush dev ${1}
- fi
- }
-
diff --git a/source/n/network-scripts/0003-netconfig-typos-and-set-NM-default.diff b/source/n/network-scripts/0003-netconfig-typos-and-set-NM-default.diff
deleted file mode 100644
index cd6bf2cc..00000000
--- a/source/n/network-scripts/0003-netconfig-typos-and-set-NM-default.diff
+++ /dev/null
@@ -1,165 +0,0 @@
---- ./netconfig.orig 2018-02-21 21:21:31.000000000 -0600
-+++ ./netconfig 2018-04-12 14:07:10.137023035 -0500
-@@ -11,7 +11,7 @@
- #
-
- # If we're doing loopback, we don't want 127.0.0.1 and 255.255.255.0 in
--# rc.inet1.conf... it's better to leave the values null. However, since
-+# rc.inet1.conf... it's better to leave the values null. However, since
- # we use the IP in other places, we need to make a copy for here.
- RCIPCOPY=$IPADDR
- RCMASKCOPY=$NETMASK
-@@ -68,7 +68,7 @@
- # Default gateway IP address:
- GATEWAY="$GATEWAY"
-
--# Change this to "yes" for debugging output to stdout. Unfortunately,
-+# Change this to "yes" for debugging output to stdout. Unfortunately,
- # /sbin/hotplug seems to disable stdout so you'll only see debugging output
- # when rc.inet1 is called directly.
- DEBUG_ETH_UP="no"
-@@ -103,8 +103,8 @@
- #VIRTIFUSER[1]="someuser"
- #VIRTIFGROUP[1]="somegroup"
-
--## Example config information for wlan0. Uncomment the lines you need and fill
--## in your data. (You may not need all of these for your wireless network)
-+## Example config information for wlan0. Uncomment the lines you need and fill
-+## in your data. (You may not need all of these for your wireless network)
- #IFNAME[4]="wlan0"
- #IPADDR[4]=""
- #NETMASK[4]=""
-@@ -173,7 +173,7 @@
- /bin/cat <<EOF >$ETCNETWORKS
- #
- # networks This file describes a number of netname-to-address
--# mappings for the TCP/IP subsystem. It is mostly
-+# mappings for the TCP/IP subsystem. It is mostly
- # used at boot time, when no name servers are running.
- #
-
-@@ -192,14 +192,14 @@
- /bin/cat << EOF > $HOSTS
- #
- # hosts This file describes a number of hostname-to-address
--# mappings for the TCP/IP subsystem. It is mostly
-+# mappings for the TCP/IP subsystem. It is mostly
- # used at boot time, when no name servers are running.
- # On small systems, this file can be used instead of a
- # "named" name server. Just add the names, addresses
- # and any aliases to this file...
- #
- # By the way, Arnt Gulbrandsen <agulbra@nvg.unit.no> says that 127.0.0.1
--# should NEVER be named with the name of the machine. It causes problems
-+# should NEVER be named with the name of the machine. It causes problems
- # for some (stupid) programs, irc and reputedly talk. :^)
- #
-
-@@ -362,16 +362,21 @@
-
- # Write the hostname with domain to /etc/HOSTNAME:
- echo $HOSTNM.$DOMAIN > etc/HOSTNAME
-+## OBSOLETE with recent NetworkManager:
-+## Also make sure the hostname is written to /etc/NetworkManager/NetworkManager.conf:
-+#if [ -w etc/NetworkManager/NetworkManager.conf ]; then
-+# sed -i "s/^hostname=.*$/hostname=$HOSTNM/g" etc/NetworkManager/NetworkManager.conf
-+#fi
-
- dialog --title "CONFIGURATION TYPE FOR '$HOSTNM.$DOMAIN'" \
----default-item DHCP \
-+--default-item NetworkManager \
- --menu \
- "Now we need to know how your machine connects to the network.\n\
- If you have an internal network card and an assigned IP address, gateway, \
--and DNS, use the 'static IP' choice to enter these values. If your IP \
-+and DNS, use the 'static IP' choice to enter these values. If your IP \
- address is assigned by a DHCP server (commonly used by cable modem and DSL \
--services), select 'DHCP'. If you do not have a network card, select \
--the 'loopback' choice. You may also select 'NetworkManager' if you would \
-+services), select 'DHCP'. If you do not have a network card, select \
-+the 'loopback' choice. You may also select 'NetworkManager' if you would \
- like to have the NetworkManager daemon automatically handle your wired and \
- wireless network interfaces (this is simple and usually works). \
- Which type of network setup would you like?" 20 70 4 \
-@@ -389,10 +394,10 @@
- if [ "$REPLY" = "DHCP" ]; then
- USE_DHCP="yes"
- dialog --title "SET DHCP HOSTNAME" --inputbox "Some network providers require \
--that the DHCP hostname be set in order to connect. If so, they'll have assigned \
-+that the DHCP hostname be set in order to connect. If so, they'll have assigned \
- a hostname to your machine, which may look something like CC-NUMBER-A (this \
--depends on your ISP). If you were assigned a DHCP hostname, please enter it \
--below. If you do not have a DHCP hostname, just hit ENTER or Cancel." 13 62 \
-+depends on your ISP). If you were assigned a DHCP hostname, please enter it \
-+below. If you do not have a DHCP hostname, just hit ENTER or Cancel." 13 62 \
- 2> $TMP/SeTDHCPHOST
- NEW_DHCPHOST="`cat $TMP/SeTDHCPHOST`"
- rm -f $TMP/SeTDHCPHOST
-@@ -442,7 +447,7 @@
- NETMASK=`cat $TMP/SeTnetmask`
- fi
- cat << EOF > $TMP/tempmsg
--Enter your netmask. This will generally look something
-+Enter your netmask. This will generally look something
- like this: 255.255.255.0
- Enter netmask (aaa.bbb.ccc.ddd):
- EOF
-@@ -556,8 +561,8 @@
- dialog --title "PROBE FOR NETWORK CARD?" --menu "If you like, we \
- can look to see what kind of network card you have in your machine, and \
- if we find one create an /etc/rc.d/rc.netdevice script to load the module \
--for it at boot time. There's a slight bit of danger that the probing \
--can cause problems, but it almost always works. If you'd rather configure \
-+for it at boot time. There's a slight bit of danger that the probing \
-+can cause problems, but it almost always works. If you'd rather configure \
- your system manually, you can skip the probing process and edit \
- /etc/rc.d/rc.modules or /etc/modules.conf later to have it load the right module." \
- 16 68 2 \
-@@ -601,7 +606,7 @@
- fi
- if [ ! -r /cardfound ]; then
- dialog --title "NO CARD DETECTED" --msgbox "Sorry, but no network \
--card could be probed for on your system. Some cards (like non-PCI NE2000s) \
-+card could be probed for on your system. Some cards (like non-PCI NE2000s) \
- must be supplied with the I/O address to use and can't be probed for safely. \
- You'll have to try to configure the card later by editing \
- /etc/rc.d/rc.modules or recompiling your kernel." 9 70
-@@ -621,11 +626,11 @@
- elif [ "$LOOPBACK" = "yes" -a "$NETWORKMANAGER" = "yes" ]; then
- dialog --title "NETWORK SETUP COMPLETE" --yesno "Your networking \
- system is now configured to use NetworkManager for
--wired and wireless network management. To set up wireless networks
-+wired and wireless network management. To set up wireless networks
- and view status, add the Network Management control panel widget to
- your KDE desktop.
-
--Is this correct? Press 'Yes' to confirm, or 'No' to reconfigure." 0 0
-+Is this correct? Press 'Yes' to confirm, or 'No' to reconfigure." 0 0
- RETVAL=$?
- elif [ "$USE_DHCP" = "" ]; then
- while [ 0 ]; do
-@@ -634,8 +639,8 @@
- --extra-label Edit \
- --cancel-label Restart \
- --inputmenu \
--"These are the settings you have entered. To accept them and complete \
--the networking setup, press enter. If you need to make any changes, you \
-+"These are the settings you have entered. To accept them and complete \
-+the networking setup, press enter. If you need to make any changes, you \
- can do that now (or reconfigure later using 'netconfig')." \
- 22 60 12 \
- "Hostname:" "$HOSTNM" \
-@@ -692,11 +697,11 @@
- chmod 755 etc/rc.d/rc.networkmanager
- fi
- if [ "$1" = "" ]; then
-- dialog --msgbox "Settings accepted. Basic network configuration is complete." 6 40
-+ dialog --msgbox "Settings accepted. Basic network configuration is complete." 6 40
- fi
- else
- if [ "$1" = "" ]; then
-- dialog --msgbox "Settings discarded. Run the 'netconfig' command again if you need to reconfigure your network settings." 6 60
-+ dialog --msgbox "Settings discarded. Run the 'netconfig' command again if you need to reconfigure your network settings." 6 60
- fi
- fi
-
diff --git a/source/n/network-scripts/manpages/rc.inet1.8 b/source/n/network-scripts/manpages/rc.inet1.8
index e78353a0..ac8ce6a5 100644
--- a/source/n/network-scripts/manpages/rc.inet1.8
+++ b/source/n/network-scripts/manpages/rc.inet1.8
@@ -105,6 +105,7 @@ The /etc/rc.d/rc.wireless script is not meant to be run on its own by the user!
Patrick J. Volkerding <volkerdi@slackware.com>
Eric Hameleers <alien@slackware.com>
Robby Workman <rworkman@slackware.com>
+Darren 'Tadgy' Austin <darren@afterdark.org.uk>
.SH "SEE ALSO"
.BR rc.inet1.conf(5),
.BR ip(8),
diff --git a/source/n/network-scripts/manpages/rc.inet1.conf.5 b/source/n/network-scripts/manpages/rc.inet1.conf.5
index 1f790c0a..28683177 100644
--- a/source/n/network-scripts/manpages/rc.inet1.conf.5
+++ b/source/n/network-scripts/manpages/rc.inet1.conf.5
@@ -58,7 +58,7 @@ IPADDR[1]="192.168.3.11"
.br
NETMASK[1]="255.255.255.0"
.br
-IPALIASES[1]="192.168.3.100"
+IPALIASES[1]="192.168.3.100/24"
.br
USE_DHCP[1]=""
.br
@@ -118,9 +118,11 @@ NETMASK[0]=""
(255.255.255.0 is common)
.TP
IPALIASES[0]=""
-# Space separated list of additional IP addresses to bind to the
-interface after initial configuration is complete. If USE_DHCP is
-set to `yes' then additional addresses will only be added if the
+# Space separated list of additional IP addresses to bind to the
+interface after initial configuration is complete. An optional
+netmask may be specified after the IP in the form 1.2.3.4/24. If no
+netmask is specified the default of /32 will be used. If USE_DHCP
+is set to `yes' then additional addresses will only be added if the
dhcp client invocation is successful in obtaining a primary address.
.TP
USE_DHCP[0]="yes"
@@ -145,6 +147,9 @@ MTU[0]=""
# The default MTU is 1500, but you might need 1360 when you use NAT'ed
IPSec traffic. IPv6 will likely require smaller MTUs as well
.TP
+PROMISCUOUS[0]="yes"
+# Set promiscuous mode on the interface.
+.TP
DHCP_KEEPRESOLV[0]="yes"
# If you do
.B not
@@ -249,5 +254,6 @@ to the number of network interfaces you wish to use.
Patrick J. Volkerding <volkerdi@slackware.com>
Eric Hameleers <alien@slackware.com>
Robby Workman <rworkman@slackware.com>
+Darren 'Tadgy' Austin <darren@afterdark.org.uk>
.SH "SEE ALSO"
.BR rc.inet1(8)
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index b484de1d..4f35ed36 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=network-scripts
VERSION=${VERSION:-15.0}
ARCH=noarch
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-8}
# 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
@@ -64,15 +64,6 @@ cp -a $CWD/scripts/setup.netconfig $PKG/var/log/setup
chown root:root $PKG/var/log/setup/setup.netconfig
chmod 755 $PKG/var/log/setup/setup.netconfig
-# Apply patches until rworkman takes them up in git:
-( cd $PKG/sbin
- zcat $CWD/0001-no_hostname_in_networkmanager_conf.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/0003-netconfig-typos-and-set-NM-default.diff.gz | patch -p1 --verbose || exit 1
-) || exit 1
-( cd $PKG/etc/rc.d
- zcat $CWD/0002-set_broadcast_address_and_flush_ip_after_if_down.diff.gz | patch -p1 --verbose rc.inet1.new || exit 1
-) || exit 1
-
# Add manpages:
mkdir -p $PKG/usr/man/man{5,8}
cat $CWD/manpages/rc.inet1.conf.5 | gzip -9c > $PKG/usr/man/man5/rc.inet1.conf.5.gz
diff --git a/source/n/network-scripts/scripts/netconfig b/source/n/network-scripts/scripts/netconfig
index 51e88bd4..5c5bf8a6 100644
--- a/source/n/network-scripts/scripts/netconfig
+++ b/source/n/network-scripts/scripts/netconfig
@@ -11,7 +11,7 @@ write_config_files() {
#
# If we're doing loopback, we don't want 127.0.0.1 and 255.255.255.0 in
-# rc.inet1.conf... it's better to leave the values null. However, since
+# rc.inet1.conf... it's better to leave the values null. However, since
# we use the IP in other places, we need to make a copy for here.
RCIPCOPY=$IPADDR
RCMASKCOPY=$NETMASK
@@ -68,7 +68,7 @@ DHCP_HOSTNAME[3]=""
# Default gateway IP address:
GATEWAY="$GATEWAY"
-# Change this to "yes" for debugging output to stdout. Unfortunately,
+# Change this to "yes" for debugging output to stdout. Unfortunately,
# /sbin/hotplug seems to disable stdout so you'll only see debugging output
# when rc.inet1 is called directly.
DEBUG_ETH_UP="no"
@@ -103,8 +103,8 @@ DEBUG_ETH_UP="no"
#VIRTIFUSER[1]="someuser"
#VIRTIFGROUP[1]="somegroup"
-## Example config information for wlan0. Uncomment the lines you need and fill
-## in your data. (You may not need all of these for your wireless network)
+## Example config information for wlan0. Uncomment the lines you need and fill
+## in your data. (You may not need all of these for your wireless network)
#IFNAME[4]="wlan0"
#IPADDR[4]=""
#NETMASK[4]=""
@@ -128,10 +128,13 @@ DEBUG_ETH_UP="no"
## Config information for wlan0:
#IFNAME[4]="wlan0" # Use a different interface name instead of
# the default 'eth4'
-#IFNAME[4]="eth0:1" # Set up an IP alias.
+#IPALIASES[4]="192.168.5.10/24" # Set up an IP alias. A netmask may be given
+ # with a /<prefix> after the IP address - if
+ # not supplied, /32 will be used as default.
#HWADDR[4]="00:01:23:45:67:89" # Overrule the card's hardware MAC address
#MTU[4]="" # The default MTU is 1500, but you might need
# 1360 when you use NAT'ed IPSec traffic.
+#PROMISCUOUS[4]="yes" # Set promiscuous mode on the interface.
#DHCP_TIMEOUT[4]=15 # The default timeout for the DHCP client to
# wait for server resonse is 15 seconds, but
# you might want a shorter or longer wait.
@@ -173,7 +176,7 @@ ENDFILE
/bin/cat <<EOF >$ETCNETWORKS
#
# networks This file describes a number of netname-to-address
-# mappings for the TCP/IP subsystem. It is mostly
+# mappings for the TCP/IP subsystem. It is mostly
# used at boot time, when no name servers are running.
#
@@ -192,14 +195,14 @@ chmod 644 $ETCNETWORKS
/bin/cat << EOF > $HOSTS
#
# hosts This file describes a number of hostname-to-address
-# mappings for the TCP/IP subsystem. It is mostly
+# mappings for the TCP/IP subsystem. It is mostly
# used at boot time, when no name servers are running.
# On small systems, this file can be used instead of a
# "named" name server. Just add the names, addresses
# and any aliases to this file...
#
# By the way, Arnt Gulbrandsen <agulbra@nvg.unit.no> says that 127.0.0.1
-# should NEVER be named with the name of the machine. It causes problems
+# should NEVER be named with the name of the machine. It causes problems
# for some (stupid) programs, irc and reputedly talk. :^)
#
@@ -362,20 +365,21 @@ done
# Write the hostname with domain to /etc/HOSTNAME:
echo $HOSTNM.$DOMAIN > etc/HOSTNAME
-# Also make sure the hostname is written to /etc/NetworkManager/NetworkManager.conf:
-if [ -w etc/NetworkManager/NetworkManager.conf ]; then
- sed -i "s/^hostname=.*$/hostname=$HOSTNM/g" etc/NetworkManager/NetworkManager.conf
-fi
+## OBSOLETE with recent NetworkManager:
+## Also make sure the hostname is written to /etc/NetworkManager/NetworkManager.conf:
+#if [ -w etc/NetworkManager/NetworkManager.conf ]; then
+# sed -i "s/^hostname=.*$/hostname=$HOSTNM/g" etc/NetworkManager/NetworkManager.conf
+#fi
dialog --title "CONFIGURATION TYPE FOR '$HOSTNM.$DOMAIN'" \
---default-item DHCP \
+--default-item NetworkManager \
--menu \
"Now we need to know how your machine connects to the network.\n\
If you have an internal network card and an assigned IP address, gateway, \
-and DNS, use the 'static IP' choice to enter these values. If your IP \
+and DNS, use the 'static IP' choice to enter these values. If your IP \
address is assigned by a DHCP server (commonly used by cable modem and DSL \
-services), select 'DHCP'. If you do not have a network card, select \
-the 'loopback' choice. You may also select 'NetworkManager' if you would \
+services), select 'DHCP'. If you do not have a network card, select \
+the 'loopback' choice. You may also select 'NetworkManager' if you would \
like to have the NetworkManager daemon automatically handle your wired and \
wireless network interfaces (this is simple and usually works). \
Which type of network setup would you like?" 20 70 4 \
@@ -393,10 +397,10 @@ rm -f $TMP/reply
if [ "$REPLY" = "DHCP" ]; then
USE_DHCP="yes"
dialog --title "SET DHCP HOSTNAME" --inputbox "Some network providers require \
-that the DHCP hostname be set in order to connect. If so, they'll have assigned \
+that the DHCP hostname be set in order to connect. If so, they'll have assigned \
a hostname to your machine, which may look something like CC-NUMBER-A (this \
-depends on your ISP). If you were assigned a DHCP hostname, please enter it \
-below. If you do not have a DHCP hostname, just hit ENTER or Cancel." 13 62 \
+depends on your ISP). If you were assigned a DHCP hostname, please enter it \
+below. If you do not have a DHCP hostname, just hit ENTER or Cancel." 13 62 \
2> $TMP/SeTDHCPHOST
NEW_DHCPHOST="`cat $TMP/SeTDHCPHOST`"
rm -f $TMP/SeTDHCPHOST
@@ -446,7 +450,7 @@ EOF
NETMASK=`cat $TMP/SeTnetmask`
fi
cat << EOF > $TMP/tempmsg
-Enter your netmask. This will generally look something
+Enter your netmask. This will generally look something
like this: 255.255.255.0
Enter netmask (aaa.bbb.ccc.ddd):
EOF
@@ -560,8 +564,8 @@ if [ -d lib/modules/`uname -r` \
dialog --title "PROBE FOR NETWORK CARD?" --menu "If you like, we \
can look to see what kind of network card you have in your machine, and \
if we find one create an /etc/rc.d/rc.netdevice script to load the module \
-for it at boot time. There's a slight bit of danger that the probing \
-can cause problems, but it almost always works. If you'd rather configure \
+for it at boot time. There's a slight bit of danger that the probing \
+can cause problems, but it almost always works. If you'd rather configure \
your system manually, you can skip the probing process and edit \
/etc/rc.d/rc.modules or /etc/modules.conf later to have it load the right module." \
16 68 2 \
@@ -605,7 +609,7 @@ the $card.o module has been detected." 5 72
fi
if [ ! -r /cardfound ]; then
dialog --title "NO CARD DETECTED" --msgbox "Sorry, but no network \
-card could be probed for on your system. Some cards (like non-PCI NE2000s) \
+card could be probed for on your system. Some cards (like non-PCI NE2000s) \
must be supplied with the I/O address to use and can't be probed for safely. \
You'll have to try to configure the card later by editing \
/etc/rc.d/rc.modules or recompiling your kernel." 9 70
@@ -625,11 +629,11 @@ Is this correct? Press 'Yes' to continue, or 'No' to reconfigure." 0 0
elif [ "$LOOPBACK" = "yes" -a "$NETWORKMANAGER" = "yes" ]; then
dialog --title "NETWORK SETUP COMPLETE" --yesno "Your networking \
system is now configured to use NetworkManager for
-wired and wireless network management. To set up wireless networks
+wired and wireless network management. To set up wireless networks
and view status, add the Network Management control panel widget to
your KDE desktop.
-Is this correct? Press 'Yes' to confirm, or 'No' to reconfigure." 0 0
+Is this correct? Press 'Yes' to confirm, or 'No' to reconfigure." 0 0
RETVAL=$?
elif [ "$USE_DHCP" = "" ]; then
while [ 0 ]; do
@@ -638,8 +642,8 @@ elif [ "$USE_DHCP" = "" ]; then
--extra-label Edit \
--cancel-label Restart \
--inputmenu \
-"These are the settings you have entered. To accept them and complete \
-the networking setup, press enter. If you need to make any changes, you \
+"These are the settings you have entered. To accept them and complete \
+the networking setup, press enter. If you need to make any changes, you \
can do that now (or reconfigure later using 'netconfig')." \
22 60 12 \
"Hostname:" "$HOSTNM" \
@@ -696,11 +700,11 @@ if [ "$RETVAL" = "0" ]; then
chmod 755 etc/rc.d/rc.networkmanager
fi
if [ "$1" = "" ]; then
- dialog --msgbox "Settings accepted. Basic network configuration is complete." 6 40
+ dialog --msgbox "Settings accepted. Basic network configuration is complete." 6 40
fi
else
if [ "$1" = "" ]; then
- dialog --msgbox "Settings discarded. Run the 'netconfig' command again if you need to reconfigure your network settings." 6 60
+ dialog --msgbox "Settings discarded. Run the 'netconfig' command again if you need to reconfigure your network settings." 6 60
fi
fi
diff --git a/source/n/network-scripts/scripts/rc.inet1 b/source/n/network-scripts/scripts/rc.inet1
index 2f566ef8..cf9da0f4 100644
--- a/source/n/network-scripts/scripts/rc.inet1
+++ b/source/n/network-scripts/scripts/rc.inet1
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
# /etc/rc.d/rc.inet1
# This script is used to bring up the various network interfaces.
#
@@ -204,19 +204,28 @@ if_up() {
# 15 seconds should be a reasonable default DHCP timeout. 30 was too much.
echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER
/sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}
- # If the dhcpcd call succeeds, add extra IP addresses, if defined, to interface
- if [ "$?" == "0" ] && [ -n "${IPALIASES[$i]}" ]; then
- num=0
- for ipalias in ${IPALIASES[$i]}; do
- /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
- num=$(($num + 1))
- done
+ if [ "$?" == "0" ]; then # the dhcp call has succeeded
+ if [ -n "${IPALIASES[$i]}" ]; then
+ # Add extra IP addresses, if defined, to interface
+ num=0
+ for ipalias in ${IPALIASES[$i]}; do
+ ip="${ipalias%/*}"
+ nm="${ipalias#*/}"
+ [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+ /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
+ num=$(($num + 1))
+ done
+ fi
+ if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+ # Set promiscuous mode on the interface
+ /sbin/ip link set dev ${1} promisc on
+ fi
fi
else # bring up interface using a static IP address
if [ -n "${IPADDR[$i]}" ]; then # skip unconfigured interfaces
# Set up the network card:
- echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}" | $LOGGER
- /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}
+ echo "/etc/rc.d/rc.inet1: /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}" | $LOGGER
+ /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}
if /sbin/ip link show dev ${1} | grep -wq "state DOWN" ; then
/sbin/ip link set dev ${1} up # Bring up interface
fi
@@ -224,10 +233,17 @@ if_up() {
if [ -n "${IPALIASES[$i]}" ]; then
num=0
for ipalias in ${IPALIASES[$i]}; do
- /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
+ ip="${ipalias%/*}"
+ nm="${ipalias#*/}"
+ [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+ /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
num=$(($num + 1))
done
fi
+ if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+ # Set promiscuous mode on the interface
+ /sbin/ip link set dev ${1} promisc on
+ fi
else
debug_log "${1} interface is not configured in /etc/rc.d/rc.inet1.conf"
fi
@@ -268,6 +284,8 @@ if_down() {
if [ -n "${BRNICS[$i]}" ]; then
br_close $i
fi
+ # Flush the address from the interface:
+ ip address flush dev ${1}
fi
}
diff --git a/source/n/network-scripts/scripts/rc.inet1.conf b/source/n/network-scripts/scripts/rc.inet1.conf
index 58766d25..551c4a70 100644
--- a/source/n/network-scripts/scripts/rc.inet1.conf
+++ b/source/n/network-scripts/scripts/rc.inet1.conf
@@ -104,10 +104,13 @@ DEBUG_ETH_UP="no"
## Config information for wlan0:
#IFNAME[4]="wlan0" # Use a different interface name instead of
# the default 'eth4'
-#IFNAME[4]="eth0:1" # Set up an IP alias.
+#IPALIASES[4]="192.168.5.10/24" # Set up an IP alias. A netmask may be given
+ # with a /<prefix> after the IP address - if
+ # not supplied, /32 will be used as default.
#HWADDR[4]="00:01:23:45:67:89" # Overrule the card's hardware MAC address
#MTU[4]="" # The default MTU is 1500, but you might need
# 1360 when you use NAT'ed IPSec traffic.
+#PROMISCUOUS[4]="yes" # Set promiscuous mode on the interface.
#DHCP_TIMEOUT[4]=15 # The default timeout for the DHCP client to
# wait for server resonse is 15 seconds, but
# you might want a shorter or longer wait.
diff --git a/source/n/ulogd/ulogd.SlackBuild b/source/n/ulogd/ulogd.SlackBuild
index 1ffd0822..c1709aaf 100755
--- a/source/n/ulogd/ulogd.SlackBuild
+++ b/source/n/ulogd/ulogd.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ulogd
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -103,7 +103,7 @@ cat $CWD/rc.ulogd > $PKG/etc/rc.d/rc.ulogd.new
chmod 0755 $PKG/etc/rc.d/rc.ulogd.new
mkdir -p $PKG/etc/logrotate.d
-cat ulogd.logrotate > $PKG/etc/logrotate.d/ulogd.new
+cat $CWD/ulogd.logrotate > $PKG/etc/logrotate.d/ulogd.new
find $PKG/usr/man -exec gzip -9 {} \;
diff --git a/source/n/ulogd/ulogd.logrotate b/source/n/ulogd/ulogd.logrotate
new file mode 100644
index 00000000..b3fb6d12
--- /dev/null
+++ b/source/n/ulogd/ulogd.logrotate
@@ -0,0 +1,7 @@
+/var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.pcap {
+ missingok
+ sharedscripts
+ postrotate
+ /bin/killall -HUP ulogd 2> /dev/null || true
+ endscript
+}
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd..0cfbf088 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 1e43b86e..cdd0ebd8 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -1,2 +1,3 @@
zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
zcat $CWD/patch/xorg-server/xorg-server.combo.mouse.keyboard.layout.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/fix-nouveau-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff b/source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff
new file mode 100644
index 00000000..db66956f
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff
@@ -0,0 +1,12 @@
+--- ./render/mipict.c.orig 2018-05-10 11:32:37.000000000 -0500
++++ ./render/mipict.c 2018-05-30 00:01:50.648530333 -0500
+@@ -394,6 +394,9 @@
+ CARD32 r, g, b, a;
+ miIndexedPtr pIndexed;
+
++ if(! format)
++ *pixel = (color->alpha >> 8 << 24) | (color->red >> 8 << 16) | (color->green & 0xff00) | (color->blue >> 8);
++ else
+ switch (format->type) {
+ case PictTypeDirect:
+ r = color->red >> (16 - Ones(format->direct.redMask));
diff --git a/source/xap/network-manager-applet/fix-double-free.diff b/source/xap/network-manager-applet/fix-double-free.diff
new file mode 100644
index 00000000..45db62ff
--- /dev/null
+++ b/source/xap/network-manager-applet/fix-double-free.diff
@@ -0,0 +1,13 @@
+diff --git i/src/ap-menu-item.c w/src/ap-menu-item.c
+index 92953c04..7d614f45 100644
+--- i/src/ap-menu-item.c
++++ w/src/ap-menu-item.c
+@@ -327,7 +327,6 @@ finalize (GObject *object)
+ g_free (priv->ssid_string);
+
+ g_slist_free_full (priv->dupes, g_free);
+- g_slist_free (priv->dupes);
+
+ G_OBJECT_CLASS (nm_network_menu_item_parent_class)->finalize (object);
+ }
+
diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
index d987223b..000691c3 100755
--- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild
+++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=network-manager-applet
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -76,6 +76,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix crash:
+zcat $CWD/fix-double-free.diff.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \