summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-01-29 20:26:57 +0000
committerEric Hameleers <alien@slackware.com>2021-01-30 08:59:50 +0100
commit8040f7f06757d6830029f75eab44474464883f59 (patch)
treed61a38f177382c6f8fcb42f70ee3e2f52ee7f90d /source
parent480d98e278bacecb97d391aeb5c7263cd9abf0ea (diff)
downloadcurrent-8040f7f06757d6830029f75eab44474464883f59.tar.gz
Fri Jan 29 20:26:57 UTC 202120210129202657
a/e2fsprogs-1.45.7-x86_64-1.txz: Upgraded. n/libgcrypt-1.9.1-x86_64-1.txz: Upgraded. This update fixes a serious security issue present only in libgcrypt-1.9.0. Everyone should be sure to update this package as soon as possible. For more information, see: https://lists.gnupg.org/pipermail/gnupg-announce/2021q1/000456.html (* Security fix *) x/libwacom-1.8-x86_64-1.txz: Upgraded. x/mesa-20.3.4-x86_64-1.txz: Upgraded. xap/xpdf-4.03-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/e2fsprogs/e2fsprogs.SlackBuild2
-rw-r--r--source/d/FTBFSlog3
-rwxr-xr-xsource/d/strace/strace.SlackBuild3
-rwxr-xr-xsource/installer/sources/efi.i586/EFI/BOOT/message.txt2
-rwxr-xr-xsource/installer/sources/efi.x86_64/EFI/BOOT/message.txt2
-rwxr-xr-xsource/x/libwacom/libwacom.SlackBuild2
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild2
-rw-r--r--source/xap/xpdf/lang/xpdf-korean.diff11
-rw-r--r--source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff11
-rwxr-xr-xsource/xap/xpdf/xpdf.SlackBuild5
10 files changed, 20 insertions, 23 deletions
diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild
index 7f717f67..1db5f48b 100755
--- a/source/a/e2fsprogs/e2fsprogs.SlackBuild
+++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=e2fsprogs
VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/d/FTBFSlog b/source/d/FTBFSlog
index 01f7f3a5..2487b89f 100644
--- a/source/d/FTBFSlog
+++ b/source/d/FTBFSlog
@@ -1,3 +1,6 @@
+Fri Jan 29 20:26:15 UTC 2021
+ strace: added --enable-mpers=check. Thanks to nobodino.
++--------------------------+
Sun Apr 14 17:58:44 UTC 2019
subversion: include workaround for building with apr-1.7.0.
Thanks to Stefan Sperling and nobodino.
diff --git a/source/d/strace/strace.SlackBuild b/source/d/strace/strace.SlackBuild
index 37dc2814..31d123ed 100755
--- a/source/d/strace/strace.SlackBuild
+++ b/source/d/strace/strace.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2013, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2016, 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -82,6 +82,7 @@ CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--mandir=/usr/man \
+ --enable-mpers=check \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
diff --git a/source/installer/sources/efi.i586/EFI/BOOT/message.txt b/source/installer/sources/efi.i586/EFI/BOOT/message.txt
index 6153d784..adcd8571 100755
--- a/source/installer/sources/efi.i586/EFI/BOOT/message.txt
+++ b/source/installer/sources/efi.i586/EFI/BOOT/message.txt
@@ -6,7 +6,7 @@ below after the name of the kernel to boot (e.g., hugesmp.s).
In a pinch, you can boot your system from here with a command like:
-boot: hugesmp.s root=/dev/sda1 rdinit= ro
+boot: hugesmp.s root=/dev/sda1 initrd= ro
In the example above, /dev/sda1 is the / Linux partition.
diff --git a/source/installer/sources/efi.x86_64/EFI/BOOT/message.txt b/source/installer/sources/efi.x86_64/EFI/BOOT/message.txt
index 69e6b4de..e2debba4 100755
--- a/source/installer/sources/efi.x86_64/EFI/BOOT/message.txt
+++ b/source/installer/sources/efi.x86_64/EFI/BOOT/message.txt
@@ -6,7 +6,7 @@ below after the name of the kernel to boot (e.g., huge.s).
In a pinch, you can boot your system from here with a command like:
-boot: huge.s root=/dev/sda1 rdinit= ro
+boot: huge.s root=/dev/sda1 initrd= ro
In the example above, /dev/sda1 is the / Linux partition.
diff --git a/source/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild
index 35f5c302..207b2374 100755
--- a/source/x/libwacom/libwacom.SlackBuild
+++ b/source/x/libwacom/libwacom.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libwacom
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index f41ca6bd..8cbc8b6f 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mesa
VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
DEMOVERS=${DEMOVERS:-8.4.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
BUILD_DEMOS=${BUILD_DEMOS:-YES}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/xap/xpdf/lang/xpdf-korean.diff b/source/xap/xpdf/lang/xpdf-korean.diff
index 63ffde77..aecf0a7e 100644
--- a/source/xap/xpdf/lang/xpdf-korean.diff
+++ b/source/xap/xpdf/lang/xpdf-korean.diff
@@ -1,14 +1,19 @@
---- ./add-to-xpdfrc.orig 2019-10-03 13:51:30.196084522 -0500
-+++ ./add-to-xpdfrc 2019-10-03 13:57:24.517055203 -0500
-@@ -1,7 +1,7 @@
+--- ./add-to-xpdfrc.orig 2021-01-29 12:36:23.966962831 -0600
++++ ./add-to-xpdfrc 2021-01-29 12:38:24.237956178 -0600
+@@ -1,10 +1,10 @@
#----- begin Korean support package (2011-sep-02)
-cidToUnicode Adobe-Korea1 /usr/local/share/xpdf/korean/Adobe-Korea1.cidToUnicode
+-cidToUnicode Adobe-KR /usr/local/share/xpdf/korean/Adobe-KR.cidToUnicode
-unicodeMap ISO-2022-KR /usr/local/share/xpdf/korean/ISO-2022-KR.unicodeMap
-cMapDir Adobe-Korea1 /usr/local/share/xpdf/korean/CMap
+-cMapDir Adobe-KR /usr/local/share/xpdf/korean/CMap
-toUnicodeDir /usr/local/share/xpdf/korean/CMap
+cidToUnicode Adobe-Korea1 /usr/share/xpdf/korean/Adobe-Korea1.cidToUnicode
++cidToUnicode Adobe-KR /usr/share/xpdf/korean/Adobe-KR.cidToUnicode
+unicodeMap ISO-2022-KR /usr/share/xpdf/korean/ISO-2022-KR.unicodeMap
+cMapDir Adobe-Korea1 /usr/share/xpdf/korean/CMap
++cMapDir Adobe-KR /usr/share/xpdf/korean/CMap
+toUnicodeDir /usr/share/xpdf/korean/CMap
#fontFileCC Adobe-Korea1 /usr/..../NotoSansCJKkr-Regular.otf
+ #fontFileCC Adobe-KR /usr/..../NotoSansCJKkr-Regular.otf
#----- end Korean support package
diff --git a/source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff b/source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff
deleted file mode 100644
index 3a65985a..00000000
--- a/source/xap/xpdf/patches/xpdf-4.02.crash.fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xpdf/GlobalParams.cc.orig 2019-09-25 14:54:33.000000000 -0500
-+++ ./xpdf/GlobalParams.cc 2019-10-08 13:33:36.526738508 -0500
-@@ -568,7 +568,7 @@
- FcFontSetDestroy(fontSet);
- }
-
-- FcFini();
-+ // FcFini(); Commented out to fix crash
- }
- #endif // HAVE_FONTCONFIG
-
diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild
index c86cd6a2..7ad4bf2f 100755
--- a/source/xap/xpdf/xpdf.SlackBuild
+++ b/source/xap/xpdf/xpdf.SlackBuild
@@ -23,9 +23,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xpdf
-VERSION=4.02
+VERSION=4.03
PATCHLEVEL=
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -80,7 +80,6 @@ find . \
-exec chmod 644 {} \+
zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/xpdf-4.02.crash.fix.diff.gz | patch -p1 --verbose || exit 1
mkdir build
cd build