summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-12-07 00:22:04 +0000
committerEric Hameleers <alien@slackware.com>2019-12-07 08:59:52 +0100
commit47964291693dfba44143431da5eefd00717e005b (patch)
treefec58dde2a6b69126112715fbe5cf37d6312846a /source
parent4fc798c4ca2a975ab8af459a6c27ee592baf0605 (diff)
downloadcurrent-47964291693dfba44143431da5eefd00717e005b.tar.gz
Sat Dec 7 00:22:04 UTC 201920191207002204
a/aaa_terminfo-6.1_20191130-x86_64-1.txz: Upgraded. a/shadow-4.8-x86_64-1.txz: Upgraded. d/mercurial-5.2.1-x86_64-1.txz: Upgraded. l/mozilla-nss-3.48-x86_64-1.txz: Upgraded. Upgraded to nss-3.48 and nspr-4.24. l/ncurses-6.1_20191130-x86_64-1.txz: Upgraded. x/libglvnd-1.3.0-x86_64-1.txz: Upgraded. xap/xlockmore-5.60-x86_64-1.txz: Upgraded. extra/bash-completion/bash-completion-2.10-noarch-1.txz: Upgraded.
Diffstat (limited to 'source')
-rw-r--r--source/a/shadow/login.defs29
-rwxr-xr-xsource/a/shadow/shadow.SlackBuild25
-rw-r--r--source/installer/ChangeLog.txt6
-rwxr-xr-xsource/installer/build_installer.sh2
-rwxr-xr-xsource/installer/repack_installer.SlackBuild136
-rwxr-xr-xsource/l/mozilla-nss/mozilla-nss.SlackBuild6
-rwxr-xr-xsource/x/libglvnd/libglvnd.SlackBuild9
-rw-r--r--source/x/libglvnd/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch62
-rw-r--r--source/x/libglvnd/patches/6f52473dac08c44b081b792874b4ce73122096da.patch28
-rw-r--r--source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch245
-rwxr-xr-xsource/xap/xlockmore/xlockmore.SlackBuild7
-rw-r--r--source/xap/xlockmore/xlockmore.gltrackball_init.diff11
12 files changed, 208 insertions, 358 deletions
diff --git a/source/a/shadow/login.defs b/source/a/shadow/login.defs
index e52f91a5..0e137a35 100644
--- a/source/a/shadow/login.defs
+++ b/source/a/shadow/login.defs
@@ -30,6 +30,15 @@ LOG_OK_LOGINS no
LASTLOG_ENAB yes
#
+# Limit the highest user ID number for which the lastlog entries should
+# be updated.
+#
+# No LASTLOG_UID_MAX means that there is no user ID limit for writing
+# lastlog entries.
+#
+#LASTLOG_UID_MAX
+
+#
# Enable checking and display of mailbox status upon login.
#
# Disable if the shell startup files already check for mail
@@ -297,6 +306,7 @@ CHFN_RESTRICT frwh
# If set to MD5 , MD5-based algorithm will be used for encrypting password
# If set to SHA256, SHA256-based algorithm will be used for encrypting password
# If set to SHA512, SHA512-based algorithm will be used for encrypting password
+# If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password
# If set to DES, DES-based algorithm will be used for encrypting password (default)
# Overrides the MD5_CRYPT_ENAB option
#
@@ -315,8 +325,23 @@ ENCRYPT_METHOD SHA256
# If only one of the MIN or MAX values is set, then this value will be used.
# If MIN > MAX, the highest value will be used.
#
-# SHA_CRYPT_MIN_ROUNDS 5000
-# SHA_CRYPT_MAX_ROUNDS 5000
+#SHA_CRYPT_MIN_ROUNDS 5000
+#SHA_CRYPT_MAX_ROUNDS 5000
+
+#
+# Only works if ENCRYPT_METHOD is set to BCRYPT.
+#
+# Define the number of BCRYPT rounds.
+# With a lot of rounds, it is more difficult to brute-force the password.
+# However, more CPU resources will be needed to authenticate users if
+# this value is increased.
+#
+# If not specified, 13 rounds will be attempted.
+# If only one of the MIN or MAX values is set, then this value will be used.
+# If MIN > MAX, the highest value will be used.
+#
+#BCRYPT_MIN_ROUNDS 13
+#BCRYPT_MAX_ROUNDS 13
#
# List of groups to add to the user's supplementary group set
diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild
index b99ad869..fd184bb9 100755
--- a/source/a/shadow/shadow.SlackBuild
+++ b/source/a/shadow/shadow.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=shadow
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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
@@ -96,6 +96,8 @@ fi
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --sbindir=/usr/sbin \
+ --bindir=/usr/bin \
--sysconfdir=/etc \
--mandir=/usr/man \
--docdir=/usr/doc/shadow-$VERSION \
@@ -114,6 +116,19 @@ make install DESTDIR=$PKG || exit 1
zcat $CWD/useradd.gz > $PKG/etc/default/useradd
mv $PKG/etc/default/useradd $PKG/etc/default/useradd.new
+# Put some stuff back in "old" locations and make symlinks for compat
+mkdir -p $PKG/bin $PKG/sbin
+( cd $PKG/usr/bin
+ mv groups ../../bin
+ mv login ../../bin
+ mv su ../../bin
+ mv faillog ../sbin
+ mv lastlog ../sbin
+ ln -s ../sbin/faillog
+ ln -s ../sbin/lastlog
+)
+mv $PKG/usr/sbin/nologin $PKG/sbin/nologin
+
# /bin/groups is provided by coreutils.
rm -f $PKG/bin/groups
find $PKG -name groups.1 -exec rm {} \+
@@ -144,14 +159,6 @@ cp -a src/sulogin $PKG/sbin
mkdir -p $PKG/var/log
touch $PKG/var/log/faillog.new
-# Put some stuff back in "old" locations and make symlinks for compat
-( cd $PKG/usr/bin
- mv faillog ../sbin
- mv lastlog ../sbin
- ln -s ../sbin/faillog
- ln -s ../sbin/lastlog
-)
-
# Use 4711 rather than 4755 permissions where setuid root is required:
find $PKG -type f -perm 4755 -exec chmod 4711 "{}" \+
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 7e28004c..db57f3ef 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,9 @@
+Fri Dec 6 20:16:45 UTC 2019
+ repack_installer.SlackBuild: Added.
+ This repacks the installer from the tree found under
+ $TMP/build-slackware-installer, allowing changes to be made and tested.
+ build_installer.sh: Trivial typo fix - add a space in a comment.
++--------------------------+
Sat Nov 30 21:01:01 UTC 2019
Use $NUMJOBS with busybox make install.
+--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 30c289b8..e980207a 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1911,7 +1911,7 @@ sync
umount ${CWD}/usbmount
syslinux ${CWD}/usbboot.img
-#Clean up:
+# Clean up:
rm -rf ${CWD}/usbmount
}
diff --git a/source/installer/repack_installer.SlackBuild b/source/installer/repack_installer.SlackBuild
new file mode 100755
index 00000000..b8b2af91
--- /dev/null
+++ b/source/installer/repack_installer.SlackBuild
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+# This script repacks initrd.gz and usbboot.img from an existing tree in
+# $TMP/build-slackware-installer/package-slackware-installer/*-installer-filesystem
+# to allow making some changes to the installer files and then testing them.
+
+INSTALLERVERSION=${INSTALLERVERSION:-"15.0"}
+EFIBOOT=${EFIBOOT:-1}
+TMP=${TMP:-/tmp}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i586
+ SLACKROOT=${SLACKROOT:-/root/slackware-current}
+ OUTPUT=${OUTPUT:-$TMP/output-ia32-$(basename $(uname -r) -smp)}
+ ;;
+ x86_64) ARCH=x86_64
+ SLACKROOT=${SLACKROOT:-/root/slackware64-current}
+ OUTPUT=${OUTPUT:-$TMP/output-x86_64-$(uname -r)}
+ ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl
+ SLACKROOT=${SLACKROOT:-/root/slackware-current}
+ OUTPUT=${OUTPUT:-$TMP/output-arm-$(uname -r)}
+ ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m)
+ SLACKROOT=${SLACKROOT:-/root/slackware-current}
+ OUTPUT=${OUTPUT:-$TMP/output-$(uname -m)-$(uname -r)}
+ ;;
+ esac
+ export ARCH
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+mkdir -p $OUTPUT
+( cd $TMP/build-slackware-installer/package-slackware-installer/*-installer-filesystem
+ # CREATE INITRD.GZ:
+ # Determine the size of the installer:
+ echo " Installer size (uncompressed): $( du -sh . )"
+ find . | cpio -o -H newc | xz -9fv -C crc32 > $OUTPUT/initrd.img
+ echo " New installer image is ${OUTPUT}/initrd.img"
+
+ # CREATE USBBOOT.IMG:
+ # Like initrd.img, the usbboot.img will be created in the current directory
+ echo "--- Creating an image for the USB boot disk ---"
+
+ # Calculate sizes:
+ let USBIMG=$( LC_ALL=C du -ck ${OUTPUT}/initrd*.img | grep total | cut -f1 )
+ for KERN in ${SLACKROOT}/kernels/*.?/*zImage ; do
+ let USBIMG=USBIMG+$( LC_ALL=C du -sk $KERN | cut -f1 )
+ done
+ let USBIMG=USBIMG+777 # Add just that little extra...
+
+ if [ $EFIBOOT -eq 1 ]; then
+ # A bit more extra space since elilo will be added...
+ let USBIMG=USBIMG+256
+ fi
+
+ # Generate a pxelinux.cfg/default file (used for usbboot.img too)
+ cat ${SLACKROOT}/isolinux/isolinux.cfg \
+ | sed -e "s#/kernels/#kernels/#" > ${OUTPUT}/pxelinux.cfg_default
+
+ # Create a DOS formatted image file
+ if $(which mkfs.msdos 1>/dev/null 2>&1) ; then
+ MKDOS=mkfs.msdos
+ else
+ MKDOS=mkdosfs
+ fi
+ rm -f ${OUTPUT}/usbboot.img
+ ${MKDOS} -n USBSLACK -F 16 -C ${OUTPUT}/usbboot.img $USBIMG || exit 1
+ file ${OUTPUT}/usbboot.img
+
+ # Copy all relevant files into the image.
+ rm -rf ${OUTPUT}/usbmount
+ mkdir -p -m700 ${OUTPUT}/usbmount
+ mount -o loop,rw ${OUTPUT}/usbboot.img ${OUTPUT}/usbmount
+ echo "--- Copying data to the USB boot disk image: ---"
+ cp $SLACKROOT/isolinux/setpkg ${OUTPUT}/usbmount/
+ cp $SLACKROOT/isolinux/{f*.txt,message.txt} ${OUTPUT}/usbmount/
+ cp ${OUTPUT}/initrd*.img ${OUTPUT}/usbmount/
+ cat ${OUTPUT}/pxelinux.cfg_default |sed -e 's# kernels/# #g' -e 's#/.zImage##' \
+ -e 's#/memtest##' \
+ > ${OUTPUT}/usbmount/syslinux.cfg
+
+ # Add EFI support:
+ if [ $EFIBOOT -eq 1 ]; then
+ cp -a ${SLACKROOT}/source/installer/sources/efi.${ARCH}/* ${OUTPUT}/usbmount
+ # Make sure the Slackware and kernel version in message.txt are up to date:
+ cat ${SLACKROOT}/source/installer/sources/efi.${ARCH}/EFI/BOOT/message.txt | sed "s/version.*/version ${INSTALLERVERSION} \(Linux kernel $(uname -r | cut -f 1 -d -)\)\!/g" > ${OUTPUT}/usbmount/EFI/BOOT/message.txt
+ fi
+
+ # Older syslinux can not cope with subdirectories - let's just be safe:
+ echo "--- Making the usbboot image bootable: ---"
+ (
+ cd $SLACKROOT/kernels/
+ for dir in `find -type d -name "*.?" -maxdepth 1` ; do
+ cp $dir/*zImage ${OUTPUT}/usbmount/$dir
+ done
+ cp $SLACKROOT/kernels/memtest/memtest ${OUTPUT}/usbmount/memtest
+ )
+ sync
+
+ # Stamp the file with the syslinux bootloader:
+ # > Do "vi ~/.mtoolsrc" to add "mtools_skip_check=1",
+ # > if the next command gives an error:
+ umount ${OUTPUT}/usbmount
+ syslinux ${OUTPUT}/usbboot.img
+
+ # Clean up:
+ rm -rf ${OUTPUT}/usbmount
+
+)
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index df9e11e3..473a42d4 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright 2005, 2006, 2008, 2009, 2010, 2012 Eric Hameleers, Eindhoven, NL
-# Copyright 2013, 2014, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2013, 2014, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-nss
SRCNAM=nss
-VERSION=${VERSION:-3.47.1}
-NSPR=${NSPR:-4.23}
+VERSION=${VERSION:-3.48}
+NSPR=${NSPR:-4.24}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
diff --git a/source/x/libglvnd/libglvnd.SlackBuild b/source/x/libglvnd/libglvnd.SlackBuild
index 5386bd9d..ef5d65dd 100755
--- a/source/x/libglvnd/libglvnd.SlackBuild
+++ b/source/x/libglvnd/libglvnd.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libglvnd
VERSION=${VERSION:-$(echo libglvnd-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -73,15 +73,12 @@ cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
# Fix headers:
-zcat $CWD/patches/6f52473dac08c44b081b792874b4ce73122096da.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/patches/193.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/update-gl-h-to-match-mesa.patch.gz | patch -p1 --verbose || exit 1
if [ ! -r configure ]; then
NOCONFIGURE=1 ./autogen.sh
diff --git a/source/x/libglvnd/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch b/source/x/libglvnd/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch
deleted file mode 100644
index 4d8f2bba..00000000
--- a/source/x/libglvnd/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 51233cc52cbcbe25f8461830913c06f5b5bc9508 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 17 Oct 2019 11:51:37 -0400
-Subject: [PATCH] egl: Sync with Khronos
-
- commit de3a5e867d906a04a5c37ee0d89e7f01d3598eb9
- Author: Ken Russell <kbrussel@alum.mit.edu>
- Date: Sat Oct 12 05:44:43 2019 -0700
-
- Reserve enums 0x34A0..0x34AF for ANGLE project. (#93)
-
-Closes: https://gitlab.freedesktop.org/glvnd/libglvnd/issues/193
----
- include/EGL/eglplatform.h | 6 ++++++
- src/generate/xml/egl.xml | 7 +++++--
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
-index 29ab288..5ab49c1 100644
---- a/include/EGL/eglplatform.h
-+++ b/include/EGL/eglplatform.h
-@@ -116,6 +116,12 @@ typedef intptr_t EGLNativeDisplayType;
- typedef intptr_t EGLNativePixmapType;
- typedef intptr_t EGLNativeWindowType;
-
-+#elif defined(__unix__) && defined(EGL_NO_X11)
-+
-+typedef void *EGLNativeDisplayType;
-+typedef khronos_uintptr_t EGLNativePixmapType;
-+typedef khronos_uintptr_t EGLNativeWindowType;
-+
- #elif defined(__unix__) || defined(USE_X11)
-
- /* X11 (tentative) */
-diff --git a/src/generate/xml/egl.xml b/src/generate/xml/egl.xml
-index c27f172..6bc2ea2 100644
---- a/src/generate/xml/egl.xml
-+++ b/src/generate/xml/egl.xml
-@@ -1002,6 +1002,9 @@
- <enum value="0x3490" name="EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT"/>
- <unused start="0x3491" end="0x349F"/>
- </enums>
-+ <enums namespace="EGL" start="0x34A0" end="0x34AF" vendor="ANGLE" comment="Reserved for Ken Russell - ANGLE (via github pull request)">
-+ <unused start="0x34A0" end="0x34AF"/>
-+ </enums>
-
- <!-- Please remember that new enumerant allocations must be obtained by
- request to the Khronos API registrar (see comments at the top of this
-@@ -1012,8 +1015,8 @@
-
- <!-- Reservable for future use. To generate a new range, allocate multiples
- of 16 starting at the lowest available point in this block. -->
-- <enums namespace="EGL" start="0x34A0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
-- <unused start="0x34A0" end="0x3FFF"/>
-+ <enums namespace="EGL" start="0x34B0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
-+ <unused start="0x34B0" end="0x3FFF"/>
- </enums>
-
- <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
---
-2.22.0
-
diff --git a/source/x/libglvnd/patches/6f52473dac08c44b081b792874b4ce73122096da.patch b/source/x/libglvnd/patches/6f52473dac08c44b081b792874b4ce73122096da.patch
deleted file mode 100644
index a11f7742..00000000
--- a/source/x/libglvnd/patches/6f52473dac08c44b081b792874b4ce73122096da.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6f52473dac08c44b081b792874b4ce73122096da Mon Sep 17 00:00:00 2001
-From: Eric Engestrom <eric@engestrom.ch>
-Date: Mon, 30 Sep 2019 16:06:42 +0100
-Subject: [PATCH] include: install GL headers when GL is enabled
-
-A typo made it depend on EGL instead.
-
-Fixes: ab9b5fcc3bf90064418f ("Install the GL/GLES/GLX/EGL header files.")
----
- include/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/Makefile.am b/include/Makefile.am
-index 1e33d2d..3d81d17 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -39,7 +39,7 @@ EGL_HEADER_FILES = \
- EGL/eglext.h \
- EGL/eglplatform.h
-
--if ENABLE_EGL_HEADERS
-+if ENABLE_GL_HEADERS
- nobase_include_HEADERS += $(GL_HEADER_FILES)
- else
- noinst_HEADERS += $(GL_HEADER_FILES)
---
-2.22.0
-
diff --git a/source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch b/source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch
deleted file mode 100644
index 9e1f26a6..00000000
--- a/source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From 5dfdc5a6dc60a3bdc63cd4510dabacba388da13a Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman <kbrenneman@nvidia.com>
-Date: Tue, 22 Oct 2019 16:46:09 -0600
-Subject: [PATCH] Update GL/gl.h to match Mesa.
-
-Updated GL/gl.h to match the copy from Mesa at commit
-a0829cf23b307ca44ab8c4505974fb7c8d71a35a.
----
- include/GL/gl.h | 147 ++++++------------------------------------------
- 1 file changed, 17 insertions(+), 130 deletions(-)
-
-diff --git a/include/GL/gl.h b/include/GL/gl.h
-index 3f8cb62..2518dfb 100644
---- a/include/GL/gl.h
-+++ b/include/GL/gl.h
-@@ -27,40 +27,24 @@
- #ifndef __gl_h_
- #define __gl_h_
-
--#if defined(USE_MGL_NAMESPACE)
--#include "gl_mangle.h"
--#endif
--
--
- /**********************************************************************
-- * Begin system-specific stuff. Do not do any of this when building
-- * for SciTech SNAP, as this is all done before this header file is
-- * included.
-+ * Begin system-specific stuff.
- */
--#if !defined(__SCITECH_SNAP__)
--
--#if defined(__BEOS__)
--#include <stdlib.h> /* to get some BeOS-isms */
--#endif
--
--#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
--#define OPENSTEP
--#endif
-
- #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
- #define __WIN32__
- #endif
-
--#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
-+#if defined(__WIN32__) && !defined(__CYGWIN__)
- # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
- # define GLAPI __declspec(dllexport)
- # elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
- # define GLAPI __declspec(dllimport)
- # else /* for use with static link lib build of Win32 edition only */
- # define GLAPI extern
--# endif /* _STATIC_MESA support */
-+# endif
- # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
--# define GLAPIENTRY
-+# define GLAPIENTRY
- # else
- # define GLAPIENTRY __stdcall
- # endif
-@@ -72,10 +56,6 @@
- # define GLAPIENTRY
- #endif /* WIN32 && !CYGWIN */
-
--#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
--# define PRAGMA_EXPORT_SUPPORTED 1
--#endif
--
- /*
- * WINDOWS: Include windows.h here to define APIENTRY.
- * It is also useful when applications include this file by
-@@ -91,10 +71,6 @@
- #include <windows.h>
- #endif
-
--#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
--#pragma import on
--#endif
--
- #ifndef GLAPI
- #define GLAPI extern
- #endif
-@@ -116,15 +92,6 @@
- #define GLAPIENTRYP GLAPIENTRY *
- #endif
-
--#ifdef CENTERLINE_CLPP
--#define signed
--#endif
--
--#if defined(PRAGMA_EXPORT_SUPPORTED)
--#pragma export on
--#endif
--
--#endif /* !__SCITECH_SNAP__ */
- /*
- * End system-specific stuff.
- **********************************************************************/
-@@ -718,7 +685,7 @@ typedef double GLclampd; /* double precision float in [0,1] */
- #define GL_LIST_BIT 0x00020000
- #define GL_TEXTURE_BIT 0x00040000
- #define GL_SCISSOR_BIT 0x00080000
--#define GL_ALL_ATTRIB_BITS 0x000FFFFF
-+#define GL_ALL_ATTRIB_BITS 0xFFFFFFFF
-
-
- /* OpenGL 1.1 */
-@@ -1738,6 +1705,7 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
-
-
-
-+
- /*
- * OpenGL 1.3
- */
-@@ -2085,26 +2053,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh
-
-
-
--#if GL_ARB_shader_objects
--
--#ifndef GL_MESA_shader_debug
--#define GL_MESA_shader_debug 1
--
--#define GL_DEBUG_OBJECT_MESA 0x8759
--#define GL_DEBUG_PRINT_MESA 0x875A
--#define GL_DEBUG_ASSERT_MESA 0x875B
--
--GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
--GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
--GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
-- GLsizei *length, GLcharARB *debugLog);
--GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
--
--#endif /* GL_MESA_shader_debug */
--
--#endif /* GL_ARB_shader_objects */
--
--
- /*
- * ???. GL_MESA_packed_depth_stencil
- * XXX obsolete
-@@ -2121,60 +2069,6 @@ GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logTyp
- #endif /* GL_MESA_packed_depth_stencil */
-
-
--#ifndef GL_MESA_program_debug
--#define GL_MESA_program_debug 1
--
--#define GL_FRAGMENT_PROGRAM_POSITION_MESA 0x8bb0
--#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA 0x8bb1
--#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA 0x8bb2
--#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA 0x8bb3
--#define GL_VERTEX_PROGRAM_POSITION_MESA 0x8bb4
--#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8bb5
--#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8bb6
--#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8bb7
--
--typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
--
--GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
--
--GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
--
--#endif /* GL_MESA_program_debug */
--
--
--#ifndef GL_MESA_texture_array
--#define GL_MESA_texture_array 1
--
--/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array.
-- */
--#ifndef GL_EXT_texture_array
--
--#ifdef GL_GLEXT_PROTOTYPES
--GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target,
-- GLenum attachment, GLuint texture, GLint level, GLint layer);
--#endif /* GL_GLEXT_PROTOTYPES */
--
--#if 0
--/* (temporarily) disabled because of collision with typedef in glext.h
-- * that happens if apps include both gl.h and glext.h
-- */
--typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target,
-- GLenum attachment, GLuint texture, GLint level, GLint layer);
--#endif
--
--#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18
--#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19
--#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
--#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B
--#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C
--#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
--#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
--#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
--#endif
--
--#endif
--
--
- #ifndef GL_ATI_blend_equation_separate
- #define GL_ATI_blend_equation_separate 1
-
-@@ -2186,27 +2080,20 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen
- #endif /* GL_ATI_blend_equation_separate */
-
-
--/**
-- ** NOTE!!!!! If you add new functions to this file, or update
-- ** glext.h be sure to regenerate the gl_mangle.h file. See comments
-- ** in that file for details.
-- **/
--
--
--
--/**********************************************************************
-- * Begin system-specific stuff
-- */
--#if defined(PRAGMA_EXPORT_SUPPORTED)
--#pragma export off
-+/* GL_OES_EGL_image */
-+#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage)
-+typedef void* GLeglImageOES;
- #endif
-
--#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
--#pragma import off
-+#ifndef GL_OES_EGL_image
-+#define GL_OES_EGL_image 1
-+#ifdef GL_GLEXT_PROTOTYPES
-+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
-+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
-+#endif
-+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
- #endif
--/*
-- * End system-specific stuff
-- **********************************************************************/
-
-
- #ifdef __cplusplus
---
-2.22.0
-
diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild
index ef6d12c7..e92b19dc 100755
--- a/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/source/xap/xlockmore/xlockmore.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xlockmore
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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
@@ -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 a trivial coding bug in 5.60:
+zcat $CWD/xlockmore.gltrackball_init.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
zcat $CWD/xlockmore.bitmap.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
mkdir -p $PKG/usr/include/X11/bitmaps
cp $CWD/l-bob.xbm $PKG/usr/include/X11/bitmaps
diff --git a/source/xap/xlockmore/xlockmore.gltrackball_init.diff b/source/xap/xlockmore/xlockmore.gltrackball_init.diff
new file mode 100644
index 00000000..8aed3ae6
--- /dev/null
+++ b/source/xap/xlockmore/xlockmore.gltrackball_init.diff
@@ -0,0 +1,11 @@
+--- ./modes/glx/juggler3d.c.orig 2019-09-11 00:06:52.000000000 -0500
++++ ./modes/glx/juggler3d.c 2019-12-06 15:03:43.465002755 -0600
+@@ -2729,7 +2729,7 @@
+ double spin_accel = 0.05;
+ sp->rot = make_rotator (0, spin_speed, 0,
+ spin_accel, wander_speed, False);
+- sp->trackball = gltrackball_init ();
++ sp->trackball = gltrackball_init ( 0 );
+ }
+
+ if (only && *only && strcmp(only, " ")) {