summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-08-10 22:42:55 +0000
committerEric Hameleers <alien@slackware.com>2018-08-11 09:00:31 +0200
commitcc59e5e82c942adec962972f51c9818f1d1cc185 (patch)
tree8075dfa93f705ab020bf39b8ad7114eeba2191f8 /source
parent16c26916c02e8f062fc4cdf8fbb8f5be9b204093 (diff)
downloadcurrent-cc59e5e82c942adec962972f51c9818f1d1cc185.tar.gz
Fri Aug 10 22:42:55 UTC 201820180810224255
a/kernel-generic-4.14.62-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.62-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.62-x86_64-1.txz: Upgraded. ap/pamixer-1.3.1-x86_64-7.txz: Rebuilt. Recompiled against boost-1.68.0. d/cmake-3.12.1-x86_64-1.txz: Upgraded. d/distcc-3.3-x86_64-3.txz: Rebuilt. Install masquerade symlinks in /usr/lib${LIBDIRSUFFIX}/distcc/. d/kernel-headers-4.14.62-x86-1.txz: Upgraded. k/kernel-source-4.14.62-noarch-1.txz: Upgraded. kde/calligra-2.9.11-x86_64-24.txz: Rebuilt. Recompiled against boost-1.68.0. l/akonadi-1.13.0-x86_64-10.txz: Rebuilt. Recompiled against boost-1.68.0. l/boost-1.68.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/harfbuzz-1.8.7-x86_64-1.txz: Upgraded. l/libgsf-1.14.44-x86_64-1.txz: Upgraded. l/librsvg-2.42.6-x86_64-1.txz: Upgraded. l/libsoup-2.62.3-x86_64-1.txz: Upgraded. n/bind-9.12.2_P1-x86_64-1.txz: Upgraded. Fixed a security issue where named could crash during recursive processing of DNAME records when "deny-answer-aliases" was in use resulting in a denial of service. Note that "deny-answer-aliases" is rarely used. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-5740 (* Security fix *) xap/audacious-3.10-x86_64-1.txz: Upgraded. xap/audacious-plugins-3.10-x86_64-1.txz: Upgraded. extra/pure-alsa-system/audacious-plugins-3.10-x86_64-1_alsa.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/pamixer/pamixer.SlackBuild2
-rwxr-xr-xsource/d/distcc/distcc.SlackBuild43
-rw-r--r--source/k/kernel-configs/config-generic-4.14.62 (renamed from source/k/kernel-configs/config-generic-4.14.61)2
-rw-r--r--source/k/kernel-configs/config-generic-4.14.62.x64 (renamed from source/k/kernel-configs/config-generic-4.14.61.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-4.14.62-smp (renamed from source/k/kernel-configs/config-generic-smp-4.14.61-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-4.14.62 (renamed from source/k/kernel-configs/config-huge-4.14.61)2
-rw-r--r--source/k/kernel-configs/config-huge-4.14.62.x64 (renamed from source/k/kernel-configs/config-huge-4.14.61.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-4.14.62-smp (renamed from source/k/kernel-configs/config-huge-smp-4.14.61-smp)2
-rw-r--r--source/kde/build/calligra2
-rwxr-xr-xsource/l/akonadi/akonadi.SlackBuild2
-rwxr-xr-xsource/l/libgsf/libgsf.SlackBuild2
-rwxr-xr-xsource/n/bind/bind.SlackBuild2
-rwxr-xr-xsource/xap/audacious-plugins/audacious-plugins.SlackBuild6
-rwxr-xr-xsource/xap/audacious/audacious.SlackBuild6
14 files changed, 59 insertions, 18 deletions
diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild
index 4fc58bba..80eac7fe 100755
--- a/source/ap/pamixer/pamixer.SlackBuild
+++ b/source/ap/pamixer/pamixer.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pamixer
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild
index 7d6947f4..017a392a 100755
--- a/source/d/distcc/distcc.SlackBuild
+++ b/source/d/distcc/distcc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=distcc
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -36,6 +36,20 @@ if [ -z "$ARCH" ]; then
esac
fi
+if [ "$ARCH" = "i586" ]; then
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ LIBDIRSUFFIX=""
+else
+ LIBDIRSUFFIX=""
+fi
+
# 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.
@@ -63,10 +77,19 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Make sure we change code/docs to use lib64 if needed:
+if [ ! "$LIBDIRSUFFIX" = "" ]; then
+ grep -l -r usr/lib/distcc | while read file ; do
+ sed -i "s|usr/lib/distcc|usr/lib${LIBDIRSUFFIX}/distcc|g" $file
+ done
+fi
+sed -i "s|usr/lib/gcc|usr/lib${LIBDIRSUFFIX}/gcc|g" update-distcc-symlinks.py
+
./configure \
--prefix=/usr \
--datadir=/usr/share \
--sysconfdir=/etc \
+ --mandir=/usr/man \
--with-gtk \
--without-gnome \
--without-avahi \
@@ -76,6 +99,24 @@ find . \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG docdir=/usr/doc/distcc-$VERSION || exit 1
+# Make a masquarade directory in /usr/lib${LIBDIRSUFFIX}:
+GCCVER=$(gcc -dumpversion)
+mkdir -p $PKG//usr/lib${LIBDIRSUFFIX}/distcc
+( cd $PKG//usr/lib${LIBDIRSUFFIX}/distcc
+ ln -sf ../../bin/distcc c++
+ ln -sf ../../bin/distcc c89
+ ln -sf ../../bin/distcc c99
+ ln -sf ../../bin/distcc cc
+ ln -sf ../../bin/distcc clang
+ ln -sf ../../bin/distcc clang++
+ ln -sf ../../bin/distcc g++
+ ln -sf ../../bin/distcc gcc
+ ln -sf ../../bin/distcc gcc-$GCCVER
+ ln -sf ../../bin/distcc $ARCH-slackware-linux-g++
+ ln -sf ../../bin/distcc $ARCH-slackware-linux-gcc
+ ln -sf ../../bin/distcc $ARCH-slackware-linux-gcc-$GCCVER
+)
+
# pkgdocdir=/usr/doc/distcc-$VERSION
mkdir -p $PKG/usr/share/applications
( cd $PKG/usr/share/applications
diff --git a/source/k/kernel-configs/config-generic-4.14.61 b/source/k/kernel-configs/config-generic-4.14.62
index fc320188..df7b7702 100644
--- a/source/k/kernel-configs/config-generic-4.14.61
+++ b/source/k/kernel-configs/config-generic-4.14.62
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.61 Kernel Configuration
+# Linux/x86 4.14.62 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-generic-4.14.61.x64 b/source/k/kernel-configs/config-generic-4.14.62.x64
index d380828f..9478f1ff 100644
--- a/source/k/kernel-configs/config-generic-4.14.61.x64
+++ b/source/k/kernel-configs/config-generic-4.14.62.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.61 Kernel Configuration
+# Linux/x86 4.14.62 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-generic-smp-4.14.61-smp b/source/k/kernel-configs/config-generic-smp-4.14.62-smp
index 3cace459..473d305f 100644
--- a/source/k/kernel-configs/config-generic-smp-4.14.61-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.14.62-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.61 Kernel Configuration
+# Linux/x86 4.14.62 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.61 b/source/k/kernel-configs/config-huge-4.14.62
index fe68efdb..c2022ae5 100644
--- a/source/k/kernel-configs/config-huge-4.14.61
+++ b/source/k/kernel-configs/config-huge-4.14.62
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.61 Kernel Configuration
+# Linux/x86 4.14.62 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.61.x64 b/source/k/kernel-configs/config-huge-4.14.62.x64
index 07be0101..bea43e83 100644
--- a/source/k/kernel-configs/config-huge-4.14.61.x64
+++ b/source/k/kernel-configs/config-huge-4.14.62.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.61 Kernel Configuration
+# Linux/x86 4.14.62 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-huge-smp-4.14.61-smp b/source/k/kernel-configs/config-huge-smp-4.14.62-smp
index ae34a521..5dbc39c7 100644
--- a/source/k/kernel-configs/config-huge-smp-4.14.61-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.14.62-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.61 Kernel Configuration
+# Linux/x86 4.14.62 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/source/kde/build/calligra b/source/kde/build/calligra
index 40994076..a45fd52c 100644
--- a/source/kde/build/calligra
+++ b/source/kde/build/calligra
@@ -1 +1 @@
-23
+24
diff --git a/source/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild
index 2f0fbe4d..851f707b 100755
--- a/source/l/akonadi/akonadi.SlackBuild
+++ b/source/l/akonadi/akonadi.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=akonadi
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/source/l/libgsf/libgsf.SlackBuild b/source/l/libgsf/libgsf.SlackBuild
index 36e38b4f..3ae1c784 100755
--- a/source/l/libgsf/libgsf.SlackBuild
+++ b/source/l/libgsf/libgsf.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libgsf
VERSION=${VERSION:-$(echo libgsf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index f88e5d8e..ec4d3226 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bind
-VERSION=${VERSION:-9.12.2}
+VERSION=${VERSION:-9.12.2-P1}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
diff --git a/source/xap/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
index cc5d0729..1817cff5 100755
--- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild
+++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=audacious-plugins
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -76,7 +76,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION || exit 1
# Make sure ownerships and permissions are sane:
diff --git a/source/xap/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild
index b99953f9..fce48407 100755
--- a/source/xap/audacious/audacious.SlackBuild
+++ b/source/xap/audacious/audacious.SlackBuild
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=audacious
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -76,7 +76,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION || exit 1
# Make sure ownerships and permissions are sane: