summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/n/conntrack-tools/conntrack-tools.SlackBuild2
-rw-r--r--source/n/conntrack-tools/conntrack-tools.url2
-rw-r--r--source/n/postfix/linux-6.patch24
-rwxr-xr-xsource/n/postfix/postfix.SlackBuild5
-rwxr-xr-xsource/x/freeglut/freeglut.SlackBuild29
-rw-r--r--source/x/x11/build/fstobdf2
6 files changed, 50 insertions, 14 deletions
diff --git a/source/n/conntrack-tools/conntrack-tools.SlackBuild b/source/n/conntrack-tools/conntrack-tools.SlackBuild
index e20be8f43..566567d27 100755
--- a/source/n/conntrack-tools/conntrack-tools.SlackBuild
+++ b/source/n/conntrack-tools/conntrack-tools.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=conntrack-tools
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/n/conntrack-tools/conntrack-tools.url b/source/n/conntrack-tools/conntrack-tools.url
index 688ac4be8..07cbc16e5 100644
--- a/source/n/conntrack-tools/conntrack-tools.url
+++ b/source/n/conntrack-tools/conntrack-tools.url
@@ -1 +1 @@
-ftp://ftp.netfilter.org/pub/conntrack-tools
+https://netfilter.org/projects/conntrack-tools/files
diff --git a/source/n/postfix/linux-6.patch b/source/n/postfix/linux-6.patch
new file mode 100644
index 000000000..19e73dc34
--- /dev/null
+++ b/source/n/postfix/linux-6.patch
@@ -0,0 +1,24 @@
+--- a/makedefs 2022-01-23 21:53:41.000000000 +0100
++++ b/makedefs 2022-09-07 19:07:02.000000000 +0200
+@@ -627,7 +627,8 @@
+ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+ : ${PLUGIN_LD="${CC-gcc} -shared"}
+ ;;
+- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR
++ Linux.[3456].*)
++ SYSTYPE=LINUX$RELEASE_MAJOR
+ case "$CCARGS" in
+ *-DNO_DB*) ;;
+ *-DHAS_DB*) ;;
+--- a/src/util/sys_defs.h 2021-12-05 19:59:27.000000000 +0100
++++ b/src/util/sys_defs.h 2022-09-07 19:09:09.000000000 +0200
+@@ -751,7 +751,8 @@
+ /*
+ * LINUX.
+ */
+-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5)
++#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) \
++ || defined(LINUX6)
+ #define SUPPORTED
+ #define UINT32_TYPE unsigned int
+ #define UINT16_TYPE unsigned short
diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild
index b3cbf888e..8c5a4c3ef 100755
--- a/source/n/postfix/postfix.SlackBuild
+++ b/source/n/postfix/postfix.SlackBuild
@@ -2,7 +2,7 @@
#
# Copyright 2006, 2011 Alan Hicks, Lizella, GA
# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017 Mario Preksavec, Zagreb, Croatia
-# Copyright 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2017, 2018, 2020, 2022 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -102,6 +102,9 @@ zcat $CWD/postfix.only.warn.regular.files.diff.gz | patch -p1 --verbose || exit
# Make the postfix startup message look more like the other boot notices:
zcat $CWD/postfix.script.starting.message.diff.gz | patch -p1 --verbose || exit 1
+# Support the Linux 6.x kernel:
+zcat $CWD/linux-6.patch.gz | patch -p1 --verbose || exit 1
+
# Postfix does not use a ./configure script (no GNU autoconf)
#
# The AUXLIBS variable is for dynamic library linking, which as of this
diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild
index 5b8d89213..4de47d9fb 100755
--- a/source/x/freeglut/freeglut.SlackBuild
+++ b/source/x/freeglut/freeglut.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2012 Robby Workman, Northport, Alabama, USA
-# Copyright 2016, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2018, 2019, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -79,15 +79,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
-cp -a \
- AUTHORS COPYING* INSTALL NEWS README TODO \
- $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html
-find $PKG/usr/doc -type f -exec chmod 0644 {} \+
-# In case this is empty:
-rmdir $PKG/usr/doc/$PKGNAM-$VERSION/html 2> /dev/null
-
mkdir -p build
cd build
CFLAGS="$SLKCFLAGS" \
@@ -121,6 +112,24 @@ make install DESTDIR=$PKG || exit 1
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cd ..
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
+cp -a \
+ AUTHORS* COPYING* ChangeLog INSTALL* NEWS* README* TODO* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html
+find $PKG/usr/doc -type f -exec chmod 0644 {} \+
+# In case this is empty:
+rmdir $PKG/usr/doc/$PKGNAM-$VERSION/html 2> /dev/null
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/x/x11/build/fstobdf b/source/x/x11/build/fstobdf
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/fstobdf
+++ b/source/x/x11/build/fstobdf
@@ -1 +1 @@
-5
+1