diff options
Diffstat (limited to 'source')
374 files changed, 10922 insertions, 2262 deletions
diff --git a/source/a/bcachefs-tools/bcachefs-tools-1.7.0.tar.zst b/source/a/bcachefs-tools/bcachefs-tools-1.7.0.tar.zst Binary files differnew file mode 100644 index 000000000..b683b226b --- /dev/null +++ b/source/a/bcachefs-tools/bcachefs-tools-1.7.0.tar.zst diff --git a/source/a/bcachefs-tools/bcachefs-tools.SlackBuild b/source/a/bcachefs-tools/bcachefs-tools.SlackBuild new file mode 100755 index 000000000..5eaabd8d0 --- /dev/null +++ b/source/a/bcachefs-tools/bcachefs-tools.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/bash + +# Copyright 2024 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) + +PKGNAM=bcachefs-tools +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.zst | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.zst || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Let's not draw this dep in right now: +# BCACHEFS_FUSE=1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ + make $NUMJOBS \ + PREFIX=/usr \ + LIBEXECDIR=/usr/lib${LIBDIRSUFFIX} \ + ROOT_SBINDIR=/sbin \ + INITRAMFS_DIR=/etc/junk \ + DESTDIR=$PKG \ + install || exit 1 + +# Remove junk: +rm -rf $PKG/etc + +# No option, so relocate: +mv $PKG/usr/share/man $PKG/usr +rmdir $PKG/usr/share + +# Install completions: +mkdir -p $PKG/usr/share/bash-completion/completions +$PKG/sbin/bcachefs completions bash > $PKG/usr/share/bash-completion/completions/bcachefs +mkdir -p $PKG/usr/share/zsh/site-functions +$PKG/sbin/bcachefs completions zsh > $PKG/usr/share/zsh/site-functions/_bcachefs + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + COPYING* INSTALL* README* \ + doc/bcachefs-principles-of-operation.tex \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/bcachefs-tools/bcachefs-tools.url b/source/a/bcachefs-tools/bcachefs-tools.url new file mode 100644 index 000000000..42c0def89 --- /dev/null +++ b/source/a/bcachefs-tools/bcachefs-tools.url @@ -0,0 +1 @@ +https://evilpiepirate.org/bcachefs-tools/ diff --git a/source/a/bcachefs-tools/slack-desc b/source/a/bcachefs-tools/slack-desc new file mode 100644 index 000000000..6d78e799a --- /dev/null +++ b/source/a/bcachefs-tools/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +bcachefs-tools: bcachefs-tools (tools for bcachefs filesystem) +bcachefs-tools: +bcachefs-tools: Bcachefs is an advanced new filesystem for Linux, with an emphasis on +bcachefs-tools: reliability and robustness and the complete set of features one would +bcachefs-tools: expect from a modern filesystem. +bcachefs-tools: +bcachefs-tools: This package contains the bcachefs tool, {mkfs,mount,fsck}.bcachefs +bcachefs-tools: wrappers that call the bcachefs tool, and documentation. +bcachefs-tools: +bcachefs-tools: Homepage: https://bcachefs.org +bcachefs-tools: diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index 4805aa315..560948fe4 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -76,6 +76,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + # Don't use icecream: PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index 0e58d8032..e39559fc1 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:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -102,6 +102,7 @@ CFLAGS="$SLKCFLAGS" \ --includedir=/usr/include \ --datadir=/usr/share \ --datarootdir=/usr/share \ + --libexecdir=/usr/libexec \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/e2fsprogs-$VERSION \ diff --git a/source/a/elvis/elvis.SlackBuild b/source/a/elvis/elvis.SlackBuild index fe2817d3b..b3bd8261d 100755 --- a/source/a/elvis/elvis.SlackBuild +++ b/source/a/elvis/elvis.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=elvis VERSION=2.2_0 -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/etc/_etc/etc/profile.new b/source/a/etc/_etc/etc/profile.new index 9cfc74aa0..73a6c9993 100644 --- a/source/a/etc/_etc/etc/profile.new +++ b/source/a/etc/_etc/etc/profile.new @@ -4,15 +4,6 @@ # Set the values for some environment variables: export MINICOM="-c on" export HOSTNAME="`cat /etc/HOSTNAME`" -export LESSOPEN="|lesspipe.sh %s" -# Setting a default $LESS was something inherited from SLS many years ago, -# but apparently the previous setting of "-M" causes display issues with -# some programs (i.e. git log). Adding "-R" as well fixes this, but some -# folks have concerns about the security of this option (I think it's -# actually "-r" that's the dangerous one). Anyway, it might be best to just -# leave this unset by default. Uncomment it if you like, or set up your -# own definition or aliases on a per-account basis. -#export LESS="-M -R" # If the user doesn't have a .inputrc, use the one in /etc. if [ ! -r "$HOME/.inputrc" ]; then @@ -63,7 +54,7 @@ else PS1='\u@\h:\w\$ ' fi PS2='> ' -export PATH DISPLAY LESS TERM PS1 PS2 +export PATH DISPLAY TERM PS1 PS2 # Default umask. A umask of 022 prevents new files from being created group # and world writable. diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild index f958d7628..82526efd0 100755 --- a/source/a/etc/etc.SlackBuild +++ b/source/a/etc/etc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=etc VERSION=15.1 -BUILD=${BUILD:-11} +BUILD=${BUILD:-12} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild index 80bcbdc94..871db6be2 100755 --- a/source/a/gettext/gettext-tools.SlackBuild +++ b/source/a/gettext/gettext-tools.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gettext-tools VERSION=0.22.5 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild index 77aeee327..b82d7b124 100755 --- a/source/a/gettext/gettext.SlackBuild +++ b/source/a/gettext/gettext.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gettext VERSION=0.22.5 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/a/gptfdisk/gptfdisk.SlackBuild b/source/a/gptfdisk/gptfdisk.SlackBuild index fd62b7f2f..b284da19c 100755 --- a/source/a/gptfdisk/gptfdisk.SlackBuild +++ b/source/a/gptfdisk/gptfdisk.SlackBuild @@ -79,6 +79,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +sed -i "s|ncursesw/ncurses.h|ncurses.h|g" gptcurses.cc + export LDFLAGS="$SLKLDFLAGS" export CXXFLAGS="$SLKCFLAGS" export CFLAGS="$SLKCFLAGS" diff --git a/source/a/infozip/infozip.SlackBuild b/source/a/infozip/infozip.SlackBuild index 29b89255d..9a63d9ea4 100755 --- a/source/a/infozip/infozip.SlackBuild +++ b/source/a/infozip/infozip.SlackBuild @@ -63,6 +63,8 @@ zcat $CWD/zip-patches/zip-3.0-time.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/zip-patches/man.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/zip-patches/zip-3.0-format-security.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/zip-patches/zipnote.patch.gz | patch -p1 --verbose || exit 1 +# GCC 14 fix: +zcat $CWD/zip-patches/zip.gnu89.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . mkdir -p $PKG/usr/doc/zip-$ZIP @@ -112,6 +114,8 @@ zcat $CWD/unzip-patches/unzip-6.0-timestamp.patch.gz | patch -p1 --verbose || ex zcat $CWD/unzip-patches/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/unzip-patches/unzip-6.0-cve-2018-18384.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/unzip-patches/unzip-6.0-COVSCAN-fix-unterminated-string.patch.gz | patch -p1 --verbose || exit 1 +# GCC 14 fix: +zcat $CWD/unzip-patches/unzip.gnu89.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . mkdir -p $PKG/usr/doc/unzip-$VERSION @@ -120,7 +124,7 @@ cp -a BUGS COPYING* Contents History.* INSTALL LICENSE README ToDo WHERE \ chmod 644 $PKG/usr/doc/unzip-$VERSION/* # -DNO_LCHMOD because Linux systems do not have lchmod() # -DNOMEMCPY is slower, but prevents file corruption -make -f unix/Makefile generic LOCAL_UNZIP="-DIZ_HAVE_UXUIDGID -DNOMEMCPY -DNO_LCHMOD" || exit 1 +make -f unix/Makefile generic_gcc LOCAL_UNZIP="-DIZ_HAVE_UXUIDGID -DNOMEMCPY -DNO_LCHMOD" || exit 1 cat unzip > $PKG/usr/bin/unzip cat unzipsfx > $PKG/usr/bin/unzipsfx cat funzip > $PKG/usr/bin/funzip diff --git a/source/a/infozip/unzip-patches/unzip.gnu89.diff b/source/a/infozip/unzip-patches/unzip.gnu89.diff new file mode 100644 index 000000000..7bbb05031 --- /dev/null +++ b/source/a/infozip/unzip-patches/unzip.gnu89.diff @@ -0,0 +1,11 @@ +--- ./unix/Makefile.orig 2009-01-18 16:41:18.000000000 -0600 ++++ ./unix/Makefile 2024-05-11 12:50:37.503835132 -0500 +@@ -545,7 +545,7 @@ + # make $(MAKEF) unzips CF="${CF} `cat flags`" + + generic_gcc: +- $(MAKE) $(MAKEF) generic CC=gcc IZ_BZIP2="$(IZ_BZIP2)" ++ $(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" IZ_BZIP2="$(IZ_BZIP2)" + + # extensions to perform SVR4 package-creation after compilation + generic_pkg: generic svr4package diff --git a/source/a/infozip/zip-patches/zip.gnu89.diff b/source/a/infozip/zip-patches/zip.gnu89.diff new file mode 100644 index 000000000..58e5f0436 --- /dev/null +++ b/source/a/infozip/zip-patches/zip.gnu89.diff @@ -0,0 +1,11 @@ +--- ./unix/Makefile.orig 2024-05-11 12:47:26.628830862 -0500 ++++ ./unix/Makefile 2024-05-11 12:48:43.705832586 -0500 +@@ -202,7 +202,7 @@ + eval $(MAKE) $(MAKEF) zips `cat flags` + + generic_gcc: +- $(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E" ++ $(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" CPP="gcc -E" + + # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes): + att6300nodir: diff --git a/source/a/iniparser/iniparser.SlackBuild b/source/a/iniparser/iniparser.SlackBuild index f4861c874..9f295e869 100755 --- a/source/a/iniparser/iniparser.SlackBuild +++ b/source/a/iniparser/iniparser.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2022, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -85,15 +85,22 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# This is an easy one ;-) -make - -# Install: -mkdir -p $PKG/usr/include -cp -a src/iniparser.h src/dictionary.h $PKG/usr/include -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} -cp -a libiniparser.so.1 $PKG/usr/lib${LIBDIRSUFFIX} -ln -sf libiniparser.so.1 $PKG/usr/lib${LIBDIRSUFFIX}/libiniparser.so +# Configure, build, and install: +mkdir cmake-build +cd cmake-build + cmake \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="$LIBDIRSUFFIX" \ + -DDOC_INSTALL_DIR="doc" \ + -DMAN_INSTALL_DIR=/usr/man \ + -DBUILD_DOCS=OFF \ + -DBUILD_STATIC_LIBS=OFF \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/less/007521ac3c95bc76.patch b/source/a/less/007521ac3c95bc76.patch deleted file mode 100644 index 663f222c0..000000000 --- a/source/a/less/007521ac3c95bc76.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 007521ac3c95bc76e3d59c6dbfe75d06c8075c33 Mon Sep 17 00:00:00 2001 -From: Mark Nudelman <markn@greenwoodsoftware.com> -Date: Thu, 11 Apr 2024 17:49:48 -0700 -Subject: [PATCH] Fix bug when viewing a file whose name contains a newline. - ---- - filename.c | 31 +++++++++++++++++++++++++------ - 1 file changed, 25 insertions(+), 6 deletions(-) - -diff --git a/filename.c b/filename.c -index f90e0e82..a52c6354 100644 ---- a/filename.c -+++ b/filename.c -@@ -127,11 +127,20 @@ static constant char * metachars(void) - /* - * Is this a shell metacharacter? - */ --static int metachar(char c) -+static lbool metachar(char c) - { - return (strchr(metachars(), c) != NULL); - } - -+/* -+ * Must use quotes rather than escape char for this metachar? -+ */ -+static lbool must_quote(char c) -+{ -+ /* {{ Maybe the set of must_quote chars should be configurable? }} */ -+ return (c == '\n'); -+} -+ - /* - * Insert a backslash before each metacharacter in a string. - */ -@@ -164,6 +173,9 @@ public char * shell_quoten(constant char *s, size_t slen) - * doesn't support escape chars. Use quotes. - */ - use_quotes = TRUE; -+ } else if (must_quote(*p)) -+ { -+ len += 3; /* open quote + char + close quote */ - } else - { - /* -@@ -194,15 +206,22 @@ public char * shell_quoten(constant char *s, size_t slen) - constant char *es = s + slen; - while (s < es) - { -- if (metachar(*s)) -+ if (!metachar(*s)) - { -- /* -- * Add the escape char. -- */ -+ *np++ = *s++; -+ } else if (must_quote(*s)) -+ { -+ /* Surround the char with quotes. */ -+ *np++ = openquote; -+ *np++ = *s++; -+ *np++ = closequote; -+ } else -+ { -+ /* Insert an escape char before the char. */ - strcpy(np, esc); - np += esclen; -+ *np++ = *s++; - } -- *np++ = *s++; - } - *np = '\0'; - } diff --git a/source/a/less/doinst.sh b/source/a/less/doinst.sh new file mode 100644 index 000000000..8fca10a6f --- /dev/null +++ b/source/a/less/doinst.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +config() { + NEW="$1" + OLD="`dirname $NEW`/`basename $NEW .new`" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/profile.d/less.csh.new +config etc/profile.d/less.sh.new + diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild index b4ea88c72..436eb912a 100755 --- a/source/a/less/less.SlackBuild +++ b/source/a/less/less.SlackBuild @@ -24,7 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=less VERSION=${VERSION:-$(echo less-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +LESSPIPEVER=$(echo lesspipe-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -85,9 +86,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# newline in filenames patch for CVE-2024-32487: -cat $CWD/007521ac3c95bc76.patch | patch -p1 --verbose || exit 1 - if [ ! -r configure ]; then if [ -x ./autogen.sh ]; then NOCONFIGURE=1 ./autogen.sh @@ -112,8 +110,47 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -zcat $CWD/lesspipe.sh.gz > $PKG/usr/bin/lesspipe.sh -chmod 755 $PKG/usr/bin/lesspipe.sh +mkdir -p $PKG/usr/man/man1 +for page in less.nro lesskey.nro ; do + cat $page > $PKG/usr/man/man1/`basename $page .nro`.1 +done + +mkdir -p $PKG/usr/doc/less-$VERSION +cp -a \ + COPYING* LICENSE README NEWS \ + $PKG/usr/doc/less-$VERSION + +# Install lesspipe.sh etc: +cd $TMP +rm -r lesspipe-$LESSPIPEVER +tar xf $CWD/lesspipe-${LESSPIPEVER}.tar.?z || exit 1 +cd lesspipe-${LESSPIPEVER} +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ +# Don't use special handling for .log files: +cat $CWD/lesspipe.log.patch | patch -p1 --verbose || exit 1 +./configure --prefix=/usr || exit 1 +make +make install DESTDIR=$PKG +mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1 +rmdir $PKG/usr/share/man/man1 $PKG/usr/share/man +# wrong directory: +mkdir -p $PKG/usr/share/bash-completion/completions +mv $PKG/usr/share/bash-completion/less_completion $PKG/usr/share/bash-completion/completions/less +mkdir -p $PKG/usr/doc/lesspipe-${LESSPIPEVER} +cp -a COPYING* ChangeLog* INSTALL* README* \ + $PKG/usr/doc/lesspipe-${LESSPIPEVER} + +# Install profile scripts: +mkdir -p $PKG/etc/profile.d +cp -a $CWD/less.csh $PKG/etc/profile.d/less.csh.new +cp -a $CWD/less.sh $PKG/etc/profile.d/less.sh.new +chown root:root $PKG/etc/profile.d/* +chmod 755 $PKG/etc/profile.d/* # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then @@ -135,20 +172,10 @@ fi find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) -mkdir -p $PKG/usr/doc/less-$VERSION -cp -a \ - COPYING* LICENSE README NEWS \ - $PKG/usr/doc/less-$VERSION - -mkdir -p $PKG/usr/man/man1 -for page in less.nro lesskey.nro ; do - cat $page | gzip -9c > $PKG/usr/man/man1/`basename $page .nro`.1.gz -done - mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/less-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/a/less/less.csh b/source/a/less/less.csh new file mode 100644 index 000000000..7c13543bf --- /dev/null +++ b/source/a/less/less.csh @@ -0,0 +1,18 @@ +# Set profile variables for less and lesspipe.sh. + +# Setting a default $LESS was something inherited from SLS many years ago, +# but apparently the previous setting of "-M" causes display issues with +# some programs (i.e. git log). Adding "-R" as well fixes this, but some +# folks have concerns about the security of this option (I think it's +# actually "-r" that's the dangerous one). Anyway, it might be best to just +# leave this unset by default. Uncomment it if you like, or set up your +# own definition or aliases on a per-account basis. +#setenv LESS "-M -R" + +# Use lesspipe.sh (see man lesspipe): +setenv LESSOPEN "|lesspipe.sh %s" + +# Suppress the "informal messages" in the first line of the lesspipe output. +# If you like these, comment this line out. +setenv LESSQUIET true + diff --git a/source/a/less/less.sh b/source/a/less/less.sh new file mode 100644 index 000000000..a924ead0b --- /dev/null +++ b/source/a/less/less.sh @@ -0,0 +1,18 @@ +# Set profile variables for less and lesspipe.sh. + +# Setting a default $LESS was something inherited from SLS many years ago, +# but apparently the previous setting of "-M" causes display issues with +# some programs (i.e. git log). Adding "-R" as well fixes this, but some +# folks have concerns about the security of this option (I think it's +# actually "-r" that's the dangerous one). Anyway, it might be best to just +# leave this unset by default. Uncomment it if you like, or set up your +# own definition or aliases on a per-account basis. +#export LESS="-M -R" + +# Use lesspipe.sh (see man lesspipe): +export LESSOPEN="|lesspipe.sh %s" + +# Suppress the "informal messages" in the first line of the lesspipe output. +# If you like these, comment this line out. +export LESSQUIET=true + diff --git a/source/a/less/lesspipe.log.patch b/source/a/less/lesspipe.log.patch new file mode 100644 index 000000000..87dca2d97 --- /dev/null +++ b/source/a/less/lesspipe.log.patch @@ -0,0 +1,21 @@ +From 355e96d89fb8ec649f4fce7650cbdd5a684035fb Mon Sep 17 00:00:00 2001 +From: Patrick J. Volkerding <volkerdi@slackware.com> +Date: Thu May 23 18:30:51 UTC 2024 +Subject: [PATCH] Ignore .log extension + +Without this patch, a log file (which should be a text file) that is +compressed will not be uncompressed and you'll get the usual warning +from less that the content might be binary, and the log file will not +be visible. Removing the special handling for .log, everything works. + +--- ./lesspipe.sh.orig 2024-05-10 13:48:19.000000000 -0500 ++++ ./lesspipe.sh 2024-05-23 13:28:25.917030712 -0500 +@@ -140,7 +140,7 @@ + if [[ $fchar != binary ]]; then + # text only file formats + case "$fext" in +- html|htm|xml|pod|log) ++ html|htm|xml|pod) + ftype="$fext" ;; + pm) + ftype=perl ;; diff --git a/source/a/less/lesspipe.sh b/source/a/less/lesspipe.sh deleted file mode 100644 index 6bc9ff64d..000000000 --- a/source/a/less/lesspipe.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# -# Copyright 1997, 1998, 1999, 2000 Patrick Volkerding, Moorhead, MN, USA -# Copyright 2001, 2002 Slackware Linux, Inc, Concord, CA, USA -# Copyright 2006, 2009, 2017, 2021 Patrick Volkerding, Sebeka, MN, 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. -# - -# This is a preprocessor for 'less'. It is used when this environment -# variable is set: LESSOPEN="|lesspipe.sh %s" - -lesspipe() { - case "$1" in - *.tar) tar tvvf "$1" 2>/dev/null ;; - *.tar.lzma ) lzma -dc "$1" 2> /dev/null | tar tvvf - 2> /dev/null ;; - *.tgz | *.tar.gz | *.tar.Z | *.tar.z | *.tar.bz2 | *.tbz ) tar tvvf "$1" 2>/dev/null ;; - *.tlz | *.tar.lz ) lzip -dc "$1" 2> /dev/null | tar tvvf - 2> /dev/null ;; - *.txz | *.tar.xz ) xz -dc "$1" 2> /dev/null | tar tvvf - 2> /dev/null ;; - *.tzst | *.tzz | *.tar.zst | *.tar.zstd ) tar tvvf "$1" 2> /dev/null ;; - *.zip) unzip -l "$1" 2>/dev/null ;; - *.rpm) rpm -qpvl "$1" 2>/dev/null ;; - *.rar) # check if rar is installed first - if which rar 1> /dev/null ; then - `which rar` t "$1" - fi ;; - *.1|*.2|*.3|*.4|*.5|*.6|*.7|*.8|*.9|*.n|*.man) # *roff src? - if file -L "$1" | grep roff 1> /dev/null ; then - nroff -S -mandoc "$1" - fi ;; - *.1.gz|*.2.gz|*.3.gz|*.4.gz|*.5.gz|*.6.gz|*.7.gz|*.8.gz|*.9.gz|*.n.gz|*.man.gz) # compressed *roff src? - if gzip -dc "$1" | file - | grep roff 1> /dev/null ; then - gzip -dc "$1" | nroff -S -mandoc - - else gzip -dc "$1" 2>/dev/null - fi ;; - *.1.bz2|*.2.bz2|*.3.bz2|*.4.bz2|*.5.bz2|*.6.bz2|*.7.bz2|*.8.bz2|*.9.bz2|*.n.bz2|*.man.bz2) # compressed *roff src? - if bzip2 -dc "$1" | file - | grep roff 1> /dev/null ; then - bzip2 -dc "$1" | nroff -S -mandoc - - fi ;; - *.gz) gzip -dc "$1" 2>/dev/null ;; - *.bz2) bzip2 -dc "$1" 2>/dev/null ;; - *.lzma) lzma -dc "$1" 2>/dev/null ;; - *.xz) xz -dc "$1" 2>/dev/null ;; -# *) FILE=`file -L "$1"` ; # Check to see if binary, if so -- view with 'strings' -# FILE1=`echo $FILE | cut -d ' ' -f 2` -# FILE2=`echo $FILE | cut -d ' ' -f 3` -# if [ "$FILE1" = "Linux/i386" -o "$FILE2" = "Linux/i386" \ -# -o "$FILE1" = "ELF" -o "$FILE2" = "ELF" ]; then -# strings "$1" -# fi ;; - esac -} - -lesspipe "$1" diff --git a/source/a/less/lesspipe.url b/source/a/less/lesspipe.url new file mode 100644 index 000000000..d822d8d12 --- /dev/null +++ b/source/a/less/lesspipe.url @@ -0,0 +1 @@ +https://github.com/wofr06/lesspipe diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild index e093f2807..edaae94dc 100755 --- a/source/a/libcgroup/libcgroup.SlackBuild +++ b/source/a/libcgroup/libcgroup.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild index 246740941..ed68b275f 100755 --- a/source/a/logrotate/logrotate.SlackBuild +++ b/source/a/logrotate/logrotate.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2012, 2015, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2012, 2015, 2017, 2018, 2020, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -76,9 +76,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fixup a few things: -zcat $CWD/logrotate.slackware.diff.gz | patch -p1 || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff deleted file mode 100644 index f5b6e2473..000000000 --- a/source/a/logrotate/logrotate.slackware.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- ./logrotate.8.orig 2020-02-28 06:10:26.000000000 -0600 -+++ ./logrotate.8 2020-02-28 17:55:41.372212059 -0600 -@@ -341,6 +341,10 @@ - .IR .ucf\-dist , - .IR .ucf\-new , - .IR .ucf\-old , -+.IR .new -+.IR .old -+.IR .orig -+.IR .bak - .I ~ - - .TP ---- ./logrotate.8.in.orig 2019-12-04 03:17:23.000000000 -0600 -+++ ./logrotate.8.in 2020-02-28 17:56:13.484213430 -0600 -@@ -341,6 +341,10 @@ - .IR .ucf\-dist , - .IR .ucf\-new , - .IR .ucf\-old , -+.IR .new -+.IR .old -+.IR .orig -+.IR .bak - .I ~ - - .TP ---- ./config.c.orig 2020-01-13 10:39:19.000000000 -0600 -+++ ./config.c 2020-02-28 17:55:06.947210589 -0600 -@@ -147,6 +147,10 @@ - ".ucf-dist", - ".ucf-new", - ".ucf-old", -+ ".new", -+ ".old", -+ ".orig", -+ ".bak", - "~" - }; - static const int defTabooCount = sizeof(defTabooExts) / sizeof(char *); diff --git a/source/a/logrotate/logrotate.url b/source/a/logrotate/logrotate.url index dd8b8bfdc..e5238f6a6 100644 --- a/source/a/logrotate/logrotate.url +++ b/source/a/logrotate/logrotate.url @@ -1 +1,2 @@ https://github.com/logrotate/logrotate +https://github.com/logrotate/logrotate/releases/download/3.22.0/logrotate-3.22.0.tar.xz diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild index 454e2b28a..7fd52476c 100755 --- a/source/a/minicom/minicom.SlackBuild +++ b/source/a/minicom/minicom.SlackBuild @@ -59,6 +59,9 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG @@ -123,6 +126,7 @@ zcat $CWD/lrzsz_0.12.21-5.diff.gz | patch -p1 --verbose || exit 1 rm -f debian/patches/{206499_ymodemg.diff.unchecked,206648_dszlog.diff.unchecked} for i in debian/patches/* ; do patch -p1 < $i || exit 1 ; done +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config index 866752902..ad3d6ea47 100644 --- a/source/a/mkinitrd/busybox-dot-config +++ b/source/a/mkinitrd/busybox-dot-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.1 -# Sun Jan 17 13:37:03 2021 +# Tue May 14 13:21:58 2024 # CONFIG_HAVE_DOT_CONFIG=y @@ -941,8 +941,8 @@ CONFIG_PSCAN=y CONFIG_ROUTE=y CONFIG_SLATTACH=y CONFIG_SSL_CLIENT=y -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set +# CONFIG_FEATURE_TC_INGRESS is not set CONFIG_TCPSVD=y CONFIG_UDPSVD=y CONFIG_TELNET=y diff --git a/source/a/ndctl/ndctl.SlackBuild b/source/a/ndctl/ndctl.SlackBuild index 8c035e31b..f691cdbd8 100755 --- a/source/a/ndctl/ndctl.SlackBuild +++ b/source/a/ndctl/ndctl.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ndctl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/nvi/nvi.SlackBuild b/source/a/nvi/nvi.SlackBuild index ea7859e52..58b5d0a6b 100755 --- a/source/a/nvi/nvi.SlackBuild +++ b/source/a/nvi/nvi.SlackBuild @@ -68,6 +68,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -92,7 +95,7 @@ done # Configure, build, and install: cd build.unix - CFLAGS="$SLKCFLAGS" \ + OPTFLAG="$SLKCFLAGS" \ ../dist/configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/a/nvi/patches/0039-Add-function-prototypes-to-fix-implicit-function-dec.patch b/source/a/nvi/patches/0039-Add-function-prototypes-to-fix-implicit-function-dec.patch new file mode 100644 index 000000000..6e2f8226e --- /dev/null +++ b/source/a/nvi/patches/0039-Add-function-prototypes-to-fix-implicit-function-dec.patch @@ -0,0 +1,87 @@ +From: Michael Hudson-Doyle <michael.hudson@ubuntu.com> +Date: Thu, 11 Apr 2024 11:18:39 +0200 +Subject: Add function prototypes to fix implicit function declaration errors + +Reviewed-By: Tobias Heider <me@tobhe.de> +Bug-Debian: https://bugs.debian.org/1066285 +--- + cl/cl.h | 5 +++++ + cl/cl_funcs.c | 6 ++++++ + common/conv.h | 3 +++ + common/multibyte.h | 6 ++++++ + dist/configure | 1 + + 5 files changed, 21 insertions(+) + +diff --git a/cl/cl.h b/cl/cl.h +index 3d71410..4ff232d 100644 +--- a/cl/cl.h ++++ b/cl/cl.h +@@ -26,6 +26,11 @@ + #endif + #endif + ++/* ++ * for setupterm() ++ */ ++#include <term.h> ++ + typedef struct _cl_private { + char ibuf[256]; /* Input keys. */ + +diff --git a/cl/cl_funcs.c b/cl/cl_funcs.c +index c5fc597..b6174ef 100644 +--- a/cl/cl_funcs.c ++++ b/cl/cl_funcs.c +@@ -31,6 +31,12 @@ static const char sccsid[] = "$Id: cl_funcs.c,v 10.72 2002/03/02 23:18:33 skimo + #include "../vi/vi.h" + #include "cl.h" + ++/* ++ * This is declared by ncurses.h, but only if _XOPEN_SOURCE is set and lots of ++ * other things break if we define that. ++ */ ++extern int waddnwstr (WINDOW *,const wchar_t *,int); ++ + static void cl_rdiv __P((SCR *)); + + static int +diff --git a/common/conv.h b/common/conv.h +index 76b06c1..a7675c4 100644 +--- a/common/conv.h ++++ b/common/conv.h +@@ -21,3 +21,6 @@ struct _conv { + char2wchar_t input2int; + wchar2char_t int2disp; + }; ++ ++extern int conv_enc (SCR *sp, int option, char *enc); ++extern void conv_init (SCR *orig, SCR *sp); +diff --git a/common/multibyte.h b/common/multibyte.h +index 820f4ec..2484521 100644 +--- a/common/multibyte.h ++++ b/common/multibyte.h +@@ -5,6 +5,12 @@ + #include <wchar.h> + #include <wctype.h> + ++/* ++ * This is declared by wchar.h, but only if _XOPEN_SOURCE is set and lots of ++ * other things break if we define that. ++ */ ++extern int wcwidth (wchar_t c); ++ + typedef wchar_t RCHAR_T; + #define RCHAR_T_MAX ((1 << 24)-1) + typedef wchar_t CHAR_T; +diff --git a/dist/configure b/dist/configure +index b23e167..d7fb54f 100755 +--- a/dist/configure ++++ b/dist/configure +@@ -27385,6 +27385,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <$CURSHEADER> ++#include <term.h> + int + main () + { diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild index 9ff42aeca..daea2eba0 100755 --- a/source/a/procps-ng/procps-ng.SlackBuild +++ b/source/a/procps-ng/procps-ng.SlackBuild @@ -27,7 +27,7 @@ VERSION=${VERSION:-4.0.4} PSMISCVER=${PSMISCVER:-v23.5} PROCINFONGVER=${PROCINFONGVER:-2.0.304} PROCINFOVER=${PROCINFOVER:-18} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,6 +81,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +# Fix for wide-only ncurses: +sed 's:<ncursesw/:<:g' -i src/watch.c + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/a/splitvt/splitvt.SlackBuild b/source/a/splitvt/splitvt.SlackBuild index 4b37790be..a02c5898e 100755 --- a/source/a/splitvt/splitvt.SlackBuild +++ b/source/a/splitvt/splitvt.SlackBuild @@ -55,7 +55,13 @@ rm -rf splitvt-1.6.6 tar xzvf $CWD/splitvt-1.6.6.tar.gz cd splitvt-1.6.6 chown -R root:root . + +cat $CWD/splitvt.configure.gcc14.diff | patch -p1 --verbose || exit 1 + ./configure + +sed -i "s|DNEED_SELECT_H|DNEED_SELECT_H -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch|g" Makefile + make || exit 1 mkdir -p $PKG/usr/bin cat splitvt > $PKG/usr/bin/splitvt diff --git a/source/a/splitvt/splitvt.configure.gcc14.diff b/source/a/splitvt/splitvt.configure.gcc14.diff new file mode 100644 index 000000000..e3652140b --- /dev/null +++ b/source/a/splitvt/splitvt.configure.gcc14.diff @@ -0,0 +1,11 @@ +--- ./configure.orig 2007-04-01 10:22:48.000000000 -0500 ++++ ./configure 2024-05-11 18:35:55.108298585 -0500 +@@ -4,7 +4,7 @@ + QUIET="-v" + # use $CC if set, else set it to cc + : ${CC:=cc} +-CFLAGS= ++CFLAGS="-Wno-error=implicit-function-declaration -Wno-error=implicit-int" + MAKE="echo \"Done. Type 'make' to build\"" + + echo "Making configuration..." diff --git a/source/a/splitvt/splitvt.gcc14.diff b/source/a/splitvt/splitvt.gcc14.diff new file mode 100644 index 000000000..2df39264f --- /dev/null +++ b/source/a/splitvt/splitvt.gcc14.diff @@ -0,0 +1,11 @@ +--- ./configure.orig 2007-04-01 10:22:48.000000000 -0500 ++++ ./configure 2024-05-11 18:30:49.454291747 -0500 +@@ -4,7 +4,7 @@ + QUIET="-v" + # use $CC if set, else set it to cc + : ${CC:=cc} +-CFLAGS= ++CFLAGS="-Wno-error=implicit-function-declaration -Wno-error=implicit-int" + MAKE="echo \"Done. Type 'make' to build\"" + + echo "Making configuration..." diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild index 18db0b66d..bec356e8c 100755 --- a/source/a/sysklogd/sysklogd.SlackBuild +++ b/source/a/sysklogd/sysklogd.SlackBuild @@ -157,7 +157,7 @@ cp -a \ # 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 +if [ -r ChangeLog.md ]; then DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) cat ChangeLog.md | head -n 1000 > $DOCSDIR/ChangeLog.md touch -r ChangeLog.md $DOCSDIR/ChangeLog.md diff --git a/source/a/sysvinit-functions/function-src.gcc14.diff b/source/a/sysvinit-functions/function-src.gcc14.diff new file mode 100644 index 000000000..0f46f2805 --- /dev/null +++ b/source/a/sysvinit-functions/function-src.gcc14.diff @@ -0,0 +1,9 @@ +--- ./Makefile.orig 2007-04-29 13:15:50.000000000 -0500 ++++ ./Makefile 2024-05-10 18:22:44.593348134 -0500 +@@ -1,5 +1,5 @@ + +-CFLAGS=-O2 -Wall -D_GNU_SOURCE ++CFLAGS=-O2 -Wall -D_GNU_SOURCE -Wno-error=incompatible-pointer-types + + PROGS=usleep initlog fstab-decode consoletype + PPPWATCH_OBJS=ppp-watch.o shvar.o diff --git a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild index cfd18bc5e..ab7526cd9 100755 --- a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild +++ b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild @@ -66,6 +66,7 @@ rm -rf function-src-$VERSION # A small patch was applied to initlog to shut it the %^@& up. tar xjf $CWD/function-src-$VERSION.tar.bz2 || exit 1 cd function-src-$VERSION +cat $CWD/function-src.gcc14.diff | patch -p1 --verbose || exit 1 make || exit 1 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/bin $PKG/sbin $PKG/usr/man/man{1,8} diff --git a/source/a/sysvinit-scripts/default/zram b/source/a/sysvinit-scripts/default/zram new file mode 100644 index 000000000..90a1e578b --- /dev/null +++ b/source/a/sysvinit-scripts/default/zram @@ -0,0 +1,26 @@ +# Should we use swap on ZRAM? +ZRAM_ENABLE=1 + +# Total system RAM, in KB: +MEMTOTAL=$(echo $(cat /proc/meminfo | grep ^MemTotal:) | cut -f 2 -d ' ') + +# ZRAM device size. We'll make this the same size as the system RAM. +# Assuming 1:4 compression, this would (if filled) occupy 1/4 of the system +# RAM. Until pages are swapped to ZRAM, the device occupies almost no RAM. +# As far as what's optimal here, I've heard all kinds of theories. So maybe +# you want to set this to twice the system RAM. Or half. Or something else +# entirely. +ZRAMSIZE=$MEMTOTAL + +# Number of ZRAM devices. We are only going to use one of them, so there's no +# need to increase this unless you'll be needing additional ZRAM devices for +# other purposes. +ZRAMNUMBER=1 + +# Set the compression algorithm. +# Use zstd for best results. +# Nothing else makes any sense. +ZRAMCOMPRESSION=zstd + +# Set the swap priority for the ZRAM device: +ZRAMPRIORITY=100 diff --git a/source/a/sysvinit-scripts/default/zram.i686 b/source/a/sysvinit-scripts/default/zram.i686 new file mode 100644 index 000000000..984752f68 --- /dev/null +++ b/source/a/sysvinit-scripts/default/zram.i686 @@ -0,0 +1,34 @@ +# Should we use swap on ZRAM? +ZRAM_ENABLE=1 + +# Total system RAM, in KB: +MEMTOTAL=$(echo $(cat /proc/meminfo | grep ^MemTotal:) | cut -f 2 -d ' ') + +# ZRAM device size. We'll make this the same size as the system RAM. +# Assuming 1:4 compression, this would (if filled) occupy 1/4 of the system +# RAM. Until pages are swapped to ZRAM, the device occupies almost no RAM. +# As far as what's optimal here, I've heard all kinds of theories. So maybe +# you want to set this to twice the system RAM. Or half. Or something else +# entirely. +ZRAMSIZE=$MEMTOTAL + +# In case of a 32-bit kernel, we are limited to 4G maximum ZRAM device size. +# If ZRAMSIZE size is greater than 4G, then use 4G for the ZRAMSIZE. +if [ "$(uname -m)" = "i686" ]; then + if [ "$ZRAMSIZE" -gt "4194304" ]; then + ZRAMSIZE=4194304 + fi +fi + +# Number of ZRAM devices. We are only going to use one of them, so there's no +# need to increase this unless you'll be needing additional ZRAM devices for +# other purposes. +ZRAMNUMBER=1 + +# Set the compression algorithm. +# Use zstd for best results. +# Nothing else makes any sense. +ZRAMCOMPRESSION=zstd + +# Set the swap priority for the ZRAM device: +ZRAMPRIORITY=100 diff --git a/source/a/sysvinit-scripts/doinst.sh b/source/a/sysvinit-scripts/doinst.sh index ad6980247..4a28e937f 100644 --- a/source/a/sysvinit-scripts/doinst.sh +++ b/source/a/sysvinit-scripts/doinst.sh @@ -25,6 +25,7 @@ config etc/rc.d/rc.modules.new config etc/rc.d/rc.modules.local.new config etc/default/cpufreq.new config etc/default/efivarfs.new +config etc/default/zram.new ( cd etc/rc.d ; rm -rf rc.0 ) ( cd etc/rc.d ; ln -sf rc.6 rc.0 ) diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index 5fec619c0..a091ef035 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -292,7 +292,7 @@ if [ -z "$container" ]; then # (and found to be clean) at boot: /bin/sync echo "Remounting root filesystem read-only:" - /bin/mount -v -n -o remount,ro / + /bin/mount -v -o remount,ro / fi # This never hurts: diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index d5bc169a8..d101aa268 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -184,6 +184,11 @@ if [ -x /etc/rc.d/rc.autofs ]; then /etc/rc.d/rc.autofs start fi +# Start dnsmasq, a simple DHCP/DNS server: +if [ -x /etc/rc.d/rc.dnsmasq ]; then + /etc/rc.d/rc.dnsmasq start +fi + # Start the Network Time Protocol daemon: if [ -x /etc/rc.d/rc.ntpd ]; then /etc/rc.d/rc.ntpd start @@ -268,11 +273,6 @@ if [ -x /usr/bin/glib-compile-schemas ]; then /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas >/dev/null 2>&1 & fi -# Start dnsmasq, a simple DHCP/DNS server: -if [ -x /etc/rc.d/rc.dnsmasq ]; then - /etc/rc.d/rc.dnsmasq start -fi - # Start snmpd: if [ -x /etc/rc.d/rc.snmpd ]; then /etc/rc.d/rc.snmpd start diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 85a2ebc31..a4cfb4691 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -16,12 +16,12 @@ fi # Mount /proc if it is not already mounted: if [ ! -d /proc/sys -a -z "$container" ]; then - /sbin/mount -v proc /proc -n -t proc 2> /dev/null + /sbin/mount -v proc /proc -t proc 2> /dev/null fi # Mount /sys if it is not already mounted: if [ ! -d /sys/kernel -a -z "$container" ]; then - /sbin/mount -v sysfs /sys -n -t sysfs 2> /dev/null + /sbin/mount -v sysfs /sys -t sysfs 2> /dev/null fi # The efivarfs filesystem is used for reading and writing EFI variables, such @@ -53,7 +53,7 @@ fi # initrd has already done so): if [ -d /run -a -z "$container" ]; then if ! grep -wq "tmpfs /run tmpfs" /proc/mounts ; then - /sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755,size=32M,nodev,nosuid,noexec + /sbin/mount -v -t tmpfs tmpfs /run -o mode=0755,size=32M,nodev,nosuid,noexec fi fi @@ -140,6 +140,24 @@ if [ -z "$container" ]; then /sbin/swapon -a 2> /dev/null fi +# Enable swapping on a ZRAM device: +if [ -z "$container" -a -r /etc/default/zram ]; then + . /etc/default/zram + if [ "$ZRAM_ENABLE" = "1" ]; then + if [ ! -d /sys/devices/virtual/block/zram0 ]; then + modprobe zram num_devices=$ZRAMNUMBER + fi + echo "Setting up /dev/zram0: zramctl -f -a $ZRAMCOMPRESSION -s ${ZRAMSIZE}K" + ZRAM_DEVICE=$(zramctl -f -a $ZRAMCOMPRESSION -s ${ZRAMSIZE}K) + if [ ! -z $ZRAM_DEVICE ]; then + mkswap $ZRAM_DEVICE 1> /dev/null 2> /dev/null + echo "Activating ZRAM swap: swapon --priority $ZRAMPRIORITY $ZRAM_DEVICE" + swapon --priority $ZRAMPRIORITY $ZRAM_DEVICE + fi + fi + unset MEMTOTAL ZRAMCOMPRESSION ZRAMNUMBER ZRAMSIZE ZRAM_DEVICE ZRAM_ENABLE +fi + # Set the tick and frequency for the system clock. # Default values are: TICK=10000 and FREQ=0 if [ -z "$container" ]; then @@ -203,7 +221,7 @@ if [ -z "$container" ]; then # allow checking a read-only filesystem: if grep -q ' / f2fs ' /proc/mounts ; then echo "Remounting root device with read-write enabled." - /sbin/mount -w -v -n -o remount / + /sbin/mount -w -v -o remount / elif [ ! $READWRITE = yes ]; then # Check the root filesystem: RETVAL=0 @@ -242,13 +260,13 @@ if [ -z "$container" ]; then fi echo "Unmounting file systems." /sbin/umount -a -r - /sbin/mount -n -o remount,ro / + /sbin/mount -o remount,ro / echo "Rebooting system." reboot -f fi # Remount the root filesystem in read-write mode echo "Remounting root device with read-write enabled." - /sbin/mount -w -v -n -o remount / + /sbin/mount -w -v -o remount / if [ $? -gt 0 ] ; then echo "FATAL: Attempt to remount root device as read-write failed! This is going to" echo "cause serious problems." diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 8180d4381..3c878d4f5 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-15.1} ARCH=noarch -BUILD=${BUILD:-16} +BUILD=${BUILD:-18} # 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 @@ -59,6 +59,13 @@ cat $CWD/default/cpufreq > $PKG/etc/default/cpufreq.new # Install /etc/default/efivarfs.new: cat $CWD/default/efivarfs > $PKG/etc/default/efivarfs.new +# Install /etc/default/zram.new: +if [ "$(uname -m)" = "i686" ]; then + cat $CWD/default/zram.i686 > $PKG/etc/default/zram.new +else + cat $CWD/default/zram > $PKG/etc/default/zram.new +fi + mkdir -p $PKG/install zcat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/unarj/Makefile b/source/a/unarj/Makefile index 95483e751..2445bb4ba 100644 --- a/source/a/unarj/Makefile +++ b/source/a/unarj/Makefile @@ -4,7 +4,7 @@ # CC = gcc -CFLAGS = -O2 -DUNIX +CFLAGS = -O2 -DUNIX -Wno-error=implicit-function-declaration INSTALLDIR=/usr/bin unarj: unarj.o decode.o environ.o diff --git a/source/a/util-linux/bsdstrings.gcc14.diff b/source/a/util-linux/bsdstrings.gcc14.diff new file mode 100644 index 000000000..32cffe03f --- /dev/null +++ b/source/a/util-linux/bsdstrings.gcc14.diff @@ -0,0 +1,12 @@ +--- ./Makefile.orig 2000-05-09 16:18:53.000000000 -0500 ++++ ./Makefile 2024-05-12 12:42:00.509961363 -0500 +@@ -1,7 +1,8 @@ + CC = gcc ++CFLAGS = -O -Wno-error=implicit-function-declaration -Wno-error=implicit-int + + strings: strings.o getopt.o +- gcc -O -o strings strings.c getopt.c ++ gcc $(CFLAGS) -o strings strings.c getopt.c + + clean: + rm -f a.out core *~ *.o strings diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 540a19229..130c7d50b 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -254,6 +254,7 @@ rm -rf bsdstrings tar xvf $CWD/bsdstrings.tar.gz || exit 1 cd bsdstrings || exit 1 zcat $CWD/bsdstrings-util-linux_overflow.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/bsdstrings.gcc14.diff.gz | patch -p1 --verbose || exit 1 make || exit 1 strip strings cat strings > $PKG/usr/bin/strings-BSD @@ -286,7 +287,8 @@ chown -R root:root . zcat $CWD/setserial-rc.serial.diff.gz | patch -E -p1 --verbose || exit 1 zcat $CWD/setserial-undef_TIOCGHAYESESP.diff.gz | patch -E -p1 --verbose || exit 1 # The original config.{guess,sub} do not work on x86_64 -cp -p /usr/share/libtool/config/config.{guess,sub} . +cp -p /usr/share/libtool/build-aux/config.{guess,sub} . +CFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration" \ ./configure --prefix=/usr || exit 1 make || exit 1 strip setserial @@ -370,4 +372,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/util-linux-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/a/xz/f9cf4c05edd14dedfe63833f8ccbe41b55823b00.patch b/source/a/xz/f9cf4c05edd14dedfe63833f8ccbe41b55823b00.patch deleted file mode 100644 index 12ce12c41..000000000 --- a/source/a/xz/f9cf4c05edd14dedfe63833f8ccbe41b55823b00.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f9cf4c05edd14dedfe63833f8ccbe41b55823b00 Mon Sep 17 00:00:00 2001 -From: Lasse Collin <lasse.collin@tukaani.org> -Date: Sat, 30 Mar 2024 14:36:28 +0200 -Subject: [PATCH] CMake: Fix sabotaged Landlock sandbox check. - -It never enabled it. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f019167..0e4d464f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1001,7 +1001,7 @@ if(NOT SANDBOX_FOUND AND ENABLE_SANDBOX MATCHES "^ON$|^landlock$") - #include <linux/landlock.h> - #include <sys/syscall.h> - #include <sys/prctl.h> --. -+ - void my_sandbox(void) - { - (void)prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); --- -2.20.1 diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild index f1b732bbc..0517477db 100755 --- a/source/a/xz/xz.SlackBuild +++ b/source/a/xz/xz.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xz VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -94,9 +94,6 @@ find . \ # memory use (these aren't indicating any sort of failure, so...) zcat $CWD/xz.default.verbosity.V_ERROR.diff.gz | patch -p1 --verbose || exit 1 -# More fallout from the incident: -cat $CWD/f9cf4c05edd14dedfe63833f8ccbe41b55823b00.patch | patch -p1 --verbose || exit 1 - if [ ! -r configure ]; then if [ -x ./autogen.sh ]; then NOCONFIGURE=1 ./autogen.sh diff --git a/source/a/xz/xz.url b/source/a/xz/xz.url index ce0a00766..03a88d1f5 100644 --- a/source/a/xz/xz.url +++ b/source/a/xz/xz.url @@ -1 +1,2 @@ https://github.com/tukaani-project/xz/tags +https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.xz.sig diff --git a/source/a/zoo/zoo.SlackBuild b/source/a/zoo/zoo.SlackBuild index cf3576065..863d084b0 100755 --- a/source/a/zoo/zoo.SlackBuild +++ b/source/a/zoo/zoo.SlackBuild @@ -67,6 +67,7 @@ tar xf $CWD/zoo_${VERSION}-${DEBPATCH}.debian.tar.?z for diff in debian/patches/*patch ; do cat $diff | patch -p1 --verbose --backup --suffix=.orig || exit 1 done +zcat $CWD/zoo.gcc14.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 make linux || exit 1 mkdir -p $PKG/usr/bin diff --git a/source/a/zoo/zoo.gcc14.diff b/source/a/zoo/zoo.gcc14.diff new file mode 100644 index 000000000..5d507f423 --- /dev/null +++ b/source/a/zoo/zoo.gcc14.diff @@ -0,0 +1,11 @@ +--- ./makefile.orig 2024-05-11 01:34:14.429927290 -0500 ++++ ./makefile 2024-05-11 01:35:16.723928683 -0500 +@@ -102,7 +102,7 @@ + + # Linux + linux: +- $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS) ++ $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS -Wno-error=implicit-int" LDFLAGS="$(LDFLAGS)" $(TARGETS) + + # Linux64 + linux64: diff --git a/source/ap/amp/amp.SlackBuild b/source/ap/amp/amp.SlackBuild index 1f955b2a9..85ee4749d 100755 --- a/source/ap/amp/amp.SlackBuild +++ b/source/ap/amp/amp.SlackBuild @@ -58,7 +58,7 @@ zcat $CWD/amp-gcc34.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exi # Avoid crashes caused by using agressive optimization with newer compilers: zcat $CWD/amp.do.not.overoptimize.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 chown -R root:root . -./configure --prefix=/usr $ARCH-slackware-linux || exit 1 +CFLAGS="-Wno-error=implicit-int" ./configure --prefix=/usr $ARCH-slackware-linux || exit 1 make || exit 1 mkdir -p $PKG/usr/doc $PKG/usr/bin $PKG/usr/man/man1 strip amp diff --git a/source/ap/bc/bc.SlackBuild b/source/ap/bc/bc.SlackBuild index 7bd6b2740..4c5504e00 100755 --- a/source/ap/bc/bc.SlackBuild +++ b/source/ap/bc/bc.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/bpe/bpe.SlackBuild b/source/ap/bpe/bpe.SlackBuild index f415472d1..3ed4529e1 100755 --- a/source/ap/bpe/bpe.SlackBuild +++ b/source/ap/bpe/bpe.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bpe VERSION=2.01.00 -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -54,6 +54,9 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + TMP=${TMP:-/tmp} PKG=$TMP/package-bpe @@ -71,7 +74,8 @@ zcat $CWD/bpe.port.to.strerror.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=/usr || exit 1 + --prefix=/usr \ + $ARCH-slackware-linux-gnu || exit 1 make || exit 1 make install DESTDIR=$PKG || exit 1 ( cd $PKG @@ -88,4 +92,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG makepkg -l y -c n $TMP/bpe-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/ap/cdrtools/cdrtools.SlackBuild b/source/ap/cdrtools/cdrtools.SlackBuild index 34334abbf..fe4f79166 100755 --- a/source/ap/cdrtools/cdrtools.SlackBuild +++ b/source/ap/cdrtools/cdrtools.SlackBuild @@ -66,6 +66,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# GCC 14 "fix": +export CFLAGS="-Wno-error=implicit-int -Wno-error=implicit-function-declaration" + # When running make below, you'll see "errors" like these: # config.h:34:10: fatal error: lconfig.h: No such file or directory # 34 | #include "lconfig.h" diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild index af557de3e..fde47b4b3 100755 --- a/source/ap/ghostscript/ghostscript.SlackBuild +++ b/source/ap/ghostscript/ghostscript.SlackBuild @@ -68,6 +68,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion" + cd $TMP rm -rf ${SRCPREFIX}${PKGNAM}-${VERSION} tar xvf $CWD/${SRCPREFIX}${PKGNAM}-$VERSION.tar.?z || exit 1 diff --git a/source/ap/ghostscript/ghostscript.url b/source/ap/ghostscript/ghostscript.url index 12b9848de..b16bf425f 100644 --- a/source/ap/ghostscript/ghostscript.url +++ b/source/ap/ghostscript/ghostscript.url @@ -1,2 +1,2 @@ https://github.com/ArtifexSoftware/ghostpdl-downloads -https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10030/ghostscript-10.03.0.tar.xz +https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10031/ghostscript-10.03.1.tar.xz diff --git a/source/ap/gutenprint/gutenprint.SlackBuild b/source/ap/gutenprint/gutenprint.SlackBuild index f732d2b31..2904ee44c 100755 --- a/source/ap/gutenprint/gutenprint.SlackBuild +++ b/source/ap/gutenprint/gutenprint.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gutenprint VERSION=${VERSION:-$(echo gutenprint-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion" + TMP=${TMP:-/tmp} PKG=$TMP/package-gutenprint rm -rf $PKG @@ -76,6 +79,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/ap/hplip/hplip-covscan.patch b/source/ap/hplip/hplip-covscan.patch new file mode 100644 index 000000000..6c8858165 --- /dev/null +++ b/source/ap/hplip/hplip-covscan.patch @@ -0,0 +1,615 @@ +diff -up hplip-3.23.3/common/utils.c.covscan hplip-3.23.3/common/utils.c +--- hplip-3.23.3/common/utils.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/common/utils.c 2023-05-29 13:58:10.969395214 +0200 +@@ -1,5 +1,9 @@ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ + #include "utils.h" +-#include "string.h" ++#include <string.h> + #include <dlfcn.h> + #include <sys/stat.h> + #include <errno.h> +diff -up hplip-3.23.3/io/hpmud/hpmud.c.covscan hplip-3.23.3/io/hpmud/hpmud.c +--- hplip-3.23.3/io/hpmud/hpmud.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/io/hpmud/hpmud.c 2023-05-29 13:58:10.970395208 +0200 +@@ -759,6 +759,7 @@ enum HPMUD_RESULT hpmud_get_dstat(HPMUD_ + } + + strncpy(ds->uri, msp->device[dd].uri, sizeof(ds->uri)); ++ ds->uri[sizeof(ds->uri)-1] = '\0'; + ds->io_mode = msp->device[dd].io_mode; + ds->channel_cnt = msp->device[dd].channel_cnt; + ds->mlc_up = msp->device[dd].mlc_up; +diff -up hplip-3.23.3/io/hpmud/jd.c.covscan hplip-3.23.3/io/hpmud/jd.c +--- hplip-3.23.3/io/hpmud/jd.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/io/hpmud/jd.c 2023-05-29 13:58:10.970395208 +0200 +@@ -31,6 +31,7 @@ + #endif + + #include <signal.h> ++#include <stdlib.h> + #include "hpmud.h" + #include "hpmudi.h" + +diff -up hplip-3.23.3/io/hpmud/model.c.covscan hplip-3.23.3/io/hpmud/model.c +--- hplip-3.23.3/io/hpmud/model.c.covscan 2023-05-29 13:58:10.958395279 +0200 ++++ hplip-3.23.3/io/hpmud/model.c 2023-05-29 13:58:10.970395208 +0200 +@@ -117,6 +117,7 @@ static int ReadConfig() + if (rcbuf[0] == '[') + { + strncpy(section, rcbuf, sizeof(section)); /* found new section */ ++ section[sizeof(section)-1] = '\0'; + continue; + } + +@@ -125,6 +126,7 @@ static int ReadConfig() + if ((strncasecmp(section, "[dirs]", 6) == 0) && (strcasecmp(key, "home") == 0)) + { + strncpy(homedir, value, sizeof(homedir)); ++ homedir[sizeof(homedir)-1] = '\0'; + break; /* done */ + } + } +diff -up hplip-3.23.3/io/hpmud/musb.c.covscan hplip-3.23.3/io/hpmud/musb.c +--- hplip-3.23.3/io/hpmud/musb.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/io/hpmud/musb.c 2023-05-29 13:58:10.970395208 +0200 +@@ -776,7 +776,7 @@ static int device_id(int fd, unsigned ch + len = size-1; /* leave byte for zero termination */ + if (len > 2) + len -= 2; +- memcpy(buffer, buffer+2, len); /* remove length */ ++ memmove(buffer, buffer+2, len); /* remove length */ + buffer[len]=0; + DBG("read actual device_id successfully fd=%d len=%d\n", fd, len); + +diff -up hplip-3.23.3/io/hpmud/pp.c.covscan hplip-3.23.3/io/hpmud/pp.c +--- hplip-3.23.3/io/hpmud/pp.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/io/hpmud/pp.c 2023-05-29 13:58:10.970395208 +0200 +@@ -632,7 +632,7 @@ static int device_id(int fd, char *buffe + len = size-1; /* leave byte for zero termination */ + if (len > 2) + len -= 2; +- memcpy(buffer, buffer+2, len); /* remove length */ ++ memmove(buffer, buffer+2, len); /* remove length */ + buffer[len]=0; + + DBG("read actual device_id successfully fd=%d len=%d\n", fd, len); +diff -up hplip-3.23.3/Makefile.am.covscan hplip-3.23.3/Makefile.am +--- hplip-3.23.3/Makefile.am.covscan 2023-05-29 13:58:10.944395361 +0200 ++++ hplip-3.23.3/Makefile.am 2023-05-29 13:58:10.969395214 +0200 +@@ -3,7 +3,7 @@ + # + # (c) 2004-2015 Copyright HP Development Company, LP + # Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher +-INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/ ++INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/ -Iprotocol + CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\" + CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\" + +@@ -310,7 +310,7 @@ dist_pcard_DATA = pcard/__init__.py pcar + pcardextdir = $(pyexecdir) + pcardext_LTLIBRARIES = pcardext.la + pcardext_la_LDFLAGS = -module -avoid-version +-pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c ++pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c pcard/pcardext/pcardext.h + pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) + + # prnt +@@ -322,7 +322,7 @@ lib_LTLIBRARIES += libhpipp.la + #hpipp_LTLIBRARIES = hpipp.la + #hpipp_la_LDFLAGS = -module -avoid-version + libhpipp_la_SOURCES = protocol/hp_ipp.c protocol/hp_ipp.h protocol/hp_ipp_i.h +-libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" ++libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -D_GNU_SOURCE + libhpipp_la_LDFLAGS = -version-info 0:1:0 + libhpipp_la_LIBADD = libhpmud.la + +diff -up hplip-3.23.3/pcard/fat.c.covscan hplip-3.23.3/pcard/fat.c +--- hplip-3.23.3/pcard/fat.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/pcard/fat.c 2023-05-29 13:58:10.971395203 +0200 +@@ -519,14 +519,17 @@ int FatFreeSpace(void) + + int FatDiskAttributes( PHOTO_CARD_ATTRIBUTES * pa ) + { +- strncpy( pa->OEMID, bpb.OEMID, 8 ); ++ strncpy(pa->OEMID, bpb.OEMID, sizeof(pa->OEMID)); ++ pa->OEMID[sizeof(pa->OEMID)-1] = '\0'; + pa->BytesPerSector = bpb.BytesPerSector; + pa->SectorsPerCluster = bpb.SectorsPerCluster; + pa->ReservedSectors = bpb.ReservedSectors; + pa->SectorsPerFat = bpb.SectorsPerFat; + pa->RootEntries = bpb.RootEntries; +- strncpy( pa->SystemID, (char *)bpb.SystemID, 8 ); +- strncpy( pa->VolumeLabel, (char *)bpb.VolumeLabel, 11 ); ++ strncpy(pa->SystemID, (char *)bpb.SystemID, sizeof(pa->SystemID)); ++ pa->SystemID[sizeof(pa->SystemID)-1] = '\0'; ++ strncpy(pa->VolumeLabel, (char *)bpb.VolumeLabel, sizeof(pa->VolumeLabel)); ++ pa->VolumeLabel[sizeof(pa->VolumeLabel)-1] = '\0'; + pa->WriteProtect = da.WriteProtect; + + return 0; +@@ -741,6 +744,7 @@ int FatSetCWD(char *dir) + return 1; + + strncpy(cwd.Name, fa.Name, sizeof(cwd.Name)); ++ cwd.Name[sizeof(cwd.Name)-1] = '\0'; + cwd.StartSector = ConvertClusterToSector(fa.StartCluster); + cwd.CurrSector = cwd.StartSector; + cwd.StartCluster = fa.StartCluster; +diff -up hplip-3.23.3/prnt/hpijs/context2.cpp.covscan hplip-3.23.3/prnt/hpijs/context2.cpp +--- hplip-3.23.3/prnt/hpijs/context2.cpp.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/prnt/hpijs/context2.cpp 2023-05-29 13:58:10.971395203 +0200 +@@ -1302,6 +1302,7 @@ DRIVER_ERROR PrintContext::SelectDevice + if(0 == strnlen((const char *)pSS->strDevID, DevIDBuffSize)) + { + strncpy((char *)pSS->strDevID,szDeviceId,DevIDBuffSize); ++ pSS->strDevID[sizeof(pSS->strDevID)-1] = '\0'; + } + thePrinter = pPFI->CreatePrinter (pSS, familyHandle); + if (thePrinter->constructor_error != NO_ERROR) +diff -up hplip-3.23.3/prnt/hpijs/systemservices.cpp.covscan hplip-3.23.3/prnt/hpijs/systemservices.cpp +--- hplip-3.23.3/prnt/hpijs/systemservices.cpp.covscan 2023-03-28 09:26:27.000000000 +0200 ++++ hplip-3.23.3/prnt/hpijs/systemservices.cpp 2023-05-29 13:58:10.971395203 +0200 +@@ -396,7 +396,10 @@ void SystemServices::AdjustIO(IO_MODE IM + IOMode.bDevID =IM.bDevID && IOMode.bDevID; + + if (model) ++ { + strncpy(strModel,model, sizeof(strModel)); ++ strModel[sizeof(strModel)-1] = '\0'; ++ } + } + + APDK_END_NAMESPACE +diff -up hplip-3.23.3/prnt/hpps/hppsfilter.c.covscan hplip-3.23.3/prnt/hpps/hppsfilter.c +--- hplip-3.23.3/prnt/hpps/hppsfilter.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/prnt/hpps/hppsfilter.c 2023-05-29 13:58:10.972395197 +0200 +@@ -274,13 +274,13 @@ static void WriteHeader(char **argument) + /* Writing Header Information + argument[1] = JOB ID , argument[2]= USERNAME, argument[3] = TITLE */ + hpwrite("\x1b%-12345X@PJL JOBNAME=", strlen("\x1b%-12345X@PJL JOBNAME=")); +- sprintf(buffer, "hplip_%s_%s\x0a", argument[2], argument[1]); ++ snprintf(buffer, MAX_BUFFER-1, "hplip_%s_%s\x0a", argument[2], argument[1]); + hpwrite(buffer, strlen(buffer)); + memset(buffer, 0, sizeof(buffer)); +- sprintf(buffer, "@PJL SET USERNAME=\"%s\"\x0a", argument[2]); ++ snprintf(buffer, MAX_BUFFER-1, "@PJL SET USERNAME=\"%s\"\x0a", argument[2]); + hpwrite(buffer, strlen(buffer)); + memset(buffer, 0, sizeof(buffer)); +- sprintf(buffer, "@PJL SET JOBNAME=\"%s\"\x0a", argument[3]); ++ snprintf(buffer, MAX_BUFFER-1, "@PJL SET JOBNAME=\"%s\"\x0a", argument[3]); + hpwrite(buffer, strlen(buffer)); + fprintf(stderr, "HP PS filter func = WriteHeader : WRITING PJL HEADER INFO\n"); + return; +diff -up hplip-3.23.3/protocol/hp_ipp.h.covscan hplip-3.23.3/protocol/hp_ipp.h +--- hplip-3.23.3/protocol/hp_ipp.h.covscan 2023-05-29 13:58:10.972395197 +0200 ++++ hplip-3.23.3/protocol/hp_ipp.h 2023-05-29 13:59:03.645085468 +0200 +@@ -168,6 +168,11 @@ HPIPP_RESULT parseResponseHeader(char* h + HPIPP_RESULT prepend_http_header(raw_ipp *raw_request,const char *resource); + enum HPMUD_RESULT sendUSBRequest(char *buf, int size, raw_ipp *responseptr, char * device_uri); + enum HPMUD_RESULT sendUSBFileRequest(char *buf, int size, int fileHandle,raw_ipp *responseptr, char *device_uri); ++void _releaseCupsInstance(); ++int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, char *model, char *info); ++int delCupsPrinter(char *pr_name); ++int setDefaultCupsPrinter(char *pr_name); ++int controlCupsPrinter(char *pr_name, int op); + + ipp_t * createFaxDetailRequest(const char *printer_name); + ipp_t * getDeviceFaxModemAttributes(char* device_uri,char* printer_name, int *count); +diff -up hplip-3.23.3/scan/sane/bb_ledm.c.covscan hplip-3.23.3/scan/sane/bb_ledm.c +--- hplip-3.23.3/scan/sane/bb_ledm.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/bb_ledm.c 2023-05-29 13:58:10.972395197 +0200 +@@ -26,6 +26,7 @@ + # include "http.h" + # include "xml.h" + # include <stdlib.h> ++# include <unistd.h> + + # include <stdint.h> + +diff -up hplip-3.23.3/scan/sane/common.h.covscan hplip-3.23.3/scan/sane/common.h +--- hplip-3.23.3/scan/sane/common.h.covscan 2023-05-29 13:58:10.727396637 +0200 ++++ hplip-3.23.3/scan/sane/common.h 2023-05-29 13:58:10.972395197 +0200 +@@ -36,7 +36,7 @@ + #define _STRINGIZE(x) #x + #define STRINGIZE(x) _STRINGIZE(x) + +-#define BUG(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); DBG(2, __FILE__ " " STRINGIZE(__LINE__) ": " args);} ++#define BUG_SCAN(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); DBG(2, __FILE__ " " STRINGIZE(__LINE__) ": " args);} + #define BUG_DUMP(data, size) bugdump((data), (size)) + #define BUG_SZ(args...) {syslog(LOG_ERR, args); DBG(2, args);} + +diff -up hplip-3.23.3/scan/sane/escl.c.covscan hplip-3.23.3/scan/sane/escl.c +--- hplip-3.23.3/scan/sane/escl.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/escl.c 2023-05-29 13:58:10.972395197 +0200 +@@ -849,7 +849,7 @@ SANE_Status escl_control_option(SANE_Han + //DBG8("escl_control_option (option=%s) action=%d\n", ps->option[option].name, action); + if (stat != SANE_STATUS_GOOD) + { +- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); ++ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); + } + + return stat; +@@ -1159,7 +1159,7 @@ void escl_close(SANE_Handle handle) + + if (ps == NULL || ps != session) + { +- BUG("invalid sane_close\n"); ++ BUG_SCAN("invalid sane_close\n"); + return; + } + +diff -up hplip-3.23.3/scan/sane/http.c.covscan hplip-3.23.3/scan/sane/http.c +--- hplip-3.23.3/scan/sane/http.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/http.c 2023-05-29 13:58:10.973395191 +0200 +@@ -36,6 +36,7 @@ + #include <string.h> + #include <syslog.h> + #include <ctype.h> ++#include <unistd.h> + #include "hpmud.h" + #include "http.h" + +diff -up hplip-3.23.3/scan/sane/io.c.covscan hplip-3.23.3/scan/sane/io.c +--- hplip-3.23.3/scan/sane/io.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/io.c 2023-05-29 13:58:10.973395191 +0200 +@@ -50,7 +50,7 @@ int __attribute__ ((visibility ("hidden" + + if (dbus_error_is_set(&dbus_err)) + { +- BUG("dBus Connection Error (%s)!\n", dbus_err.message); ++ BUG_SCAN("dBus Connection Error (%s)!\n", dbus_err.message); + dbus_error_free(&dbus_err); + } + +@@ -79,7 +79,7 @@ int __attribute__ ((visibility ("hidden" + + if (NULL == msg) + { +- BUG("dbus message is NULL!\n"); ++ BUG_SCAN("dbus message is NULL!\n"); + return 0; + } + +@@ -94,7 +94,7 @@ int __attribute__ ((visibility ("hidden" + + if (!dbus_connection_send(dbus_conn, msg, NULL)) + { +- BUG("dbus message send failed!\n"); ++ BUG_SCAN("dbus message send failed!\n"); + return 0; + } + +diff -up hplip-3.23.3/scan/sane/ledm.c.covscan hplip-3.23.3/scan/sane/ledm.c +--- hplip-3.23.3/scan/sane/ledm.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/ledm.c 2023-05-29 13:58:10.973395191 +0200 +@@ -813,7 +813,7 @@ SANE_Status ledm_control_option(SANE_Han + + if (stat != SANE_STATUS_GOOD) + { +- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); ++ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); + } + + return stat; +@@ -1078,7 +1078,7 @@ void ledm_close(SANE_Handle handle) + + if (ps == NULL || ps != session) + { +- BUG("invalid sane_close\n"); ++ BUG_SCAN("invalid sane_close\n"); + return; + } + +diff -up hplip-3.23.3/scan/sane/marvell.c.covscan hplip-3.23.3/scan/sane/marvell.c +--- hplip-3.23.3/scan/sane/marvell.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/marvell.c 2023-05-29 13:58:10.976395173 +0200 +@@ -134,7 +134,7 @@ static int get_ip_data(struct marvell_se + + if (!ps->ip_handle) + { +- BUG("invalid ipconvert state\n"); ++ BUG_SCAN("invalid ipconvert state\n"); + goto bugout; + } + +@@ -335,7 +335,7 @@ static struct marvell_session *create_se + + if ((ps = malloc(sizeof(struct marvell_session))) == NULL) + { +- BUG("malloc failed: %m\n"); ++ BUG_SCAN("malloc failed: %m\n"); + return NULL; + } + memset(ps, 0, sizeof(struct marvell_session)); +@@ -402,7 +402,7 @@ SANE_Status marvell_open(SANE_String_Con + + if (session) + { +- BUG("session in use\n"); ++ BUG_SCAN("session in use\n"); + return SANE_STATUS_DEVICE_BUSY; + } + +@@ -431,7 +431,7 @@ SANE_Status marvell_open(SANE_String_Con + + if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK) + { +- BUG("unable to open device %s\n", session->uri); ++ BUG_SCAN("unable to open device %s\n", session->uri); + goto bugout; + + free(session); +@@ -441,7 +441,7 @@ SANE_Status marvell_open(SANE_String_Con + + if (hpmud_open_channel(session->dd, HPMUD_S_MARVELL_SCAN_CHANNEL, &session->cd) != HPMUD_R_OK) + { +- BUG("unable to open %s channel %s\n", HPMUD_S_MARVELL_SCAN_CHANNEL, session->uri); ++ BUG_SCAN("unable to open %s channel %s\n", HPMUD_S_MARVELL_SCAN_CHANNEL, session->uri); + stat = SANE_STATUS_DEVICE_BUSY; + goto bugout; + } +@@ -554,7 +554,7 @@ void marvell_close(SANE_Handle handle) + + if (ps == NULL || ps != session) + { +- BUG("invalid sane_close\n"); ++ BUG_SCAN("invalid sane_close\n"); + return; + } + +@@ -849,7 +849,7 @@ SANE_Status marvell_control_option(SANE_ + stat = SANE_STATUS_GOOD; + break; + } +- BUG("value=%d brymin=%d brymax=%d\n", *int_value, ps->bryRange.min, ps->bryRange.max); ++ BUG_SCAN("value=%d brymin=%d brymax=%d\n", *int_value, ps->bryRange.min, ps->bryRange.max); + } + else + { /* Set default. */ +@@ -866,7 +866,7 @@ SANE_Status marvell_control_option(SANE_ + + if (stat != SANE_STATUS_GOOD) + { +- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, ++ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, + action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); + } + +@@ -905,7 +905,7 @@ SANE_Status marvell_start(SANE_Handle ha + + if (set_extents(ps)) + { +- BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n", ++ BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n", + ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max); + stat = SANE_STATUS_INVAL; + goto bugout; +@@ -963,7 +963,7 @@ SANE_Status marvell_start(SANE_Handle ha + /* Open image processor. */ + if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE) + { +- BUG("unable open image processor: err=%d\n", ret); ++ BUG_SCAN("unable open image processor: err=%d\n", ret); + stat = SANE_STATUS_INVAL; + goto bugout; + } +@@ -1023,7 +1023,7 @@ SANE_Status marvell_read(SANE_Handle han + + if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR)) + { +- BUG("ipConvert error=%x\n", ret); ++ BUG_SCAN("ipConvert error=%x\n", ret); + goto bugout; + } + +diff -up hplip-3.23.3/scan/sane/sclpml.c.covscan hplip-3.23.3/scan/sane/sclpml.c +--- hplip-3.23.3/scan/sane/sclpml.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/sclpml.c 2023-05-29 13:58:10.976395173 +0200 +@@ -30,6 +30,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <string.h> ++#include <sys/time.h> + #include "sane.h" + #include "saneopts.h" + #include "common.h" +@@ -2090,7 +2091,7 @@ void sclpml_close(SANE_Handle handle) + DBG(8, "sane_hpaio_close(): %s %d\n", __FILE__, __LINE__); + if (hpaio == NULL || hpaio != session) + { +- BUG("invalid sane_close\n"); ++ BUG_SCAN("invalid sane_close\n"); + return; + } + +diff -up hplip-3.23.3/scan/sane/soap.c.covscan hplip-3.23.3/scan/sane/soap.c +--- hplip-3.23.3/scan/sane/soap.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/soap.c 2023-05-29 13:58:10.977395167 +0200 +@@ -142,7 +142,7 @@ static int get_ip_data(struct soap_sessi + + if (!ps->ip_handle) + { +- BUG("invalid ipconvert state\n"); ++ BUG_SCAN("invalid ipconvert state\n"); + goto bugout; + } + +@@ -219,7 +219,7 @@ static struct soap_session *create_sessi + + if ((ps = malloc(sizeof(struct soap_session))) == NULL) + { +- BUG("malloc failed: %m\n"); ++ BUG_SCAN("malloc failed: %m\n"); + return NULL; + } + memset(ps, 0, sizeof(struct soap_session)); +@@ -418,7 +418,7 @@ SANE_Status soap_open(SANE_String_Const + + if (session) + { +- BUG("session in use\n"); ++ BUG_SCAN("session in use\n"); + return SANE_STATUS_DEVICE_BUSY; + } + +@@ -434,7 +434,7 @@ SANE_Status soap_open(SANE_String_Const + + if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK) + { +- BUG("unable to open device %s\n", session->uri); ++ BUG_SCAN("unable to open device %s\n", session->uri); + goto bugout; + + free(session); +@@ -519,7 +519,7 @@ void soap_close(SANE_Handle handle) + + if (ps == NULL || ps != session) + { +- BUG("invalid sane_close\n"); ++ BUG_SCAN("invalid sane_close\n"); + return; + } + +@@ -824,7 +824,7 @@ SANE_Status soap_control_option(SANE_Han + + if (stat != SANE_STATUS_GOOD) + { +- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, ++ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, + action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); + } + +@@ -862,7 +862,7 @@ SANE_Status soap_start(SANE_Handle handl + ps->user_cancel = 0; + if (set_extents(ps)) + { +- BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n", ++ BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n", + ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max); + stat = SANE_STATUS_INVAL; + goto bugout; +@@ -913,7 +913,7 @@ SANE_Status soap_start(SANE_Handle handl + /* Open image processor. */ + if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE) + { +- BUG("unable open image processor: err=%d\n", ret); ++ BUG_SCAN("unable open image processor: err=%d\n", ret); + stat = SANE_STATUS_INVAL; + goto bugout; + } +@@ -955,7 +955,7 @@ SANE_Status soap_start(SANE_Handle handl + + if (ret & (IP_INPUT_ERROR | IP_FATAL_ERROR | IP_DONE)) + { +- BUG("ipConvert error=%x\n", ret); ++ BUG_SCAN("ipConvert error=%x\n", ret); + stat = SANE_STATUS_IO_ERROR; + goto bugout; + } +@@ -1007,7 +1007,7 @@ SANE_Status soap_read(SANE_Handle handle + + if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR)) + { +- BUG("ipConvert error=%x\n", ret); ++ BUG_SCAN("ipConvert error=%x\n", ret); + goto bugout; + } + +diff -up hplip-3.23.3/scan/sane/soapht.c.covscan hplip-3.23.3/scan/sane/soapht.c +--- hplip-3.23.3/scan/sane/soapht.c.covscan 2023-03-28 09:26:11.000000000 +0200 ++++ hplip-3.23.3/scan/sane/soapht.c 2023-05-29 13:58:10.977395167 +0200 +@@ -136,7 +136,7 @@ static int get_ip_data(struct soap_sessi + + if (!ps->ip_handle) + { +- BUG("invalid ipconvert state\n"); ++ BUG_SCAN("invalid ipconvert state\n"); + goto bugout; + } + +@@ -435,7 +435,7 @@ static struct soap_session *create_sessi + + if ((ps = malloc(sizeof(struct soap_session))) == NULL) + { +- BUG("malloc failed: %m\n"); ++ BUG_SCAN("malloc failed: %m\n"); + return NULL; + } + memset(ps, 0, sizeof(struct soap_session)); +@@ -459,7 +459,7 @@ SANE_Status soapht_open(SANE_String_Cons + + if (session) + { +- BUG("session in use\n"); ++ BUG_SCAN("session in use\n"); + return SANE_STATUS_DEVICE_BUSY; + } + +@@ -475,7 +475,7 @@ SANE_Status soapht_open(SANE_String_Cons + + if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK) + { +- BUG("unable to open device %s\n", session->uri); ++ BUG_SCAN("unable to open device %s\n", session->uri); + goto bugout; + + free(session); +@@ -554,7 +554,7 @@ void soapht_close(SANE_Handle handle) + + if (ps == NULL || ps != session) + { +- BUG("invalid sane_close\n"); ++ BUG_SCAN("invalid sane_close\n"); + return; + } + +@@ -904,7 +904,7 @@ SANE_Status soapht_control_option(SANE_H + + if (stat != SANE_STATUS_GOOD) + { +- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, ++ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, + action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto"); + } + +@@ -946,7 +946,7 @@ SANE_Status soapht_start(SANE_Handle han + + if (set_extents(ps)) + { +- BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n", ++ BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n", + ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max); + stat = SANE_STATUS_INVAL; + goto bugout; +@@ -1032,7 +1032,7 @@ SANE_Status soapht_start(SANE_Handle han + /* Open image processor. */ + if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE) + { +- BUG("unable open image processor: err=%d\n", ret); ++ BUG_SCAN("unable open image processor: err=%d\n", ret); + stat = SANE_STATUS_INVAL; + goto bugout; + } +@@ -1075,7 +1075,7 @@ SANE_Status soapht_start(SANE_Handle han + + if (ret & (IP_INPUT_ERROR | IP_FATAL_ERROR | IP_DONE)) + { +- BUG("ipConvert error=%x\n", ret); ++ BUG_SCAN("ipConvert error=%x\n", ret); + stat = SANE_STATUS_IO_ERROR; + goto bugout; + } +@@ -1124,7 +1124,7 @@ SANE_Status soapht_read(SANE_Handle hand + + if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR)) + { +- BUG("ipConvert error=%x\n", ret); ++ BUG_SCAN("ipConvert error=%x\n", ret); + goto bugout; + } + diff --git a/source/ap/hplip/hplip-hpaio-gcc14.patch b/source/ap/hplip/hplip-hpaio-gcc14.patch new file mode 100644 index 000000000..f7d195ed1 --- /dev/null +++ b/source/ap/hplip/hplip-hpaio-gcc14.patch @@ -0,0 +1,114 @@ +diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c +index 57d1dde..3475929 100644 +--- a/scan/sane/hpaio.c ++++ b/scan/sane/hpaio.c +@@ -379,7 +379,7 @@ extern SANE_Status sane_hpaio_get_devices(const SANE_Device ***deviceList, SANE_ + ResetDeviceList(&DeviceList); + DevDiscovery(localOnly); + *deviceList = (const SANE_Device **)DeviceList; +- SANE_Device*** devList; ++ const SANE_Device*** devList; + orblite_get_devices(devList, localOnly); + + return SANE_STATUS_GOOD; +diff --git a/scan/sane/orblite.c b/scan/sane/orblite.c +index 2eb7aba..4eaa468 100644 +--- a/scan/sane/orblite.c ++++ b/scan/sane/orblite.c +@@ -64,28 +64,28 @@ SANE_Option_Descriptor DefaultOrbOptions[] = { + SANE_NAME_SCAN_TL_X, SANE_TITLE_SCAN_TL_X, SANE_DESC_SCAN_TL_X, // name, title, desc
+ SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeLeft // constraint_type, constraint
++ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeLeft // constraint_type, constraint
+ },
+
+ {
+ SANE_NAME_SCAN_TL_Y, SANE_TITLE_SCAN_TL_Y, SANE_DESC_SCAN_TL_Y, // name, title, desc
+ SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeTop // constraint_type, constraint
++ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeTop // constraint_type, constraint
+ },
+
+ {
+ SANE_NAME_SCAN_BR_X, SANE_TITLE_SCAN_BR_X, SANE_DESC_SCAN_BR_X, // name, title, desc
+ SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeRight // constraint_type, constraint
++ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeRight // constraint_type, constraint
+ },
+
+ {
+ SANE_NAME_SCAN_BR_Y, SANE_TITLE_SCAN_BR_Y, SANE_DESC_SCAN_BR_Y, // name, title, desc
+ SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeBottom // constraint_type, constraint
++ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeBottom // constraint_type, constraint
+ },
+
+ // optResolution, // resolution group
+@@ -93,7 +93,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = { + SANE_NAME_SCAN_RESOLUTION, SANE_TITLE_SCAN_RESOLUTION, SANE_DESC_SCAN_RESOLUTION, // name, title, desc
+ SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word), // type, unit, size,
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
++ SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
+ },
+
+ // optMode, // color/depth group
+@@ -101,7 +101,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = { + SANE_NAME_SCAN_MODE, SANE_TITLE_SCAN_MODE, SANE_DESC_SCAN_MODE, // name, title, desc
+ SANE_TYPE_STRING, SANE_UNIT_NONE, 256, // type, unit, size,
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_modes // constraint type, constraint
++ SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_modes // constraint type, constraint
+ },
+
+ // optSource,
+@@ -109,7 +109,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = { + SANE_NAME_SCAN_SOURCE, SANE_TITLE_SCAN_SOURCE, SANE_DESC_SCAN_SOURCE, // name, title, desc
+ SANE_TYPE_STRING, SANE_UNIT_NONE, 256, // type, unit, size,
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_sources // constraint type, constraint
++ SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_sources // constraint type, constraint
+ },
+
+ // optPaperSize,
+@@ -117,7 +117,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = { + SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
+ SANE_TYPE_STRING, SANE_UNIT_NONE, 256, // type, unit, size,
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_paper_sizes // constraint type, constraint
++ SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_paper_sizes // constraint type, constraint
+ },
+
+ // optPaperSize,
+@@ -125,7 +125,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = { + SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
+ SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word), // type, unit, size,
+ SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
+- SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
++ SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
+ },
+ #ifdef NOTDEF
+ // default template
+@@ -274,6 +274,7 @@ orblite_open (SANE_String_Const devicename, SANE_Handle * handle) + SANE_Auth_Callback authorize;
+ const SANE_Device *** device_list;
+ SANE_Bool local_only;
++ void * temp_handle;
+
+
+ // Allocate handle, set all handle values to zero
+@@ -305,7 +306,9 @@ orblite_open (SANE_String_Const devicename, SANE_Handle * handle) + if (stat != SANE_STATUS_GOOD)
+ return stat;
+
+- stat = g_handle->bb_orblite_open(devicename, &g_handle);
++ temp_handle = g_handle;
++ stat = g_handle->bb_orblite_open(devicename, &temp_handle);
++ g_handle = temp_handle;
+ if (stat == SANE_STATUS_GOOD)
+ *handle = g_handle;
+
diff --git a/source/ap/hplip/hplip-pcardext-disable.patch b/source/ap/hplip/hplip-pcardext-disable.patch new file mode 100644 index 000000000..c16fb5a25 --- /dev/null +++ b/source/ap/hplip/hplip-pcardext-disable.patch @@ -0,0 +1,16 @@ +--- ./Makefile.am.orig 2024-05-10 18:14:51.431337550 -0500 ++++ ./Makefile.am 2024-05-10 18:15:37.078338571 -0500 +@@ -306,13 +306,6 @@ + pcarddir = $(hplipdir)/pcard + dist_pcard_DATA = pcard/__init__.py pcard/photocard.py + +-# pcardext +-pcardextdir = $(pyexecdir) +-pcardext_LTLIBRARIES = pcardext.la +-pcardext_la_LDFLAGS = -module -avoid-version +-pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c pcard/pcardext/pcardext.h +-pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) +- + # prnt + prntdir = $(hplipdir)/prnt + dist_prnt_DATA = prnt/cups.py prnt/__init__.py prnt/ldl.py prnt/pcl.py prnt/colorcal.py diff --git a/source/ap/hplip/hplip-pserror-c99.patch b/source/ap/hplip/hplip-pserror-c99.patch new file mode 100644 index 000000000..747af3abf --- /dev/null +++ b/source/ap/hplip/hplip-pserror-c99.patch @@ -0,0 +1,17 @@ +prnt/pserror.c: Replace an implicit int with an explicit int + +Submitted upstream: <https://bugs.launchpad.net/hplip/+bug/1997875> + +diff --git a/prnt/hpps/pserror.c b/prnt/hpps/pserror.c +index 114d7e1b5fa364fb..493b49c27917a7e6 100644 +--- a/prnt/hpps/pserror.c ++++ b/prnt/hpps/pserror.c +@@ -24,7 +24,7 @@ extern char *program ; /* Defined by main program, giving program name */ + void message(int flags, char *format, ...) + { + va_list args ; +- static column = 0 ; /* current screen column for message wrap */ ++ static int column = 0 ; /* current screen column for message wrap */ + char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */ + char *bufptr = msgbuf ; /* message buffer pointer */ + diff --git a/source/ap/hplip/hplip-scan-hpaio-include.patch b/source/ap/hplip/hplip-scan-hpaio-include.patch new file mode 100644 index 000000000..79d1d94b7 --- /dev/null +++ b/source/ap/hplip/hplip-scan-hpaio-include.patch @@ -0,0 +1,19 @@ +scam/sane/hpaio.c: Include orblite.h for more function prototypes + +Otherwise the build fails with compilers which do not support +implicit function declarations. + +Submitted upstream: <https://bugs.launchpad.net/hplip/+bug/1997875> + +diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c +index d342626822fc2190..57d1ddea32fb5816 100644 +--- a/scan/sane/hpaio.c ++++ b/scan/sane/hpaio.c +@@ -50,6 +50,7 @@ + #include "sclpml.h" + #include "escl.h" + #include "io.h" ++#include "orblite.h" + #include "orblitei.h" + + diff --git a/source/ap/hplip/hplip-scan-orblite-c99.patch b/source/ap/hplip/hplip-scan-orblite-c99.patch new file mode 100644 index 000000000..c921f22f1 --- /dev/null +++ b/source/ap/hplip/hplip-scan-orblite-c99.patch @@ -0,0 +1,21 @@ +diff --git a/scan/sane/orblite.c b/scan/sane/orblite.c +index ba86640..2eb7aba 100644 +--- a/scan/sane/orblite.c ++++ b/scan/sane/orblite.c +@@ -20,6 +20,7 @@ + #include "orblitei.h"
+ #include "orblite.h"//Added New
+ #include <math.h>
++#include <dlfcn.h>
+ #include "utils.h"
+ #include "io.h"
+
+@@ -195,7 +196,7 @@ bugout: +
+ static int bb_unload(SANE_THandle ps)
+ {
+- _DBG("Calling orblite bb_unload: \n");
++ DBG("Calling orblite bb_unload: \n");
+ if (ps->bb_handle)
+ {
+ dlclose(ps->bb_handle);
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild index 682377996..c39b0f047 100755 --- a/source/ap/hplip/hplip.SlackBuild +++ b/source/ap/hplip/hplip.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +#SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -86,6 +89,16 @@ zcat $CWD/hplip.python3.shebang.diff.gz | patch -p1 --verbose || exit 1 # Fix the desktop file to show correct icon and category zcat $CWD/fix-desktop-file.patch.gz | patch -p1 --verbose || exit 1 +# GCC 14 fixes: +cat $CWD/hplip-pserror-c99.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-hpaio-gcc14.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-covscan.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-scan-orblite-c99.patch | patch -p1 --verbose || exit 1 +cat $CWD/hplip-scan-hpaio-include.patch | patch -p1 --verbose || exit 1 + +# This extension was never ported to python3: +cat $CWD/hplip-pcardext-disable.patch | patch -p1 --verbose || exit 1 + # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then unset SHADOW_OPTIONS @@ -203,4 +216,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/ap/ispell/ispell.SlackBuild b/source/ap/ispell/ispell.SlackBuild index eceeb7351..35a2d22ef 100755 --- a/source/ap/ispell/ispell.SlackBuild +++ b/source/ap/ispell/ispell.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ispell VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/joe/joe.SlackBuild b/source/ap/joe/joe.SlackBuild index 7c3e9d70a..56b5628fe 100755 --- a/source/ap/joe/joe.SlackBuild +++ b/source/ap/joe/joe.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=joe VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/libx86/libx86.SlackBuild b/source/ap/libx86/libx86.SlackBuild index cbf9f9867..2c6dfcd0f 100755 --- a/source/ap/libx86/libx86.SlackBuild +++ b/source/ap/libx86/libx86.SlackBuild @@ -64,6 +64,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion -Wno-error=incompatible-pointer-types" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/ap/man-pages/man-pages.SlackBuild b/source/ap/man-pages/man-pages.SlackBuild index 7acba4656..1815fe88a 100755 --- a/source/ap/man-pages/man-pages.SlackBuild +++ b/source/ap/man-pages/man-pages.SlackBuild @@ -43,8 +43,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf man-pages-$VERSION -tar xvf $CWD/man-pages-$VERSION.tar.?z -tar xvf $CWD/man-pages-posix-*.tar.?z +tar xvf $CWD/man-pages-$VERSION.tar.?z || exit 1 +tar xvf $CWD/man-pages-posix-*.tar.?z || exit 1 echo "Fixing permissions..." chown -R root:root man-pages-$VERSION man-pages-posix-* chmod -R a-s,u+rw,go+r-w man-pages-$VERSION man-pages-posix-* @@ -59,8 +59,20 @@ find man-pages-posix-* \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -mkdir -p $PKG/usr/man -cp -a man-pages-$VERSION/man* $PKG/usr/man +# Wow, this new build system is something else. +# Let's not use it. +# cd man-pages-$VERSION || exit 1 +#make || exit 1 +#make install prefix=/usr DESTDIR=$PKG || exit 1 +#mv $PKG/usr/share/man $PKG/usr +#rmdir $PKG/usr/share + +# Add the release version, which is about the only useful thing "make" does: +sed -i "s/(unreleased)/$VERSION/g" man-pages-${VERSION}/man/man*/* + +# Install the man pages: +mkdir -p $PKG/usr +cp -a man-pages-${VERSION}/man $PKG/usr # Are these other POSIX manpages of any real usefulness here? # Granted there may be some historical interest, and it's nice @@ -100,7 +112,7 @@ rm -r $TEMPDIR # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - man-pages-$VERSION/{CONTRIBUTING,Changes,README,man-pages-${VERSION}.Announce,man-pages-${VERSION}.lsm} \ + man-pages-$VERSION/{CONTRIBUTING*,Changes,INSTALL,LICENSES*,README*,RELEASE,lsm} \ man-pages-posix-*/POSIX-COPYRIGHT \ $PKG/usr/doc/${PKGNAM}-$VERSION diff --git a/source/ap/mariadb/doinst.sh b/source/ap/mariadb/doinst.sh index f65d4269f..c7d5f91cd 100644 --- a/source/ap/mariadb/doinst.sh +++ b/source/ap/mariadb/doinst.sh @@ -15,6 +15,7 @@ config() { if [ -e etc/rc.d/rc.mysqld ]; then cp -a etc/rc.d/rc.mysqld etc/rc.d/rc.mysqld.new.incoming cat etc/rc.d/rc.mysqld.new > etc/rc.d/rc.mysqld.new.incoming + touch -r etc/rc.d/rc.mysqld.new etc/rc.d/rc.mysqld.new.incoming mv etc/rc.d/rc.mysqld.new.incoming etc/rc.d/rc.mysqld.new fi diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index e89014d08..250c244a2 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2011, 2012, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # @@ -203,6 +203,7 @@ chmod 0755 $PKG/var/run/mysql mkdir -p $PKG/etc/rc.d # This is installed chmod 644 so that the server does not run by default. zcat $CWD/rc.mysqld.gz > $PKG/etc/rc.d/rc.mysqld.new +touch -r $CWD/rc.mysqld.gz $PKG/etc/rc.d/rc.mysqld.new rm -rf $PKG/etc/init.d $PKG/usr/libexec/rcmysql # Install mysqlaccess.conf diff --git a/source/ap/mc/bogus.cflags.diff b/source/ap/mc/bogus.cflags.diff new file mode 100644 index 000000000..0fec13e7f --- /dev/null +++ b/source/ap/mc/bogus.cflags.diff @@ -0,0 +1,10 @@ +--- ./m4.include/mc-cflags.m4.orig 2024-01-20 13:34:38.000000000 -0600 ++++ ./m4.include/mc-cflags.m4 2024-05-08 12:42:18.326695150 -0500 +@@ -57,7 +57,6 @@ + AX_APPEND_COMPILE_FLAGS([-Wmissing-format-attribute], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wmissing-parameter-type], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes], [mc_configured_cflags], [$EXTRA_OPTION]) +- AX_APPEND_COMPILE_FLAGS([-Wmissing-variable-declarations], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wnested-externs], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wno-long-long], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wno-unreachable-code], [mc_configured_cflags], [$EXTRA_OPTION]) diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild index 19082a848..71d9107b6 100755 --- a/source/ap/mc/mc.SlackBuild +++ b/source/ap/mc/mc.SlackBuild @@ -73,9 +73,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -if [ ! -x ./configure ]; then - ./autogen.sh -fi +cat $CWD/bogus.cflags.diff | patch -p1 --verbose || exit 1 +autoreconf -vif CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/ap/powertop/powertop.SlackBuild b/source/ap/powertop/powertop.SlackBuild index fbfb597df..91af9cee4 100755 --- a/source/ap/powertop/powertop.SlackBuild +++ b/source/ap/powertop/powertop.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=powertop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/rzip/rzip.SlackBuild b/source/ap/rzip/rzip.SlackBuild index 716b98ec0..352efbce2 100755 --- a/source/ap/rzip/rzip.SlackBuild +++ b/source/ap/rzip/rzip.SlackBuild @@ -55,6 +55,9 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + TMP=${TMP:-/tmp} PKG=$TMP/package-rzip diff --git a/source/ap/sc-im/sc-im.SlackBuild b/source/ap/sc-im/sc-im.SlackBuild index b48e8fa7f..b9f380143 100755 --- a/source/ap/sc-im/sc-im.SlackBuild +++ b/source/ap/sc-im/sc-im.SlackBuild @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +export CFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/ap/sc/sc.SlackBuild b/source/ap/sc/sc.SlackBuild index 5cbd9be47..b815dd55f 100755 --- a/source/ap/sc/sc.SlackBuild +++ b/source/ap/sc/sc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-10} +BUILD=${BUILD:-11} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -87,6 +87,7 @@ find . \ # Old software, modern compiler: zcat $CWD/sc-7.16-3.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/sc.gcc14.diff.gz | patch -p1 --verbose || exit 1 # Build: make $NUMJOBS || exit 1 diff --git a/source/ap/sc/sc.gcc14.diff b/source/ap/sc/sc.gcc14.diff new file mode 100644 index 000000000..25c9f1e0b --- /dev/null +++ b/source/ap/sc/sc.gcc14.diff @@ -0,0 +1,11 @@ +--- ./Makefile.orig 2024-05-11 16:51:27.919158388 -0500 ++++ ./Makefile 2024-05-11 16:53:10.235160676 -0500 +@@ -336,7 +336,7 @@ + # real effect on the reliability of the program, but may concern some + # people who don't understand them. + #CFLAGS=-DSYSV3 -O2 -Wall -pipe +-CFLAGS=-DSYSV3 -O2 -pipe ++CFLAGS=-DSYSV3 -O2 -pipe -Wno-error=implicit-function-declaration -Wno-error=implicit-int + LIB=-lm -lncurses + + # All of the source files diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild index 960c38d3e..b781023dc 100755 --- a/source/ap/screen/screen.SlackBuild +++ b/source/ap/screen/screen.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=screen VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/seejpeg/seejpeg.SlackBuild b/source/ap/seejpeg/seejpeg.SlackBuild index cb3ba4adb..6bb06e2a1 100755 --- a/source/ap/seejpeg/seejpeg.SlackBuild +++ b/source/ap/seejpeg/seejpeg.SlackBuild @@ -73,7 +73,7 @@ find . \ ( cd libjpeg-6a ; ./configure ; make || exit 1 ) || exit 1 ln -sf libjpeg-6a jpeglib -make seejpeg || exit 1 +CFLAGS="-Wno-error=incompatible-pointer-types" make seejpeg || exit 1 strip seejpeg cat seejpeg > $PKG/usr/bin/seejpeg @@ -89,4 +89,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/seejpeg-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/ap/sox/sox.SlackBuild b/source/ap/sox/sox.SlackBuild index fa8c4d363..2cc0fb7ce 100755 --- a/source/ap/sox/sox.SlackBuild +++ b/source/ap/sox/sox.SlackBuild @@ -52,6 +52,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + # If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG: if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then TAG="_alsa" diff --git a/source/ap/vorbis-tools/vorbis-tools.SlackBuild b/source/ap/vorbis-tools/vorbis-tools.SlackBuild index 7f23e008e..41d813480 100755 --- a/source/ap/vorbis-tools/vorbis-tools.SlackBuild +++ b/source/ap/vorbis-tools/vorbis-tools.SlackBuild @@ -69,6 +69,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/ap/xfsdump/xfsdump.SlackBuild b/source/ap/xfsdump/xfsdump.SlackBuild index 18d782cfa..b2e2499ea 100755 --- a/source/ap/xfsdump/xfsdump.SlackBuild +++ b/source/ap/xfsdump/xfsdump.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfsdump VERSION=${VERSION:-$(echo xfsdump-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/ap/zsh/0007-zsh-configure-c99.patch b/source/ap/zsh/0007-zsh-configure-c99.patch new file mode 100644 index 000000000..c4b36231b --- /dev/null +++ b/source/ap/zsh/0007-zsh-configure-c99.patch @@ -0,0 +1,44 @@ +Avoid incompatible pointer types in terminfo global variable checks. +Some compilers reject these incompatible pointer types, causing the +checks to always fail, when these variables are in fact available. + +Submitted upstream: <https://www.zsh.org/mla/workers/2023/msg01112.html> + +diff --git a/configure.ac b/configure.ac +index a58242f453b4a8f3..5534f42df14eb28c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1769,27 +1769,27 @@ if test x$zsh_cv_path_term_header != xnone; then + fi + + AC_MSG_CHECKING(if boolcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) + AC_MSG_RESULT($boolcodes) + + AC_MSG_CHECKING(if numcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) + AC_MSG_RESULT($numcodes) + + AC_MSG_CHECKING(if strcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) + AC_MSG_RESULT($strcodes) + + AC_MSG_CHECKING(if boolnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) + AC_MSG_RESULT($boolnames) + + AC_MSG_CHECKING(if numnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) + AC_MSG_RESULT($numnames) + + AC_MSG_CHECKING(if strnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) + AC_MSG_RESULT($strnames) + + dnl There are apparently defective terminal library headers on some diff --git a/source/ap/zsh/zsh.SlackBuild b/source/ap/zsh/zsh.SlackBuild index 3a5aa5c69..361b365ab 100755 --- a/source/ap/zsh/zsh.SlackBuild +++ b/source/ap/zsh/zsh.SlackBuild @@ -77,6 +77,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +cat $CWD/0007-zsh-configure-c99.patch | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild index c09d3ef6a..f3a48d430 100755 --- a/source/d/clisp/clisp.SlackBuild +++ b/source/d/clisp/clisp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=clisp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Bundled libraries: FFCALLVER=2.4 @@ -61,6 +61,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion" + # Don't use icecream: PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url index a77cfe13f..27841f4dd 100644 --- a/source/d/cmake/cmake.url +++ b/source/d/cmake/cmake.url @@ -1,2 +1,2 @@ https://github.com/Kitware/CMake/releases -https://github.com/Kitware/CMake/releases/download/v3.29.2/cmake-3.29.2.tar.gz +https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3.tar.gz diff --git a/source/d/cscope/cscope.SlackBuild b/source/d/cscope/cscope.SlackBuild index 02aa1eef6..11b8112db 100755 --- a/source/d/cscope/cscope.SlackBuild +++ b/source/d/cscope/cscope.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cscope VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/dev86/dev86.SlackBuild b/source/d/dev86/dev86.SlackBuild index 82470b14b..99f07ae9d 100755 --- a/source/d/dev86/dev86.SlackBuild +++ b/source/d/dev86/dev86.SlackBuild @@ -64,6 +64,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch" + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -79,6 +82,7 @@ find . \ #Does not compile with changed CFLAGS #CC="gcc" make CFLAGS="-Wall -Wstrict-prototypes $SLKCFLAGS -g" DIST=$PKG || exit 1 +GCCFLAG="$SLKCFLAGS" \ CC="gcc" \ make \ DIST=$PKG MANDIR=/usr/man LIBDIR=/usr/lib${LIBDIRSUFFIX}/bcc \ diff --git a/source/d/doxygen/doxygen.url b/source/d/doxygen/doxygen.url index 1f74849ea..6c67ed74e 100644 --- a/source/d/doxygen/doxygen.url +++ b/source/d/doxygen/doxygen.url @@ -1 +1,2 @@ http://www.doxygen.org/download.html +https://www.doxygen.nl/files/doxygen-1.11.0.src.tar.gz diff --git a/source/d/gnucobol/gnucobol.SlackBuild b/source/d/gnucobol/gnucobol.SlackBuild index 0ef415688..e605ab137 100755 --- a/source/d/gnucobol/gnucobol.SlackBuild +++ b/source/d/gnucobol/gnucobol.SlackBuild @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild index 56767bf69..9c00b21f0 100755 --- a/source/d/guile/guile.SlackBuild +++ b/source/d/guile/guile.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=guile VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index f42c1fbc1..1da8be0e3 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libtool VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url index cdcec53d5..80698a4bb 100644 --- a/source/d/llvm/llvm.url +++ b/source/d/llvm/llvm.url @@ -1,15 +1,15 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/llvm-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/clang-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/clang-tools-extra-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/compiler-rt-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/flang-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/lldb-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/openmp-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/polly-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/libcxx-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/libcxxabi-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/lld-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/libunwind-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/cmake-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/third-party-18.1.4.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/runtimes-18.1.4.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/llvm-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/clang-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/clang-tools-extra-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/compiler-rt-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/flang-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/lldb-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/openmp-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/polly-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/libcxx-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/libcxxabi-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/lld-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/libunwind-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/cmake-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/third-party-18.1.6.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/runtimes-18.1.6.src.tar.xz diff --git a/source/d/lua/lua.SlackBuild b/source/d/lua/lua.SlackBuild index 20aa6a035..6872a6f79 100755 --- a/source/d/lua/lua.SlackBuild +++ b/source/d/lua/lua.SlackBuild @@ -16,7 +16,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lua VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/luajit/fetch-luajit.sh b/source/d/luajit/fetch-luajit.sh new file mode 100755 index 000000000..980c3b465 --- /dev/null +++ b/source/d/luajit/fetch-luajit.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +# Copyright 2024 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. + + +PKGNAM=luajit + +# Pull a stable branch + patches +BRANCH=${1:-v2.1} + +# Clear download area: +rm -rf ${PKGNAM} + +# Clone repository: +git clone https://luajit.org/git/luajit.git + +pushd luajit + PATCH="$(git show -s --format=%ct)" +popd + +# checkout $BRANCH: +( cd ${PKGNAM} + git checkout $BRANCH || exit 1 + # Add patch version: + echo $PATCH > .relver + # Use patchlevel, not ROLLING: + sed -i "s/ROLLING/$PATCH/g" etc/luajit.pc src/luajit_rolling.h +) +MAJOR=$(grep majver= ${PKGNAM}/etc/luajit.pc | cut -f 2 -d =) +MINOR=$(grep minver= ${PKGNAM}/etc/luajit.pc | cut -f 2 -d =) +PATCH=$(grep relver= ${PKGNAM}/etc/luajit.pc | cut -f 2 -d =) +HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )" +DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv ${PKGNAM} ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH} +tar cf ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH} +plzip -9 -f ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar +rm -rf ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH} +touch -d "$LONGDATE" ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar.lz +echo +echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar.lz" +echo diff --git a/source/d/luajit/luajit.SlackBuild b/source/d/luajit/luajit.SlackBuild new file mode 100755 index 000000000..8f9ab0c7a --- /dev/null +++ b/source/d/luajit/luajit.SlackBuild @@ -0,0 +1,137 @@ +#!/bin/bash + +# Copyright 2018 Erik Falor <ewfalor@gmail.com>, Logan, Utah, USA +# Copyright 2024 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) + +PKGNAM=luajit +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Enable Lua 5.2 features: +sed -i -e '/-DLUAJIT_ENABLE_LUA52COMPAT/s/^#//' src/Makefile + +# preserve timestamps: +sed -i -e '/install -m/s/-m/-p -m/' Makefile + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +make $NUMJOBS \ + Q= \ + PREFIX=/usr \ + MULTILIB=lib${LIBDIRSUFFIX} \ + INSTALL_LIB=/usr/lib${LIBDIRSUFFIX} \ + INSTALL_MAN=/usr/man/man1 || exit 1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +make install \ + Q= \ + DESTDIR=$PKG \ + PREFIX=/usr \ + MULTILIB=lib${LIBDIRSUFFIX} \ + INSTALL_LIB=$PKG/usr/lib${LIBDIRSUFFIX} \ + INSTALL_MAN=$PKG/usr/man/man1 || exit 1 + +# No static library: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libluajit*.a + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + COPYRIGHT* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/d/luajit/slack-desc b/source/d/luajit/slack-desc new file mode 100644 index 000000000..367c9e126 --- /dev/null +++ b/source/d/luajit/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +luajit: luajit (Just-In-Time Lua compiler) +luajit: +luajit: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming +luajit: language. +luajit: +luajit: Homepage: https://luajit.org/ +luajit: +luajit: +luajit: +luajit: +luajit: diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild index 6fc50899b..6e0faba19 100755 --- a/source/d/meson/meson.SlackBuild +++ b/source/d/meson/meson.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=meson VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index d9d3e46a4..8b640019a 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -fpermissive" + TMP=${TMP:-/tmp} PKG=$TMP/package-oprofile diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild index d3c486f53..ee4eaba1b 100755 --- a/source/d/ruby/ruby.SlackBuild +++ b/source/d/ruby/ruby.SlackBuild @@ -76,6 +76,9 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 6c398d95b..0a43df8f0 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.77.2} +VERSION=${VERSION:-1.78.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-NO} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.76.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2024-02-08} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.76.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.77.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2024-03-21} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.77.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index d7fc4bf62..5642b674e 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.lz): -VERSION=1.77.2 +VERSION=1.78.0 rm -f rustc-${VERSION}-src.tar.* lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc @@ -20,8 +20,8 @@ fi # update the settings below, look at src/stage0.json in the Rust sources. exit 0 -BOOTSTRAP_DATE=2024-02-08 -BOOTSTRAP_VERSION=1.76.0 +BOOTSTRAP_DATE=2024-03-21 +BOOTSTRAP_VERSION=1.77.0 BOOTSTRAP_CARGO=$BOOTSTRAP_VERSION # i686 bootstrap: diff --git a/source/d/strace/strace.url b/source/d/strace/strace.url index 7f8c04ea1..845787a44 100644 --- a/source/d/strace/strace.url +++ b/source/d/strace/strace.url @@ -1,2 +1,2 @@ https://github.com/strace/strace -https://github.com/strace/strace/releases/download/v6.8/strace-6.8.tar.xz +https://github.com/strace/strace/releases/download/v6.9/strace-6.9.tar.xz diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 2023e81fd..4863bfa6b 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion" + TMP=${TMP:-/tmp} PKG=$TMP/package-subversion diff --git a/source/e/emacspeak/emacspeak.SlackBuild b/source/e/emacspeak/emacspeak.SlackBuild index 7c45f0ffb..800e00fa5 100755 --- a/source/e/emacspeak/emacspeak.SlackBuild +++ b/source/e/emacspeak/emacspeak.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=emacspeak VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -146,8 +146,17 @@ mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION ln -sf /usr/share/emacs/site-lisp/emacspeak/etc . ln -sf etc/COPYRIGHT . ln -sf etc/NEWS . - ln -sf /usr/share/emacs/site-lisp/emacspeak/README.md . + ln -sf /usr/share/emacs/site-lisp/emacspeak/README . + ln -sf /usr/share/emacs/site-lisp/emacspeak/Readme.org . ln -sf /usr/share/emacs/site-lisp/emacspeak/blog-archive . + # Check these: + find $PKG/usr/doc/${PKGNAM}-$VERSION -xtype l | while read brokenlink ; do + echo + echo "WARNING: Removing broken symlink $brokenlink" + echo + rm -f $brokenlink + sleep 60 + done ) mkdir -p $PKG/install diff --git a/source/e/emacspeak/emacspeak.url b/source/e/emacspeak/emacspeak.url index 018d49104..9a92588c3 100644 --- a/source/e/emacspeak/emacspeak.url +++ b/source/e/emacspeak/emacspeak.url @@ -1,2 +1,2 @@ https://github.com/tvraman/emacspeak -https://github.com/tvraman/emacspeak/releases/download/59/emacspeak-59.0.tar.bz2 +https://github.com/tvraman/emacspeak/releases/download/60.0/emacspeak-60.0.tar.bz2 diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 6b40c72d4..cd0c305a0 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,30 @@ +Tue May 28 17:53:49 UTC 2024 + Add /sbin/zramctl. + rc.S: Set up some swap on a ZRAM device. + SeTpartitions: Support installing to bcachefs filesystems. + SeTpartitions: quit offering reiserfs which will be gone in Linux 6.10. ++--------------------------+ +Sat May 25 17:39:17 UTC 2024 + Add zram.ko. ++--------------------------+ +Wed May 15 22:32:33 UTC 2024 + Force compress the hwdata files. Thanks to Stuart Winter. + Include rescan_scsi_bus.sh, sg_inq, sg_turs, and libsgutils2 from the + sg3_utils package. Thanks to ikocher. + Include bcachefs-tools. + Add libsodium for bcachefs-tools. + No menu-driven installer support yet (nor immediately pending). ++--------------------------+ +Tue May 14 18:24:45 UTC 2024 + Disable CONFIG_TC in busybox-dot-config. ++--------------------------+ +Wed May 8 09:26:31 UTC 2024 + build_installer.sh: Switch to the 'pciutils' implementation of 'lspci' since + Busybox's implementation lacks the capability to map hardware IDs to model + names; a feature we rely on for the conditional loading of Kernel modules on + AArch64. + gzip the content of /usr/share/hwdata to conserve space. ++--------------------------+ Mon Mar 18 08:08:08 UTC 2024 Added console font 'ter-v18n' to accommodate the Raspberry Pi 400's screen. Thanks to BrianL. diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 6cf9cf664..20707f943 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -946,6 +946,7 @@ case $ARCH in esac PKGLIST="${EXTRA_PKGS} \ a/bash \ +a/bcachefs-tools \ a/btrfs-progs \ a/coreutils \ a/cryptsetup \ @@ -1010,6 +1011,7 @@ l/libcap \ l/libidn2 \ l/libnsl \ l/libnvme \ +l/libsodium \ l/libunistring \ l/libusb \ l/lz4 \ @@ -1018,6 +1020,7 @@ l/parted \ l/pcre2 \ l/popt \ l/readline \ +l/sg3_utils \ l/zlib \ l/zstd \ n/dhcpcd \ @@ -1094,6 +1097,9 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \ plzip \ rev \ uuidgen \ + rescan-scsi-bus.sh \ + sg_inq \ + sg_turs \ syslinux-nomtools \ strings \ $PKG/$ARCH-installer-filesystem/usr/bin/ @@ -1121,6 +1127,7 @@ cp --remove-destination -fa${VERBOSE1} \ cd $TMP/extract-packages/sbin cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_SBIN} \ badblocks \ + *bcachefs* \ blkid \ btrfs* \ cgdisk \ @@ -1177,6 +1184,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_SBIN} \ udev* \ umount \ xfs_repair \ + zramctl \ $PKG/$ARCH-installer-filesystem/sbin/ # This had dmsetup* above, which unnecessarily copies dmsetup.static # This had lvm* above, which unnecessarily copies lvm.static @@ -1383,6 +1391,8 @@ cp -fa${VERBOSE1} \ libnvme*.so* \ libparted*so* \ libreadline*.so* \ + libsgutils2*.so* \ + libsodium.so* \ libstdc++*.so* \ libunistring*.so* \ libusb-1.0*.so* \ @@ -1426,9 +1436,13 @@ cp -fa${VERBOSE1} \ # Add pci.ids and usb.ids now that we have lspci and lsusb onboard: cd $TMP/extract-packages/usr/share/hwdata +# Remove any previous data files that exist if you're working with +# an existing initrd image: +rm -rf $PKG/$ARCH-installer-filesystem/usr/share/hwdata mkdir -p -m755 $PKG/$ARCH-installer-filesystem/usr/share/hwdata cp -fa${VERBOSE1} pci.ids usb.ids \ $PKG/$ARCH-installer-filesystem/usr/share/hwdata +gzip -f9${VERBOSE1} $PKG/$ARCH-installer-filesystem/usr/share/hwdata/* # Copy the rc script for rpcbind: cd $TMP/extract-packages/etc/rc.d @@ -1456,14 +1470,19 @@ for prunedir in $PKG/$ARCH-installer-filesystem/usr/bin $PKG/$ARCH-installer-fil rm -f $PKG/$ARCH-installer-filesystem/sbin/$(basename $removefile) done done -if [ -r $PKG/$ARCH-installer-filesystem/sbin/lspci -a ! -L $PKG/$ARCH-installer-filesystem/sbin/lspci -a -L $PKG/$ARCH-installer-filesystem/bin/lspci ]; then - rm -f $PKG/$ARCH-installer-filesystem/bin/lspci -fi + # busybox's implementation of 'xzcat' provides different output when piped into 'dd'. # Symlink 'xzcat' to the real 'xz' as we do within the OS: cd $PKG/$ARCH-installer-filesystem/bin ln -fs xz xzcat +# Busybox's implementation of 'lspci' doesn't consult the hardware data within +# /usr/share/hwdata. Replace it with pciutils' version: +cp --remove-destination \ + -fa${VERBOSE1} \ + $TMP/extract-packages/usr/bin/lspci \ + $PKG/$ARCH-installer-filesystem/bin/ + # Update to latest versions of files within /etc/ # /etc/ file Package Reason # ------------------------------------------------------------------------------------ @@ -1698,12 +1717,13 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do rm -rf${VERBOSE1} md.orig ;; esac - # Save loop.ko, nvme.ko, and virtio_blk.ko, but remove other block drivers: + # Save loop.ko, nvme.ko, virtio_blk.ko, and zram.ko, but remove other block drivers: mv block block.orig mkdir block mv block.orig/nvme.ko block mv block.orig/loop.ko block mv block.orig/virtio_blk.ko block + mv block.orig/zram block rm -rf${VERBOSE1} block.orig # Done with block directory # Grab a few modules from staging: @@ -2259,6 +2279,7 @@ if [ -d usr/man ]; then # man page format... perhaps handy for future documentation, or # README_LVM, etc. ? for manpage in \ + man8/bcachefs.8.bz2 \ man8/cfdisk.8.bz2 \ man8/fdisk.8.bz2 \ man8/gdisk.8.bz2 \ diff --git a/source/installer/sources/busybox/busybox-dot-config b/source/installer/sources/busybox/busybox-dot-config index 866752902..ad3d6ea47 100644 --- a/source/installer/sources/busybox/busybox-dot-config +++ b/source/installer/sources/busybox/busybox-dot-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.32.1 -# Sun Jan 17 13:37:03 2021 +# Tue May 14 13:21:58 2024 # CONFIG_HAVE_DOT_CONFIG=y @@ -941,8 +941,8 @@ CONFIG_PSCAN=y CONFIG_ROUTE=y CONFIG_SLATTACH=y CONFIG_SSL_CLIENT=y -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set +# CONFIG_FEATURE_TC_INGRESS is not set CONFIG_TCPSVD=y CONFIG_UDPSVD=y CONFIG_TELNET=y diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S index 0e69d7349..c798c9d18 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.S +++ b/source/installer/sources/initrd/etc/rc.d/rc.S @@ -139,6 +139,27 @@ else fi # End Run udev: +# Set up some swap on a ZRAM device: +ZRAMSIZE=$(echo $(cat /proc/meminfo | grep ^MemTotal:) | cut -f 2 -d ' ') +ZRAMCOMPRESSION=zstd +ZRAMPRIORITY=100 +if [ ! -d /sys/devices/virtual/block/zram0 ]; then + modprobe zram +fi +# In case of a 32-bit kernel, we are limited to 4G maximum ZRAM device size. +# If the RAM size is greater than 4G, then use 4G for the ZRAMSIZE. +if [ "$(uname -m)" = "i686" ]; then + if [ "$ZRAMSIZE" -gt "4194304" ]; then + ZRAMSIZE=4194304 + fi +fi +ZRAM_DEVICE=$(/sbin/zramctl -f -a $ZRAMCOMPRESSION -s ${ZRAMSIZE}K) +if [ ! -z $ZRAM_DEVICE ]; then + /sbin/mkswap $ZRAM_DEVICE + /sbin/swapon -p $ZRAMPRIORITY $ZRAM_DEVICE +fi +unset ZRAMCOMPRESSION ZRAM_DEVICE ZRAMPRIORITY ZRAMSIZE + # Here's the situation. Because of the practice of keeping the local # time (rather than UTC) in the system's clock, at any given time half # of the people doing an install will be creating files that upon diff --git a/source/installer/sources/initrd/sbin/rescan-scsi-bus b/source/installer/sources/initrd/sbin/rescan-scsi-bus index 4be8f01e1..106125246 100755..120000 --- a/source/installer/sources/initrd/sbin/rescan-scsi-bus +++ b/source/installer/sources/initrd/sbin/rescan-scsi-bus @@ -1,759 +1 @@ -#!/bin/bash -# Skript to rescan SCSI bus, using the -# scsi add-single-device mechanism -# (c) 1998--2010 Kurt Garloff <kurt@garloff.de>, GNU GPL v2 or v3 -# (c) 2006--2008 Hannes Reinecke, GNU GPL v2 or later -# $Id: rescan-scsi-bus.sh,v 1.56 2012/01/14 22:23:53 garloff Exp $ - -SCAN_WILD_CARD=4294967295 - -setcolor () -{ - red="\e[0;31m" - green="\e[0;32m" - yellow="\e[0;33m" - bold="\e[0;1m" - norm="\e[0;0m" -} - -unsetcolor () -{ - red=""; green="" - yellow=""; norm="" -} - -# Output some text and return cursor to previous position -# (only works for simple strings) -# Stores length of string in LN and returns it -print_and_scroll_back () -{ - STRG="$1" - LN=${#STRG} - BK="" - declare -i cntr=0 - while test $cntr -lt $LN; do BK="$BK\e[D"; let cntr+=1; done - echo -en "$STRG$BK" - return $LN -} - -# Overwrite a text of length $1 (fallback to $LN) with whitespace -white_out () -{ - BK=""; WH="" - if test -n "$1"; then LN=$1; fi - declare -i cntr=0 - while test $cntr -lt $LN; do BK="$BK\e[D"; WH="$WH "; let cntr+=1; done - echo -en "$WH$BK" -} - -# Return hosts. sysfs must be mounted -findhosts_26 () -{ - hosts=`find /sys/class/scsi_host/host* -maxdepth 4 -type d -o -type l 2> /dev/null | awk -F'/' '{print $5}' | sed -e 's~host~~' | sort -nu` - scsi_host_data=`echo "$hosts" | sed -e 's~^~/sys/class/scsi_host/host~'` - for hostdir in $scsi_host_data; do - hostno=${hostdir#/sys/class/scsi_host/host} - if [ -f $hostdir/isp_name ] ; then - hostname="qla2xxx" - elif [ -f $hostdir/lpfc_drvr_version ] ; then - hostname="lpfc" - else - hostname=`cat $hostdir/proc_name` - fi - #hosts="$hosts $hostno" - echo "Host adapter $hostno ($hostname) found." - done - if [ -z "$hosts" ] ; then - echo "No SCSI host adapters found in sysfs" - exit 1; - fi - # Not necessary just use double quotes around variable to preserve new lines - #hosts=`echo $hosts | tr ' ' '\n'` -} - -# Return hosts. /proc/scsi/HOSTADAPTER/? must exist -findhosts () -{ - hosts= - for driverdir in /proc/scsi/*; do - driver=${driverdir#/proc/scsi/} - if test $driver = scsi -o $driver = sg -o $driver = dummy -o $driver = device_info; then continue; fi - for hostdir in $driverdir/*; do - name=${hostdir#/proc/scsi/*/} - if test $name = add_map -o $name = map -o $name = mod_parm; then continue; fi - num=$name - driverinfo=$driver - if test -r $hostdir/status; then - num=$(printf '%d\n' `sed -n 's/SCSI host number://p' $hostdir/status`) - driverinfo="$driver:$name" - fi - hosts="$hosts $num" - echo "Host adapter $num ($driverinfo) found." - done - done -} - -printtype () -{ - local type=$1 - - case "$type" in - 0) echo "Direct-Access " ;; - 1) echo "Sequential-Access" ;; - 2) echo "Printer " ;; - 3) echo "Processor " ;; - 4) echo "WORM " ;; - 5) echo "CD-ROM " ;; - 6) echo "Scanner " ;; - 7) echo "Optical Device " ;; - 8) echo "Medium Changer " ;; - 9) echo "Communications " ;; - 10) echo "Unknown " ;; - 11) echo "Unknown " ;; - 12) echo "RAID " ;; - 13) echo "Enclosure " ;; - 14) echo "Direct-Access-RBC" ;; - *) echo "Unknown " ;; - esac -} - -print02i() -{ - if [ "$1" = "*" ] ; then - echo "00" - else - printf "%02i" "$1" - fi -} - -# Get /proc/scsi/scsi info for device $host:$channel:$id:$lun -# Optional parameter: Number of lines after first (default = 2), -# result in SCSISTR, return code 1 means empty. -procscsiscsi () -{ - if test -z "$1"; then LN=2; else LN=$1; fi - CHANNEL=`print02i "$channel"` - ID=`print02i "$id"` - LUN=`print02i "$lun"` - if [ -d /sys/class/scsi_device ]; then - SCSIPATH="/sys/class/scsi_device/${host}:${channel}:${id}:${lun}" - if [ -d "$SCSIPATH" ] ; then - SCSISTR="Host: scsi${host} Channel: $CHANNEL Id: $ID Lun: $LUN" - if [ "$LN" -gt 0 ] ; then - IVEND=$(cat ${SCSIPATH}/device/vendor) - IPROD=$(cat ${SCSIPATH}/device/model) - IPREV=$(cat ${SCSIPATH}/device/rev) - SCSIDEV=$(printf ' Vendor: %-08s Model: %-16s Rev: %-4s' "$IVEND" "$IPROD" "$IPREV") - SCSISTR="$SCSISTR -$SCSIDEV" - fi - if [ "$LN" -gt 1 ] ; then - ILVL=$(cat ${SCSIPATH}/device/scsi_level) - type=$(cat ${SCSIPATH}/device/type) - ITYPE=$(printtype $type) - SCSITMP=$(printf ' Type: %-16s ANSI SCSI revision: %02d' "$ITYPE" "$((ILVL - 1))") - SCSISTR="$SCSISTR -$SCSITMP" - fi - else - return 1 - fi - else - grepstr="scsi$host Channel: $CHANNEL Id: $ID Lun: $LUN" - SCSISTR=`cat /proc/scsi/scsi | grep -A$LN -e"$grepstr"` - fi - if test -z "$SCSISTR"; then return 1; else return 0; fi -} - -# Find sg device with 2.6 sysfs support -sgdevice26 () -{ - if test -e /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic; then - SGDEV=`readlink /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic` - SGDEV=`basename $SGDEV` - else - for SGDEV in /sys/class/scsi_generic/sg*; do - DEV=`readlink $SGDEV/device` - if test "${DEV##*/}" = "$host:$channel:$id:$lun"; then - SGDEV=`basename $SGDEV`; return - fi - done - SGDEV="" - fi -} - -# Find sg device with 2.4 report-devs extensions -sgdevice24 () -{ - if procscsiscsi 3; then - SGDEV=`echo "$SCSISTR" | grep 'Attached drivers:' | sed 's/^ *Attached drivers: \(sg[0-9]*\).*/\1/'` - fi -} - -# Find sg device that belongs to SCSI device $host $channel $id $lun -# and return in SGDEV -sgdevice () -{ - SGDEV= - if test -d /sys/class/scsi_device; then - sgdevice26 - else - DRV=`grep 'Attached drivers:' /proc/scsi/scsi 2>/dev/null` - repdevstat=$((1-$?)) - if [ $repdevstat = 0 ]; then - echo "scsi report-devs 1" >/proc/scsi/scsi - DRV=`grep 'Attached drivers:' /proc/scsi/scsi 2>/dev/null` - if [ $? = 1 ]; then return; fi - fi - if ! `echo $DRV | grep 'drivers: sg' >/dev/null`; then - modprobe sg - fi - sgdevice24 - if [ $repdevstat = 0 ]; then - echo "scsi report-devs 0" >/proc/scsi/scsi - fi - fi -} - -# Test if SCSI device is still responding to commands -testonline () -{ - : testonline - RC=0 - if test ! -x /usr/bin/sg_turs; then return 0; fi - sgdevice - if test -z "$SGDEV"; then return 0; fi - sg_turs /dev/$SGDEV >/dev/null 2>&1 - RC=$? - # Handle in progress of becoming ready and unit attention -- wait at max 11s - declare -i ctr=0 - if test $RC = 2 -o $RC = 6; then - RMB=`sg_inq /dev/$SGDEV | grep 'RMB=' | sed 's/^.*RMB=\(.\).*$/\1/'` - print_and_scroll_back "$host:$channel:$id:$lun $SGDEV ($RMB) " - fi - while test $RC = 2 -o $RC = 6 && test $ctr -le 8; do - if test $RC = 2 -a "$RMB" != "1"; then echo -n "."; let $LN+=1; sleep 1 - else usleep 20000; fi - let ctr+=1 - sg_turs /dev/$SGDEV >/dev/null 2>&1 - RC=$? - done - if test $ctr != 0; then white_out; fi - # echo -e "\e[A\e[A\e[A${yellow}Test existence of $SGDEV = $RC ${norm} \n\n\n" - if test $RC = 1; then return $RC; fi - # Reset RC (might be !=0 for passive paths) - RC=0 - # OK, device online, compare INQUIRY string - INQ=`sg_inq $sg_len_arg /dev/$SGDEV 2>/dev/null` - IVEND=`echo "$INQ" | grep 'Vendor identification:' | sed 's/^[^:]*: \(.*\)$/\1/'` - IPROD=`echo "$INQ" | grep 'Product identification:' | sed 's/^[^:]*: \(.*\)$/\1/'` - IPREV=`echo "$INQ" | grep 'Product revision level:' | sed 's/^[^:]*: \(.*\)$/\1/'` - STR=`printf " Vendor: %-08s Model: %-16s Rev: %-4s" "$IVEND" "$IPROD" "$IPREV"` - IPTYPE=`echo "$INQ" | sed -n 's/.* Device_type=\([0-9]*\) .*/\1/p'` - IPQUAL=`echo "$INQ" | sed -n 's/ *PQual=\([0-9]*\) Device.*/\1/p'` - if [ "$IPQUAL" != 0 ] ; then - echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}LU not available (PQual $IPQUAL)${norm} \n\n\n" - return 2 - fi - - TYPE=$(printtype $IPTYPE) - procscsiscsi - TMPSTR=`echo "$SCSISTR" | grep 'Vendor:'` - if [ "$TMPSTR" != "$STR" ]; then - echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${SCSISTR#* } \nto: $STR ${norm} \n\n\n" - return 1 - fi - TMPSTR=`echo "$SCSISTR" | sed -n 's/.*Type: *\(.*\) *ANSI.*/\1/p'` - if [ $TMPSTR != $TYPE ] ; then - echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR} \nto: $TYPE ${norm} \n\n\n" - return 1 - fi - return $RC -} - -# Test if SCSI device $host $channen $id $lun exists -# Outputs description from /proc/scsi/scsi (unless arg passed) -# Returns SCSISTR (empty if no dev) -testexist () -{ - : testexist - SCSISTR= - if procscsiscsi && test -z "$1"; then - echo "$SCSISTR" | head -n1 - echo "$SCSISTR" | tail -n2 | pr -o4 -l1 - fi -} - -# Returns the list of existing channels per host -chanlist () -{ - local hcil - local cil - local chan - local tmpchan - - for dev in /sys/class/scsi_device/${host}:* ; do - [ -d $dev ] || continue; - hcil=${dev##*/} - cil=${hcil#*:} - chan=${cil%%:*} - for tmpchan in $channelsearch ; do - if test "$chan" -eq $tmpchan ; then - chan= - fi - done - if test -n "$chan" ; then - channelsearch="$channelsearch $chan" - fi - done - if test -z "$channelsearch"; then channelsearch="0"; fi -} - -# Returns the list of existing targets per host -idlist () -{ - local hcil - local cil - local il - local target - local tmpid - - for dev in /sys/class/scsi_device/${host}:${channel}:* ; do - [ -d $dev ] || continue; - hcil=${dev##*/} - cil=${hcil#*:} - il=${cil#*:} - target=${il%%:*} - for tmpid in $idsearch ; do - if test "$target" -eq $tmpid ; then - target= - break - fi - done - if test -n "$target" ; then - idsearch="$idsearch $target" - fi - done -} - -# Returns the list of existing LUNs from device $host $channel $id $lun -# and returns list to stdout -getluns() -{ - sgdevice - if test -z "$SGDEV"; then return 1; fi - if test ! -x /usr/bin/sg_luns; then echo 0; return 1; fi - LLUN=`sg_luns /dev/$SGDEV 2>/dev/null | sed -n 's/ \(.*\)/\1/p'` - if test $? != 0; then echo 0; return 1; fi - #echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p' - for lun in $LLUN ; do - # Swap LUN number - l0=$(printf '%u' 0x$lun) - l1=$(( ($l0 >> 48) & 0xffff )) - l2=$(( ($l0 >> 32) & 0xffff )) - l3=$(( ($l0 >> 16) & 0xffff )) - l4=$(( $l0 & 0xffff )) - l0=$(( ( ( ($l4 * 0xffff) + $l3 ) * 0xffff + $l2 ) * 0xffff + $l1 )) - printf "%u\n" $l0 - done - return 0 -} - -# Wait for udev to settle (create device nodes etc.) -udevadm_settle() -{ - if test -x /sbin/udevadm; then - print_and_scroll_back " Calling udevadm settle (can take a while) " - /sbin/udevadm settle - white_out - elif test -x /sbin/udevsettle; then - print_and_scroll_back " Calling udevsettle (can take a while) " - /sbin/udevsettle - white_out - else - usleep 20000 - fi -} - -# Perform scan on a single lun $host $channel $id $lun -dolunscan() -{ - SCSISTR= - devnr="$host $channel $id $lun" - echo -e " Scanning for device $devnr ... " - printf "${yellow}OLD: $norm" - testexist - # Special case: lun 0 just got added (for reportlunscan), - # so make sure we correctly treat it as new - if test "$lun" = "0" -a "$1"; then - SCSISTR="" - printf "\r\e[A\e[A\e[A" - fi - : f $remove s $SCSISTR - if test "$remove" -a "$SCSISTR"; then - # Device exists: Test whether it's still online - # (testonline returns 1 if it's gone or has changed) - testonline - RC=$? - if test $RC != 0 -o ! -z "$forceremove"; then - echo -en "\r\e[A\e[A\e[A${red}REM: " - echo "$SCSISTR" | head -n1 - echo -e "${norm}\e[B\e[B" - if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then - echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete - # FIXME: Can we skip udevadm settle for removal? - #udevadm_settle - usleep 20000 - else - echo "scsi remove-single-device $devnr" > /proc/scsi/scsi - if test $RC -eq 1 -o $lun -eq 0 ; then - # Try readding, should fail if device is gone - echo "scsi add-single-device $devnr" > /proc/scsi/scsi - fi - fi - fi - if test $RC = 0 -o "$forcerescan" ; then - if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then - echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/rescan - udevadm_settle - fi - fi - printf "\r\e[A\e[A\e[A${yellow}OLD: $norm" - testexist - if test -z "$SCSISTR"; then - printf "\r${red}DEL: $norm\r\n\n" - let rmvd+=1; - return 1 - fi - fi - if test -z "$SCSISTR"; then - # Device does not exist, try to add - printf "\r${green}NEW: $norm" - if test -e /sys/class/scsi_host/host${host}/scan; then - echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null - udevadm_settle - else - echo "scsi add-single-device $devnr" > /proc/scsi/scsi - fi - testexist - if test -z "$SCSISTR"; then - # Device not present - printf "\r\e[A"; - ## COMMENTED OUT as the "break" below is broken. - ## Optimization: if lun==0, stop here (only if in non-remove mode) - #if test $lun = 0 -a -z "$remove" -a $optscan = 1; then - # break; - #fi - else - let found+=1; - fi - fi -} - -# Perform report lun scan on $host $channel $id using REPORT_LUNS -doreportlun() -{ - lun=0 - SCSISTR= - devnr="$host $channel $id $lun" - echo -en " Scanning for device $devnr ...\r" - lun0added= - #printf "${yellow}OLD: $norm" - # Phase one: If LUN0 does not exist, try to add - testexist -q - if test -z "$SCSISTR"; then - # Device does not exist, try to add - #printf "\r${green}NEW: $norm" - if test -e /sys/class/scsi_host/host${host}/scan; then - echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null - udevadm_settle - else - echo "scsi add-single-device $devnr" > /proc/scsi/scsi - fi - testexist -q - if test -n "$SCSISTR"; then - lun0added=1 - #testonline - else - # Device not present - # return - # Find alternative LUN to send getluns to - for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do - [ -d "$dev" ] || continue - lun=${dev##*:} - break - done - fi - fi - targetluns=`getluns` - REPLUNSTAT=$? - lunremove= - #echo "getluns reports " $targetluns - olddev=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null` - oldluns=`echo "$olddev" | awk -F'/' '{print $5}' | awk -F':' '{print $4}'` - oldtargets="$targetluns" - # OK -- if we don't have a LUN to send a REPORT_LUNS to, we could - # fall back to wildcard scanning. Same thing if the device does not - # support REPORT_LUNS - # TODO: We might be better off to ALWAYS use wildcard scanning if - # it works - if test "$REPLUNSTAT" = "1"; then - if test -e /sys/class/scsi_host/host${host}/scan; then - echo "$channel $id -" > /sys/class/scsi_host/host${host}/scan 2> /dev/null - udevadm_settle - else - echo "scsi add-single-device $host $channel $id $SCAN_WILD_CARD" > /proc/scsi/scsi - fi - targetluns=`find /sys/class/scsi_device/ -name $host:$channel:$id:* 2>/dev/null | awk -F'/' '{print $5}' | awk -F':' '{print $4}' | sort -n` - let found+=`echo "$targetluns" | wc -l` - let found-=`echo "$olddev" | wc -l` - fi - if test -z "$targetluns"; then targetluns="$oldtargets"; fi - # Check existing luns - for dev in $olddev; do - [ -d "$dev" ] || continue - lun=${dev##*:} - newsearch= - inlist= - # OK, is existing $lun (still) in reported list - for tmplun in $targetluns; do - if test $tmplun -eq $lun ; then - inlist=1 - dolunscan $lun0added - else - newsearch="$newsearch $tmplun" - fi - done - # OK, we have now done a lunscan on $lun and - # $newsearch is the old $targetluns without $lun - if [ -z "$inlist" ]; then - # Stale lun - lunremove="$lunremove $lun" - fi - # $lun removed from $lunsearch (echo for whitespace cleanup) - targetluns=`echo $newsearch` - done - # Add new ones and check stale ones - for lun in $targetluns $lunremove; do - dolunscan $lun0added - done -} - -# Perform search (scan $host) -dosearch () -{ - if test -z "$channelsearch" ; then - chanlist - fi - for channel in $channelsearch; do - if test -z "$idsearch" ; then - idlist - fi - for id in $idsearch; do - if test -z "$lunsearch" ; then - doreportlun - else - for lun in $lunsearch; do - dolunscan - done - fi - done - done -} - -expandlist () -{ - list=$1 - result="" - first=${list%%,*} - rest=${list#*,} - while test ! -z "$first"; do - beg=${first%%-*}; - if test "$beg" = "$first"; then - result="$result $beg"; - else - end=${first#*-} - result="$result `seq $beg $end`" - fi - test "$rest" = "$first" && rest="" - first=${rest%%,*} - rest=${rest#*,} - done - echo $result -} - -# main -if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then - echo "Usage: rescan-scsi-bus.sh [options] [host [host ...]]" - echo "Options:" - echo " -l activates scanning for LUNs 0--7 [default: 0]" - echo " -L NUM activates scanning for LUNs 0--NUM [default: 0]" - echo " -w scan for target device IDs 0--15 [default: 0--7]" - echo " -c enables scanning of channels 0 1 [default: 0 / all detected ones]" - echo " -r enables removing of devices [default: disabled]" - echo " -i issue a FibreChannel LIP reset [default: disabled]" - echo "--remove: same as -r" - echo "--issue-lip: same as -i" - echo "--forcerescan: Rescan existing devices" - echo "--forceremove: Remove and readd every device (DANGEROUS)" - echo "--nooptscan: don't stop looking for LUNs is 0 is not found" - echo "--color: use coloured prefixes OLD/NEW/DEL" - echo "--hosts=LIST: Scan only host(s) in LIST" - echo "--channels=LIST: Scan only channel(s) in LIST" - echo "--ids=LIST: Scan only target ID(s) in LIST" - echo "--luns=LIST: Scan only lun(s) in LIST" - echo "--sync/nosync: Issue a sync / no sync [default: sync if remove]" - echo "--attachpq3: Tell kernel to attach sg to LUN 0 that reports PQ=3" - echo "--reportlun2: Tell kernel to try REPORT_LUN even on SCSI2 devices" - echo "--largelun: Tell kernel to support LUNs > 7 even on SCSI2 devs" - echo "--sparselun: Tell kernel to support sparse LUN numbering" - echo " Host numbers may thus be specified either directly on cmd line (deprecated) or" - echo " or with the --hosts=LIST parameter (recommended)." - echo "LIST: A[-B][,C[-D]]... is a comma separated list of single values and ranges" - echo " (No spaces allowed.)" - exit 0 -fi - -if test ! -d /sys/class/scsi_host/ -a ! -d /proc/scsi/; then - echo "Error: SCSI subsystem not active" - exit 1 -fi - -# Make sure sg is there -modprobe sg >/dev/null 2>&1 - -if test -x /usr/bin/sg_inq; then - sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) - sg_version=${sg_version##0.} - #echo "\"$sg_version\"" - #if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then - #sg_len_arg="-36" - #else - sg_len_arg="--len=36" - #fi -#else -# # Slackware note: it may not "fully work", but it works well enough for -# # what we need here in the installer. If that turns out not to be the -# # case, let volkerdi know on the Slackware Linux Questions forum. -# echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils" -# echo " or rescan-scsi-bus.sh might not fully work." -fi - -# defaults -unsetcolor -lunsearch= -opt_idsearch=`seq 0 7` -opt_channelsearch= -remove= -forceremove= -optscan=1 -sync=1 -declare -i scan_flags=0 -if test -d /sys/class/scsi_host; then - findhosts_26 -else - findhosts -fi - -# Scan options -opt="$1" -while test ! -z "$opt" -a -z "${opt##-*}"; do - opt=${opt#-} - case "$opt" in - l) lunsearch=`seq 0 7` ;; - L) lunsearch=`seq 0 $2`; shift ;; - w) opt_idsearch=`seq 0 15` ;; - c) opt_channelsearch="0 1" ;; - r) remove=1 ;; - i) lipreset=1 ;; - -remove) remove=1 ;; - -forcerescan) remove=1; forcerescan=1 ;; - -forceremove) remove=1; forceremove=1 ;; - -hosts=*) arg=${opt#-hosts=}; hosts=`expandlist $arg` ;; - -channels=*) arg=${opt#-channels=};opt_channelsearch=`expandlist $arg` ;; - -ids=*) arg=${opt#-ids=}; opt_idsearch=`expandlist $arg` ;; - -luns=*) arg=${opt#-luns=}; lunsearch=`expandlist $arg` ;; - -color) setcolor ;; - -nooptscan) optscan=0 ;; - -issue-lip) lipreset=1 ;; - -sync) sync=2 ;; - -nosync) sync=0 ;; - -attachpq3) scan_flags=$(($scan_flags|0x1000000)) ;; - -reportlun2) scan_flags=$(($scan_flags|0x20000)) ;; - -largelun) scan_flags=$(($scan_flags|0x200)) ;; - -sparselun) scan_flags=$((scan_flags|0x40)) ;; - *) echo "Unknown option -$opt !" ;; - esac - shift - opt="$1" -done - -# Hosts given ? -if test "@$1" != "@"; then - hosts=$* -fi - -if [ -d /sys/class/scsi_host -a ! -w /sys/class/scsi_host ]; then - echo "You need to run scsi-rescan-bus.sh as root" - exit 2 -fi -if test "$sync" = 1 -a "$remove" = 1; then sync=2; fi -if test "$sync" = 2; then echo "Syncing file systems"; sync; fi -if test -w /sys/module/scsi_mod/parameters/default_dev_flags -a $scan_flags != 0; then - OLD_SCANFLAGS=`cat /sys/module/scsi_mod/parameters/default_dev_flags` - NEW_SCANFLAGS=$(($OLD_SCANFLAGS|$scan_flags)) - if test "$OLD_SCANFLAGS" != "$NEW_SCANFLAGS"; then - echo -n "Temporarily setting kernel scanning flags from " - printf "0x%08x to 0x%08x\n" $OLD_SCANFLAGS $NEW_SCANFLAGS - echo $NEW_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags - else - unset OLD_SCANFLAGS - fi -fi -echo "Scanning SCSI subsystem for new devices" -test -z "$remove" || echo " and remove devices that have disappeared" -declare -i found=0 -declare -i rmvd=0 -for host in $hosts; do - echo -n "Scanning host $host " - if test -e /sys/class/fc_host/host$host ; then - # It's pointless to do a target scan on FC - if test -n "$lipreset" ; then - echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null; - udevadm_settle - fi - # We used to always trigger a rescan for FC to update channels and targets - # Commented out -- as discussed with Hannes we should rely - # on the main loop doing the scan, no need to do it here. - #echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; - #udevadm_settle - channelsearch= - idsearch= - else - channelsearch=$opt_channelsearch - idsearch=$opt_idsearch - fi - [ -n "$channelsearch" ] && echo -n "channels $channelsearch " - echo -n "for " - if [ -n "$idsearch" ] ; then - echo -n " SCSI target IDs " $idsearch - else - echo -n " all SCSI target IDs" - fi - if [ -n "$lunsearch" ] ; then - echo ", LUNs " $lunsearch - else - echo ", all LUNs" - fi - dosearch -done -if test -n "$OLD_SCANFLAGS"; then - echo $OLD_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags -fi -echo "$found new device(s) found. " -echo "$rmvd device(s) removed. " - -# Local Variables: -# sh-basic-offset: 2 -# End: - +../usr/bin/rescan-scsi-bus.sh
\ No newline at end of file diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTpartitions b/source/installer/sources/initrd/usr/lib/setup/SeTpartitions index 279edd94a..2a73ba5e5 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTpartitions +++ b/source/installer/sources/initrd/usr/lib/setup/SeTpartitions @@ -35,6 +35,50 @@ Filesystem type: f2fs " 0 0 mkfs.f2fs -f $1 1> $REDIR 2> $REDIR } +# make_bcachefs( dev ) - Create a new bcachefs filesystem on the named dev. +# Parameters: dev Device node to format. +make_bcachefs() { + dialog --title "BCACHEFS COMPRESSION" --default-item "none" --menu \ + "Bcachefs supports on-the-fly compression/decompression to make the \ + most of your storage. If you'd like to use filesystem compression, \ + select one of the options below. Note that bcachefs has a lot of \ + options for compression, such as different levels, or compressing \ + in the background to eliminate write lag. These basic options will \ + get you going, though. Bcachefs filesystem options can be changed \ + later with \"bcachefs set-option\"." \ + 17 76 4 \ + "none" "Do not use filesystem compression" \ + "zstd" "Fast writes and very good compression ratio" \ + "lz4" "Very fast writes and good compression ratio" \ + "gzip" "Relatively useless, but be my guest" 2> $TMP/SeTcompress + if [ ! $? = 0 ]; then + rm -f $TMP/SeTcompress + exit + fi + if [ -r $TMP/SeTcompress ]; then + BCACHEFS_COMPRESSION="$(cat $TMP/SeTcompress)" + else + BCACHEFS_COMPRESSION=none + fi + # get the size of the named partition + SIZE=`get_part_size $1` + # output a nice status message + dialog --title "FORMATTING" \ + --backtitle "Formatting $1 with filesystem bcachefs, compression type $BCACHEFS_COMPRESSION." \ + --infobox "Formatting $1 \n\ +Size: $SIZE \n\ +Compression: $BCACHEFS_COMPRESSION \n\ +Filesystem type: bcachefs " 0 0 + # do the format + if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then + umount $1 2> $NDIR + fi + mkfs.bcachefs -f --compression=$BCACHEFS_COMPRESSION $1 1> $REDIR 2> $REDIR + # mkfs.bcachefs is so ridiculously fast that we'd better pause for a moment + # or folks will wonder if the format failed + sleep 3 +} + # make_btrfs( dev ) - Create a new btrfs filesystem on the named dev. # Parameters: dev Device node to format. make_btrfs() { @@ -45,7 +89,7 @@ make_btrfs() { --backtitle "Formatting $1 with filesystem btrfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: btrfs " 0 0 +Filesystem type: btrfs " 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -65,7 +109,7 @@ make_ext2() { --backtitle "Formatting $1 with filesystem ext2." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: ext2" 0 0 +Filesystem type: ext2" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -89,7 +133,7 @@ make_ext3() { --backtitle "Formatting $1 with filesystem ext3." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: ext3" 0 0 +Filesystem type: ext3" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -113,7 +157,7 @@ make_ext4() { --backtitle "Formatting $1 with filesystem ext4." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: ext4" 0 0 +Filesystem type: ext4" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -137,7 +181,7 @@ make_jfs() { --backtitle "Formatting $1 with filesystem jfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: jfs" 0 0 +Filesystem type: jfs" 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -159,7 +203,7 @@ make_reiserfs() { --backtitle "Formatting $1 with filesystem reiserfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: reiserfs " 0 0 +Filesystem type: reiserfs " 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -177,7 +221,7 @@ make_xfs() { --backtitle "Formatting $1 with filesystem xfs." \ --infobox "Formatting $1 \n\ Size: $SIZE \n\ -Filesystem type: xfs " 0 0 +Filesystem type: xfs " 0 0 # do the format if mount | grep "$1 " 1> $NDIR 2> $NDIR ; then umount $1 2> $NDIR @@ -238,7 +282,7 @@ to format this partition?" 12 70 3 \ # ask_fs( dev ) - Asks the user the type of filesystem to use for the named # device. Answer in $TMP/return ask_fs() { - unset BTRFS EXT2 EXT3 F2FS JFS REISERFS XFS + unset BCACHEFS BTRFS EXT2 EXT3 F2FS JFS REISERFS XFS if grep -wq ext2 /proc/filesystems 1> $NDIR 2> $NDIR ; then EXT2="Ext2 is the traditional Linux file system and is fast and stable. " fi @@ -250,8 +294,12 @@ ask_fs() { EXT4="Ext4 is the successor to the ext3 filesystem. " DEFAULT=ext4 fi - if grep -wq reiserfs /proc/filesystems 1> $NDIR 2> $NDIR ; then - REISERFS="ReiserFS is a journaling filesystem that stores all files and filenames in a balanced tree structure. " + # This will be gone in Linux 6.10, so it's probably time to quit offering it. + #if grep -wq reiserfs /proc/filesystems 1> $NDIR 2> $NDIR ; then + # REISERFS="ReiserFS is a journaling filesystem that stores all files and filenames in a balanced tree structure. " + #fi + if grep -wq bcachefs /proc/filesystems 1> $NDIR 2> $NDIR ; then + BCACHEFS="Bcachefs is a B-tree copy-on-write filesystem. " fi if grep -wq btrfs /proc/filesystems 1> $NDIR 2> $NDIR ; then BTRFS="Btrfs is a B-tree copy-on-write filesystem. " @@ -272,7 +320,7 @@ dialog --title "SELECT FILESYSTEM FOR $1" \\ --backtitle "Partition $1 will be formatted." \\ --default-item $DEFAULT --menu \\ "Please select the type of filesystem to use for the specified \\ -device. Here are descriptions of the available filesystems: $EXT2 $EXT3 $EXT4 $BTRFS $F2FS $JFS $REISERFS $XFS" \\ +device. Here are descriptions of the available filesystems: $EXT2 $EXT3 $EXT4 $BCACHEFS $BTRFS $F2FS $JFS $REISERFS $XFS" \\ 0 0 0 \\ EOF if [ ! "$EXT2" = "" ]; then @@ -290,6 +338,9 @@ EOF if [ ! "$REISERFS" = "" ]; then echo "\"reiserfs\" \"ReiserFS Journaling Filesystem\" \\" >> $TMP/tempscript fi + if [ ! "$BCACHEFS" = "" ]; then + echo "\"bcachefs\" \"Bcachefs Copy-on-Write B-tree Filesystem\" \\" >> $TMP/tempscript + fi if [ ! "$BTRFS" = "" ]; then echo "\"btrfs\" \"Btrfs Copy-on-Write B-tree Filesystem\" \\" >> $TMP/tempscript fi @@ -374,6 +425,8 @@ if [ ! "$DOFORMAT" = "No" ]; then fi elif [ "$ROOT_SYS_TYPE" = "reiserfs" ]; then make_reiserfs $ROOT_DEVICE + elif [ "$ROOT_SYS_TYPE" = "bcachefs" ]; then + make_bcachefs $ROOT_DEVICE elif [ "$ROOT_SYS_TYPE" = "btrfs" ]; then make_btrfs $ROOT_DEVICE elif [ "$ROOT_SYS_TYPE" = "f2fs" ]; then @@ -478,6 +531,8 @@ EOF fi elif [ "$NEXT_SYS_TYPE" = "reiserfs" ]; then make_reiserfs $NEXT_PARTITION + elif [ "$NEXT_SYS_TYPE" = "bcachefs" ]; then + make_bcachefs $NEXT_PARTITION elif [ "$NEXT_SYS_TYPE" = "btrfs" ]; then make_btrfs $NEXT_PARTITION elif [ "$NEXT_SYS_TYPE" = "f2fs" ]; then diff --git a/source/k/kernel-configs/config-generic-6.6.29 b/source/k/kernel-configs/config-generic-6.9.3 index 12dcfb58b..6e84e7819 100644 --- a/source/k/kernel-configs/config-generic-6.6.29 +++ b/source/k/kernel-configs/config-generic-6.9.3 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.29 Kernel Configuration +# Linux/x86 6.9.3 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130200 +CONFIG_GCC_VERSION=140100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24200 @@ -16,7 +16,6 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -90,6 +89,7 @@ CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y @@ -197,6 +197,8 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_GCC_NO_STRINGOP_OVERFLOW=y +CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set @@ -276,18 +278,18 @@ CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y +CONFIG_KCMP=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +CONFIG_CACHESTAT_SYSCALL=y +# CONFIG_PC104 is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_KCMP=y -CONFIG_RSEQ=y -CONFIG_CACHESTAT_SYSCALL=y -# CONFIG_DEBUG_RSEQ is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y -# CONFIG_PC104 is not set # # Kernel Performance Events And Counters @@ -303,7 +305,8 @@ CONFIG_TRACEPOINTS=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y +CONFIG_CRASH_RESERVE=y +CONFIG_VMCORE_INFO=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y CONFIG_KEXEC_JUMP=y @@ -334,7 +337,6 @@ CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_32_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=3 @@ -345,7 +347,6 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # CONFIG_SMP=y CONFIG_X86_MPPARSE=y -# CONFIG_GOLDFISH is not set CONFIG_X86_CPU_RESCTRL=y CONFIG_X86_BIGSMP=y # CONFIG_X86_EXTENDED_PLATFORM is not set @@ -397,6 +398,7 @@ CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y +CONFIG_X86_HAVE_PAE=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=6 @@ -454,6 +456,7 @@ CONFIG_X86_IOPL_IOPERM=y CONFIG_TOSHIBA=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=y +CONFIG_MICROCODE_INITRD32=y # CONFIG_MICROCODE_LATE_LOADING is not set CONFIG_X86_MSR=y CONFIG_X86_CPUID=y @@ -507,6 +510,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y +CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -519,16 +523,18 @@ CONFIG_MODIFY_LDT_SYSCALL=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set # end of Processor type and features +CONFIG_CC_HAS_NAMED_AS=y +CONFIG_USE_X86_SEG_SUPPORT=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_CC_HAS_ENTRY_PADDING=y CONFIG_FUNCTION_PADDING_CFI=0 CONFIG_FUNCTION_PADDING_BYTES=4 -CONFIG_SPECULATION_MITIGATIONS=y -CONFIG_PAGE_TABLE_ISOLATION=y -CONFIG_RETPOLINE=y -CONFIG_RETHUNK=y -# CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_CPU_MITIGATIONS=y +CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y +CONFIG_MITIGATION_RETPOLINE=y +CONFIG_MITIGATION_RETHUNK=y +# CONFIG_MITIGATION_GDS_FORCE is not set CONFIG_MITIGATION_RFDS=y CONFIG_MITIGATION_SPECTRE_BHI=y @@ -542,6 +548,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="\"\"" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -563,6 +572,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y CONFIG_ACPI_TABLE_LIB=y +CONFIG_ACPI_THERMAL_LIB=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SLEEP=y @@ -592,7 +602,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set CONFIG_ACPI_BGRT=y # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NUMA=y @@ -712,18 +721,17 @@ CONFIG_COMPAT_32=y # end of Binary Emulations CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_HAVE_KVM=y +CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_PFNCACHE=y CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_DIRTY_RING=y CONFIG_HAVE_KVM_DIRTY_RING_TSO=y CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y -CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -732,19 +740,23 @@ CONFIG_HAVE_KVM_NO_POLL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y +CONFIG_KVM_GENERIC_MMU_NOTIFIER=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m # CONFIG_KVM_WERROR is not set CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_SMM=y +CONFIG_KVM_HYPERV=y CONFIG_KVM_XEN=y # CONFIG_KVM_PROVE_MMU is not set +CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -835,8 +847,11 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_ISA_BUS_API=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -861,6 +876,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SPLIT_ARG64=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y CONFIG_DYNAMIC_SIGFRAME=y +CONFIG_ARCH_HAS_HW_PTE_YOUNG=y CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y # @@ -875,6 +891,8 @@ CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 +CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y +CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -907,6 +925,7 @@ CONFIG_BLK_ICQ=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY_T10=y +CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set @@ -998,7 +1017,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON=y +CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -1017,9 +1036,8 @@ CONFIG_ZSMALLOC=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # -# SLAB allocator options +# Slab allocator options # -# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -1028,7 +1046,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set -# end of SLAB allocator options +# end of Slab allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_COMPAT_BRK is not set @@ -1048,6 +1066,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_BOUNCE=y CONFIG_MMU_NOTIFIER=y @@ -1057,13 +1076,13 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set CONFIG_CMA_SYSFS=y CONFIG_CMA_AREAS=7 @@ -1110,7 +1129,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1191,6 +1209,7 @@ CONFIG_TCP_CONG_BBR=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_SIGPOOL=y CONFIG_TCP_MD5SIG=y CONFIG_IPV6=m # CONFIG_IPV6_ROUTER_PREF is not set @@ -1478,6 +1497,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1510,6 +1530,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1517,6 +1538,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1554,6 +1576,7 @@ CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1575,7 +1598,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1659,12 +1681,6 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_LLC=m CONFIG_LLC2=m CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_PHONET is not set @@ -1757,7 +1773,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1972,7 +1987,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -2033,7 +2047,7 @@ CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y -# CONFIG_PAGE_POOL_STATS is not set +CONFIG_PAGE_POOL_STATS=y CONFIG_FAILOVER=y CONFIG_ETHTOOL_NETLINK=y @@ -2043,12 +2057,14 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_HAVE_EISA=y # CONFIG_EISA is not set CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIEAER=y CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEAER_CXL=y # CONFIG_PCIE_ECRC is not set CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y @@ -2132,7 +2148,6 @@ CONFIG_CXL_PORT=y CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set -CONFIG_CXL_PMU=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2191,6 +2206,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set CONFIG_HMEM_REPORTING=y CONFIG_TEST_ASYNC_DRIVER_PROBE=m +CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y @@ -2277,6 +2293,11 @@ CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y # +# Qualcomm firmware drivers +# +# end of Qualcomm firmware drivers + +# # Tegra firmware driver # # end of Tegra firmware driver @@ -2289,7 +2310,6 @@ CONFIG_MTD_TESTS=m # # Partition parsers # -CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 @@ -2368,7 +2388,6 @@ CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m CONFIG_MTD_PCMCIA=m # CONFIG_MTD_PCMCIA_ANONYMOUS is not set -CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -2458,6 +2477,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set CONFIG_MTD_UBI_GLUEBI=m # CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_NVMEM=m # CONFIG_MTD_HYPERBUS is not set # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -2492,7 +2512,8 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set # CONFIG_ZRAM_DEF_COMP_842 is not set CONFIG_ZRAM_DEF_COMP="lzo-rle" -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y +# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y CONFIG_BLK_DEV_LOOP=m @@ -2518,7 +2539,8 @@ CONFIG_BLK_DEV_RNBD_SERVER=m # # NVME Support # -CONFIG_NVME_COMMON=y +CONFIG_NVME_KEYRING=m +CONFIG_NVME_AUTH=y CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y @@ -2528,7 +2550,8 @@ CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m CONFIG_NVME_TCP=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_TCP_TLS=y +CONFIG_NVME_HOST_AUTH=y CONFIG_NVME_TARGET=m CONFIG_NVME_TARGET_PASSTHRU=y CONFIG_NVME_TARGET_LOOP=m @@ -2536,6 +2559,7 @@ CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_TCP=m +CONFIG_NVME_TARGET_TCP_TLS=y CONFIG_NVME_TARGET_AUTH=y # end of NVME Support @@ -2575,6 +2599,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_MISC_RTSX=m CONFIG_TPS6594_ESM=m CONFIG_TPS6594_PFSM=m +CONFIG_NSM=m # CONFIG_C2PORT is not set # @@ -2582,7 +2607,6 @@ CONFIG_TPS6594_PFSM=m # CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set @@ -2610,6 +2634,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m CONFIG_INTEL_MEI_GSC=m +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_HDCP=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_GSC_PROXY=m @@ -2737,7 +2763,6 @@ CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m @@ -2893,17 +2918,13 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y -CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y CONFIG_MD_RAID10=y CONFIG_MD_RAID456=y -CONFIG_MD_MULTIPATH=y -CONFIG_MD_FAULTY=m CONFIG_MD_CLUSTER=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set # CONFIG_BCACHE_ASYNC_REGISTRATION is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=y @@ -3015,6 +3036,7 @@ CONFIG_TAP=m CONFIG_VETH=m CONFIG_VIRTIO_NET=y CONFIG_NLMON=m +CONFIG_NETKIT=y CONFIG_NET_VRF=m CONFIG_VSOCKMON=m CONFIG_MHI_NET=m @@ -3087,10 +3109,6 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_REALTEK=m -# CONFIG_NET_DSA_REALTEK_MDIO is not set -# CONFIG_NET_DSA_REALTEK_SMI is not set -CONFIG_NET_DSA_REALTEK_RTL8365MB=m -CONFIG_NET_DSA_REALTEK_RTL8366RB=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -3232,10 +3250,13 @@ CONFIG_I40E=m CONFIG_IAVF=m CONFIG_I40EVF=m CONFIG_ICE=m +CONFIG_ICE_HWMON=y CONFIG_ICE_SWITCHDEV=y CONFIG_ICE_HWTS=y CONFIG_FM10K=m CONFIG_IGC=m +CONFIG_IGC_LEDS=y +CONFIG_IDPF=m CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y CONFIG_ADIN1110=m @@ -3271,6 +3292,7 @@ CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y CONFIG_MLX5_SF_MANAGER=y +CONFIG_MLX5_DPLL=m CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE_THERMAL=y @@ -3347,6 +3369,7 @@ CONFIG_8139TOO_PIO=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m +CONFIG_R8169_LEDS=y CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_ROCKER=y CONFIG_ROCKER=m @@ -3475,7 +3498,10 @@ CONFIG_NXP_CBTX_PHY=m CONFIG_NXP_C45_TJA11XX_PHY=m # CONFIG_NXP_TJA11XX_PHY is not set CONFIG_NCN26000_PHY=m +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +CONFIG_QCA83XX_PHY=m +CONFIG_QCA808X_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m @@ -3489,6 +3515,7 @@ CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m CONFIG_DP83869_PHY=m CONFIG_DP83TD510_PHY=m +CONFIG_DP83TG720_PHY=m CONFIG_VITESSE_PHY=m CONFIG_XILINX_GMII2RGMII=m # CONFIG_MICREL_KS8995MA is not set @@ -3511,6 +3538,7 @@ CONFIG_CAN_CC770_ISA=m CONFIG_CAN_CC770_PLATFORM=m CONFIG_CAN_CTUCANFD=m CONFIG_CAN_CTUCANFD_PCI=m +# CONFIG_CAN_ESD_402_PCI is not set CONFIG_CAN_IFI_CANFD=m CONFIG_CAN_M_CAN=m CONFIG_CAN_M_CAN_PCI=m @@ -3665,7 +3693,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y # CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_DYNACK is not set CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y @@ -3709,9 +3736,6 @@ CONFIG_ATH12K=m # CONFIG_ATH12K_DEBUG is not set # CONFIG_ATH12K_TRACING is not set CONFIG_WLAN_VENDOR_ATMEL=y -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_WLAN_VENDOR_BROADCOM=y CONFIG_B43=m @@ -3753,9 +3777,6 @@ CONFIG_BRCMFMAC_USB=y CONFIG_BRCMFMAC_PCIE=y CONFIG_BRCM_TRACING=y # CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_AIRO=m -CONFIG_AIRO_CS=m CONFIG_WLAN_VENDOR_INTEL=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3792,21 +3813,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # end of Debugging Options CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_HERMES=m -# CONFIG_HERMES_PRISM is not set -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m @@ -3815,7 +3821,6 @@ CONFIG_P54_LEDS=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set @@ -3857,6 +3862,9 @@ CONFIG_MT7921E=m CONFIG_MT7921S=m CONFIG_MT7921U=m CONFIG_MT7996E=m +CONFIG_MT7925_COMMON=m +CONFIG_MT7925E=m +CONFIG_MT7925U=m CONFIG_WLAN_VENDOR_MICROCHIP=y # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set @@ -3971,15 +3979,11 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WLAN_VENDOR_ZYDAS=y -CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_QTNFMAC=m CONFIG_QTNFMAC_PCIE=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_MAC80211_HWSIM is not set CONFIG_VIRT_WIFI=m CONFIG_WAN=y @@ -3993,6 +3997,7 @@ CONFIG_HDLC_PPP=m # # X.25/LAPB support is disabled # +# CONFIG_FRAMER is not set CONFIG_PCI200SYN=m CONFIG_WANXL=m # CONFIG_PC300TOO is not set @@ -4178,6 +4183,7 @@ CONFIG_JOYSTICK_PXRC=m CONFIG_JOYSTICK_QWIIC=m CONFIG_JOYSTICK_FSIA6B=m # CONFIG_JOYSTICK_SENSEHAT is not set +CONFIG_JOYSTICK_SEESAW=m CONFIG_INPUT_TABLET=y CONFIG_TABLET_USB_ACECAD=m CONFIG_TABLET_USB_AIPTEK=m @@ -4214,6 +4220,9 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m CONFIG_TOUCHSCREEN_EXC3000=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m CONFIG_TOUCHSCREEN_HIDEEP=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m @@ -4387,7 +4396,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y @@ -4618,6 +4626,7 @@ CONFIG_I2C_XILINX=m # CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_DLN2=m +CONFIG_I2C_LJCA=m CONFIG_I2C_CP2615=m CONFIG_I2C_PARPORT=m # CONFIG_I2C_PCI1XXXX is not set @@ -4663,6 +4672,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_DLN2 is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +CONFIG_SPI_LJCA=m CONFIG_SPI_MICROCHIP_CORE=m # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set # CONFIG_SPI_LANTIQ_SSC is not set @@ -4729,6 +4739,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +CONFIG_PTP_1588_CLOCK_FC3W=m # CONFIG_PTP_1588_CLOCK_MOCK is not set CONFIG_PTP_1588_CLOCK_VMW=m CONFIG_PTP_1588_CLOCK_OCP=m @@ -4751,6 +4762,7 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_INTEL_PLATFORM=m CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -4764,6 +4776,7 @@ CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_METEORLAKE=m +CONFIG_PINCTRL_METEORPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -4830,10 +4843,12 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_ARIZONA=m CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_CROS_EC=m CONFIG_GPIO_CS5535=m CONFIG_GPIO_DLN2=m CONFIG_GPIO_ELKHARTLAKE=m CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_LJCA=m CONFIG_GPIO_LP3943=m # CONFIG_GPIO_TIMBERDALE is not set # CONFIG_GPIO_TPS68470 is not set @@ -4884,11 +4899,13 @@ CONFIG_W1_CON=y # # 1-wire Bus Masters # +CONFIG_W1_MASTER_AMD_AXI=m CONFIG_W1_MASTER_MATROX=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_SGI is not set +CONFIG_W1_MASTER_UART=m # end of 1-wire Bus Masters # @@ -4973,6 +4990,7 @@ CONFIG_CHARGER_WILCO=m CONFIG_BATTERY_SURFACE=m CONFIG_CHARGER_SURFACE=m CONFIG_BATTERY_UG3105=m +CONFIG_FUEL_GAUGE_MM8013=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -5002,6 +5020,7 @@ CONFIG_SENSORS_AHT10=m CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_ASUS_ROG_RYUJIN=m CONFIG_SENSORS_AXI_FAN_CONTROL=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m @@ -5009,6 +5028,7 @@ CONFIG_SENSORS_FAM15H_POWER=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CHIPCAP2=m CONFIG_SENSORS_CORSAIR_CPRO=m CONFIG_SENSORS_CORSAIR_PSU=m CONFIG_SENSORS_DRIVETEMP=m @@ -5023,6 +5043,7 @@ CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GIGABYTE_WATERFORCE=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m @@ -5036,6 +5057,7 @@ CONFIG_SENSORS_I5500=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWERZ=m CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LTC2945=m @@ -5043,6 +5065,7 @@ CONFIG_SENSORS_LTC2947=m CONFIG_SENSORS_LTC2947_I2C=m CONFIG_SENSORS_LTC2947_SPI=m CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC2991=m CONFIG_SENSORS_LTC2992=m CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m @@ -5050,6 +5073,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LTC4282=m # CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX127=m CONFIG_SENSORS_MAX16065=m @@ -5101,6 +5125,7 @@ CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NZXT_KRAKEN2=m +CONFIG_SENSORS_NZXT_KRAKEN3=m CONFIG_SENSORS_NZXT_SMART2=m # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_OXP=m @@ -5129,6 +5154,7 @@ CONFIG_SENSORS_LT7182S=m CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_SENSORS_LTC3815=m +# CONFIG_SENSORS_LTC4286 is not set CONFIG_SENSORS_MAX15301=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX16601=m @@ -5137,12 +5163,15 @@ CONFIG_SENSORS_MAX20751=m CONFIG_SENSORS_MAX31785=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MP2856=m CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP2975_REGULATOR=y CONFIG_SENSORS_MP5023=m +CONFIG_SENSORS_MP5990=m CONFIG_SENSORS_MPQ7932_REGULATOR=y CONFIG_SENSORS_MPQ7932=m +CONFIG_SENSORS_MPQ8785=m CONFIG_SENSORS_PIM4328=m CONFIG_SENSORS_PLI1209BC=m CONFIG_SENSORS_PLI1209BC_REGULATOR=y @@ -5161,6 +5190,7 @@ CONFIG_SENSORS_XDPE152=m CONFIG_SENSORS_XDPE122=m CONFIG_SENSORS_XDPE122_REGULATOR=y CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_PT5161L=m CONFIG_SENSORS_SBTSI=m CONFIG_SENSORS_SBRMI=m CONFIG_SENSORS_SHT15=m @@ -5181,6 +5211,7 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SURFACE_FAN=m CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set @@ -5226,10 +5257,9 @@ CONFIG_SENSORS_HP_WMI=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_STATISTICS=y +# CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_ACPI=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -5280,6 +5310,7 @@ CONFIG_WATCHDOG_SYSFS=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_CROS_EC_WATCHDOG=m CONFIG_MENF21BMC_WATCHDOG=m CONFIG_WDAT_WDT=m # CONFIG_XILINX_WATCHDOG is not set @@ -5477,6 +5508,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set CONFIG_REGULATOR_USERSPACE_CONSUMER=m +# CONFIG_REGULATOR_NETLINK_EVENTS is not set # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m @@ -5500,6 +5532,7 @@ CONFIG_REGULATOR_LP8755=m CONFIG_REGULATOR_LTC3589=m CONFIG_REGULATOR_LTC3676=m CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX77503=m CONFIG_REGULATOR_MAX77857=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m @@ -5819,6 +5852,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y # # Media capture support # +# CONFIG_VIDEO_MGB4 is not set CONFIG_VIDEO_SOLO6X10=m # CONFIG_VIDEO_TW5864 is not set CONFIG_VIDEO_TW68=m @@ -5983,6 +6017,10 @@ CONFIG_VIDEO_CAFE_CCIC=m # # +# Nuvoton media platform drivers +# + +# # NVidia media platform drivers # @@ -6079,7 +6117,10 @@ CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_ALVIUM_CSI2=m CONFIG_VIDEO_AR0521=m +CONFIG_VIDEO_GC0308=m +CONFIG_VIDEO_GC2145=m CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m CONFIG_VIDEO_HI847=m @@ -6095,6 +6136,7 @@ CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_MAX9271_LIB=m CONFIG_VIDEO_MT9M001=m CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9M114=m CONFIG_VIDEO_MT9P031=m CONFIG_VIDEO_MT9T112=m CONFIG_VIDEO_MT9V011=m @@ -6119,6 +6161,7 @@ CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV64A40=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7640=m @@ -6141,6 +6184,12 @@ CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m # +# Camera ISPs +# +CONFIG_VIDEO_THP7312=m +# end of Camera ISPs + +# # Lens drivers # CONFIG_VIDEO_AD5820=m @@ -6209,6 +6258,7 @@ CONFIG_VIDEO_TVP514X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_TVP7002=m CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9900=m CONFIG_VIDEO_TW9903=m CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_TW9910=m @@ -6488,22 +6538,24 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_SCREEN_INFO=y +CONFIG_VIDEO=y CONFIG_AUXDISPLAY=y CONFIG_CHARLCD=m -CONFIG_LINEDISP=m CONFIG_HD44780_COMMON=m CONFIG_HD44780=m -# CONFIG_KS0108 is not set -# CONFIG_IMG_ASCII_LCD is not set -CONFIG_HT16K33=m # CONFIG_LCD2S is not set # CONFIG_PARPORT_PANEL is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_KS0108 is not set +CONFIG_LINEDISP=m +# CONFIG_IMG_ASCII_LCD is not set +CONFIG_HT16K33=m +CONFIG_MAX6959=m +CONFIG_SEG_LED_GPIO=m # CONFIG_PANEL is not set CONFIG_AGP=m CONFIG_AGP_ALI=m @@ -6521,6 +6573,7 @@ CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6530,12 +6583,14 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DISPLAY_HELPER=m CONFIG_DRM_DISPLAY_DP_HELPER=y +CONFIG_DRM_DISPLAY_DP_TUNNEL=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m +CONFIG_DRM_GPUVM=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -6587,12 +6642,14 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_MMU is not set # CONFIG_NOUVEAU_DEBUG_PUSH is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_I915=m CONFIG_DRM_I915_FORCE_PROBE="" CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_I915_PXP=y +CONFIG_DRM_I915_DP_TUNNEL=y # # drm/i915 Debugging @@ -6607,6 +6664,7 @@ CONFIG_DRM_I915_PXP=y # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set +# CONFIG_DRM_I915_DEBUG_WAKEREF is not set # end of drm/i915 Debugging # @@ -6623,6 +6681,36 @@ CONFIG_DRM_I915_STOP_TIMEOUT=100 CONFIG_DRM_I915_TIMESLICE_DURATION=1 # end of drm/i915 Profile Guided Optimisation +CONFIG_DRM_XE=m +CONFIG_DRM_XE_DISPLAY=y +CONFIG_DRM_XE_FORCE_PROBE="" + +# +# drm/Xe Debugging +# +# CONFIG_DRM_XE_WERROR is not set +# CONFIG_DRM_XE_DEBUG is not set +# CONFIG_DRM_XE_DEBUG_VM is not set +# CONFIG_DRM_XE_DEBUG_SRIOV is not set +# CONFIG_DRM_XE_DEBUG_MEM is not set +# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set +# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set +# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set +# end of drm/Xe Debugging + +# +# drm/xe Profile Guided Optimisation +# +CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000 +CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1 +CONFIG_DRM_XE_TIMESLICE_MAX=10000000 +CONFIG_DRM_XE_TIMESLICE_MIN=1 +CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1 +CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y +# end of drm/xe Profile Guided Optimisation + CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_VMWGFX=m @@ -6640,6 +6728,7 @@ CONFIG_DRM_PANEL=y # Display Panels # # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set @@ -6655,7 +6744,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_ANALOGIX_DP=m # end of Display Interface Bridges -# CONFIG_DRM_LOONGSON is not set # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6677,7 +6765,6 @@ CONFIG_DRM_SSD130X=m CONFIG_DRM_SSD130X_I2C=m CONFIG_DRM_SSD130X_SPI=m CONFIG_DRM_HYPERV=m -CONFIG_DRM_LEGACY=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PRIVACY_SCREEN=y @@ -6715,11 +6802,6 @@ CONFIG_FB_I740=m CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y CONFIG_FB_I810_I2C=y -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y @@ -6787,10 +6869,12 @@ CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y +CONFIG_FB_SYSMEM_FOPS=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_FOPS=y CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS_DEFERRED=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y CONFIG_FB_BACKLIGHT=m @@ -6816,9 +6900,9 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_KTD253=m +CONFIG_BACKLIGHT_KTD2801=m CONFIG_BACKLIGHT_KTZ8866=m CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_QCOM_WLED=m @@ -6830,6 +6914,7 @@ CONFIG_BACKLIGHT_PCF50633=m CONFIG_BACKLIGHT_LM3630A=m CONFIG_BACKLIGHT_LM3639=m CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_MP3309C=m CONFIG_BACKLIGHT_SKY81452=m CONFIG_BACKLIGHT_GPIO=m CONFIG_BACKLIGHT_LV5207LP=m @@ -7055,8 +7140,10 @@ CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CIRRUS_SCODEC=m CONFIG_SND_HDA_SCODEC_CS35L41=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m +CONFIG_SND_HDA_SCODEC_COMPONENT=m CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m CONFIG_SND_HDA_SCODEC_CS35L56=m @@ -7154,10 +7241,15 @@ CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCI=m CONFIG_SND_AMD_ASOC_RENOIR=m CONFIG_SND_AMD_ASOC_REMBRANDT=m +CONFIG_SND_AMD_ASOC_ACP63=m +CONFIG_SND_AMD_ASOC_ACP70=m CONFIG_SND_SOC_AMD_MACH_COMMON=m CONFIG_SND_SOC_AMD_LEGACY_MACH=m CONFIG_SND_SOC_AMD_SOF_MACH=m +CONFIG_SND_AMD_SOUNDWIRE_ACPI=m CONFIG_SND_SOC_AMD_RPL_ACP6x=m +CONFIG_SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_AMD_SOUNDWIRE=m CONFIG_SND_SOC_AMD_PS=m CONFIG_SND_SOC_AMD_PS_MACH=m # CONFIG_SND_ATMEL_SOC is not set @@ -7180,7 +7272,6 @@ CONFIG_SND_DESIGNWARE_PCM=y # CONFIG_SND_SOC_FSL_ESAI is not set # CONFIG_SND_SOC_FSL_MICFIL is not set # CONFIG_SND_SOC_FSL_XCVR is not set -# CONFIG_SND_SOC_FSL_RPMSG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # end of SoC Audio for Freescale CPUs @@ -7229,6 +7320,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m @@ -7240,6 +7332,9 @@ CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m @@ -7278,7 +7373,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m -CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m @@ -7294,13 +7389,16 @@ CONFIG_SND_SOC_SOF_CLIENT=m CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_IPC3=y -CONFIG_SND_SOC_SOF_INTEL_IPC4=y +CONFIG_SND_SOC_SOF_IPC4=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_SOF_AMD_RENOIR=m CONFIG_SND_SOC_SOF_AMD_VANGOGH=m CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m CONFIG_SND_SOC_SOF_ACP_PROBES=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE=m +CONFIG_SND_SOC_SOF_AMD_ACP63=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m @@ -7385,10 +7483,13 @@ CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m CONFIG_SND_SOC_AW88261=m +CONFIG_SND_SOC_AW87390=m +CONFIG_SND_SOC_AW88399=m CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CHV3_CODEC=m CONFIG_SND_SOC_CROS_EC_CODEC=m +CONFIG_SND_SOC_CS_AMP_LIB=m # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set CONFIG_SND_SOC_CS35L34=m @@ -7433,6 +7534,7 @@ CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m +CONFIG_SND_SOC_ES83XX_DSM_COMMON=m CONFIG_SND_SOC_ES8316=m CONFIG_SND_SOC_ES8326=m CONFIG_SND_SOC_ES8328=m @@ -7523,6 +7625,7 @@ CONFIG_SND_SOC_RT715=m CONFIG_SND_SOC_RT715_SDW=m CONFIG_SND_SOC_RT715_SDCA_SDW=m CONFIG_SND_SOC_RT9120=m +CONFIG_SND_SOC_RTQ9128=m CONFIG_SND_SOC_SDW_MOCKUP=m # CONFIG_SND_SOC_SGTL5000 is not set CONFIG_SND_SOC_SIGMADSP=m @@ -7571,7 +7674,11 @@ CONFIG_SND_SOC_TS3A227E=m CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_TSCS454 is not set # CONFIG_SND_SOC_UDA1334 is not set +CONFIG_SND_SOC_WCD_CLASSH=m +CONFIG_SND_SOC_WCD_MBHC=m # CONFIG_SND_SOC_WCD938X_SDW is not set +CONFIG_SND_SOC_WCD939X=m +CONFIG_SND_SOC_WCD939X_SDW=m CONFIG_SND_SOC_WM5102=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set @@ -7772,6 +7879,7 @@ CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_ALPS=m +# CONFIG_HID_MCP2200 is not set CONFIG_HID_MCP2221=m # end of Special HID drivers @@ -7818,6 +7926,7 @@ CONFIG_USB_ULPI_BUS=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y +CONFIG_USB_PCI_AMD=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # @@ -7832,6 +7941,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=y # @@ -7941,6 +8051,7 @@ CONFIG_USB_DWC3_PCI=m CONFIG_USB_CHIPIDEA=m # CONFIG_USB_CHIPIDEA_HOST is not set CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_GENERIC=m CONFIG_USB_ISP1760=m CONFIG_USB_ISP1760_HCD=y @@ -8021,6 +8132,7 @@ CONFIG_USB_CYTHERM=m CONFIG_USB_IDMOUSE=m CONFIG_USB_APPLEDISPLAY=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_LJCA=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m @@ -8077,7 +8189,10 @@ CONFIG_TYPEC_MUX_FSA4480=m CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_MUX_INTEL_PMC=m +CONFIG_TYPEC_MUX_IT5205=m CONFIG_TYPEC_MUX_NB7VPQ904M=m +CONFIG_TYPEC_MUX_PTN36502=m +# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -8150,6 +8265,7 @@ CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_LEDS_EXPRESSWIRE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m @@ -8230,6 +8346,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m # CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # @@ -8354,6 +8471,7 @@ CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1374_WDT=y CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_MAX31335=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m @@ -8366,6 +8484,7 @@ CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_TPS6594=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_RX8010=m @@ -8510,6 +8629,7 @@ CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_VIRQFD=y +# CONFIG_VFIO_DEBUGFS is not set # # VFIO support for PCI devices @@ -8521,9 +8641,10 @@ CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y CONFIG_MLX5_VFIO_PCI=m +CONFIG_VIRTIO_VFIO_PCI=m # end of VFIO support for PCI devices -CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y CONFIG_VBOXGUEST=m @@ -8534,6 +8655,7 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_ADMIN_LEGACY=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_PMEM=y @@ -8578,7 +8700,6 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_COMEDI is not set CONFIG_STAGING=y CONFIG_PRISM2_USB=m -CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m @@ -8627,12 +8748,6 @@ CONFIG_ADT7316_I2C=m # CONFIG_AD5933=m # end of Network Analyzer, Impedance Converters - -# -# Resolver to digital converters -# -# CONFIG_AD2S1210 is not set -# end of Resolver to digital converters # end of IIO staging drivers CONFIG_FB_SM750=m @@ -8640,14 +8755,18 @@ CONFIG_STAGING_MEDIA=y # CONFIG_INTEL_ATOMISP is not set # CONFIG_DVB_AV7110 is not set # CONFIG_VIDEO_IPU3_IMGU is not set + +# +# StarFive media platform drivers +# # CONFIG_STAGING_MEDIA_DEPRECATED is not set CONFIG_LTE_GDM724X=m # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set # CONFIG_PI433 is not set # CONFIG_FIELDBUS_DEV is not set -CONFIG_QLGE=m # CONFIG_VME_BUS is not set +# CONFIG_GOLDFISH is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_ACPI=m CONFIG_CHROMEOS_LAPTOP=m @@ -8707,9 +8826,8 @@ CONFIG_YOGABOOK=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m -CONFIG_AMD_PMF=m -# CONFIG_AMD_PMF_DEBUG is not set CONFIG_AMD_PMC=m +# CONFIG_AMD_WBRF is not set CONFIG_ADV_SWBUTTON=m CONFIG_APPLE_GMUX=m CONFIG_ASUS_LAPTOP=m @@ -8764,7 +8882,7 @@ CONFIG_INTEL_ATOMISP2_LED=m CONFIG_INTEL_ATOMISP2_PM=m # CONFIG_INTEL_SAR_INT1092 is not set CONFIG_INTEL_SKL_INT3472=m -CONFIG_INTEL_PMC_CORE=y +CONFIG_INTEL_PMC_CORE=m CONFIG_INTEL_PMT_CLASS=m CONFIG_INTEL_PMT_TELEMETRY=m CONFIG_INTEL_PMT_CRASHLOG=m @@ -8803,6 +8921,7 @@ CONFIG_SYSTEM76_ACPI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_MLX_PLATFORM=m +CONFIG_INSPUR_PLATFORM_PROFILE=m CONFIG_X86_ANDROID_TABLETS=m CONFIG_FW_ATTR_CLASS=m CONFIG_INTEL_IPS=m @@ -8816,6 +8935,7 @@ CONFIG_SIEMENS_SIMATIC_IPC_BATT=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m +# CONFIG_SILICOM_PLATFORM is not set CONFIG_WINMATE_FM07_KEYS=m CONFIG_SEL3350_PLATFORM=m CONFIG_P2SB=y @@ -8846,6 +8966,7 @@ CONFIG_CLKBLD_I8253=y # CONFIG_MAILBOX is not set CONFIG_IOMMU_IOVA=y CONFIG_IOMMU_API=y +CONFIG_IOMMUFD_DRIVER=y CONFIG_IOMMU_SUPPORT=y # @@ -8935,6 +9056,7 @@ CONFIG_WPCM450_SOC=m # # Qualcomm SoC drivers # +# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set CONFIG_QCOM_QMI_HELPERS=m # end of Qualcomm SoC drivers @@ -8946,6 +9068,31 @@ CONFIG_QCOM_QMI_HELPERS=m # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers +# +# PM Domains +# + +# +# Amlogic PM Domains +# +# end of Amlogic PM Domains + +# +# Broadcom PM Domains +# +# end of Broadcom PM Domains + +# +# i.MX PM Domains +# +# end of i.MX PM Domains + +# +# Qualcomm PM Domains +# +# end of Qualcomm PM Domains +# end of PM Domains + CONFIG_PM_DEVFREQ=y # @@ -8994,6 +9141,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 CONFIG_IIO_SW_DEVICE=m CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_TRIGGERED_EVENT=m +CONFIG_IIO_BACKEND=m # # Accelerometers @@ -9058,7 +9206,9 @@ CONFIG_STK8BA50=m # Analog to digital converters # CONFIG_AD4130=m +CONFIG_AD7091R=m # CONFIG_AD7091R5 is not set +CONFIG_AD7091R8=m # CONFIG_AD7124 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set @@ -9079,6 +9229,8 @@ CONFIG_AD7606_IFACE_PARALLEL=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set CONFIG_AD799X=m +CONFIG_AD9467=m +# CONFIG_ADI_AXI_ADC is not set CONFIG_CC10001_ADC=m CONFIG_DLN2_ADC=m CONFIG_ENVELOPE_DETECTOR=m @@ -9086,6 +9238,7 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_HX711=m CONFIG_INA2XX_ADC=m CONFIG_INTEL_MRFLD_ADC=m +# CONFIG_LTC2309 is not set CONFIG_LTC2471=m CONFIG_LTC2485=m CONFIG_LTC2496=m @@ -9097,11 +9250,14 @@ CONFIG_LTC2497=m CONFIG_MAX11410=m CONFIG_MAX1241=m CONFIG_MAX1363=m +CONFIG_MAX34408=m CONFIG_MAX9611=m # CONFIG_MCP320X is not set CONFIG_MCP3422=m +# CONFIG_MCP3564 is not set # CONFIG_MCP3911 is not set CONFIG_NAU7802=m +CONFIG_PAC1934=m # CONFIG_RICHTEK_RTQ6056 is not set CONFIG_SD_ADC_MODULATOR=m CONFIG_TI_ADC081C=m @@ -9114,6 +9270,7 @@ CONFIG_TI_ADC081C=m CONFIG_TI_ADS1015=m CONFIG_TI_ADS7924=m CONFIG_TI_ADS1100=m +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set CONFIG_TI_ADS8344=m CONFIG_TI_ADS8688=m @@ -9158,6 +9315,7 @@ CONFIG_AD7746=m # # Chemical Sensors # +# CONFIG_AOSONG_AGS02MA is not set # CONFIG_ATLAS_PH_SENSOR is not set # CONFIG_ATLAS_EZO_SENSOR is not set # CONFIG_BME680 is not set @@ -9242,6 +9400,7 @@ CONFIG_MAX5522=m CONFIG_MAX5821=m CONFIG_MCP4725=m CONFIG_MCP4728=m +CONFIG_MCP4821=m # CONFIG_MCP4922 is not set # CONFIG_TI_DAC082S085 is not set CONFIG_TI_DAC5571=m @@ -9277,6 +9436,7 @@ CONFIG_TI_DAC5571=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set CONFIG_ADF4377=m +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV4420 is not set # CONFIG_ADRF6780 is not set @@ -9328,6 +9488,7 @@ CONFIG_ITG3200=m CONFIG_DHT11=m CONFIG_HDC100X=m CONFIG_HDC2010=m +# CONFIG_HDC3020 is not set CONFIG_HID_SENSOR_HUMIDITY=m CONFIG_HTS221=m CONFIG_HTS221_I2C=m @@ -9344,8 +9505,12 @@ CONFIG_SI7020=m # CONFIG_ADIS16460 is not set CONFIG_ADIS16475=m # CONFIG_ADIS16480 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_BMI323=m +CONFIG_BMI323_I2C=m +# CONFIG_BMI323_SPI is not set # CONFIG_BOSCH_BNO055_SERIAL is not set # CONFIG_BOSCH_BNO055_I2C is not set CONFIG_FXOS8700=m @@ -9387,6 +9552,7 @@ CONFIG_GP2AP020A00F=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_ISL29125=m +# CONFIG_ISL76682 is not set CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m @@ -9394,6 +9560,7 @@ CONFIG_JSA1212=m CONFIG_ROHM_BU27034=m CONFIG_RPR0521=m CONFIG_SENSORS_LM3533=m +# CONFIG_LTR390 is not set CONFIG_LTR501=m # CONFIG_LTRF216A is not set CONFIG_LV0104CS=m @@ -9421,6 +9588,7 @@ CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set +# CONFIG_VEML6075 is not set CONFIG_VL6180=m CONFIG_ZOPT2201=m # end of Light sensors @@ -9504,6 +9672,7 @@ CONFIG_LMP91000=m # Pressure sensors # CONFIG_ABP060MG=m +# CONFIG_ROHM_BM1390 is not set CONFIG_BMP280=m CONFIG_BMP280_I2C=m CONFIG_BMP280_SPI=m @@ -9511,6 +9680,7 @@ CONFIG_BMP280_SPI=m # CONFIG_DPS310 is not set CONFIG_HID_SENSOR_PRESS=m # CONFIG_HP03 is not set +# CONFIG_HSC030PA is not set CONFIG_ICP10100=m # CONFIG_MPL115_I2C is not set # CONFIG_MPL115_SPI is not set @@ -9560,6 +9730,7 @@ CONFIG_VL53L0X_I2C=m # # CONFIG_AD2S90 is not set # CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set # end of Resolver to digital converters # @@ -9570,6 +9741,7 @@ CONFIG_LTC2983=m CONFIG_HID_SENSOR_TEMP=m CONFIG_MLX90614=m CONFIG_MLX90632=m +# CONFIG_MLX90635 is not set CONFIG_TMP006=m CONFIG_TMP007=m CONFIG_TMP117=m @@ -9578,6 +9750,7 @@ CONFIG_TSYS02D=m CONFIG_MAX30208=m # CONFIG_MAX31856 is not set CONFIG_MAX31865=m +CONFIG_MCP9600=m # end of Temperature sensors CONFIG_NTB=m @@ -9594,6 +9767,7 @@ CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set CONFIG_PWM_CLK=m CONFIG_PWM_CROS_EC=m +CONFIG_PWM_DWC_CORE=m CONFIG_PWM_DWC=m # CONFIG_PWM_LP3943 is not set CONFIG_PWM_LPSS=m @@ -9608,6 +9782,7 @@ CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_GPIO=m # CONFIG_RESET_SIMPLE is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RESET_TI_TPS380X=m @@ -9644,9 +9819,12 @@ CONFIG_IDLE_INJECT=y # # Performance monitor support # +CONFIG_DWC_PCIE_PMU=m +CONFIG_CXL_PMU=m # end of Performance monitor support CONFIG_RAS=y +# CONFIG_AMD_ATL is not set CONFIG_USB4=m # CONFIG_USB4_DEBUGFS_WRITE is not set # CONFIG_USB4_DMA_TEST is not set @@ -9671,14 +9849,7 @@ CONFIG_DEV_DAX_CXL=m CONFIG_DEV_DAX_HMEM_DEVICES=y CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y - -# -# Layout Types -# -CONFIG_NVMEM_LAYOUT_SL28_VPD=m -CONFIG_NVMEM_LAYOUT_ONIE_TLV=m -# end of Layout Types - +# CONFIG_NVMEM_LAYOUTS is not set CONFIG_NVMEM_RMEM=m # @@ -9721,6 +9892,7 @@ CONFIG_PM_OPP=y # CONFIG_MOST is not set # CONFIG_PECI is not set # CONFIG_HTE is not set +CONFIG_DPLL=y # end of Device Drivers # @@ -9729,6 +9901,7 @@ CONFIG_PM_OPP=y CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_VALIDATE_FS_PARSER is not set CONFIG_FS_IOMAP=y +CONFIG_FS_STACK=y CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set @@ -9759,6 +9932,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y # CONFIG_XFS_ONLINE_SCRUB_STATS is not set # CONFIG_XFS_ONLINE_REPAIR is not set @@ -9774,7 +9949,6 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set @@ -9795,6 +9969,15 @@ CONFIG_F2FS_FS_LZ4HC=y CONFIG_F2FS_FS_ZSTD=y CONFIG_F2FS_IOSTAT=y # CONFIG_F2FS_UNFAIR_RWSEM is not set +CONFIG_BCACHEFS_FS=y +CONFIG_BCACHEFS_QUOTA=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set +CONFIG_BCACHEFS_POSIX_ACL=y +# CONFIG_BCACHEFS_DEBUG is not set +# CONFIG_BCACHEFS_TESTS is not set +# CONFIG_BCACHEFS_LOCK_TIME_STATS is not set +# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set +CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y CONFIG_ZONEFS_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -9820,6 +10003,7 @@ CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -9861,12 +10045,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=y -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=y CONFIG_NTFS3_LZX_XPRESS=y CONFIG_NTFS3_FS_POSIX_ACL=y +CONFIG_NTFS_FS=y # end of DOS/FAT/EXFAT/NT Filesystems # @@ -9999,6 +10181,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_FLEXFILELAYOUT=y CONFIG_NFSD_V4_2_INTER_SSC=y # CONFIG_NFSD_V4_SECURITY_LABEL is not set +CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y CONFIG_GRACE_PERIOD=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y @@ -10184,6 +10367,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -10255,16 +10439,14 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y # CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HCTR2=m CONFIG_CRYPTO_KEYWRAP=m CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=y CONFIG_CRYPTO_XCTR=m CONFIG_CRYPTO_XTS=y @@ -10295,7 +10477,7 @@ CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_POLYVAL=m -CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y @@ -10340,7 +10522,9 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y -# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=1 CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -10387,9 +10571,11 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C62X=m CONFIG_CRYPTO_DEV_QAT_4XXX=m +CONFIG_CRYPTO_DEV_QAT_420XX=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_SAFEXCEL=m @@ -10410,6 +10596,7 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set CONFIG_SECONDARY_TRUSTED_KEYRING=y +# CONFIG_SECONDARY_TRUSTED_KEYRING_SIGNED_BY_BUILTIN is not set CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_REVOCATION_LIST is not set @@ -10432,8 +10619,8 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y @@ -10445,13 +10632,13 @@ CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_LIB_ARC4=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y CONFIG_CRYPTO_LIB_CHACHA=m CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 -CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA1=y @@ -10492,7 +10679,6 @@ CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_SPARC=y @@ -10522,6 +10708,7 @@ CONFIG_INTERVAL_TREE=y CONFIG_INTERVAL_TREE_SPAN_ITER=y CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_CLOSURES=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y @@ -10586,14 +10773,17 @@ CONFIG_MEMREGION=y CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y CONFIG_ARCH_STACKWALK=y CONFIG_STACKDEPOT=y +CONFIG_STACKDEPOT_MAX_FRAMES=64 CONFIG_SBITMAP=y CONFIG_PARMAN=m CONFIG_OBJAGG=m +# CONFIG_LWQ_TEST is not set # end of Library routines CONFIG_PLDMFW=y CONFIG_ASN1_ENCODER=y CONFIG_POLYNOMIAL=m +CONFIG_FIRMWARE_TABLE=y # # Kernel hacking @@ -10621,7 +10811,7 @@ CONFIG_DEBUG_KERNEL=y # # Compile-time checks and compiler options # -CONFIG_AS_HAS_NON_CONST_LEB128=y +CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set @@ -10650,7 +10840,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments @@ -10761,6 +10951,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CLOSURES is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures @@ -10773,6 +10964,7 @@ CONFIG_STACKTRACE=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_CPU_STALL_CPUTIME is not set +# CONFIG_RCU_CPU_STALL_NOTIFIER is not set # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging @@ -10907,8 +11099,6 @@ CONFIG_RUNTIME_TESTING_MENU=y CONFIG_ATOMIC64_SELFTEST=y CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m -# CONFIG_STRING_SELFTEST is not set -# CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_SCANF is not set @@ -10937,6 +11127,7 @@ CONFIG_TEST_UDELAY=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_FPU is not set # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set +# CONFIG_TEST_OBJPOOL is not set CONFIG_ARCH_USE_MEMTEST=y CONFIG_MEMTEST=y # CONFIG_HYPERV_TESTING is not set diff --git a/source/k/kernel-configs/config-generic-6.6.29.x64 b/source/k/kernel-configs/config-generic-6.9.3.x64 index a6a07ecf2..94619d5bd 100644 --- a/source/k/kernel-configs/config-generic-6.6.29.x64 +++ b/source/k/kernel-configs/config-generic-6.9.3.x64 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.29 Kernel Configuration +# Linux/x86 6.9.3 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130200 +CONFIG_GCC_VERSION=140100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24200 @@ -15,7 +15,6 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -90,6 +89,7 @@ CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y @@ -202,6 +202,8 @@ CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_GCC_NO_STRINGOP_OVERFLOW=y +CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -284,19 +286,19 @@ CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y +CONFIG_KCMP=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +CONFIG_CACHESTAT_SYSCALL=y +# CONFIG_PC104 is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_KCMP=y -CONFIG_RSEQ=y -CONFIG_CACHESTAT_SYSCALL=y -# CONFIG_DEBUG_RSEQ is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y -# CONFIG_PC104 is not set # # Kernel Performance Events And Counters @@ -312,7 +314,8 @@ CONFIG_TRACEPOINTS=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y +CONFIG_CRASH_RESERVE=y +CONFIG_VMCORE_INFO=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y @@ -361,8 +364,8 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y -# CONFIG_GOLDFISH is not set CONFIG_X86_CPU_RESCTRL=y +CONFIG_X86_FRED=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y @@ -392,6 +395,7 @@ CONFIG_GENERIC_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_TSC=y +CONFIG_X86_HAVE_PAE=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 @@ -504,6 +508,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y +CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -524,6 +529,8 @@ CONFIG_HAVE_LIVEPATCH=y CONFIG_LIVEPATCH=y # end of Processor type and features +CONFIG_CC_HAS_NAMED_AS=y +CONFIG_USE_X86_SEG_SUPPORT=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_CC_HAS_ENTRY_PADDING=y @@ -533,18 +540,18 @@ CONFIG_CALL_PADDING=y CONFIG_HAVE_CALL_THUNKS=y CONFIG_CALL_THUNKS=y CONFIG_PREFIX_SYMBOLS=y -CONFIG_SPECULATION_MITIGATIONS=y -CONFIG_PAGE_TABLE_ISOLATION=y -CONFIG_RETPOLINE=y -CONFIG_RETHUNK=y -CONFIG_CPU_UNRET_ENTRY=y -CONFIG_CALL_DEPTH_TRACKING=y +CONFIG_CPU_MITIGATIONS=y +CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y +CONFIG_MITIGATION_RETPOLINE=y +CONFIG_MITIGATION_RETHUNK=y +CONFIG_MITIGATION_UNRET_ENTRY=y +CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y # CONFIG_CALL_THUNKS_DEBUG is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y -CONFIG_CPU_SRSO=y -CONFIG_SLS=y -# CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_MITIGATION_IBPB_ENTRY=y +CONFIG_MITIGATION_IBRS_ENTRY=y +CONFIG_MITIGATION_SRSO=y +CONFIG_MITIGATION_SLS=y +# CONFIG_MITIGATION_GDS_FORCE is not set CONFIG_MITIGATION_RFDS=y CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y @@ -559,6 +566,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="\"\"" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -580,6 +590,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y CONFIG_ACPI_TABLE_LIB=y +CONFIG_ACPI_THERMAL_LIB=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_FPDT=y @@ -613,7 +624,6 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set CONFIG_ACPI_BGRT=y # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NFIT=m @@ -714,24 +724,24 @@ CONFIG_AMD_NB=y # Binary Emulations # CONFIG_IA32_EMULATION=y +# CONFIG_IA32_EMULATION_DEFAULT_DISABLED is not set # CONFIG_X86_X32_ABI is not set CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y # end of Binary Emulations -CONFIG_HAVE_KVM=y +CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_PFNCACHE=y CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_DIRTY_RING=y CONFIG_HAVE_KVM_DIRTY_RING_TSO=y CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y -CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -741,23 +751,28 @@ CONFIG_HAVE_KVM_NO_POLL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y +CONFIG_KVM_GENERIC_MMU_NOTIFIER=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m # CONFIG_KVM_WERROR is not set +# CONFIG_KVM_SW_PROTECTED_VM is not set CONFIG_KVM_INTEL=m CONFIG_X86_SGX_KVM=y CONFIG_KVM_AMD=m CONFIG_KVM_AMD_SEV=y CONFIG_KVM_SMM=y +CONFIG_KVM_HYPERV=y CONFIG_KVM_XEN=y # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y +CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y CONFIG_AS_WRUSS=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -794,6 +809,7 @@ CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y +CONFIG_ARCH_HAS_CPU_PASID=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y @@ -861,8 +877,11 @@ CONFIG_ARCH_MMAP_RND_BITS=28 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_HAVE_OBJTOOL=y CONFIG_HAVE_JUMP_LABEL_HACK=y CONFIG_HAVE_NOINSTR_HACK=y @@ -899,6 +918,7 @@ CONFIG_ARCH_HAS_ELFCORE_COMPAT=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y CONFIG_DYNAMIC_SIGFRAME=y CONFIG_HAVE_ARCH_NODE_DEV_GROUP=y +CONFIG_ARCH_HAS_HW_PTE_YOUNG=y CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y # @@ -914,6 +934,8 @@ CONFIG_GCC_PLUGINS=y CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT_16B=y CONFIG_FUNCTION_ALIGNMENT=16 +CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y +CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -946,6 +968,7 @@ CONFIG_BLK_ICQ=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY_T10=y +CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set @@ -1038,7 +1061,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON=y +CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -1057,9 +1080,8 @@ CONFIG_ZSMALLOC=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # -# SLAB allocator options +# Slab allocator options # -# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -1068,7 +1090,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set -# end of SLAB allocator options +# end of Slab allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_COMPAT_BRK is not set @@ -1102,6 +1124,7 @@ CONFIG_DEVICE_MIGRATION=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -1114,6 +1137,7 @@ CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set CONFIG_THP_SWAP=y # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y @@ -1121,7 +1145,6 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set CONFIG_CMA_SYSFS=y CONFIG_CMA_AREAS=7 @@ -1151,16 +1174,18 @@ CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set -CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y +CONFIG_USERFAULTFD=y CONFIG_PTE_MARKER_UFFD_WP=y CONFIG_LRU_GEN=y CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN_WALKS_MMU=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y +CONFIG_IOMMU_MM_DATA=y # # Data Access Monitoring @@ -1183,7 +1208,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1265,6 +1289,7 @@ CONFIG_TCP_CONG_BBR=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_SIGPOOL=y CONFIG_TCP_MD5SIG=y CONFIG_IPV6=m # CONFIG_IPV6_ROUTER_PREF is not set @@ -1553,6 +1578,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1585,6 +1611,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1592,6 +1619,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1629,6 +1657,7 @@ CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1650,7 +1679,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1734,9 +1762,6 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_LLC=m CONFIG_LLC2=m CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_PHONET is not set @@ -1829,7 +1854,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -2040,7 +2064,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -2101,7 +2124,7 @@ CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y -# CONFIG_PAGE_POOL_STATS is not set +CONFIG_PAGE_POOL_STATS=y CONFIG_FAILOVER=y CONFIG_ETHTOOL_NETLINK=y @@ -2111,12 +2134,14 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_HAVE_EISA=y # CONFIG_EISA is not set CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIEAER=y CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEAER_CXL=y # CONFIG_PCIE_ECRC is not set CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y @@ -2201,7 +2226,6 @@ CONFIG_CXL_PORT=y CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set -CONFIG_CXL_PMU=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2257,6 +2281,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set CONFIG_HMEM_REPORTING=y CONFIG_TEST_ASYNC_DRIVER_PROBE=m +CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y @@ -2343,6 +2368,11 @@ CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y # +# Qualcomm firmware drivers +# +# end of Qualcomm firmware drivers + +# # Tegra firmware driver # # end of Tegra firmware driver @@ -2355,7 +2385,6 @@ CONFIG_MTD_TESTS=m # # Partition parsers # -CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 @@ -2433,7 +2462,6 @@ CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m CONFIG_MTD_PCMCIA=m # CONFIG_MTD_PCMCIA_ANONYMOUS is not set -CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -2522,6 +2550,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set CONFIG_MTD_UBI_GLUEBI=m # CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_NVMEM=m # CONFIG_MTD_HYPERBUS is not set # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -2554,7 +2583,8 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set # CONFIG_ZRAM_DEF_COMP_842 is not set CONFIG_ZRAM_DEF_COMP="lzo-rle" -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y +# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y CONFIG_BLK_DEV_LOOP=m @@ -2580,7 +2610,8 @@ CONFIG_BLK_DEV_RNBD_SERVER=m # # NVME Support # -CONFIG_NVME_COMMON=y +CONFIG_NVME_KEYRING=m +CONFIG_NVME_AUTH=y CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y @@ -2590,7 +2621,8 @@ CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m CONFIG_NVME_TCP=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_TCP_TLS=y +CONFIG_NVME_HOST_AUTH=y CONFIG_NVME_TARGET=m CONFIG_NVME_TARGET_PASSTHRU=y CONFIG_NVME_TARGET_LOOP=m @@ -2598,6 +2630,7 @@ CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_TCP=m +CONFIG_NVME_TARGET_TCP_TLS=y CONFIG_NVME_TARGET_AUTH=y # end of NVME Support @@ -2633,6 +2666,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_MISC_RTSX=m CONFIG_TPS6594_ESM=m CONFIG_TPS6594_PFSM=m +CONFIG_NSM=m # CONFIG_C2PORT is not set # @@ -2640,7 +2674,6 @@ CONFIG_TPS6594_PFSM=m # CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set @@ -2668,6 +2701,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m CONFIG_INTEL_MEI_GSC=m +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_HDCP=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_GSC_PROXY=m @@ -2793,7 +2828,6 @@ CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m @@ -2938,17 +2972,13 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y -CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y CONFIG_MD_RAID10=y CONFIG_MD_RAID456=y -CONFIG_MD_MULTIPATH=y -CONFIG_MD_FAULTY=m CONFIG_MD_CLUSTER=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set # CONFIG_BCACHE_ASYNC_REGISTRATION is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=y @@ -2990,6 +3020,7 @@ CONFIG_DM_LOG_WRITES=m CONFIG_DM_INTEGRITY=m CONFIG_DM_ZONED=m CONFIG_DM_AUDIT=y +CONFIG_DM_VDO=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -3061,6 +3092,7 @@ CONFIG_TAP=m CONFIG_VETH=m CONFIG_VIRTIO_NET=y CONFIG_NLMON=m +CONFIG_NETKIT=y CONFIG_NET_VRF=m CONFIG_VSOCKMON=m CONFIG_MHI_NET=m @@ -3132,10 +3164,6 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_REALTEK=m -# CONFIG_NET_DSA_REALTEK_MDIO is not set -# CONFIG_NET_DSA_REALTEK_SMI is not set -CONFIG_NET_DSA_REALTEK_RTL8365MB=m -CONFIG_NET_DSA_REALTEK_RTL8366RB=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -3283,10 +3311,13 @@ CONFIG_I40E=m CONFIG_IAVF=m CONFIG_I40EVF=m CONFIG_ICE=m +CONFIG_ICE_HWMON=y CONFIG_ICE_SWITCHDEV=y CONFIG_ICE_HWTS=y CONFIG_FM10K=m CONFIG_IGC=m +CONFIG_IGC_LEDS=y +CONFIG_IDPF=m CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y CONFIG_ADIN1110=m @@ -3299,6 +3330,7 @@ CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set CONFIG_OCTEON_EP=m +CONFIG_OCTEON_EP_VF=m CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_NET_VENDOR_MELLANOX=y @@ -3323,6 +3355,7 @@ CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y CONFIG_MLX5_SF_MANAGER=y +CONFIG_MLX5_DPLL=m CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE_THERMAL=y @@ -3399,6 +3432,7 @@ CONFIG_8139TOO_PIO=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m +CONFIG_R8169_LEDS=y CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_ROCKER=y CONFIG_ROCKER=m @@ -3526,7 +3560,10 @@ CONFIG_NXP_CBTX_PHY=m CONFIG_NXP_C45_TJA11XX_PHY=m # CONFIG_NXP_TJA11XX_PHY is not set CONFIG_NCN26000_PHY=m +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +CONFIG_QCA83XX_PHY=m +CONFIG_QCA808X_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m @@ -3540,6 +3577,7 @@ CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m CONFIG_DP83869_PHY=m CONFIG_DP83TD510_PHY=m +CONFIG_DP83TG720_PHY=m CONFIG_VITESSE_PHY=m CONFIG_XILINX_GMII2RGMII=m # CONFIG_MICREL_KS8995MA is not set @@ -3562,6 +3600,7 @@ CONFIG_CAN_CC770_ISA=m CONFIG_CAN_CC770_PLATFORM=m CONFIG_CAN_CTUCANFD=m CONFIG_CAN_CTUCANFD_PCI=m +# CONFIG_CAN_ESD_402_PCI is not set CONFIG_CAN_IFI_CANFD=m CONFIG_CAN_M_CAN=m CONFIG_CAN_M_CAN_PCI=m @@ -3717,7 +3756,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y # CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_DYNACK is not set CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y @@ -3761,9 +3799,6 @@ CONFIG_ATH12K=m # CONFIG_ATH12K_DEBUG is not set # CONFIG_ATH12K_TRACING is not set CONFIG_WLAN_VENDOR_ATMEL=y -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_WLAN_VENDOR_BROADCOM=y CONFIG_B43=m @@ -3805,9 +3840,6 @@ CONFIG_BRCMFMAC_USB=y CONFIG_BRCMFMAC_PCIE=y CONFIG_BRCM_TRACING=y # CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_AIRO=m -CONFIG_AIRO_CS=m CONFIG_WLAN_VENDOR_INTEL=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3844,21 +3876,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # end of Debugging Options CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_HERMES=m -# CONFIG_HERMES_PRISM is not set -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m @@ -3867,7 +3884,6 @@ CONFIG_P54_LEDS=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set @@ -3909,6 +3925,9 @@ CONFIG_MT7921E=m CONFIG_MT7921S=m CONFIG_MT7921U=m CONFIG_MT7996E=m +CONFIG_MT7925_COMMON=m +CONFIG_MT7925E=m +CONFIG_MT7925U=m CONFIG_WLAN_VENDOR_MICROCHIP=y # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set @@ -4023,15 +4042,11 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WLAN_VENDOR_ZYDAS=y -CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_QTNFMAC=m CONFIG_QTNFMAC_PCIE=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_MAC80211_HWSIM is not set CONFIG_VIRT_WIFI=m CONFIG_WAN=y @@ -4045,6 +4060,7 @@ CONFIG_HDLC_PPP=m # # X.25/LAPB support is disabled # +# CONFIG_FRAMER is not set CONFIG_PCI200SYN=m CONFIG_WANXL=m # CONFIG_PC300TOO is not set @@ -4223,6 +4239,7 @@ CONFIG_JOYSTICK_PXRC=m CONFIG_JOYSTICK_QWIIC=m CONFIG_JOYSTICK_FSIA6B=m # CONFIG_JOYSTICK_SENSEHAT is not set +CONFIG_JOYSTICK_SEESAW=m CONFIG_INPUT_TABLET=y CONFIG_TABLET_USB_ACECAD=m CONFIG_TABLET_USB_AIPTEK=m @@ -4259,6 +4276,9 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m CONFIG_TOUCHSCREEN_EXC3000=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m CONFIG_TOUCHSCREEN_HIDEEP=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m @@ -4427,7 +4447,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y @@ -4645,6 +4664,7 @@ CONFIG_I2C_XILINX=m # CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_DLN2=m +CONFIG_I2C_LJCA=m CONFIG_I2C_CP2615=m CONFIG_I2C_PARPORT=m # CONFIG_I2C_PCI1XXXX is not set @@ -4689,6 +4709,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_DLN2 is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +CONFIG_SPI_LJCA=m CONFIG_SPI_MICROCHIP_CORE=m # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set # CONFIG_SPI_LANTIQ_SSC is not set @@ -4753,6 +4774,7 @@ CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +CONFIG_PTP_1588_CLOCK_FC3W=m # CONFIG_PTP_1588_CLOCK_MOCK is not set CONFIG_PTP_1588_CLOCK_VMW=m CONFIG_PTP_1588_CLOCK_OCP=m @@ -4775,6 +4797,7 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_INTEL_PLATFORM=m CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -4788,6 +4811,7 @@ CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_METEORLAKE=m +CONFIG_PINCTRL_METEORPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -4854,9 +4878,11 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_ARIZONA=m CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_CROS_EC=m CONFIG_GPIO_DLN2=m CONFIG_GPIO_ELKHARTLAKE=m CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_LJCA=m CONFIG_GPIO_LP3943=m # CONFIG_GPIO_TPS68470 is not set CONFIG_GPIO_WHISKEY_COVE=m @@ -4905,11 +4931,13 @@ CONFIG_W1_CON=y # # 1-wire Bus Masters # +CONFIG_W1_MASTER_AMD_AXI=m CONFIG_W1_MASTER_MATROX=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_SGI is not set +CONFIG_W1_MASTER_UART=m # end of 1-wire Bus Masters # @@ -4994,6 +5022,7 @@ CONFIG_CHARGER_WILCO=m CONFIG_BATTERY_SURFACE=m CONFIG_CHARGER_SURFACE=m CONFIG_BATTERY_UG3105=m +CONFIG_FUEL_GAUGE_MM8013=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -5023,6 +5052,7 @@ CONFIG_SENSORS_AHT10=m CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_ASUS_ROG_RYUJIN=m CONFIG_SENSORS_AXI_FAN_CONTROL=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m @@ -5030,6 +5060,7 @@ CONFIG_SENSORS_FAM15H_POWER=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CHIPCAP2=m CONFIG_SENSORS_CORSAIR_CPRO=m CONFIG_SENSORS_CORSAIR_PSU=m CONFIG_SENSORS_DRIVETEMP=m @@ -5044,6 +5075,7 @@ CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GIGABYTE_WATERFORCE=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m @@ -5057,6 +5089,7 @@ CONFIG_SENSORS_I5500=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWERZ=m CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LTC2945=m @@ -5064,6 +5097,7 @@ CONFIG_SENSORS_LTC2947=m CONFIG_SENSORS_LTC2947_I2C=m CONFIG_SENSORS_LTC2947_SPI=m CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC2991=m CONFIG_SENSORS_LTC2992=m CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m @@ -5071,6 +5105,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LTC4282=m # CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX127=m CONFIG_SENSORS_MAX16065=m @@ -5122,6 +5157,7 @@ CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NZXT_KRAKEN2=m +CONFIG_SENSORS_NZXT_KRAKEN3=m CONFIG_SENSORS_NZXT_SMART2=m # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_OXP=m @@ -5150,6 +5186,7 @@ CONFIG_SENSORS_LT7182S=m CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_SENSORS_LTC3815=m +# CONFIG_SENSORS_LTC4286 is not set CONFIG_SENSORS_MAX15301=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX16601=m @@ -5158,12 +5195,15 @@ CONFIG_SENSORS_MAX20751=m CONFIG_SENSORS_MAX31785=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MP2856=m CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP2975_REGULATOR=y CONFIG_SENSORS_MP5023=m +CONFIG_SENSORS_MP5990=m CONFIG_SENSORS_MPQ7932_REGULATOR=y CONFIG_SENSORS_MPQ7932=m +CONFIG_SENSORS_MPQ8785=m CONFIG_SENSORS_PIM4328=m CONFIG_SENSORS_PLI1209BC=m CONFIG_SENSORS_PLI1209BC_REGULATOR=y @@ -5182,6 +5222,7 @@ CONFIG_SENSORS_XDPE152=m CONFIG_SENSORS_XDPE122=m CONFIG_SENSORS_XDPE122_REGULATOR=y CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_PT5161L=m CONFIG_SENSORS_SBTSI=m CONFIG_SENSORS_SBRMI=m CONFIG_SENSORS_SHT15=m @@ -5202,6 +5243,7 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SURFACE_FAN=m CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set @@ -5248,10 +5290,9 @@ CONFIG_SENSORS_HP_WMI=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_STATISTICS=y +# CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_ACPI=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -5306,6 +5347,7 @@ CONFIG_WATCHDOG_SYSFS=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_CROS_EC_WATCHDOG=m CONFIG_MENF21BMC_WATCHDOG=m CONFIG_WDAT_WDT=m # CONFIG_XILINX_WATCHDOG is not set @@ -5490,6 +5532,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set CONFIG_REGULATOR_USERSPACE_CONSUMER=m +# CONFIG_REGULATOR_NETLINK_EVENTS is not set # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m @@ -5513,6 +5556,7 @@ CONFIG_REGULATOR_LP8755=m CONFIG_REGULATOR_LTC3589=m CONFIG_REGULATOR_LTC3676=m CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX77503=m CONFIG_REGULATOR_MAX77857=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m @@ -5832,6 +5876,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y # # Media capture support # +# CONFIG_VIDEO_MGB4 is not set CONFIG_VIDEO_SOLO6X10=m # CONFIG_VIDEO_TW5864 is not set CONFIG_VIDEO_TW68=m @@ -5981,6 +6026,10 @@ CONFIG_VIDEO_CAFE_CCIC=m # # +# Nuvoton media platform drivers +# + +# # NVidia media platform drivers # @@ -6077,7 +6126,10 @@ CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_ALVIUM_CSI2=m CONFIG_VIDEO_AR0521=m +CONFIG_VIDEO_GC0308=m +CONFIG_VIDEO_GC2145=m CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m CONFIG_VIDEO_HI847=m @@ -6093,6 +6145,7 @@ CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_MAX9271_LIB=m CONFIG_VIDEO_MT9M001=m CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9M114=m CONFIG_VIDEO_MT9P031=m CONFIG_VIDEO_MT9T112=m CONFIG_VIDEO_MT9V011=m @@ -6117,6 +6170,7 @@ CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV64A40=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7640=m @@ -6139,6 +6193,12 @@ CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m # +# Camera ISPs +# +CONFIG_VIDEO_THP7312=m +# end of Camera ISPs + +# # Lens drivers # CONFIG_VIDEO_AD5820=m @@ -6207,6 +6267,7 @@ CONFIG_VIDEO_TVP514X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_TVP7002=m CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9900=m CONFIG_VIDEO_TW9903=m CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_TW9910=m @@ -6486,22 +6547,24 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_SCREEN_INFO=y +CONFIG_VIDEO=y CONFIG_AUXDISPLAY=y CONFIG_CHARLCD=m -CONFIG_LINEDISP=m CONFIG_HD44780_COMMON=m CONFIG_HD44780=m -# CONFIG_KS0108 is not set -# CONFIG_IMG_ASCII_LCD is not set -CONFIG_HT16K33=m # CONFIG_LCD2S is not set # CONFIG_PARPORT_PANEL is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_KS0108 is not set +CONFIG_LINEDISP=m +# CONFIG_IMG_ASCII_LCD is not set +CONFIG_HT16K33=m +CONFIG_MAX6959=m +CONFIG_SEG_LED_GPIO=m # CONFIG_PANEL is not set CONFIG_AGP=m CONFIG_AGP_AMD64=m @@ -6513,6 +6576,7 @@ CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6522,12 +6586,14 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DISPLAY_HELPER=m CONFIG_DRM_DISPLAY_DP_HELPER=y +CONFIG_DRM_DISPLAY_DP_TUNNEL=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m +CONFIG_DRM_GPUVM=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -6582,6 +6648,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_PUSH is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y # CONFIG_DRM_NOUVEAU_SVM is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_I915=m CONFIG_DRM_I915_FORCE_PROBE="" CONFIG_DRM_I915_CAPTURE_ERROR=y @@ -6589,6 +6656,7 @@ CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_PXP=y +CONFIG_DRM_I915_DP_TUNNEL=y # # drm/i915 Debugging @@ -6603,6 +6671,7 @@ CONFIG_DRM_I915_PXP=y # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set +# CONFIG_DRM_I915_DEBUG_WAKEREF is not set # end of drm/i915 Debugging # @@ -6620,6 +6689,36 @@ CONFIG_DRM_I915_TIMESLICE_DURATION=1 # end of drm/i915 Profile Guided Optimisation CONFIG_DRM_I915_GVT=y +CONFIG_DRM_XE=m +CONFIG_DRM_XE_DISPLAY=y +CONFIG_DRM_XE_FORCE_PROBE="" + +# +# drm/Xe Debugging +# +# CONFIG_DRM_XE_WERROR is not set +# CONFIG_DRM_XE_DEBUG is not set +# CONFIG_DRM_XE_DEBUG_VM is not set +# CONFIG_DRM_XE_DEBUG_SRIOV is not set +# CONFIG_DRM_XE_DEBUG_MEM is not set +# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set +# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set +# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set +# end of drm/Xe Debugging + +# +# drm/xe Profile Guided Optimisation +# +CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000 +CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1 +CONFIG_DRM_XE_TIMESLICE_MAX=10000000 +CONFIG_DRM_XE_TIMESLICE_MIN=1 +CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1 +CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y +# end of drm/xe Profile Guided Optimisation + CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_VMWGFX=m @@ -6637,6 +6736,7 @@ CONFIG_DRM_PANEL=y # Display Panels # # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set @@ -6652,7 +6752,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_ANALOGIX_DP=m # end of Display Interface Bridges -# CONFIG_DRM_LOONGSON is not set # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6674,7 +6773,6 @@ CONFIG_DRM_SSD130X=m CONFIG_DRM_SSD130X_I2C=m CONFIG_DRM_SSD130X_SPI=m CONFIG_DRM_HYPERV=m -CONFIG_DRM_LEGACY=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PRIVACY_SCREEN=y @@ -6709,11 +6807,6 @@ CONFIG_FB_RIVA_I2C=y # CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_RIVA_BACKLIGHT=y CONFIG_FB_I740=m -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y @@ -6777,10 +6870,12 @@ CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y +CONFIG_FB_SYSMEM_FOPS=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_FOPS=y CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS_DEFERRED=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y CONFIG_FB_BACKLIGHT=m @@ -6806,9 +6901,9 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_KTD253=m +CONFIG_BACKLIGHT_KTD2801=m CONFIG_BACKLIGHT_KTZ8866=m CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_QCOM_WLED=m @@ -6820,6 +6915,7 @@ CONFIG_BACKLIGHT_PCF50633=m CONFIG_BACKLIGHT_LM3630A=m CONFIG_BACKLIGHT_LM3639=m CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_MP3309C=m CONFIG_BACKLIGHT_SKY81452=m CONFIG_BACKLIGHT_GPIO=m CONFIG_BACKLIGHT_LV5207LP=m @@ -7001,8 +7097,10 @@ CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CIRRUS_SCODEC=m CONFIG_SND_HDA_SCODEC_CS35L41=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m +CONFIG_SND_HDA_SCODEC_COMPONENT=m CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m CONFIG_SND_HDA_SCODEC_CS35L56=m @@ -7100,10 +7198,15 @@ CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCI=m CONFIG_SND_AMD_ASOC_RENOIR=m CONFIG_SND_AMD_ASOC_REMBRANDT=m +CONFIG_SND_AMD_ASOC_ACP63=m +CONFIG_SND_AMD_ASOC_ACP70=m CONFIG_SND_SOC_AMD_MACH_COMMON=m CONFIG_SND_SOC_AMD_LEGACY_MACH=m CONFIG_SND_SOC_AMD_SOF_MACH=m +CONFIG_SND_AMD_SOUNDWIRE_ACPI=m CONFIG_SND_SOC_AMD_RPL_ACP6x=m +CONFIG_SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_AMD_SOUNDWIRE=m CONFIG_SND_SOC_AMD_PS=m CONFIG_SND_SOC_AMD_PS_MACH=m # CONFIG_SND_ATMEL_SOC is not set @@ -7126,7 +7229,6 @@ CONFIG_SND_DESIGNWARE_PCM=y # CONFIG_SND_SOC_FSL_ESAI is not set # CONFIG_SND_SOC_FSL_MICFIL is not set # CONFIG_SND_SOC_FSL_XCVR is not set -# CONFIG_SND_SOC_FSL_RPMSG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # end of SoC Audio for Freescale CPUs @@ -7175,6 +7277,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m @@ -7186,6 +7289,9 @@ CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m @@ -7224,7 +7330,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m -CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m @@ -7240,13 +7346,16 @@ CONFIG_SND_SOC_SOF_CLIENT=m CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_IPC3=y -CONFIG_SND_SOC_SOF_INTEL_IPC4=y +CONFIG_SND_SOC_SOF_IPC4=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_SOF_AMD_RENOIR=m CONFIG_SND_SOC_SOF_AMD_VANGOGH=m CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m CONFIG_SND_SOC_SOF_ACP_PROBES=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE=m +CONFIG_SND_SOC_SOF_AMD_ACP63=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m @@ -7331,10 +7440,13 @@ CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m CONFIG_SND_SOC_AW88261=m +CONFIG_SND_SOC_AW87390=m +CONFIG_SND_SOC_AW88399=m CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CHV3_CODEC=m CONFIG_SND_SOC_CROS_EC_CODEC=m +CONFIG_SND_SOC_CS_AMP_LIB=m # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set CONFIG_SND_SOC_CS35L34=m @@ -7379,6 +7491,7 @@ CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m +CONFIG_SND_SOC_ES83XX_DSM_COMMON=m CONFIG_SND_SOC_ES8316=m CONFIG_SND_SOC_ES8326=m CONFIG_SND_SOC_ES8328=m @@ -7469,6 +7582,7 @@ CONFIG_SND_SOC_RT715=m CONFIG_SND_SOC_RT715_SDW=m CONFIG_SND_SOC_RT715_SDCA_SDW=m CONFIG_SND_SOC_RT9120=m +CONFIG_SND_SOC_RTQ9128=m CONFIG_SND_SOC_SDW_MOCKUP=m # CONFIG_SND_SOC_SGTL5000 is not set CONFIG_SND_SOC_SIGMADSP=m @@ -7517,7 +7631,11 @@ CONFIG_SND_SOC_TS3A227E=m CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_TSCS454 is not set # CONFIG_SND_SOC_UDA1334 is not set +CONFIG_SND_SOC_WCD_CLASSH=m +CONFIG_SND_SOC_WCD_MBHC=m # CONFIG_SND_SOC_WCD938X_SDW is not set +CONFIG_SND_SOC_WCD939X=m +CONFIG_SND_SOC_WCD939X_SDW=m CONFIG_SND_SOC_WM5102=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set @@ -7718,6 +7836,7 @@ CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_ALPS=m +# CONFIG_HID_MCP2200 is not set CONFIG_HID_MCP2221=m # end of Special HID drivers @@ -7777,6 +7896,7 @@ CONFIG_USB_ULPI_BUS=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y +CONFIG_USB_PCI_AMD=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # @@ -7791,6 +7911,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=y # @@ -7900,6 +8021,7 @@ CONFIG_USB_DWC3_PCI=m CONFIG_USB_CHIPIDEA=m # CONFIG_USB_CHIPIDEA_HOST is not set CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_GENERIC=m CONFIG_USB_ISP1760=m CONFIG_USB_ISP1760_HCD=y @@ -7980,6 +8102,7 @@ CONFIG_USB_CYTHERM=m CONFIG_USB_IDMOUSE=m CONFIG_USB_APPLEDISPLAY=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_LJCA=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m @@ -8036,7 +8159,10 @@ CONFIG_TYPEC_MUX_FSA4480=m CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_MUX_INTEL_PMC=m +CONFIG_TYPEC_MUX_IT5205=m CONFIG_TYPEC_MUX_NB7VPQ904M=m +CONFIG_TYPEC_MUX_PTN36502=m +# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -8109,6 +8235,7 @@ CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_LEDS_EXPRESSWIRE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m @@ -8186,6 +8313,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m # CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # @@ -8319,6 +8447,7 @@ CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1374_WDT=y CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_MAX31335=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m @@ -8331,6 +8460,7 @@ CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_TPS6594=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_RX8010=m @@ -8478,6 +8608,7 @@ CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_VIRQFD=y +# CONFIG_VFIO_DEBUGFS is not set # # VFIO support for PCI devices @@ -8490,15 +8621,17 @@ CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y CONFIG_MLX5_VFIO_PCI=m CONFIG_PDS_VFIO_PCI=m +CONFIG_VIRTIO_VFIO_PCI=m # end of VFIO support for PCI devices CONFIG_VFIO_MDEV=m -CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y CONFIG_VBOXGUEST=m CONFIG_NITRO_ENCLAVES=m CONFIG_ACRN_HSM=m +CONFIG_TSM_REPORTS=m CONFIG_EFI_SECRET=m CONFIG_SEV_GUEST=m CONFIG_TDX_GUEST_DRIVER=m @@ -8508,6 +8641,7 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_ADMIN_LEGACY=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_PMEM=y @@ -8555,7 +8689,6 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_COMEDI is not set CONFIG_STAGING=y CONFIG_PRISM2_USB=m -CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m @@ -8604,12 +8737,6 @@ CONFIG_ADT7316_I2C=m # CONFIG_AD5933=m # end of Network Analyzer, Impedance Converters - -# -# Resolver to digital converters -# -# CONFIG_AD2S1210 is not set -# end of Resolver to digital converters # end of IIO staging drivers CONFIG_FB_SM750=m @@ -8617,14 +8744,18 @@ CONFIG_STAGING_MEDIA=y # CONFIG_INTEL_ATOMISP is not set # CONFIG_DVB_AV7110 is not set # CONFIG_VIDEO_IPU3_IMGU is not set + +# +# StarFive media platform drivers +# # CONFIG_STAGING_MEDIA_DEPRECATED is not set CONFIG_LTE_GDM724X=m # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set # CONFIG_PI433 is not set # CONFIG_FIELDBUS_DEV is not set -CONFIG_QLGE=m # CONFIG_VME_BUS is not set +# CONFIG_GOLDFISH is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_ACPI=m CONFIG_CHROMEOS_LAPTOP=m @@ -8685,10 +8816,9 @@ CONFIG_YOGABOOK=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m -CONFIG_AMD_PMF=m -# CONFIG_AMD_PMF_DEBUG is not set CONFIG_AMD_PMC=m CONFIG_AMD_HSMP=m +# CONFIG_AMD_WBRF is not set CONFIG_ADV_SWBUTTON=m CONFIG_APPLE_GMUX=m CONFIG_ASUS_LAPTOP=m @@ -8743,7 +8873,7 @@ CONFIG_INTEL_ATOMISP2_PM=m CONFIG_INTEL_IFS=m # CONFIG_INTEL_SAR_INT1092 is not set CONFIG_INTEL_SKL_INT3472=m -CONFIG_INTEL_PMC_CORE=y +CONFIG_INTEL_PMC_CORE=m CONFIG_INTEL_PMT_CLASS=m CONFIG_INTEL_PMT_TELEMETRY=m CONFIG_INTEL_PMT_CRASHLOG=m @@ -8803,6 +8933,7 @@ CONFIG_SYSTEM76_ACPI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_MLX_PLATFORM=m +CONFIG_INSPUR_PLATFORM_PROFILE=m CONFIG_X86_ANDROID_TABLETS=m CONFIG_FW_ATTR_CLASS=m CONFIG_INTEL_IPS=m @@ -8816,6 +8947,7 @@ CONFIG_SIEMENS_SIMATIC_IPC_BATT=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m +# CONFIG_SILICOM_PLATFORM is not set CONFIG_WINMATE_FM07_KEYS=m CONFIG_SEL3350_PLATFORM=m CONFIG_P2SB=y @@ -8847,6 +8979,7 @@ CONFIG_PCC=y # CONFIG_ALTERA_MBOX is not set CONFIG_IOMMU_IOVA=y CONFIG_IOMMU_API=y +CONFIG_IOMMUFD_DRIVER=y CONFIG_IOMMU_SUPPORT=y # @@ -8861,8 +8994,8 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_DMA=y CONFIG_IOMMU_SVA=y +CONFIG_IOMMU_IOPF=y CONFIG_AMD_IOMMU=y -CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y @@ -8943,6 +9076,7 @@ CONFIG_WPCM450_SOC=m # # Qualcomm SoC drivers # +# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set CONFIG_QCOM_QMI_HELPERS=m # end of Qualcomm SoC drivers @@ -8954,6 +9088,31 @@ CONFIG_QCOM_QMI_HELPERS=m # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers +# +# PM Domains +# + +# +# Amlogic PM Domains +# +# end of Amlogic PM Domains + +# +# Broadcom PM Domains +# +# end of Broadcom PM Domains + +# +# i.MX PM Domains +# +# end of i.MX PM Domains + +# +# Qualcomm PM Domains +# +# end of Qualcomm PM Domains +# end of PM Domains + CONFIG_PM_DEVFREQ=y # @@ -9002,6 +9161,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 CONFIG_IIO_SW_DEVICE=m CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_TRIGGERED_EVENT=m +CONFIG_IIO_BACKEND=m # # Accelerometers @@ -9066,7 +9226,9 @@ CONFIG_STK8BA50=m # Analog to digital converters # CONFIG_AD4130=m +CONFIG_AD7091R=m # CONFIG_AD7091R5 is not set +CONFIG_AD7091R8=m # CONFIG_AD7124 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set @@ -9087,6 +9249,8 @@ CONFIG_AD7606_IFACE_PARALLEL=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set CONFIG_AD799X=m +CONFIG_AD9467=m +# CONFIG_ADI_AXI_ADC is not set CONFIG_CC10001_ADC=m CONFIG_DLN2_ADC=m CONFIG_ENVELOPE_DETECTOR=m @@ -9094,6 +9258,7 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_HX711=m CONFIG_INA2XX_ADC=m CONFIG_INTEL_MRFLD_ADC=m +# CONFIG_LTC2309 is not set CONFIG_LTC2471=m CONFIG_LTC2485=m CONFIG_LTC2496=m @@ -9105,11 +9270,14 @@ CONFIG_LTC2497=m CONFIG_MAX11410=m CONFIG_MAX1241=m CONFIG_MAX1363=m +CONFIG_MAX34408=m CONFIG_MAX9611=m # CONFIG_MCP320X is not set CONFIG_MCP3422=m +# CONFIG_MCP3564 is not set # CONFIG_MCP3911 is not set CONFIG_NAU7802=m +CONFIG_PAC1934=m # CONFIG_RICHTEK_RTQ6056 is not set CONFIG_SD_ADC_MODULATOR=m CONFIG_TI_ADC081C=m @@ -9122,6 +9290,7 @@ CONFIG_TI_ADC081C=m CONFIG_TI_ADS1015=m CONFIG_TI_ADS7924=m CONFIG_TI_ADS1100=m +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set CONFIG_TI_ADS8344=m CONFIG_TI_ADS8688=m @@ -9166,6 +9335,7 @@ CONFIG_AD7746=m # # Chemical Sensors # +# CONFIG_AOSONG_AGS02MA is not set # CONFIG_ATLAS_PH_SENSOR is not set # CONFIG_ATLAS_EZO_SENSOR is not set # CONFIG_BME680 is not set @@ -9250,6 +9420,7 @@ CONFIG_MAX5522=m CONFIG_MAX5821=m CONFIG_MCP4725=m CONFIG_MCP4728=m +CONFIG_MCP4821=m # CONFIG_MCP4922 is not set # CONFIG_TI_DAC082S085 is not set CONFIG_TI_DAC5571=m @@ -9286,6 +9457,7 @@ CONFIG_TI_DAC5571=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set CONFIG_ADF4377=m +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV1014 is not set # CONFIG_ADMV4420 is not set @@ -9338,6 +9510,7 @@ CONFIG_ITG3200=m CONFIG_DHT11=m CONFIG_HDC100X=m CONFIG_HDC2010=m +# CONFIG_HDC3020 is not set CONFIG_HID_SENSOR_HUMIDITY=m CONFIG_HTS221=m CONFIG_HTS221_I2C=m @@ -9354,8 +9527,12 @@ CONFIG_SI7020=m # CONFIG_ADIS16460 is not set CONFIG_ADIS16475=m # CONFIG_ADIS16480 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_BMI323=m +CONFIG_BMI323_I2C=m +# CONFIG_BMI323_SPI is not set # CONFIG_BOSCH_BNO055_SERIAL is not set # CONFIG_BOSCH_BNO055_I2C is not set CONFIG_FXOS8700=m @@ -9397,6 +9574,7 @@ CONFIG_GP2AP020A00F=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_ISL29125=m +# CONFIG_ISL76682 is not set CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m @@ -9404,6 +9582,7 @@ CONFIG_JSA1212=m CONFIG_ROHM_BU27034=m CONFIG_RPR0521=m CONFIG_SENSORS_LM3533=m +# CONFIG_LTR390 is not set CONFIG_LTR501=m # CONFIG_LTRF216A is not set CONFIG_LV0104CS=m @@ -9431,6 +9610,7 @@ CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set +# CONFIG_VEML6075 is not set CONFIG_VL6180=m CONFIG_ZOPT2201=m # end of Light sensors @@ -9514,6 +9694,7 @@ CONFIG_LMP91000=m # Pressure sensors # CONFIG_ABP060MG=m +# CONFIG_ROHM_BM1390 is not set CONFIG_BMP280=m CONFIG_BMP280_I2C=m CONFIG_BMP280_SPI=m @@ -9521,6 +9702,7 @@ CONFIG_BMP280_SPI=m # CONFIG_DPS310 is not set CONFIG_HID_SENSOR_PRESS=m # CONFIG_HP03 is not set +# CONFIG_HSC030PA is not set CONFIG_ICP10100=m # CONFIG_MPL115_I2C is not set # CONFIG_MPL115_SPI is not set @@ -9570,6 +9752,7 @@ CONFIG_VL53L0X_I2C=m # # CONFIG_AD2S90 is not set # CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set # end of Resolver to digital converters # @@ -9580,6 +9763,7 @@ CONFIG_LTC2983=m CONFIG_HID_SENSOR_TEMP=m CONFIG_MLX90614=m CONFIG_MLX90632=m +# CONFIG_MLX90635 is not set CONFIG_TMP006=m CONFIG_TMP007=m CONFIG_TMP117=m @@ -9588,6 +9772,7 @@ CONFIG_TSYS02D=m CONFIG_MAX30208=m # CONFIG_MAX31856 is not set CONFIG_MAX31865=m +CONFIG_MCP9600=m # end of Temperature sensors CONFIG_NTB=m @@ -9606,6 +9791,7 @@ CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set CONFIG_PWM_CLK=m CONFIG_PWM_CROS_EC=m +CONFIG_PWM_DWC_CORE=m CONFIG_PWM_DWC=m # CONFIG_PWM_LP3943 is not set CONFIG_PWM_LPSS=m @@ -9620,6 +9806,7 @@ CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_GPIO=m # CONFIG_RESET_SIMPLE is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RESET_TI_TPS380X=m @@ -9657,11 +9844,15 @@ CONFIG_IDLE_INJECT=y # # Performance monitor support # +CONFIG_DWC_PCIE_PMU=m +CONFIG_CXL_PMU=m # end of Performance monitor support CONFIG_RAS=y CONFIG_RAS_CEC=y # CONFIG_RAS_CEC_DEBUG is not set +CONFIG_AMD_ATL=m +CONFIG_RAS_FMPM=m CONFIG_USB4=m # CONFIG_USB4_DEBUGFS_WRITE is not set # CONFIG_USB4_DMA_TEST is not set @@ -9691,14 +9882,7 @@ CONFIG_DEV_DAX_HMEM_DEVICES=y CONFIG_DEV_DAX_KMEM=m CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y - -# -# Layout Types -# -CONFIG_NVMEM_LAYOUT_SL28_VPD=m -CONFIG_NVMEM_LAYOUT_ONIE_TLV=m -# end of Layout Types - +# CONFIG_NVMEM_LAYOUTS is not set CONFIG_NVMEM_RMEM=m # @@ -9741,6 +9925,7 @@ CONFIG_PM_OPP=y # CONFIG_MOST is not set # CONFIG_PECI is not set # CONFIG_HTE is not set +CONFIG_DPLL=y # end of Device Drivers # @@ -9749,6 +9934,7 @@ CONFIG_PM_OPP=y CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_VALIDATE_FS_PARSER is not set CONFIG_FS_IOMAP=y +CONFIG_FS_STACK=y CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set @@ -9779,6 +9965,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y # CONFIG_XFS_ONLINE_SCRUB_STATS is not set # CONFIG_XFS_ONLINE_REPAIR is not set @@ -9794,7 +9982,6 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set @@ -9815,6 +10002,15 @@ CONFIG_F2FS_FS_LZ4HC=y CONFIG_F2FS_FS_ZSTD=y CONFIG_F2FS_IOSTAT=y # CONFIG_F2FS_UNFAIR_RWSEM is not set +CONFIG_BCACHEFS_FS=y +CONFIG_BCACHEFS_QUOTA=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set +CONFIG_BCACHEFS_POSIX_ACL=y +# CONFIG_BCACHEFS_DEBUG is not set +# CONFIG_BCACHEFS_TESTS is not set +# CONFIG_BCACHEFS_LOCK_TIME_STATS is not set +# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set +CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y CONFIG_ZONEFS_FS=m CONFIG_FS_DAX=y CONFIG_FS_DAX_PMD=y @@ -9843,6 +10039,7 @@ CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m CONFIG_FUSE_DAX=y +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -9885,13 +10082,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=y -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=y # CONFIG_NTFS3_64BIT_CLUSTER is not set CONFIG_NTFS3_LZX_XPRESS=y CONFIG_NTFS3_FS_POSIX_ACL=y +CONFIG_NTFS_FS=y # end of DOS/FAT/EXFAT/NT Filesystems # @@ -9914,9 +10109,9 @@ CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_QUOTA=y CONFIG_HUGETLBFS=y +# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_HUGETLB_PAGE=y CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y CONFIG_EFIVAR_FS=y @@ -10028,6 +10223,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_FLEXFILELAYOUT=y CONFIG_NFSD_V4_2_INTER_SSC=y # CONFIG_NFSD_V4_SECURITY_LABEL is not set +CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y CONFIG_GRACE_PERIOD=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y @@ -10213,6 +10409,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -10284,16 +10481,14 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y # CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HCTR2=m CONFIG_CRYPTO_KEYWRAP=m CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=y CONFIG_CRYPTO_XCTR=m CONFIG_CRYPTO_XTS=y @@ -10324,7 +10519,7 @@ CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_POLYVAL=m -CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y @@ -10369,7 +10564,9 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y -# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=1 CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -10448,9 +10645,11 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C62X=m CONFIG_CRYPTO_DEV_QAT_4XXX=m +CONFIG_CRYPTO_DEV_QAT_420XX=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_SAFEXCEL=m @@ -10471,6 +10670,7 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set CONFIG_SECONDARY_TRUSTED_KEYRING=y +# CONFIG_SECONDARY_TRUSTED_KEYRING_SIGNED_BY_BUILTIN is not set CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_REVOCATION_LIST is not set @@ -10493,7 +10693,6 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y @@ -10509,7 +10708,7 @@ CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y CONFIG_CRYPTO_LIB_CHACHA=m CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m @@ -10517,7 +10716,7 @@ CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m -CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA1=y @@ -10557,7 +10756,6 @@ CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_SPARC=y @@ -10587,6 +10785,7 @@ CONFIG_INTERVAL_TREE=y CONFIG_INTERVAL_TREE_SPAN_ITER=y CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_CLOSURES=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y @@ -10656,14 +10855,17 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_COPY_MC=y CONFIG_ARCH_STACKWALK=y CONFIG_STACKDEPOT=y +CONFIG_STACKDEPOT_MAX_FRAMES=64 CONFIG_SBITMAP=y CONFIG_PARMAN=m CONFIG_OBJAGG=m +# CONFIG_LWQ_TEST is not set # end of Library routines CONFIG_PLDMFW=y CONFIG_ASN1_ENCODER=y CONFIG_POLYNOMIAL=m +CONFIG_FIRMWARE_TABLE=y # # Kernel hacking @@ -10691,7 +10893,7 @@ CONFIG_DEBUG_KERNEL=y # # Compile-time checks and compiler options # -CONFIG_AS_HAS_NON_CONST_LEB128=y +CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set @@ -10721,7 +10923,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KCSAN=y CONFIG_HAVE_KCSAN_COMPILER=y @@ -10771,6 +10973,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y @@ -10840,6 +11043,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CLOSURES is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures @@ -10852,6 +11056,7 @@ CONFIG_STACKTRACE=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_CPU_STALL_CPUTIME is not set +# CONFIG_RCU_CPU_STALL_NOTIFIER is not set # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging @@ -10996,8 +11201,6 @@ CONFIG_RUNTIME_TESTING_MENU=y CONFIG_ATOMIC64_SELFTEST=y CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m -# CONFIG_STRING_SELFTEST is not set -# CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_SCANF is not set @@ -11027,6 +11230,7 @@ CONFIG_TEST_UDELAY=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_FPU is not set # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set +# CONFIG_TEST_OBJPOOL is not set CONFIG_ARCH_USE_MEMTEST=y CONFIG_MEMTEST=y # CONFIG_HYPERV_TESTING is not set diff --git a/source/k/kernel-configs/config-huge-6.6.29 b/source/k/kernel-configs/config-huge-6.9.3 index ef4e5b5fa..de396f4d2 100644 --- a/source/k/kernel-configs/config-huge-6.6.29 +++ b/source/k/kernel-configs/config-huge-6.9.3 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.29 Kernel Configuration +# Linux/x86 6.9.3 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130200 +CONFIG_GCC_VERSION=140100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24200 @@ -16,7 +16,6 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -90,6 +89,7 @@ CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y @@ -197,6 +197,8 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_GCC_NO_STRINGOP_OVERFLOW=y +CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set @@ -276,18 +278,18 @@ CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y +CONFIG_KCMP=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +CONFIG_CACHESTAT_SYSCALL=y +# CONFIG_PC104 is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_KCMP=y -CONFIG_RSEQ=y -CONFIG_CACHESTAT_SYSCALL=y -# CONFIG_DEBUG_RSEQ is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y -# CONFIG_PC104 is not set # # Kernel Performance Events And Counters @@ -303,7 +305,8 @@ CONFIG_TRACEPOINTS=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y +CONFIG_CRASH_RESERVE=y +CONFIG_VMCORE_INFO=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y CONFIG_KEXEC_JUMP=y @@ -334,7 +337,6 @@ CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_32_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=3 @@ -345,7 +347,6 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # CONFIG_SMP=y CONFIG_X86_MPPARSE=y -# CONFIG_GOLDFISH is not set CONFIG_X86_CPU_RESCTRL=y CONFIG_X86_BIGSMP=y # CONFIG_X86_EXTENDED_PLATFORM is not set @@ -397,6 +398,7 @@ CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y +CONFIG_X86_HAVE_PAE=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=6 @@ -454,6 +456,7 @@ CONFIG_X86_IOPL_IOPERM=y CONFIG_TOSHIBA=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=y +CONFIG_MICROCODE_INITRD32=y # CONFIG_MICROCODE_LATE_LOADING is not set CONFIG_X86_MSR=y CONFIG_X86_CPUID=y @@ -507,6 +510,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y +CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -519,16 +523,18 @@ CONFIG_MODIFY_LDT_SYSCALL=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set # end of Processor type and features +CONFIG_CC_HAS_NAMED_AS=y +CONFIG_USE_X86_SEG_SUPPORT=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_CC_HAS_ENTRY_PADDING=y CONFIG_FUNCTION_PADDING_CFI=0 CONFIG_FUNCTION_PADDING_BYTES=4 -CONFIG_SPECULATION_MITIGATIONS=y -CONFIG_PAGE_TABLE_ISOLATION=y -CONFIG_RETPOLINE=y -CONFIG_RETHUNK=y -# CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_CPU_MITIGATIONS=y +CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y +CONFIG_MITIGATION_RETPOLINE=y +CONFIG_MITIGATION_RETHUNK=y +# CONFIG_MITIGATION_GDS_FORCE is not set CONFIG_MITIGATION_RFDS=y CONFIG_MITIGATION_SPECTRE_BHI=y @@ -542,6 +548,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="\"\"" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -563,6 +572,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y CONFIG_ACPI_TABLE_LIB=y +CONFIG_ACPI_THERMAL_LIB=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SLEEP=y @@ -592,7 +602,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set CONFIG_ACPI_BGRT=y # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NUMA=y @@ -712,18 +721,17 @@ CONFIG_COMPAT_32=y # end of Binary Emulations CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_HAVE_KVM=y +CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_PFNCACHE=y CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_DIRTY_RING=y CONFIG_HAVE_KVM_DIRTY_RING_TSO=y CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y -CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -732,19 +740,23 @@ CONFIG_HAVE_KVM_NO_POLL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y +CONFIG_KVM_GENERIC_MMU_NOTIFIER=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m # CONFIG_KVM_WERROR is not set CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_SMM=y +CONFIG_KVM_HYPERV=y CONFIG_KVM_XEN=y # CONFIG_KVM_PROVE_MMU is not set +CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -835,8 +847,11 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_ISA_BUS_API=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -861,6 +876,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SPLIT_ARG64=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y CONFIG_DYNAMIC_SIGFRAME=y +CONFIG_ARCH_HAS_HW_PTE_YOUNG=y CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y # @@ -875,6 +891,8 @@ CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 +CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y +CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -907,6 +925,7 @@ CONFIG_BLK_ICQ=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY_T10=y +CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set @@ -998,7 +1017,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON=y +CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -1017,9 +1036,8 @@ CONFIG_ZSMALLOC=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # -# SLAB allocator options +# Slab allocator options # -# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -1028,7 +1046,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set -# end of SLAB allocator options +# end of Slab allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_COMPAT_BRK is not set @@ -1048,6 +1066,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_BOUNCE=y CONFIG_MMU_NOTIFIER=y @@ -1057,13 +1076,13 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set CONFIG_CMA_SYSFS=y CONFIG_CMA_AREAS=7 @@ -1110,7 +1129,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1191,6 +1209,7 @@ CONFIG_TCP_CONG_BBR=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_SIGPOOL=y CONFIG_TCP_MD5SIG=y CONFIG_IPV6=m # CONFIG_IPV6_ROUTER_PREF is not set @@ -1478,6 +1497,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1510,6 +1530,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1517,6 +1538,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1554,6 +1576,7 @@ CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1575,7 +1598,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1659,12 +1681,6 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_LLC=m CONFIG_LLC2=m CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_PHONET is not set @@ -1757,7 +1773,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1972,7 +1987,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -2033,7 +2047,7 @@ CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y -# CONFIG_PAGE_POOL_STATS is not set +CONFIG_PAGE_POOL_STATS=y CONFIG_FAILOVER=y CONFIG_ETHTOOL_NETLINK=y @@ -2043,12 +2057,14 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_HAVE_EISA=y # CONFIG_EISA is not set CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIEAER=y CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEAER_CXL=y # CONFIG_PCIE_ECRC is not set CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y @@ -2132,7 +2148,6 @@ CONFIG_CXL_PORT=y CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set -CONFIG_CXL_PMU=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2191,6 +2206,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set CONFIG_HMEM_REPORTING=y CONFIG_TEST_ASYNC_DRIVER_PROBE=m +CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y @@ -2277,6 +2293,11 @@ CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y # +# Qualcomm firmware drivers +# +# end of Qualcomm firmware drivers + +# # Tegra firmware driver # # end of Tegra firmware driver @@ -2289,7 +2310,6 @@ CONFIG_MTD_TESTS=m # # Partition parsers # -CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 @@ -2368,7 +2388,6 @@ CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m CONFIG_MTD_PCMCIA=m # CONFIG_MTD_PCMCIA_ANONYMOUS is not set -CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -2458,6 +2477,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set CONFIG_MTD_UBI_GLUEBI=m # CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_NVMEM=m # CONFIG_MTD_HYPERBUS is not set # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -2492,7 +2512,8 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set # CONFIG_ZRAM_DEF_COMP_842 is not set CONFIG_ZRAM_DEF_COMP="lzo-rle" -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y +# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y CONFIG_BLK_DEV_LOOP=m @@ -2518,7 +2539,8 @@ CONFIG_BLK_DEV_RNBD_SERVER=m # # NVME Support # -CONFIG_NVME_COMMON=y +CONFIG_NVME_KEYRING=m +CONFIG_NVME_AUTH=y CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y @@ -2528,7 +2550,8 @@ CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m CONFIG_NVME_TCP=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_TCP_TLS=y +CONFIG_NVME_HOST_AUTH=y CONFIG_NVME_TARGET=m CONFIG_NVME_TARGET_PASSTHRU=y CONFIG_NVME_TARGET_LOOP=m @@ -2536,6 +2559,7 @@ CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_TCP=m +CONFIG_NVME_TARGET_TCP_TLS=y CONFIG_NVME_TARGET_AUTH=y # end of NVME Support @@ -2575,6 +2599,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_MISC_RTSX=m CONFIG_TPS6594_ESM=m CONFIG_TPS6594_PFSM=m +CONFIG_NSM=m # CONFIG_C2PORT is not set # @@ -2582,7 +2607,6 @@ CONFIG_TPS6594_PFSM=m # CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set @@ -2610,6 +2634,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m CONFIG_INTEL_MEI_GSC=m +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_HDCP=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_GSC_PROXY=m @@ -2737,7 +2763,6 @@ CONFIG_SCSI_INITIO=y CONFIG_SCSI_INIA100=y CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_STEX=y CONFIG_SCSI_SYM53C8XX_2=y @@ -2893,17 +2918,13 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y -CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y CONFIG_MD_RAID10=y CONFIG_MD_RAID456=y -CONFIG_MD_MULTIPATH=y -CONFIG_MD_FAULTY=m CONFIG_MD_CLUSTER=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set # CONFIG_BCACHE_ASYNC_REGISTRATION is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=y @@ -3015,6 +3036,7 @@ CONFIG_TAP=m CONFIG_VETH=m CONFIG_VIRTIO_NET=y CONFIG_NLMON=m +CONFIG_NETKIT=y CONFIG_NET_VRF=m CONFIG_VSOCKMON=m CONFIG_MHI_NET=m @@ -3087,10 +3109,6 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_REALTEK=m -# CONFIG_NET_DSA_REALTEK_MDIO is not set -# CONFIG_NET_DSA_REALTEK_SMI is not set -CONFIG_NET_DSA_REALTEK_RTL8365MB=m -CONFIG_NET_DSA_REALTEK_RTL8366RB=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -3232,10 +3250,13 @@ CONFIG_I40E=m CONFIG_IAVF=m CONFIG_I40EVF=m CONFIG_ICE=m +CONFIG_ICE_HWMON=y CONFIG_ICE_SWITCHDEV=y CONFIG_ICE_HWTS=y CONFIG_FM10K=m CONFIG_IGC=m +CONFIG_IGC_LEDS=y +CONFIG_IDPF=m CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y CONFIG_ADIN1110=m @@ -3271,6 +3292,7 @@ CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y CONFIG_MLX5_SF_MANAGER=y +CONFIG_MLX5_DPLL=m CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE_THERMAL=y @@ -3347,6 +3369,7 @@ CONFIG_8139TOO_PIO=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m +CONFIG_R8169_LEDS=y CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_ROCKER=y CONFIG_ROCKER=m @@ -3475,7 +3498,10 @@ CONFIG_NXP_CBTX_PHY=m CONFIG_NXP_C45_TJA11XX_PHY=m # CONFIG_NXP_TJA11XX_PHY is not set CONFIG_NCN26000_PHY=m +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +CONFIG_QCA83XX_PHY=m +CONFIG_QCA808X_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m @@ -3489,6 +3515,7 @@ CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m CONFIG_DP83869_PHY=m CONFIG_DP83TD510_PHY=m +CONFIG_DP83TG720_PHY=m CONFIG_VITESSE_PHY=m CONFIG_XILINX_GMII2RGMII=m # CONFIG_MICREL_KS8995MA is not set @@ -3511,6 +3538,7 @@ CONFIG_CAN_CC770_ISA=m CONFIG_CAN_CC770_PLATFORM=m CONFIG_CAN_CTUCANFD=m CONFIG_CAN_CTUCANFD_PCI=m +# CONFIG_CAN_ESD_402_PCI is not set CONFIG_CAN_IFI_CANFD=m CONFIG_CAN_M_CAN=m CONFIG_CAN_M_CAN_PCI=m @@ -3665,7 +3693,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y # CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_DYNACK is not set CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y @@ -3709,9 +3736,6 @@ CONFIG_ATH12K=m # CONFIG_ATH12K_DEBUG is not set # CONFIG_ATH12K_TRACING is not set CONFIG_WLAN_VENDOR_ATMEL=y -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_WLAN_VENDOR_BROADCOM=y CONFIG_B43=m @@ -3753,9 +3777,6 @@ CONFIG_BRCMFMAC_USB=y CONFIG_BRCMFMAC_PCIE=y CONFIG_BRCM_TRACING=y # CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_AIRO=m -CONFIG_AIRO_CS=m CONFIG_WLAN_VENDOR_INTEL=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3792,21 +3813,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # end of Debugging Options CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_HERMES=m -# CONFIG_HERMES_PRISM is not set -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m @@ -3815,7 +3821,6 @@ CONFIG_P54_LEDS=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set @@ -3857,6 +3862,9 @@ CONFIG_MT7921E=m CONFIG_MT7921S=m CONFIG_MT7921U=m CONFIG_MT7996E=m +CONFIG_MT7925_COMMON=m +CONFIG_MT7925E=m +CONFIG_MT7925U=m CONFIG_WLAN_VENDOR_MICROCHIP=y # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set @@ -3971,15 +3979,11 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WLAN_VENDOR_ZYDAS=y -CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_QTNFMAC=m CONFIG_QTNFMAC_PCIE=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_MAC80211_HWSIM is not set CONFIG_VIRT_WIFI=m CONFIG_WAN=y @@ -3993,6 +3997,7 @@ CONFIG_HDLC_PPP=m # # X.25/LAPB support is disabled # +# CONFIG_FRAMER is not set CONFIG_PCI200SYN=m CONFIG_WANXL=m # CONFIG_PC300TOO is not set @@ -4178,6 +4183,7 @@ CONFIG_JOYSTICK_PXRC=m CONFIG_JOYSTICK_QWIIC=m CONFIG_JOYSTICK_FSIA6B=m # CONFIG_JOYSTICK_SENSEHAT is not set +CONFIG_JOYSTICK_SEESAW=m CONFIG_INPUT_TABLET=y CONFIG_TABLET_USB_ACECAD=m CONFIG_TABLET_USB_AIPTEK=m @@ -4214,6 +4220,9 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m CONFIG_TOUCHSCREEN_EXC3000=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m CONFIG_TOUCHSCREEN_HIDEEP=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m @@ -4387,7 +4396,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y @@ -4618,6 +4626,7 @@ CONFIG_I2C_XILINX=m # CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_DLN2=m +CONFIG_I2C_LJCA=m CONFIG_I2C_CP2615=m CONFIG_I2C_PARPORT=m # CONFIG_I2C_PCI1XXXX is not set @@ -4663,6 +4672,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_DLN2 is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +CONFIG_SPI_LJCA=m CONFIG_SPI_MICROCHIP_CORE=m # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set # CONFIG_SPI_LANTIQ_SSC is not set @@ -4729,6 +4739,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +CONFIG_PTP_1588_CLOCK_FC3W=m # CONFIG_PTP_1588_CLOCK_MOCK is not set CONFIG_PTP_1588_CLOCK_VMW=m CONFIG_PTP_1588_CLOCK_OCP=m @@ -4751,6 +4762,7 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_INTEL_PLATFORM=m CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -4764,6 +4776,7 @@ CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_METEORLAKE=m +CONFIG_PINCTRL_METEORPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -4830,10 +4843,12 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_ARIZONA=m CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_CROS_EC=m CONFIG_GPIO_CS5535=m CONFIG_GPIO_DLN2=m CONFIG_GPIO_ELKHARTLAKE=m CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_LJCA=m CONFIG_GPIO_LP3943=m # CONFIG_GPIO_TIMBERDALE is not set # CONFIG_GPIO_TPS68470 is not set @@ -4884,11 +4899,13 @@ CONFIG_W1_CON=y # # 1-wire Bus Masters # +CONFIG_W1_MASTER_AMD_AXI=m CONFIG_W1_MASTER_MATROX=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_SGI is not set +CONFIG_W1_MASTER_UART=m # end of 1-wire Bus Masters # @@ -4973,6 +4990,7 @@ CONFIG_CHARGER_WILCO=m CONFIG_BATTERY_SURFACE=m CONFIG_CHARGER_SURFACE=m CONFIG_BATTERY_UG3105=m +CONFIG_FUEL_GAUGE_MM8013=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -5002,6 +5020,7 @@ CONFIG_SENSORS_AHT10=m CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_ASUS_ROG_RYUJIN=m CONFIG_SENSORS_AXI_FAN_CONTROL=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m @@ -5009,6 +5028,7 @@ CONFIG_SENSORS_FAM15H_POWER=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CHIPCAP2=m CONFIG_SENSORS_CORSAIR_CPRO=m CONFIG_SENSORS_CORSAIR_PSU=m CONFIG_SENSORS_DRIVETEMP=m @@ -5023,6 +5043,7 @@ CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GIGABYTE_WATERFORCE=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m @@ -5036,6 +5057,7 @@ CONFIG_SENSORS_I5500=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWERZ=m CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LTC2945=m @@ -5043,6 +5065,7 @@ CONFIG_SENSORS_LTC2947=m CONFIG_SENSORS_LTC2947_I2C=m CONFIG_SENSORS_LTC2947_SPI=m CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC2991=m CONFIG_SENSORS_LTC2992=m CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m @@ -5050,6 +5073,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LTC4282=m # CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX127=m CONFIG_SENSORS_MAX16065=m @@ -5101,6 +5125,7 @@ CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NZXT_KRAKEN2=m +CONFIG_SENSORS_NZXT_KRAKEN3=m CONFIG_SENSORS_NZXT_SMART2=m # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_OXP=m @@ -5129,6 +5154,7 @@ CONFIG_SENSORS_LT7182S=m CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_SENSORS_LTC3815=m +# CONFIG_SENSORS_LTC4286 is not set CONFIG_SENSORS_MAX15301=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX16601=m @@ -5137,12 +5163,15 @@ CONFIG_SENSORS_MAX20751=m CONFIG_SENSORS_MAX31785=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MP2856=m CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP2975_REGULATOR=y CONFIG_SENSORS_MP5023=m +CONFIG_SENSORS_MP5990=m CONFIG_SENSORS_MPQ7932_REGULATOR=y CONFIG_SENSORS_MPQ7932=m +CONFIG_SENSORS_MPQ8785=m CONFIG_SENSORS_PIM4328=m CONFIG_SENSORS_PLI1209BC=m CONFIG_SENSORS_PLI1209BC_REGULATOR=y @@ -5161,6 +5190,7 @@ CONFIG_SENSORS_XDPE152=m CONFIG_SENSORS_XDPE122=m CONFIG_SENSORS_XDPE122_REGULATOR=y CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_PT5161L=m CONFIG_SENSORS_SBTSI=m CONFIG_SENSORS_SBRMI=m CONFIG_SENSORS_SHT15=m @@ -5181,6 +5211,7 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SURFACE_FAN=m CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set @@ -5226,10 +5257,9 @@ CONFIG_SENSORS_HP_WMI=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_STATISTICS=y +# CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_ACPI=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -5280,6 +5310,7 @@ CONFIG_WATCHDOG_SYSFS=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_CROS_EC_WATCHDOG=m CONFIG_MENF21BMC_WATCHDOG=m CONFIG_WDAT_WDT=m # CONFIG_XILINX_WATCHDOG is not set @@ -5477,6 +5508,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set CONFIG_REGULATOR_USERSPACE_CONSUMER=m +# CONFIG_REGULATOR_NETLINK_EVENTS is not set # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m @@ -5500,6 +5532,7 @@ CONFIG_REGULATOR_LP8755=m CONFIG_REGULATOR_LTC3589=m CONFIG_REGULATOR_LTC3676=m CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX77503=m CONFIG_REGULATOR_MAX77857=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m @@ -5819,6 +5852,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y # # Media capture support # +# CONFIG_VIDEO_MGB4 is not set CONFIG_VIDEO_SOLO6X10=m # CONFIG_VIDEO_TW5864 is not set CONFIG_VIDEO_TW68=m @@ -5983,6 +6017,10 @@ CONFIG_VIDEO_CAFE_CCIC=m # # +# Nuvoton media platform drivers +# + +# # NVidia media platform drivers # @@ -6079,7 +6117,10 @@ CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_ALVIUM_CSI2=m CONFIG_VIDEO_AR0521=m +CONFIG_VIDEO_GC0308=m +CONFIG_VIDEO_GC2145=m CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m CONFIG_VIDEO_HI847=m @@ -6095,6 +6136,7 @@ CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_MAX9271_LIB=m CONFIG_VIDEO_MT9M001=m CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9M114=m CONFIG_VIDEO_MT9P031=m CONFIG_VIDEO_MT9T112=m CONFIG_VIDEO_MT9V011=m @@ -6119,6 +6161,7 @@ CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV64A40=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7640=m @@ -6141,6 +6184,12 @@ CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m # +# Camera ISPs +# +CONFIG_VIDEO_THP7312=m +# end of Camera ISPs + +# # Lens drivers # CONFIG_VIDEO_AD5820=m @@ -6209,6 +6258,7 @@ CONFIG_VIDEO_TVP514X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_TVP7002=m CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9900=m CONFIG_VIDEO_TW9903=m CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_TW9910=m @@ -6488,22 +6538,24 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_SCREEN_INFO=y +CONFIG_VIDEO=y CONFIG_AUXDISPLAY=y CONFIG_CHARLCD=m -CONFIG_LINEDISP=m CONFIG_HD44780_COMMON=m CONFIG_HD44780=m -# CONFIG_KS0108 is not set -# CONFIG_IMG_ASCII_LCD is not set -CONFIG_HT16K33=m # CONFIG_LCD2S is not set # CONFIG_PARPORT_PANEL is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_KS0108 is not set +CONFIG_LINEDISP=m +# CONFIG_IMG_ASCII_LCD is not set +CONFIG_HT16K33=m +CONFIG_MAX6959=m +CONFIG_SEG_LED_GPIO=m # CONFIG_PANEL is not set CONFIG_AGP=m CONFIG_AGP_ALI=m @@ -6521,6 +6573,7 @@ CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6530,12 +6583,14 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DISPLAY_HELPER=m CONFIG_DRM_DISPLAY_DP_HELPER=y +CONFIG_DRM_DISPLAY_DP_TUNNEL=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m +CONFIG_DRM_GPUVM=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -6587,12 +6642,14 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_MMU is not set # CONFIG_NOUVEAU_DEBUG_PUSH is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_I915=m CONFIG_DRM_I915_FORCE_PROBE="" CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_I915_PXP=y +CONFIG_DRM_I915_DP_TUNNEL=y # # drm/i915 Debugging @@ -6607,6 +6664,7 @@ CONFIG_DRM_I915_PXP=y # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set +# CONFIG_DRM_I915_DEBUG_WAKEREF is not set # end of drm/i915 Debugging # @@ -6623,6 +6681,36 @@ CONFIG_DRM_I915_STOP_TIMEOUT=100 CONFIG_DRM_I915_TIMESLICE_DURATION=1 # end of drm/i915 Profile Guided Optimisation +CONFIG_DRM_XE=m +CONFIG_DRM_XE_DISPLAY=y +CONFIG_DRM_XE_FORCE_PROBE="" + +# +# drm/Xe Debugging +# +# CONFIG_DRM_XE_WERROR is not set +# CONFIG_DRM_XE_DEBUG is not set +# CONFIG_DRM_XE_DEBUG_VM is not set +# CONFIG_DRM_XE_DEBUG_SRIOV is not set +# CONFIG_DRM_XE_DEBUG_MEM is not set +# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set +# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set +# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set +# end of drm/Xe Debugging + +# +# drm/xe Profile Guided Optimisation +# +CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000 +CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1 +CONFIG_DRM_XE_TIMESLICE_MAX=10000000 +CONFIG_DRM_XE_TIMESLICE_MIN=1 +CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1 +CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y +# end of drm/xe Profile Guided Optimisation + CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_VMWGFX=m @@ -6640,6 +6728,7 @@ CONFIG_DRM_PANEL=y # Display Panels # # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set @@ -6655,7 +6744,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_ANALOGIX_DP=m # end of Display Interface Bridges -# CONFIG_DRM_LOONGSON is not set # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6677,7 +6765,6 @@ CONFIG_DRM_SSD130X=m CONFIG_DRM_SSD130X_I2C=m CONFIG_DRM_SSD130X_SPI=m CONFIG_DRM_HYPERV=m -CONFIG_DRM_LEGACY=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PRIVACY_SCREEN=y @@ -6715,11 +6802,6 @@ CONFIG_FB_I740=m CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y CONFIG_FB_I810_I2C=y -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y @@ -6787,10 +6869,12 @@ CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y +CONFIG_FB_SYSMEM_FOPS=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_FOPS=y CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS_DEFERRED=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y CONFIG_FB_BACKLIGHT=m @@ -6816,9 +6900,9 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_KTD253=m +CONFIG_BACKLIGHT_KTD2801=m CONFIG_BACKLIGHT_KTZ8866=m CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_QCOM_WLED=m @@ -6830,6 +6914,7 @@ CONFIG_BACKLIGHT_PCF50633=m CONFIG_BACKLIGHT_LM3630A=m CONFIG_BACKLIGHT_LM3639=m CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_MP3309C=m CONFIG_BACKLIGHT_SKY81452=m CONFIG_BACKLIGHT_GPIO=m CONFIG_BACKLIGHT_LV5207LP=m @@ -7055,8 +7140,10 @@ CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CIRRUS_SCODEC=m CONFIG_SND_HDA_SCODEC_CS35L41=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m +CONFIG_SND_HDA_SCODEC_COMPONENT=m CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m CONFIG_SND_HDA_SCODEC_CS35L56=m @@ -7154,10 +7241,15 @@ CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCI=m CONFIG_SND_AMD_ASOC_RENOIR=m CONFIG_SND_AMD_ASOC_REMBRANDT=m +CONFIG_SND_AMD_ASOC_ACP63=m +CONFIG_SND_AMD_ASOC_ACP70=m CONFIG_SND_SOC_AMD_MACH_COMMON=m CONFIG_SND_SOC_AMD_LEGACY_MACH=m CONFIG_SND_SOC_AMD_SOF_MACH=m +CONFIG_SND_AMD_SOUNDWIRE_ACPI=m CONFIG_SND_SOC_AMD_RPL_ACP6x=m +CONFIG_SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_AMD_SOUNDWIRE=m CONFIG_SND_SOC_AMD_PS=m CONFIG_SND_SOC_AMD_PS_MACH=m # CONFIG_SND_ATMEL_SOC is not set @@ -7180,7 +7272,6 @@ CONFIG_SND_DESIGNWARE_PCM=y # CONFIG_SND_SOC_FSL_ESAI is not set # CONFIG_SND_SOC_FSL_MICFIL is not set # CONFIG_SND_SOC_FSL_XCVR is not set -# CONFIG_SND_SOC_FSL_RPMSG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # end of SoC Audio for Freescale CPUs @@ -7229,6 +7320,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m @@ -7240,6 +7332,9 @@ CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m @@ -7278,7 +7373,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m -CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m @@ -7294,13 +7389,16 @@ CONFIG_SND_SOC_SOF_CLIENT=m CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_IPC3=y -CONFIG_SND_SOC_SOF_INTEL_IPC4=y +CONFIG_SND_SOC_SOF_IPC4=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_SOF_AMD_RENOIR=m CONFIG_SND_SOC_SOF_AMD_VANGOGH=m CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m CONFIG_SND_SOC_SOF_ACP_PROBES=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE=m +CONFIG_SND_SOC_SOF_AMD_ACP63=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m @@ -7385,10 +7483,13 @@ CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m CONFIG_SND_SOC_AW88261=m +CONFIG_SND_SOC_AW87390=m +CONFIG_SND_SOC_AW88399=m CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CHV3_CODEC=m CONFIG_SND_SOC_CROS_EC_CODEC=m +CONFIG_SND_SOC_CS_AMP_LIB=m # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set CONFIG_SND_SOC_CS35L34=m @@ -7433,6 +7534,7 @@ CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m +CONFIG_SND_SOC_ES83XX_DSM_COMMON=m CONFIG_SND_SOC_ES8316=m CONFIG_SND_SOC_ES8326=m CONFIG_SND_SOC_ES8328=m @@ -7523,6 +7625,7 @@ CONFIG_SND_SOC_RT715=m CONFIG_SND_SOC_RT715_SDW=m CONFIG_SND_SOC_RT715_SDCA_SDW=m CONFIG_SND_SOC_RT9120=m +CONFIG_SND_SOC_RTQ9128=m CONFIG_SND_SOC_SDW_MOCKUP=m # CONFIG_SND_SOC_SGTL5000 is not set CONFIG_SND_SOC_SIGMADSP=m @@ -7571,7 +7674,11 @@ CONFIG_SND_SOC_TS3A227E=m CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_TSCS454 is not set # CONFIG_SND_SOC_UDA1334 is not set +CONFIG_SND_SOC_WCD_CLASSH=m +CONFIG_SND_SOC_WCD_MBHC=m # CONFIG_SND_SOC_WCD938X_SDW is not set +CONFIG_SND_SOC_WCD939X=m +CONFIG_SND_SOC_WCD939X_SDW=m CONFIG_SND_SOC_WM5102=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set @@ -7772,6 +7879,7 @@ CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_ALPS=m +# CONFIG_HID_MCP2200 is not set CONFIG_HID_MCP2221=m # end of Special HID drivers @@ -7818,6 +7926,7 @@ CONFIG_USB_ULPI_BUS=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y +CONFIG_USB_PCI_AMD=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # @@ -7832,6 +7941,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=y # @@ -7941,6 +8051,7 @@ CONFIG_USB_DWC3_PCI=m CONFIG_USB_CHIPIDEA=m # CONFIG_USB_CHIPIDEA_HOST is not set CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_GENERIC=m CONFIG_USB_ISP1760=m CONFIG_USB_ISP1760_HCD=y @@ -8021,6 +8132,7 @@ CONFIG_USB_CYTHERM=m CONFIG_USB_IDMOUSE=m CONFIG_USB_APPLEDISPLAY=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_LJCA=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m @@ -8077,7 +8189,10 @@ CONFIG_TYPEC_MUX_FSA4480=m CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_MUX_INTEL_PMC=m +CONFIG_TYPEC_MUX_IT5205=m CONFIG_TYPEC_MUX_NB7VPQ904M=m +CONFIG_TYPEC_MUX_PTN36502=m +# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -8150,6 +8265,7 @@ CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_LEDS_EXPRESSWIRE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m @@ -8230,6 +8346,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m # CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # @@ -8354,6 +8471,7 @@ CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1374_WDT=y CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_MAX31335=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m @@ -8366,6 +8484,7 @@ CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_TPS6594=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_RX8010=m @@ -8510,6 +8629,7 @@ CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_VIRQFD=y +# CONFIG_VFIO_DEBUGFS is not set # # VFIO support for PCI devices @@ -8521,9 +8641,10 @@ CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y CONFIG_MLX5_VFIO_PCI=m +CONFIG_VIRTIO_VFIO_PCI=m # end of VFIO support for PCI devices -CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y CONFIG_VBOXGUEST=m @@ -8534,6 +8655,7 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_ADMIN_LEGACY=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_PMEM=y @@ -8578,7 +8700,6 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_COMEDI is not set CONFIG_STAGING=y CONFIG_PRISM2_USB=m -CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m @@ -8627,12 +8748,6 @@ CONFIG_ADT7316_I2C=m # CONFIG_AD5933=m # end of Network Analyzer, Impedance Converters - -# -# Resolver to digital converters -# -# CONFIG_AD2S1210 is not set -# end of Resolver to digital converters # end of IIO staging drivers CONFIG_FB_SM750=m @@ -8640,14 +8755,18 @@ CONFIG_STAGING_MEDIA=y # CONFIG_INTEL_ATOMISP is not set # CONFIG_DVB_AV7110 is not set # CONFIG_VIDEO_IPU3_IMGU is not set + +# +# StarFive media platform drivers +# # CONFIG_STAGING_MEDIA_DEPRECATED is not set CONFIG_LTE_GDM724X=m # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set # CONFIG_PI433 is not set # CONFIG_FIELDBUS_DEV is not set -CONFIG_QLGE=m # CONFIG_VME_BUS is not set +# CONFIG_GOLDFISH is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_ACPI=m CONFIG_CHROMEOS_LAPTOP=m @@ -8707,9 +8826,8 @@ CONFIG_YOGABOOK=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m -CONFIG_AMD_PMF=m -# CONFIG_AMD_PMF_DEBUG is not set CONFIG_AMD_PMC=m +# CONFIG_AMD_WBRF is not set CONFIG_ADV_SWBUTTON=m CONFIG_APPLE_GMUX=m CONFIG_ASUS_LAPTOP=m @@ -8764,7 +8882,7 @@ CONFIG_INTEL_ATOMISP2_LED=m CONFIG_INTEL_ATOMISP2_PM=m # CONFIG_INTEL_SAR_INT1092 is not set CONFIG_INTEL_SKL_INT3472=m -CONFIG_INTEL_PMC_CORE=y +CONFIG_INTEL_PMC_CORE=m CONFIG_INTEL_PMT_CLASS=m CONFIG_INTEL_PMT_TELEMETRY=m CONFIG_INTEL_PMT_CRASHLOG=m @@ -8803,6 +8921,7 @@ CONFIG_SYSTEM76_ACPI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_MLX_PLATFORM=m +CONFIG_INSPUR_PLATFORM_PROFILE=m CONFIG_X86_ANDROID_TABLETS=m CONFIG_FW_ATTR_CLASS=m CONFIG_INTEL_IPS=m @@ -8816,6 +8935,7 @@ CONFIG_SIEMENS_SIMATIC_IPC_BATT=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m +# CONFIG_SILICOM_PLATFORM is not set CONFIG_WINMATE_FM07_KEYS=m CONFIG_SEL3350_PLATFORM=m CONFIG_P2SB=y @@ -8846,6 +8966,7 @@ CONFIG_CLKBLD_I8253=y # CONFIG_MAILBOX is not set CONFIG_IOMMU_IOVA=y CONFIG_IOMMU_API=y +CONFIG_IOMMUFD_DRIVER=y CONFIG_IOMMU_SUPPORT=y # @@ -8935,6 +9056,7 @@ CONFIG_WPCM450_SOC=m # # Qualcomm SoC drivers # +# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set CONFIG_QCOM_QMI_HELPERS=m # end of Qualcomm SoC drivers @@ -8946,6 +9068,31 @@ CONFIG_QCOM_QMI_HELPERS=m # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers +# +# PM Domains +# + +# +# Amlogic PM Domains +# +# end of Amlogic PM Domains + +# +# Broadcom PM Domains +# +# end of Broadcom PM Domains + +# +# i.MX PM Domains +# +# end of i.MX PM Domains + +# +# Qualcomm PM Domains +# +# end of Qualcomm PM Domains +# end of PM Domains + CONFIG_PM_DEVFREQ=y # @@ -8994,6 +9141,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 CONFIG_IIO_SW_DEVICE=m CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_TRIGGERED_EVENT=m +CONFIG_IIO_BACKEND=m # # Accelerometers @@ -9058,7 +9206,9 @@ CONFIG_STK8BA50=m # Analog to digital converters # CONFIG_AD4130=m +CONFIG_AD7091R=m # CONFIG_AD7091R5 is not set +CONFIG_AD7091R8=m # CONFIG_AD7124 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set @@ -9079,6 +9229,8 @@ CONFIG_AD7606_IFACE_PARALLEL=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set CONFIG_AD799X=m +CONFIG_AD9467=m +# CONFIG_ADI_AXI_ADC is not set CONFIG_CC10001_ADC=m CONFIG_DLN2_ADC=m CONFIG_ENVELOPE_DETECTOR=m @@ -9086,6 +9238,7 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_HX711=m CONFIG_INA2XX_ADC=m CONFIG_INTEL_MRFLD_ADC=m +# CONFIG_LTC2309 is not set CONFIG_LTC2471=m CONFIG_LTC2485=m CONFIG_LTC2496=m @@ -9097,11 +9250,14 @@ CONFIG_LTC2497=m CONFIG_MAX11410=m CONFIG_MAX1241=m CONFIG_MAX1363=m +CONFIG_MAX34408=m CONFIG_MAX9611=m # CONFIG_MCP320X is not set CONFIG_MCP3422=m +# CONFIG_MCP3564 is not set # CONFIG_MCP3911 is not set CONFIG_NAU7802=m +CONFIG_PAC1934=m # CONFIG_RICHTEK_RTQ6056 is not set CONFIG_SD_ADC_MODULATOR=m CONFIG_TI_ADC081C=m @@ -9114,6 +9270,7 @@ CONFIG_TI_ADC081C=m CONFIG_TI_ADS1015=m CONFIG_TI_ADS7924=m CONFIG_TI_ADS1100=m +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set CONFIG_TI_ADS8344=m CONFIG_TI_ADS8688=m @@ -9158,6 +9315,7 @@ CONFIG_AD7746=m # # Chemical Sensors # +# CONFIG_AOSONG_AGS02MA is not set # CONFIG_ATLAS_PH_SENSOR is not set # CONFIG_ATLAS_EZO_SENSOR is not set # CONFIG_BME680 is not set @@ -9242,6 +9400,7 @@ CONFIG_MAX5522=m CONFIG_MAX5821=m CONFIG_MCP4725=m CONFIG_MCP4728=m +CONFIG_MCP4821=m # CONFIG_MCP4922 is not set # CONFIG_TI_DAC082S085 is not set CONFIG_TI_DAC5571=m @@ -9277,6 +9436,7 @@ CONFIG_TI_DAC5571=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set CONFIG_ADF4377=m +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV4420 is not set # CONFIG_ADRF6780 is not set @@ -9328,6 +9488,7 @@ CONFIG_ITG3200=m CONFIG_DHT11=m CONFIG_HDC100X=m CONFIG_HDC2010=m +# CONFIG_HDC3020 is not set CONFIG_HID_SENSOR_HUMIDITY=m CONFIG_HTS221=m CONFIG_HTS221_I2C=m @@ -9344,8 +9505,12 @@ CONFIG_SI7020=m # CONFIG_ADIS16460 is not set CONFIG_ADIS16475=m # CONFIG_ADIS16480 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_BMI323=m +CONFIG_BMI323_I2C=m +# CONFIG_BMI323_SPI is not set # CONFIG_BOSCH_BNO055_SERIAL is not set # CONFIG_BOSCH_BNO055_I2C is not set CONFIG_FXOS8700=m @@ -9387,6 +9552,7 @@ CONFIG_GP2AP020A00F=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_ISL29125=m +# CONFIG_ISL76682 is not set CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m @@ -9394,6 +9560,7 @@ CONFIG_JSA1212=m CONFIG_ROHM_BU27034=m CONFIG_RPR0521=m CONFIG_SENSORS_LM3533=m +# CONFIG_LTR390 is not set CONFIG_LTR501=m # CONFIG_LTRF216A is not set CONFIG_LV0104CS=m @@ -9421,6 +9588,7 @@ CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set +# CONFIG_VEML6075 is not set CONFIG_VL6180=m CONFIG_ZOPT2201=m # end of Light sensors @@ -9504,6 +9672,7 @@ CONFIG_LMP91000=m # Pressure sensors # CONFIG_ABP060MG=m +# CONFIG_ROHM_BM1390 is not set CONFIG_BMP280=m CONFIG_BMP280_I2C=m CONFIG_BMP280_SPI=m @@ -9511,6 +9680,7 @@ CONFIG_BMP280_SPI=m # CONFIG_DPS310 is not set CONFIG_HID_SENSOR_PRESS=m # CONFIG_HP03 is not set +# CONFIG_HSC030PA is not set CONFIG_ICP10100=m # CONFIG_MPL115_I2C is not set # CONFIG_MPL115_SPI is not set @@ -9560,6 +9730,7 @@ CONFIG_VL53L0X_I2C=m # # CONFIG_AD2S90 is not set # CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set # end of Resolver to digital converters # @@ -9570,6 +9741,7 @@ CONFIG_LTC2983=m CONFIG_HID_SENSOR_TEMP=m CONFIG_MLX90614=m CONFIG_MLX90632=m +# CONFIG_MLX90635 is not set CONFIG_TMP006=m CONFIG_TMP007=m CONFIG_TMP117=m @@ -9578,6 +9750,7 @@ CONFIG_TSYS02D=m CONFIG_MAX30208=m # CONFIG_MAX31856 is not set CONFIG_MAX31865=m +CONFIG_MCP9600=m # end of Temperature sensors CONFIG_NTB=m @@ -9594,6 +9767,7 @@ CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set CONFIG_PWM_CLK=m CONFIG_PWM_CROS_EC=m +CONFIG_PWM_DWC_CORE=m CONFIG_PWM_DWC=m # CONFIG_PWM_LP3943 is not set CONFIG_PWM_LPSS=m @@ -9608,6 +9782,7 @@ CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_GPIO=m # CONFIG_RESET_SIMPLE is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RESET_TI_TPS380X=m @@ -9644,9 +9819,12 @@ CONFIG_IDLE_INJECT=y # # Performance monitor support # +CONFIG_DWC_PCIE_PMU=m +CONFIG_CXL_PMU=m # end of Performance monitor support CONFIG_RAS=y +# CONFIG_AMD_ATL is not set CONFIG_USB4=m # CONFIG_USB4_DEBUGFS_WRITE is not set # CONFIG_USB4_DMA_TEST is not set @@ -9671,14 +9849,7 @@ CONFIG_DEV_DAX_CXL=m CONFIG_DEV_DAX_HMEM_DEVICES=y CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y - -# -# Layout Types -# -CONFIG_NVMEM_LAYOUT_SL28_VPD=m -CONFIG_NVMEM_LAYOUT_ONIE_TLV=m -# end of Layout Types - +# CONFIG_NVMEM_LAYOUTS is not set CONFIG_NVMEM_RMEM=m # @@ -9721,6 +9892,7 @@ CONFIG_PM_OPP=y # CONFIG_MOST is not set # CONFIG_PECI is not set # CONFIG_HTE is not set +CONFIG_DPLL=y # end of Device Drivers # @@ -9729,6 +9901,7 @@ CONFIG_PM_OPP=y CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_VALIDATE_FS_PARSER is not set CONFIG_FS_IOMAP=y +CONFIG_FS_STACK=y CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set @@ -9759,6 +9932,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y # CONFIG_XFS_ONLINE_SCRUB_STATS is not set # CONFIG_XFS_ONLINE_REPAIR is not set @@ -9774,7 +9949,6 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set @@ -9795,6 +9969,15 @@ CONFIG_F2FS_FS_LZ4HC=y CONFIG_F2FS_FS_ZSTD=y CONFIG_F2FS_IOSTAT=y # CONFIG_F2FS_UNFAIR_RWSEM is not set +CONFIG_BCACHEFS_FS=y +CONFIG_BCACHEFS_QUOTA=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set +CONFIG_BCACHEFS_POSIX_ACL=y +# CONFIG_BCACHEFS_DEBUG is not set +# CONFIG_BCACHEFS_TESTS is not set +# CONFIG_BCACHEFS_LOCK_TIME_STATS is not set +# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set +CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y CONFIG_ZONEFS_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -9820,6 +10003,7 @@ CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -9861,12 +10045,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=y -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=y CONFIG_NTFS3_LZX_XPRESS=y CONFIG_NTFS3_FS_POSIX_ACL=y +CONFIG_NTFS_FS=y # end of DOS/FAT/EXFAT/NT Filesystems # @@ -9999,6 +10181,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_FLEXFILELAYOUT=y CONFIG_NFSD_V4_2_INTER_SSC=y # CONFIG_NFSD_V4_SECURITY_LABEL is not set +CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y CONFIG_GRACE_PERIOD=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y @@ -10184,6 +10367,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -10255,16 +10439,14 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y # CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HCTR2=m CONFIG_CRYPTO_KEYWRAP=m CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=y CONFIG_CRYPTO_XCTR=m CONFIG_CRYPTO_XTS=y @@ -10295,7 +10477,7 @@ CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_POLYVAL=m -CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y @@ -10340,7 +10522,9 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y -# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=1 CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -10387,9 +10571,11 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C62X=m CONFIG_CRYPTO_DEV_QAT_4XXX=m +CONFIG_CRYPTO_DEV_QAT_420XX=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_SAFEXCEL=m @@ -10410,6 +10596,7 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set CONFIG_SECONDARY_TRUSTED_KEYRING=y +# CONFIG_SECONDARY_TRUSTED_KEYRING_SIGNED_BY_BUILTIN is not set CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_REVOCATION_LIST is not set @@ -10432,8 +10619,8 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y @@ -10445,13 +10632,13 @@ CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_LIB_ARC4=y CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y CONFIG_CRYPTO_LIB_CHACHA=m CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 -CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA1=y @@ -10492,7 +10679,6 @@ CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_SPARC=y @@ -10522,6 +10708,7 @@ CONFIG_INTERVAL_TREE=y CONFIG_INTERVAL_TREE_SPAN_ITER=y CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_CLOSURES=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y @@ -10586,14 +10773,17 @@ CONFIG_MEMREGION=y CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y CONFIG_ARCH_STACKWALK=y CONFIG_STACKDEPOT=y +CONFIG_STACKDEPOT_MAX_FRAMES=64 CONFIG_SBITMAP=y CONFIG_PARMAN=m CONFIG_OBJAGG=m +# CONFIG_LWQ_TEST is not set # end of Library routines CONFIG_PLDMFW=y CONFIG_ASN1_ENCODER=y CONFIG_POLYNOMIAL=m +CONFIG_FIRMWARE_TABLE=y # # Kernel hacking @@ -10621,7 +10811,7 @@ CONFIG_DEBUG_KERNEL=y # # Compile-time checks and compiler options # -CONFIG_AS_HAS_NON_CONST_LEB128=y +CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set @@ -10650,7 +10840,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments @@ -10761,6 +10951,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CLOSURES is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures @@ -10773,6 +10964,7 @@ CONFIG_STACKTRACE=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_CPU_STALL_CPUTIME is not set +# CONFIG_RCU_CPU_STALL_NOTIFIER is not set # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging @@ -10907,8 +11099,6 @@ CONFIG_RUNTIME_TESTING_MENU=y CONFIG_ATOMIC64_SELFTEST=y CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m -# CONFIG_STRING_SELFTEST is not set -# CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_SCANF is not set @@ -10937,6 +11127,7 @@ CONFIG_TEST_UDELAY=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_FPU is not set # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set +# CONFIG_TEST_OBJPOOL is not set CONFIG_ARCH_USE_MEMTEST=y CONFIG_MEMTEST=y # CONFIG_HYPERV_TESTING is not set diff --git a/source/k/kernel-configs/config-huge-6.6.29.x64 b/source/k/kernel-configs/config-huge-6.9.3.x64 index 979eef889..bc4b36286 100644 --- a/source/k/kernel-configs/config-huge-6.6.29.x64 +++ b/source/k/kernel-configs/config-huge-6.9.3.x64 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.29 Kernel Configuration +# Linux/x86 6.9.3 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130200 +CONFIG_GCC_VERSION=140100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24200 @@ -15,7 +15,6 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -90,6 +89,7 @@ CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y @@ -202,6 +202,8 @@ CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_GCC_NO_STRINGOP_OVERFLOW=y +CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -284,19 +286,19 @@ CONFIG_AIO=y CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y +CONFIG_KCMP=y +CONFIG_RSEQ=y +# CONFIG_DEBUG_RSEQ is not set +CONFIG_CACHESTAT_SYSCALL=y +# CONFIG_PC104 is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_KCMP=y -CONFIG_RSEQ=y -CONFIG_CACHESTAT_SYSCALL=y -# CONFIG_DEBUG_RSEQ is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y -# CONFIG_PC104 is not set # # Kernel Performance Events And Counters @@ -312,7 +314,8 @@ CONFIG_TRACEPOINTS=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y +CONFIG_CRASH_RESERVE=y +CONFIG_VMCORE_INFO=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y @@ -361,8 +364,8 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y -# CONFIG_GOLDFISH is not set CONFIG_X86_CPU_RESCTRL=y +CONFIG_X86_FRED=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y @@ -392,6 +395,7 @@ CONFIG_GENERIC_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_TSC=y +CONFIG_X86_HAVE_PAE=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 @@ -504,6 +508,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y +CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -524,6 +529,8 @@ CONFIG_HAVE_LIVEPATCH=y CONFIG_LIVEPATCH=y # end of Processor type and features +CONFIG_CC_HAS_NAMED_AS=y +CONFIG_USE_X86_SEG_SUPPORT=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_CC_HAS_ENTRY_PADDING=y @@ -533,18 +540,18 @@ CONFIG_CALL_PADDING=y CONFIG_HAVE_CALL_THUNKS=y CONFIG_CALL_THUNKS=y CONFIG_PREFIX_SYMBOLS=y -CONFIG_SPECULATION_MITIGATIONS=y -CONFIG_PAGE_TABLE_ISOLATION=y -CONFIG_RETPOLINE=y -CONFIG_RETHUNK=y -CONFIG_CPU_UNRET_ENTRY=y -CONFIG_CALL_DEPTH_TRACKING=y +CONFIG_CPU_MITIGATIONS=y +CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y +CONFIG_MITIGATION_RETPOLINE=y +CONFIG_MITIGATION_RETHUNK=y +CONFIG_MITIGATION_UNRET_ENTRY=y +CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y # CONFIG_CALL_THUNKS_DEBUG is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y -CONFIG_CPU_SRSO=y -CONFIG_SLS=y -# CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_MITIGATION_IBPB_ENTRY=y +CONFIG_MITIGATION_IBRS_ENTRY=y +CONFIG_MITIGATION_SRSO=y +CONFIG_MITIGATION_SLS=y +# CONFIG_MITIGATION_GDS_FORCE is not set CONFIG_MITIGATION_RFDS=y CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y @@ -559,6 +566,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="\"\"" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -580,6 +590,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y CONFIG_ACPI_TABLE_LIB=y +CONFIG_ACPI_THERMAL_LIB=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_FPDT=y @@ -613,7 +624,6 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y -# CONFIG_ACPI_CUSTOM_METHOD is not set CONFIG_ACPI_BGRT=y # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NFIT=m @@ -714,24 +724,24 @@ CONFIG_AMD_NB=y # Binary Emulations # CONFIG_IA32_EMULATION=y +# CONFIG_IA32_EMULATION_DEFAULT_DISABLED is not set # CONFIG_X86_X32_ABI is not set CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y # end of Binary Emulations -CONFIG_HAVE_KVM=y +CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_PFNCACHE=y CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_DIRTY_RING=y CONFIG_HAVE_KVM_DIRTY_RING_TSO=y CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y -CONFIG_HAVE_KVM_EVENTFD=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -741,23 +751,28 @@ CONFIG_HAVE_KVM_NO_POLL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y CONFIG_HAVE_KVM_PM_NOTIFIER=y CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y +CONFIG_KVM_GENERIC_MMU_NOTIFIER=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m # CONFIG_KVM_WERROR is not set +# CONFIG_KVM_SW_PROTECTED_VM is not set CONFIG_KVM_INTEL=m CONFIG_X86_SGX_KVM=y CONFIG_KVM_AMD=m CONFIG_KVM_AMD_SEV=y CONFIG_KVM_SMM=y +CONFIG_KVM_HYPERV=y CONFIG_KVM_XEN=y # CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y +CONFIG_KVM_MAX_NR_VCPUS=4096 CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y CONFIG_AS_WRUSS=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -794,6 +809,7 @@ CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y +CONFIG_ARCH_HAS_CPU_PASID=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y @@ -861,8 +877,11 @@ CONFIG_ARCH_MMAP_RND_BITS=28 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_HAVE_OBJTOOL=y CONFIG_HAVE_JUMP_LABEL_HACK=y CONFIG_HAVE_NOINSTR_HACK=y @@ -899,6 +918,7 @@ CONFIG_ARCH_HAS_ELFCORE_COMPAT=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y CONFIG_DYNAMIC_SIGFRAME=y CONFIG_HAVE_ARCH_NODE_DEV_GROUP=y +CONFIG_ARCH_HAS_HW_PTE_YOUNG=y CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y # @@ -914,6 +934,8 @@ CONFIG_GCC_PLUGINS=y CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT_16B=y CONFIG_FUNCTION_ALIGNMENT=16 +CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y +CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -946,6 +968,7 @@ CONFIG_BLK_ICQ=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_INTEGRITY_T10=y +CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set @@ -1038,7 +1061,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON=y +CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -1057,9 +1080,8 @@ CONFIG_ZSMALLOC=y CONFIG_ZSMALLOC_CHAIN_SIZE=8 # -# SLAB allocator options +# Slab allocator options # -# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -1068,7 +1090,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set -# end of SLAB allocator options +# end of Slab allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_COMPAT_BRK is not set @@ -1102,6 +1124,7 @@ CONFIG_DEVICE_MIGRATION=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y +CONFIG_PCP_BATCH_SCALE_MAX=5 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -1114,6 +1137,7 @@ CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set CONFIG_THP_SWAP=y # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y @@ -1121,7 +1145,6 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set CONFIG_CMA_SYSFS=y CONFIG_CMA_AREAS=7 @@ -1151,16 +1174,18 @@ CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set -CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y +CONFIG_USERFAULTFD=y CONFIG_PTE_MARKER_UFFD_WP=y CONFIG_LRU_GEN=y CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN_WALKS_MMU=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y +CONFIG_IOMMU_MM_DATA=y # # Data Access Monitoring @@ -1183,7 +1208,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1265,6 +1289,7 @@ CONFIG_TCP_CONG_BBR=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_SIGPOOL=y CONFIG_TCP_MD5SIG=y CONFIG_IPV6=m # CONFIG_IPV6_ROUTER_PREF is not set @@ -1553,6 +1578,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1585,6 +1611,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1592,6 +1619,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1629,6 +1657,7 @@ CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1650,7 +1679,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_BPFILTER is not set CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -1734,9 +1762,6 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_LLC=m CONFIG_LLC2=m CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_PHONET is not set @@ -1829,7 +1854,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -2040,7 +2064,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -2101,7 +2124,7 @@ CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y -# CONFIG_PAGE_POOL_STATS is not set +CONFIG_PAGE_POOL_STATS=y CONFIG_FAILOVER=y CONFIG_ETHTOOL_NETLINK=y @@ -2111,12 +2134,14 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_HAVE_EISA=y # CONFIG_EISA is not set CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIEAER=y CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEAER_CXL=y # CONFIG_PCIE_ECRC is not set CONFIG_PCIEASPM=y CONFIG_PCIEASPM_DEFAULT=y @@ -2201,7 +2226,6 @@ CONFIG_CXL_PORT=y CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set -CONFIG_CXL_PMU=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2257,6 +2281,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set CONFIG_HMEM_REPORTING=y CONFIG_TEST_ASYNC_DRIVER_PROBE=m +CONFIG_GENERIC_CPU_DEVICES=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y @@ -2343,6 +2368,11 @@ CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y # +# Qualcomm firmware drivers +# +# end of Qualcomm firmware drivers + +# # Tegra firmware driver # # end of Tegra firmware driver @@ -2355,7 +2385,6 @@ CONFIG_MTD_TESTS=m # # Partition parsers # -CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 @@ -2433,7 +2462,6 @@ CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m CONFIG_MTD_PCMCIA=m # CONFIG_MTD_PCMCIA_ANONYMOUS is not set -CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -2522,6 +2550,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set CONFIG_MTD_UBI_GLUEBI=m # CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_NVMEM=m # CONFIG_MTD_HYPERBUS is not set # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -2554,7 +2583,8 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set # CONFIG_ZRAM_DEF_COMP_842 is not set CONFIG_ZRAM_DEF_COMP="lzo-rle" -# CONFIG_ZRAM_WRITEBACK is not set +CONFIG_ZRAM_WRITEBACK=y +# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_MULTI_COMP=y CONFIG_BLK_DEV_LOOP=m @@ -2580,7 +2610,8 @@ CONFIG_BLK_DEV_RNBD_SERVER=m # # NVME Support # -CONFIG_NVME_COMMON=y +CONFIG_NVME_KEYRING=m +CONFIG_NVME_AUTH=y CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y @@ -2590,7 +2621,8 @@ CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m CONFIG_NVME_TCP=m -CONFIG_NVME_AUTH=y +CONFIG_NVME_TCP_TLS=y +CONFIG_NVME_HOST_AUTH=y CONFIG_NVME_TARGET=m CONFIG_NVME_TARGET_PASSTHRU=y CONFIG_NVME_TARGET_LOOP=m @@ -2598,6 +2630,7 @@ CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_TCP=m +CONFIG_NVME_TARGET_TCP_TLS=y CONFIG_NVME_TARGET_AUTH=y # end of NVME Support @@ -2633,6 +2666,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_MISC_RTSX=m CONFIG_TPS6594_ESM=m CONFIG_TPS6594_PFSM=m +CONFIG_NSM=m # CONFIG_C2PORT is not set # @@ -2640,7 +2674,6 @@ CONFIG_TPS6594_PFSM=m # CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set -CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m # CONFIG_EEPROM_93XX46 is not set @@ -2668,6 +2701,8 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m CONFIG_INTEL_MEI_GSC=m +CONFIG_INTEL_MEI_VSC_HW=m +CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_HDCP=m CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_GSC_PROXY=m @@ -2793,7 +2828,6 @@ CONFIG_SCSI_INITIO=y CONFIG_SCSI_INIA100=y CONFIG_SCSI_PPA=m CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_STEX=y CONFIG_SCSI_SYM53C8XX_2=y @@ -2938,17 +2972,13 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_BITMAP_FILE=y -CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y CONFIG_MD_RAID10=y CONFIG_MD_RAID456=y -CONFIG_MD_MULTIPATH=y -CONFIG_MD_FAULTY=m CONFIG_MD_CLUSTER=m CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set # CONFIG_BCACHE_ASYNC_REGISTRATION is not set CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=y @@ -2990,6 +3020,7 @@ CONFIG_DM_LOG_WRITES=m CONFIG_DM_INTEGRITY=m CONFIG_DM_ZONED=m CONFIG_DM_AUDIT=y +CONFIG_DM_VDO=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -3061,6 +3092,7 @@ CONFIG_TAP=m CONFIG_VETH=m CONFIG_VIRTIO_NET=y CONFIG_NLMON=m +CONFIG_NETKIT=y CONFIG_NET_VRF=m CONFIG_VSOCKMON=m CONFIG_MHI_NET=m @@ -3132,10 +3164,6 @@ CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_REALTEK=m -# CONFIG_NET_DSA_REALTEK_MDIO is not set -# CONFIG_NET_DSA_REALTEK_SMI is not set -CONFIG_NET_DSA_REALTEK_RTL8365MB=m -CONFIG_NET_DSA_REALTEK_RTL8366RB=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -3283,10 +3311,13 @@ CONFIG_I40E=m CONFIG_IAVF=m CONFIG_I40EVF=m CONFIG_ICE=m +CONFIG_ICE_HWMON=y CONFIG_ICE_SWITCHDEV=y CONFIG_ICE_HWTS=y CONFIG_FM10K=m CONFIG_IGC=m +CONFIG_IGC_LEDS=y +CONFIG_IDPF=m CONFIG_JME=m CONFIG_NET_VENDOR_ADI=y CONFIG_ADIN1110=m @@ -3299,6 +3330,7 @@ CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set CONFIG_OCTEON_EP=m +CONFIG_OCTEON_EP_VF=m CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_NET_VENDOR_MELLANOX=y @@ -3323,6 +3355,7 @@ CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y CONFIG_MLX5_SF_MANAGER=y +CONFIG_MLX5_DPLL=m CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_HWMON=y CONFIG_MLXSW_CORE_THERMAL=y @@ -3399,6 +3432,7 @@ CONFIG_8139TOO_PIO=y CONFIG_8139TOO_8129=y # CONFIG_8139_OLD_RX_RESET is not set CONFIG_R8169=m +CONFIG_R8169_LEDS=y CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_ROCKER=y CONFIG_ROCKER=m @@ -3526,7 +3560,10 @@ CONFIG_NXP_CBTX_PHY=m CONFIG_NXP_C45_TJA11XX_PHY=m # CONFIG_NXP_TJA11XX_PHY is not set CONFIG_NCN26000_PHY=m +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +CONFIG_QCA83XX_PHY=m +CONFIG_QCA808X_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m @@ -3540,6 +3577,7 @@ CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m CONFIG_DP83869_PHY=m CONFIG_DP83TD510_PHY=m +CONFIG_DP83TG720_PHY=m CONFIG_VITESSE_PHY=m CONFIG_XILINX_GMII2RGMII=m # CONFIG_MICREL_KS8995MA is not set @@ -3562,6 +3600,7 @@ CONFIG_CAN_CC770_ISA=m CONFIG_CAN_CC770_PLATFORM=m CONFIG_CAN_CTUCANFD=m CONFIG_CAN_CTUCANFD_PCI=m +# CONFIG_CAN_ESD_402_PCI is not set CONFIG_CAN_IFI_CANFD=m CONFIG_CAN_M_CAN=m CONFIG_CAN_M_CAN_PCI=m @@ -3717,7 +3756,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y # CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_DYNACK is not set CONFIG_ATH9K_WOW=y CONFIG_ATH9K_RFKILL=y @@ -3761,9 +3799,6 @@ CONFIG_ATH12K=m # CONFIG_ATH12K_DEBUG is not set # CONFIG_ATH12K_TRACING is not set CONFIG_WLAN_VENDOR_ATMEL=y -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m CONFIG_AT76C50X_USB=m CONFIG_WLAN_VENDOR_BROADCOM=y CONFIG_B43=m @@ -3805,9 +3840,6 @@ CONFIG_BRCMFMAC_USB=y CONFIG_BRCMFMAC_PCIE=y CONFIG_BRCM_TRACING=y # CONFIG_BRCMDBG is not set -CONFIG_WLAN_VENDOR_CISCO=y -CONFIG_AIRO=m -CONFIG_AIRO_CS=m CONFIG_WLAN_VENDOR_INTEL=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3844,21 +3876,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # end of Debugging Options CONFIG_WLAN_VENDOR_INTERSIL=y -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_HERMES=m -# CONFIG_HERMES_PRISM is not set -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m @@ -3867,7 +3884,6 @@ CONFIG_P54_LEDS=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set @@ -3909,6 +3925,9 @@ CONFIG_MT7921E=m CONFIG_MT7921S=m CONFIG_MT7921U=m CONFIG_MT7996E=m +CONFIG_MT7925_COMMON=m +CONFIG_MT7925E=m +CONFIG_MT7925U=m CONFIG_WLAN_VENDOR_MICROCHIP=y # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set @@ -4023,15 +4042,11 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WLAN_VENDOR_ZYDAS=y -CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_QTNFMAC=m CONFIG_QTNFMAC_PCIE=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_USB_NET_RNDIS_WLAN=m # CONFIG_MAC80211_HWSIM is not set CONFIG_VIRT_WIFI=m CONFIG_WAN=y @@ -4045,6 +4060,7 @@ CONFIG_HDLC_PPP=m # # X.25/LAPB support is disabled # +# CONFIG_FRAMER is not set CONFIG_PCI200SYN=m CONFIG_WANXL=m # CONFIG_PC300TOO is not set @@ -4223,6 +4239,7 @@ CONFIG_JOYSTICK_PXRC=m CONFIG_JOYSTICK_QWIIC=m CONFIG_JOYSTICK_FSIA6B=m # CONFIG_JOYSTICK_SENSEHAT is not set +CONFIG_JOYSTICK_SEESAW=m CONFIG_INPUT_TABLET=y CONFIG_TABLET_USB_ACECAD=m CONFIG_TABLET_USB_AIPTEK=m @@ -4259,6 +4276,9 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m CONFIG_TOUCHSCREEN_EXC3000=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C=m +CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m CONFIG_TOUCHSCREEN_HIDEEP=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m @@ -4427,7 +4447,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y @@ -4645,6 +4664,7 @@ CONFIG_I2C_XILINX=m # CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_DLN2=m +CONFIG_I2C_LJCA=m CONFIG_I2C_CP2615=m CONFIG_I2C_PARPORT=m # CONFIG_I2C_PCI1XXXX is not set @@ -4689,6 +4709,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_DLN2 is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set +CONFIG_SPI_LJCA=m CONFIG_SPI_MICROCHIP_CORE=m # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set # CONFIG_SPI_LANTIQ_SSC is not set @@ -4753,6 +4774,7 @@ CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +CONFIG_PTP_1588_CLOCK_FC3W=m # CONFIG_PTP_1588_CLOCK_MOCK is not set CONFIG_PTP_1588_CLOCK_VMW=m CONFIG_PTP_1588_CLOCK_OCP=m @@ -4775,6 +4797,7 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_PINCTRL_LYNXPOINT=m CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_INTEL_PLATFORM=m CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -4788,6 +4811,7 @@ CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_METEORLAKE=m +CONFIG_PINCTRL_METEORPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -4854,9 +4878,11 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_ARIZONA=m CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_CROS_EC=m CONFIG_GPIO_DLN2=m CONFIG_GPIO_ELKHARTLAKE=m CONFIG_GPIO_JANZ_TTL=m +CONFIG_GPIO_LJCA=m CONFIG_GPIO_LP3943=m # CONFIG_GPIO_TPS68470 is not set CONFIG_GPIO_WHISKEY_COVE=m @@ -4905,11 +4931,13 @@ CONFIG_W1_CON=y # # 1-wire Bus Masters # +CONFIG_W1_MASTER_AMD_AXI=m CONFIG_W1_MASTER_MATROX=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_SGI is not set +CONFIG_W1_MASTER_UART=m # end of 1-wire Bus Masters # @@ -4994,6 +5022,7 @@ CONFIG_CHARGER_WILCO=m CONFIG_BATTERY_SURFACE=m CONFIG_CHARGER_SURFACE=m CONFIG_BATTERY_UG3105=m +CONFIG_FUEL_GAUGE_MM8013=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -5023,6 +5052,7 @@ CONFIG_SENSORS_AHT10=m CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_ASUS_ROG_RYUJIN=m CONFIG_SENSORS_AXI_FAN_CONTROL=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m @@ -5030,6 +5060,7 @@ CONFIG_SENSORS_FAM15H_POWER=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CHIPCAP2=m CONFIG_SENSORS_CORSAIR_CPRO=m CONFIG_SENSORS_CORSAIR_PSU=m CONFIG_SENSORS_DRIVETEMP=m @@ -5044,6 +5075,7 @@ CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_FTSTEUTATES=m +CONFIG_SENSORS_GIGABYTE_WATERFORCE=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m @@ -5057,6 +5089,7 @@ CONFIG_SENSORS_I5500=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_POWERZ=m CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LTC2945=m @@ -5064,6 +5097,7 @@ CONFIG_SENSORS_LTC2947=m CONFIG_SENSORS_LTC2947_I2C=m CONFIG_SENSORS_LTC2947_SPI=m CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC2991=m CONFIG_SENSORS_LTC2992=m CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4215=m @@ -5071,6 +5105,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LTC4282=m # CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX127=m CONFIG_SENSORS_MAX16065=m @@ -5122,6 +5157,7 @@ CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NZXT_KRAKEN2=m +CONFIG_SENSORS_NZXT_KRAKEN3=m CONFIG_SENSORS_NZXT_SMART2=m # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_OXP=m @@ -5150,6 +5186,7 @@ CONFIG_SENSORS_LT7182S=m CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_SENSORS_LTC3815=m +# CONFIG_SENSORS_LTC4286 is not set CONFIG_SENSORS_MAX15301=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX16601=m @@ -5158,12 +5195,15 @@ CONFIG_SENSORS_MAX20751=m CONFIG_SENSORS_MAX31785=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MP2856=m CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP2975_REGULATOR=y CONFIG_SENSORS_MP5023=m +CONFIG_SENSORS_MP5990=m CONFIG_SENSORS_MPQ7932_REGULATOR=y CONFIG_SENSORS_MPQ7932=m +CONFIG_SENSORS_MPQ8785=m CONFIG_SENSORS_PIM4328=m CONFIG_SENSORS_PLI1209BC=m CONFIG_SENSORS_PLI1209BC_REGULATOR=y @@ -5182,6 +5222,7 @@ CONFIG_SENSORS_XDPE152=m CONFIG_SENSORS_XDPE122=m CONFIG_SENSORS_XDPE122_REGULATOR=y CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_PT5161L=m CONFIG_SENSORS_SBTSI=m CONFIG_SENSORS_SBRMI=m CONFIG_SENSORS_SHT15=m @@ -5202,6 +5243,7 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_STTS751=m +CONFIG_SENSORS_SURFACE_FAN=m CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set @@ -5248,10 +5290,9 @@ CONFIG_SENSORS_HP_WMI=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_STATISTICS=y +# CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_ACPI=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -5306,6 +5347,7 @@ CONFIG_WATCHDOG_SYSFS=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_CROS_EC_WATCHDOG=m CONFIG_MENF21BMC_WATCHDOG=m CONFIG_WDAT_WDT=m # CONFIG_XILINX_WATCHDOG is not set @@ -5490,6 +5532,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set CONFIG_REGULATOR_USERSPACE_CONSUMER=m +# CONFIG_REGULATOR_NETLINK_EVENTS is not set # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m @@ -5513,6 +5556,7 @@ CONFIG_REGULATOR_LP8755=m CONFIG_REGULATOR_LTC3589=m CONFIG_REGULATOR_LTC3676=m CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX77503=m CONFIG_REGULATOR_MAX77857=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m @@ -5832,6 +5876,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y # # Media capture support # +# CONFIG_VIDEO_MGB4 is not set CONFIG_VIDEO_SOLO6X10=m # CONFIG_VIDEO_TW5864 is not set CONFIG_VIDEO_TW68=m @@ -5981,6 +6026,10 @@ CONFIG_VIDEO_CAFE_CCIC=m # # +# Nuvoton media platform drivers +# + +# # NVidia media platform drivers # @@ -6077,7 +6126,10 @@ CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_ALVIUM_CSI2=m CONFIG_VIDEO_AR0521=m +CONFIG_VIDEO_GC0308=m +CONFIG_VIDEO_GC2145=m CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m CONFIG_VIDEO_HI847=m @@ -6093,6 +6145,7 @@ CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_MAX9271_LIB=m CONFIG_VIDEO_MT9M001=m CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9M114=m CONFIG_VIDEO_MT9P031=m CONFIG_VIDEO_MT9T112=m CONFIG_VIDEO_MT9V011=m @@ -6117,6 +6170,7 @@ CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV64A40=m CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m CONFIG_VIDEO_OV7640=m @@ -6139,6 +6193,12 @@ CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m # +# Camera ISPs +# +CONFIG_VIDEO_THP7312=m +# end of Camera ISPs + +# # Lens drivers # CONFIG_VIDEO_AD5820=m @@ -6207,6 +6267,7 @@ CONFIG_VIDEO_TVP514X=m CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_TVP7002=m CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9900=m CONFIG_VIDEO_TW9903=m CONFIG_VIDEO_TW9906=m CONFIG_VIDEO_TW9910=m @@ -6486,22 +6547,24 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_SCREEN_INFO=y +CONFIG_VIDEO=y CONFIG_AUXDISPLAY=y CONFIG_CHARLCD=m -CONFIG_LINEDISP=m CONFIG_HD44780_COMMON=m CONFIG_HD44780=m -# CONFIG_KS0108 is not set -# CONFIG_IMG_ASCII_LCD is not set -CONFIG_HT16K33=m # CONFIG_LCD2S is not set # CONFIG_PARPORT_PANEL is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_KS0108 is not set +CONFIG_LINEDISP=m +# CONFIG_IMG_ASCII_LCD is not set +CONFIG_HT16K33=m +CONFIG_MAX6959=m +CONFIG_SEG_LED_GPIO=m # CONFIG_PANEL is not set CONFIG_AGP=m CONFIG_AGP_AMD64=m @@ -6513,6 +6576,7 @@ CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6522,12 +6586,14 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DISPLAY_HELPER=m CONFIG_DRM_DISPLAY_DP_HELPER=y +CONFIG_DRM_DISPLAY_DP_TUNNEL=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=m CONFIG_DRM_EXEC=m +CONFIG_DRM_GPUVM=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -6582,6 +6648,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 # CONFIG_NOUVEAU_DEBUG_PUSH is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y # CONFIG_DRM_NOUVEAU_SVM is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_I915=m CONFIG_DRM_I915_FORCE_PROBE="" CONFIG_DRM_I915_CAPTURE_ERROR=y @@ -6589,6 +6656,7 @@ CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_PXP=y +CONFIG_DRM_I915_DP_TUNNEL=y # # drm/i915 Debugging @@ -6603,6 +6671,7 @@ CONFIG_DRM_I915_PXP=y # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set +# CONFIG_DRM_I915_DEBUG_WAKEREF is not set # end of drm/i915 Debugging # @@ -6620,6 +6689,36 @@ CONFIG_DRM_I915_TIMESLICE_DURATION=1 # end of drm/i915 Profile Guided Optimisation CONFIG_DRM_I915_GVT=y +CONFIG_DRM_XE=m +CONFIG_DRM_XE_DISPLAY=y +CONFIG_DRM_XE_FORCE_PROBE="" + +# +# drm/Xe Debugging +# +# CONFIG_DRM_XE_WERROR is not set +# CONFIG_DRM_XE_DEBUG is not set +# CONFIG_DRM_XE_DEBUG_VM is not set +# CONFIG_DRM_XE_DEBUG_SRIOV is not set +# CONFIG_DRM_XE_DEBUG_MEM is not set +# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set +# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set +# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set +# end of drm/Xe Debugging + +# +# drm/xe Profile Guided Optimisation +# +CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000 +CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1 +CONFIG_DRM_XE_TIMESLICE_MAX=10000000 +CONFIG_DRM_XE_TIMESLICE_MIN=1 +CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000 +CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1 +CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y +# end of drm/xe Profile Guided Optimisation + CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_VMWGFX=m @@ -6637,6 +6736,7 @@ CONFIG_DRM_PANEL=y # Display Panels # # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set @@ -6652,7 +6752,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_ANALOGIX_DP=m # end of Display Interface Bridges -# CONFIG_DRM_LOONGSON is not set # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6674,7 +6773,6 @@ CONFIG_DRM_SSD130X=m CONFIG_DRM_SSD130X_I2C=m CONFIG_DRM_SSD130X_SPI=m CONFIG_DRM_HYPERV=m -CONFIG_DRM_LEGACY=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PRIVACY_SCREEN=y @@ -6709,11 +6807,6 @@ CONFIG_FB_RIVA_I2C=y # CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_RIVA_BACKLIGHT=y CONFIG_FB_I740=m -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y @@ -6777,10 +6870,12 @@ CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y +CONFIG_FB_SYSMEM_FOPS=y CONFIG_FB_DEFERRED_IO=y CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_FOPS=y CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS_DEFERRED=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y CONFIG_FB_BACKLIGHT=m @@ -6806,9 +6901,9 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_KTD253=m +CONFIG_BACKLIGHT_KTD2801=m CONFIG_BACKLIGHT_KTZ8866=m CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_QCOM_WLED=m @@ -6820,6 +6915,7 @@ CONFIG_BACKLIGHT_PCF50633=m CONFIG_BACKLIGHT_LM3630A=m CONFIG_BACKLIGHT_LM3639=m CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_MP3309C=m CONFIG_BACKLIGHT_SKY81452=m CONFIG_BACKLIGHT_GPIO=m CONFIG_BACKLIGHT_LV5207LP=m @@ -7001,8 +7097,10 @@ CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CIRRUS_SCODEC=m CONFIG_SND_HDA_SCODEC_CS35L41=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m +CONFIG_SND_HDA_SCODEC_COMPONENT=m CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m CONFIG_SND_HDA_SCODEC_CS35L56=m @@ -7100,10 +7198,15 @@ CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCI=m CONFIG_SND_AMD_ASOC_RENOIR=m CONFIG_SND_AMD_ASOC_REMBRANDT=m +CONFIG_SND_AMD_ASOC_ACP63=m +CONFIG_SND_AMD_ASOC_ACP70=m CONFIG_SND_SOC_AMD_MACH_COMMON=m CONFIG_SND_SOC_AMD_LEGACY_MACH=m CONFIG_SND_SOC_AMD_SOF_MACH=m +CONFIG_SND_AMD_SOUNDWIRE_ACPI=m CONFIG_SND_SOC_AMD_RPL_ACP6x=m +CONFIG_SND_SOC_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_AMD_SOUNDWIRE=m CONFIG_SND_SOC_AMD_PS=m CONFIG_SND_SOC_AMD_PS_MACH=m # CONFIG_SND_ATMEL_SOC is not set @@ -7126,7 +7229,6 @@ CONFIG_SND_DESIGNWARE_PCM=y # CONFIG_SND_SOC_FSL_ESAI is not set # CONFIG_SND_SOC_FSL_MICFIL is not set # CONFIG_SND_SOC_FSL_XCVR is not set -# CONFIG_SND_SOC_FSL_RPMSG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # end of SoC Audio for Freescale CPUs @@ -7175,6 +7277,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m @@ -7186,6 +7289,9 @@ CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_NUVOTON_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_SSP_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_BOARD_HELPERS=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m @@ -7224,7 +7330,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m -CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m @@ -7240,13 +7346,16 @@ CONFIG_SND_SOC_SOF_CLIENT=m CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_IPC3=y -CONFIG_SND_SOC_SOF_INTEL_IPC4=y +CONFIG_SND_SOC_SOF_IPC4=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_SOF_AMD_RENOIR=m CONFIG_SND_SOC_SOF_AMD_VANGOGH=m CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m CONFIG_SND_SOC_SOF_ACP_PROBES=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE=m +CONFIG_SND_SOC_SOF_AMD_ACP63=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m @@ -7331,10 +7440,13 @@ CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m CONFIG_SND_SOC_AW88261=m +CONFIG_SND_SOC_AW87390=m +CONFIG_SND_SOC_AW88399=m CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CHV3_CODEC=m CONFIG_SND_SOC_CROS_EC_CODEC=m +CONFIG_SND_SOC_CS_AMP_LIB=m # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set CONFIG_SND_SOC_CS35L34=m @@ -7379,6 +7491,7 @@ CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m +CONFIG_SND_SOC_ES83XX_DSM_COMMON=m CONFIG_SND_SOC_ES8316=m CONFIG_SND_SOC_ES8326=m CONFIG_SND_SOC_ES8328=m @@ -7469,6 +7582,7 @@ CONFIG_SND_SOC_RT715=m CONFIG_SND_SOC_RT715_SDW=m CONFIG_SND_SOC_RT715_SDCA_SDW=m CONFIG_SND_SOC_RT9120=m +CONFIG_SND_SOC_RTQ9128=m CONFIG_SND_SOC_SDW_MOCKUP=m # CONFIG_SND_SOC_SGTL5000 is not set CONFIG_SND_SOC_SIGMADSP=m @@ -7517,7 +7631,11 @@ CONFIG_SND_SOC_TS3A227E=m CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_TSCS454 is not set # CONFIG_SND_SOC_UDA1334 is not set +CONFIG_SND_SOC_WCD_CLASSH=m +CONFIG_SND_SOC_WCD_MBHC=m # CONFIG_SND_SOC_WCD938X_SDW is not set +CONFIG_SND_SOC_WCD939X=m +CONFIG_SND_SOC_WCD939X_SDW=m CONFIG_SND_SOC_WM5102=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set @@ -7718,6 +7836,7 @@ CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_ALPS=m +# CONFIG_HID_MCP2200 is not set CONFIG_HID_MCP2221=m # end of Special HID drivers @@ -7777,6 +7896,7 @@ CONFIG_USB_ULPI_BUS=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y +CONFIG_USB_PCI_AMD=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # @@ -7791,6 +7911,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=y # @@ -7900,6 +8021,7 @@ CONFIG_USB_DWC3_PCI=m CONFIG_USB_CHIPIDEA=m # CONFIG_USB_CHIPIDEA_HOST is not set CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_NPCM=m CONFIG_USB_CHIPIDEA_GENERIC=m CONFIG_USB_ISP1760=m CONFIG_USB_ISP1760_HCD=y @@ -7980,6 +8102,7 @@ CONFIG_USB_CYTHERM=m CONFIG_USB_IDMOUSE=m CONFIG_USB_APPLEDISPLAY=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_LJCA=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m @@ -8036,7 +8159,10 @@ CONFIG_TYPEC_MUX_FSA4480=m CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_MUX_INTEL_PMC=m +CONFIG_TYPEC_MUX_IT5205=m CONFIG_TYPEC_MUX_NB7VPQ904M=m +CONFIG_TYPEC_MUX_PTN36502=m +# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -8109,6 +8235,7 @@ CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_REALTEK_PCI=m CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_LEDS_EXPRESSWIRE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m @@ -8186,6 +8313,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m # CONFIG_LEDS_TRIGGER_CPU is not set CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # @@ -8319,6 +8447,7 @@ CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1374_WDT=y CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_MAX31335=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m @@ -8331,6 +8460,7 @@ CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_TPS6594=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_RX8010=m @@ -8478,6 +8608,7 @@ CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m # CONFIG_VFIO_NOIOMMU is not set CONFIG_VFIO_VIRQFD=y +# CONFIG_VFIO_DEBUGFS is not set # # VFIO support for PCI devices @@ -8490,15 +8621,17 @@ CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y CONFIG_MLX5_VFIO_PCI=m CONFIG_PDS_VFIO_PCI=m +CONFIG_VIRTIO_VFIO_PCI=m # end of VFIO support for PCI devices CONFIG_VFIO_MDEV=m -CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y CONFIG_VBOXGUEST=m CONFIG_NITRO_ENCLAVES=m CONFIG_ACRN_HSM=m +CONFIG_TSM_REPORTS=m CONFIG_EFI_SECRET=m CONFIG_SEV_GUEST=m CONFIG_TDX_GUEST_DRIVER=m @@ -8508,6 +8641,7 @@ CONFIG_VIRTIO_PCI_LIB=y CONFIG_VIRTIO_PCI_LIB_LEGACY=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_ADMIN_LEGACY=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTIO_VDPA=m CONFIG_VIRTIO_PMEM=y @@ -8555,7 +8689,6 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_COMEDI is not set CONFIG_STAGING=y CONFIG_PRISM2_USB=m -CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m @@ -8604,12 +8737,6 @@ CONFIG_ADT7316_I2C=m # CONFIG_AD5933=m # end of Network Analyzer, Impedance Converters - -# -# Resolver to digital converters -# -# CONFIG_AD2S1210 is not set -# end of Resolver to digital converters # end of IIO staging drivers CONFIG_FB_SM750=m @@ -8617,14 +8744,18 @@ CONFIG_STAGING_MEDIA=y # CONFIG_INTEL_ATOMISP is not set # CONFIG_DVB_AV7110 is not set # CONFIG_VIDEO_IPU3_IMGU is not set + +# +# StarFive media platform drivers +# # CONFIG_STAGING_MEDIA_DEPRECATED is not set CONFIG_LTE_GDM724X=m # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set # CONFIG_PI433 is not set # CONFIG_FIELDBUS_DEV is not set -CONFIG_QLGE=m # CONFIG_VME_BUS is not set +# CONFIG_GOLDFISH is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_ACPI=m CONFIG_CHROMEOS_LAPTOP=m @@ -8685,10 +8816,9 @@ CONFIG_YOGABOOK=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m -CONFIG_AMD_PMF=m -# CONFIG_AMD_PMF_DEBUG is not set CONFIG_AMD_PMC=m CONFIG_AMD_HSMP=m +# CONFIG_AMD_WBRF is not set CONFIG_ADV_SWBUTTON=m CONFIG_APPLE_GMUX=m CONFIG_ASUS_LAPTOP=m @@ -8743,7 +8873,7 @@ CONFIG_INTEL_ATOMISP2_PM=m CONFIG_INTEL_IFS=m # CONFIG_INTEL_SAR_INT1092 is not set CONFIG_INTEL_SKL_INT3472=m -CONFIG_INTEL_PMC_CORE=y +CONFIG_INTEL_PMC_CORE=m CONFIG_INTEL_PMT_CLASS=m CONFIG_INTEL_PMT_TELEMETRY=m CONFIG_INTEL_PMT_CRASHLOG=m @@ -8803,6 +8933,7 @@ CONFIG_SYSTEM76_ACPI=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_MLX_PLATFORM=m +CONFIG_INSPUR_PLATFORM_PROFILE=m CONFIG_X86_ANDROID_TABLETS=m CONFIG_FW_ATTR_CLASS=m CONFIG_INTEL_IPS=m @@ -8816,6 +8947,7 @@ CONFIG_SIEMENS_SIMATIC_IPC_BATT=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m +# CONFIG_SILICOM_PLATFORM is not set CONFIG_WINMATE_FM07_KEYS=m CONFIG_SEL3350_PLATFORM=m CONFIG_P2SB=y @@ -8847,6 +8979,7 @@ CONFIG_PCC=y # CONFIG_ALTERA_MBOX is not set CONFIG_IOMMU_IOVA=y CONFIG_IOMMU_API=y +CONFIG_IOMMUFD_DRIVER=y CONFIG_IOMMU_SUPPORT=y # @@ -8861,8 +8994,8 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_DMA=y CONFIG_IOMMU_SVA=y +CONFIG_IOMMU_IOPF=y CONFIG_AMD_IOMMU=y -CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y @@ -8943,6 +9076,7 @@ CONFIG_WPCM450_SOC=m # # Qualcomm SoC drivers # +# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set CONFIG_QCOM_QMI_HELPERS=m # end of Qualcomm SoC drivers @@ -8954,6 +9088,31 @@ CONFIG_QCOM_QMI_HELPERS=m # end of Xilinx SoC drivers # end of SOC (System On Chip) specific Drivers +# +# PM Domains +# + +# +# Amlogic PM Domains +# +# end of Amlogic PM Domains + +# +# Broadcom PM Domains +# +# end of Broadcom PM Domains + +# +# i.MX PM Domains +# +# end of i.MX PM Domains + +# +# Qualcomm PM Domains +# +# end of Qualcomm PM Domains +# end of PM Domains + CONFIG_PM_DEVFREQ=y # @@ -9002,6 +9161,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 CONFIG_IIO_SW_DEVICE=m CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_TRIGGERED_EVENT=m +CONFIG_IIO_BACKEND=m # # Accelerometers @@ -9066,7 +9226,9 @@ CONFIG_STK8BA50=m # Analog to digital converters # CONFIG_AD4130=m +CONFIG_AD7091R=m # CONFIG_AD7091R5 is not set +CONFIG_AD7091R8=m # CONFIG_AD7124 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set @@ -9087,6 +9249,8 @@ CONFIG_AD7606_IFACE_PARALLEL=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set CONFIG_AD799X=m +CONFIG_AD9467=m +# CONFIG_ADI_AXI_ADC is not set CONFIG_CC10001_ADC=m CONFIG_DLN2_ADC=m CONFIG_ENVELOPE_DETECTOR=m @@ -9094,6 +9258,7 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_HX711=m CONFIG_INA2XX_ADC=m CONFIG_INTEL_MRFLD_ADC=m +# CONFIG_LTC2309 is not set CONFIG_LTC2471=m CONFIG_LTC2485=m CONFIG_LTC2496=m @@ -9105,11 +9270,14 @@ CONFIG_LTC2497=m CONFIG_MAX11410=m CONFIG_MAX1241=m CONFIG_MAX1363=m +CONFIG_MAX34408=m CONFIG_MAX9611=m # CONFIG_MCP320X is not set CONFIG_MCP3422=m +# CONFIG_MCP3564 is not set # CONFIG_MCP3911 is not set CONFIG_NAU7802=m +CONFIG_PAC1934=m # CONFIG_RICHTEK_RTQ6056 is not set CONFIG_SD_ADC_MODULATOR=m CONFIG_TI_ADC081C=m @@ -9122,6 +9290,7 @@ CONFIG_TI_ADC081C=m CONFIG_TI_ADS1015=m CONFIG_TI_ADS7924=m CONFIG_TI_ADS1100=m +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set CONFIG_TI_ADS8344=m CONFIG_TI_ADS8688=m @@ -9166,6 +9335,7 @@ CONFIG_AD7746=m # # Chemical Sensors # +# CONFIG_AOSONG_AGS02MA is not set # CONFIG_ATLAS_PH_SENSOR is not set # CONFIG_ATLAS_EZO_SENSOR is not set # CONFIG_BME680 is not set @@ -9250,6 +9420,7 @@ CONFIG_MAX5522=m CONFIG_MAX5821=m CONFIG_MCP4725=m CONFIG_MCP4728=m +CONFIG_MCP4821=m # CONFIG_MCP4922 is not set # CONFIG_TI_DAC082S085 is not set CONFIG_TI_DAC5571=m @@ -9286,6 +9457,7 @@ CONFIG_TI_DAC5571=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set CONFIG_ADF4377=m +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV1014 is not set # CONFIG_ADMV4420 is not set @@ -9338,6 +9510,7 @@ CONFIG_ITG3200=m CONFIG_DHT11=m CONFIG_HDC100X=m CONFIG_HDC2010=m +# CONFIG_HDC3020 is not set CONFIG_HID_SENSOR_HUMIDITY=m CONFIG_HTS221=m CONFIG_HTS221_I2C=m @@ -9354,8 +9527,12 @@ CONFIG_SI7020=m # CONFIG_ADIS16460 is not set CONFIG_ADIS16475=m # CONFIG_ADIS16480 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_BMI323=m +CONFIG_BMI323_I2C=m +# CONFIG_BMI323_SPI is not set # CONFIG_BOSCH_BNO055_SERIAL is not set # CONFIG_BOSCH_BNO055_I2C is not set CONFIG_FXOS8700=m @@ -9397,6 +9574,7 @@ CONFIG_GP2AP020A00F=m CONFIG_SENSORS_ISL29018=m CONFIG_SENSORS_ISL29028=m CONFIG_ISL29125=m +# CONFIG_ISL76682 is not set CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m @@ -9404,6 +9582,7 @@ CONFIG_JSA1212=m CONFIG_ROHM_BU27034=m CONFIG_RPR0521=m CONFIG_SENSORS_LM3533=m +# CONFIG_LTR390 is not set CONFIG_LTR501=m # CONFIG_LTRF216A is not set CONFIG_LV0104CS=m @@ -9431,6 +9610,7 @@ CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set +# CONFIG_VEML6075 is not set CONFIG_VL6180=m CONFIG_ZOPT2201=m # end of Light sensors @@ -9514,6 +9694,7 @@ CONFIG_LMP91000=m # Pressure sensors # CONFIG_ABP060MG=m +# CONFIG_ROHM_BM1390 is not set CONFIG_BMP280=m CONFIG_BMP280_I2C=m CONFIG_BMP280_SPI=m @@ -9521,6 +9702,7 @@ CONFIG_BMP280_SPI=m # CONFIG_DPS310 is not set CONFIG_HID_SENSOR_PRESS=m # CONFIG_HP03 is not set +# CONFIG_HSC030PA is not set CONFIG_ICP10100=m # CONFIG_MPL115_I2C is not set # CONFIG_MPL115_SPI is not set @@ -9570,6 +9752,7 @@ CONFIG_VL53L0X_I2C=m # # CONFIG_AD2S90 is not set # CONFIG_AD2S1200 is not set +# CONFIG_AD2S1210 is not set # end of Resolver to digital converters # @@ -9580,6 +9763,7 @@ CONFIG_LTC2983=m CONFIG_HID_SENSOR_TEMP=m CONFIG_MLX90614=m CONFIG_MLX90632=m +# CONFIG_MLX90635 is not set CONFIG_TMP006=m CONFIG_TMP007=m CONFIG_TMP117=m @@ -9588,6 +9772,7 @@ CONFIG_TSYS02D=m CONFIG_MAX30208=m # CONFIG_MAX31856 is not set CONFIG_MAX31865=m +CONFIG_MCP9600=m # end of Temperature sensors CONFIG_NTB=m @@ -9606,6 +9791,7 @@ CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set CONFIG_PWM_CLK=m CONFIG_PWM_CROS_EC=m +CONFIG_PWM_DWC_CORE=m CONFIG_PWM_DWC=m # CONFIG_PWM_LP3943 is not set CONFIG_PWM_LPSS=m @@ -9620,6 +9806,7 @@ CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_GPIO=m # CONFIG_RESET_SIMPLE is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RESET_TI_TPS380X=m @@ -9657,11 +9844,15 @@ CONFIG_IDLE_INJECT=y # # Performance monitor support # +CONFIG_DWC_PCIE_PMU=m +CONFIG_CXL_PMU=m # end of Performance monitor support CONFIG_RAS=y CONFIG_RAS_CEC=y # CONFIG_RAS_CEC_DEBUG is not set +CONFIG_AMD_ATL=m +CONFIG_RAS_FMPM=m CONFIG_USB4=m # CONFIG_USB4_DEBUGFS_WRITE is not set # CONFIG_USB4_DMA_TEST is not set @@ -9691,14 +9882,7 @@ CONFIG_DEV_DAX_HMEM_DEVICES=y CONFIG_DEV_DAX_KMEM=m CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y - -# -# Layout Types -# -CONFIG_NVMEM_LAYOUT_SL28_VPD=m -CONFIG_NVMEM_LAYOUT_ONIE_TLV=m -# end of Layout Types - +# CONFIG_NVMEM_LAYOUTS is not set CONFIG_NVMEM_RMEM=m # @@ -9741,6 +9925,7 @@ CONFIG_PM_OPP=y # CONFIG_MOST is not set # CONFIG_PECI is not set # CONFIG_HTE is not set +CONFIG_DPLL=y # end of Device Drivers # @@ -9749,6 +9934,7 @@ CONFIG_PM_OPP=y CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_VALIDATE_FS_PARSER is not set CONFIG_FS_IOMAP=y +CONFIG_FS_STACK=y CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set @@ -9779,6 +9965,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y # CONFIG_XFS_ONLINE_SCRUB_STATS is not set # CONFIG_XFS_ONLINE_REPAIR is not set @@ -9794,7 +9982,6 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set @@ -9815,6 +10002,15 @@ CONFIG_F2FS_FS_LZ4HC=y CONFIG_F2FS_FS_ZSTD=y CONFIG_F2FS_IOSTAT=y # CONFIG_F2FS_UNFAIR_RWSEM is not set +CONFIG_BCACHEFS_FS=y +CONFIG_BCACHEFS_QUOTA=y +# CONFIG_BCACHEFS_ERASURE_CODING is not set +CONFIG_BCACHEFS_POSIX_ACL=y +# CONFIG_BCACHEFS_DEBUG is not set +# CONFIG_BCACHEFS_TESTS is not set +# CONFIG_BCACHEFS_LOCK_TIME_STATS is not set +# CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set +CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y CONFIG_ZONEFS_FS=m CONFIG_FS_DAX=y CONFIG_FS_DAX_PMD=y @@ -9843,6 +10039,7 @@ CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m CONFIG_FUSE_DAX=y +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -9885,13 +10082,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=y -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=y # CONFIG_NTFS3_64BIT_CLUSTER is not set CONFIG_NTFS3_LZX_XPRESS=y CONFIG_NTFS3_FS_POSIX_ACL=y +CONFIG_NTFS_FS=y # end of DOS/FAT/EXFAT/NT Filesystems # @@ -9914,9 +10109,9 @@ CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_QUOTA=y CONFIG_HUGETLBFS=y +# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_HUGETLB_PAGE=y CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y CONFIG_EFIVAR_FS=y @@ -10028,6 +10223,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_FLEXFILELAYOUT=y CONFIG_NFSD_V4_2_INTER_SSC=y # CONFIG_NFSD_V4_SECURITY_LABEL is not set +CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y CONFIG_GRACE_PERIOD=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y @@ -10213,6 +10409,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -10284,16 +10481,14 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y # CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HCTR2=m CONFIG_CRYPTO_KEYWRAP=m CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=y CONFIG_CRYPTO_XCTR=m CONFIG_CRYPTO_XTS=y @@ -10324,7 +10519,7 @@ CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_POLYVAL=m -CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_RMD160=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y @@ -10369,7 +10564,9 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y -# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=1 CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -10448,9 +10645,11 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C62X=m CONFIG_CRYPTO_DEV_QAT_4XXX=m +CONFIG_CRYPTO_DEV_QAT_420XX=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DEV_SAFEXCEL=m @@ -10471,6 +10670,7 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set CONFIG_SECONDARY_TRUSTED_KEYRING=y +# CONFIG_SECONDARY_TRUSTED_KEYRING_SIGNED_BY_BUILTIN is not set CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_REVOCATION_LIST is not set @@ -10493,7 +10693,6 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y @@ -10509,7 +10708,7 @@ CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y CONFIG_CRYPTO_LIB_CHACHA=m CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m @@ -10517,7 +10716,7 @@ CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_DES=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m -CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA1=y @@ -10557,7 +10756,6 @@ CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_SPARC=y @@ -10587,6 +10785,7 @@ CONFIG_INTERVAL_TREE=y CONFIG_INTERVAL_TREE_SPAN_ITER=y CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_CLOSURES=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y @@ -10656,14 +10855,17 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_COPY_MC=y CONFIG_ARCH_STACKWALK=y CONFIG_STACKDEPOT=y +CONFIG_STACKDEPOT_MAX_FRAMES=64 CONFIG_SBITMAP=y CONFIG_PARMAN=m CONFIG_OBJAGG=m +# CONFIG_LWQ_TEST is not set # end of Library routines CONFIG_PLDMFW=y CONFIG_ASN1_ENCODER=y CONFIG_POLYNOMIAL=m +CONFIG_FIRMWARE_TABLE=y # # Kernel hacking @@ -10691,7 +10893,7 @@ CONFIG_DEBUG_KERNEL=y # # Compile-time checks and compiler options # -CONFIG_AS_HAS_NON_CONST_LEB128=y +CONFIG_AS_HAS_NON_CONST_ULEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set @@ -10721,7 +10923,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KCSAN=y CONFIG_HAVE_KCSAN_COMPILER=y @@ -10771,6 +10973,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y @@ -10840,6 +11043,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CLOSURES is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures @@ -10852,6 +11056,7 @@ CONFIG_STACKTRACE=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_CPU_STALL_CPUTIME is not set +# CONFIG_RCU_CPU_STALL_NOTIFIER is not set # CONFIG_RCU_TRACE is not set # CONFIG_RCU_EQS_DEBUG is not set # end of RCU Debugging @@ -10996,8 +11201,6 @@ CONFIG_RUNTIME_TESTING_MENU=y CONFIG_ATOMIC64_SELFTEST=y CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m -# CONFIG_STRING_SELFTEST is not set -# CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_SCANF is not set @@ -11027,6 +11230,7 @@ CONFIG_TEST_UDELAY=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_FPU is not set # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set +# CONFIG_TEST_OBJPOOL is not set CONFIG_ARCH_USE_MEMTEST=y CONFIG_MEMTEST=y # CONFIG_HYPERV_TESTING is not set diff --git a/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.5.tar.zst b/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.5.tar.zst Binary files differdeleted file mode 100644 index 24264e24e..000000000 --- a/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.5.tar.zst +++ /dev/null diff --git a/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zst b/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zst Binary files differnew file mode 100644 index 000000000..779db3f86 --- /dev/null +++ b/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zst diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index e522732c7..425151f3a 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -38 +40 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index 7ed6ff82d..1e8b31496 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -5 +6 diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/digikam +++ b/source/kde/kde/build/digikam @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/build/kalgebra b/source/kde/kde/build/kalgebra index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kalgebra +++ b/source/kde/kde/build/kalgebra @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kapidox b/source/kde/kde/build/kapidox index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kapidox +++ b/source/kde/kde/build/kapidox @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kdnssd b/source/kde/kde/build/kdnssd index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kdnssd +++ b/source/kde/kde/build/kdnssd @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index 00750edc0..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -3 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index f5c89552b..bb95160cb 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -32 +33 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index 00750edc0..b8626c4cf 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -3 +4 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 45a4fb75d..f599e28b8 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -8 +10 diff --git a/source/kde/kde/build/kstars b/source/kde/kde/build/kstars index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kstars +++ b/source/kde/kde/build/kstars @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kwin +++ b/source/kde/kde/build/kwin @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index 00750edc0..b8626c4cf 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -3 +4 diff --git a/source/kde/kde/build/step b/source/kde/kde/build/step index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/step +++ b/source/kde/kde/build/step @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications index db2d4201f..714fa3f5e 100644 --- a/source/kde/kde/modules/all-packaged-applications +++ b/source/kde/kde/modules/all-packaged-applications @@ -222,5 +222,4 @@ ghostwriter kde-inotify-survey keysmith kio-admin -# Sorry, the mpv/libass deps are getting this one yeeted -#tokodon +tokodon diff --git a/source/kde/kde/modules/applications b/source/kde/kde/modules/applications index 99e1900e1..1a8687c1c 100644 --- a/source/kde/kde/modules/applications +++ b/source/kde/kde/modules/applications @@ -226,5 +226,4 @@ ghostwriter kde-inotify-survey keysmith kio-admin -# Sorry, the mpv/libass deps are getting this one yeeted -#tokodon +tokodon diff --git a/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch index 7074bfcd1..6c8138c85 100644 --- a/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch +++ b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Fix compile with newer versions of poppler set(REQUIRED_KF5_VERSION "5.7.0") set(REQUIRED_QT_VERSION "5.3.0") -+set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + diff --git a/source/kde/kde/patch/kitinerary.patch b/source/kde/kde/patch/kitinerary.patch new file mode 100644 index 000000000..7183cf932 --- /dev/null +++ b/source/kde/kde/patch/kitinerary.patch @@ -0,0 +1 @@ +cat $CWD/patch/kitinerary/poppler.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kitinerary/poppler.diff b/source/kde/kde/patch/kitinerary/poppler.diff new file mode 100644 index 000000000..b52a24553 --- /dev/null +++ b/source/kde/kde/patch/kitinerary/poppler.diff @@ -0,0 +1,16 @@ +--- ./src/lib/pdf/pdfdocument.cpp.orig 2024-02-10 05:38:52.000000000 -0600 ++++ ./src/lib/pdf/pdfdocument.cpp 2024-05-21 17:08:28.607184297 -0500 +@@ -329,13 +329,9 @@ + return {}; + } + +- if (s->hasUnicodeMarker() || s->hasUnicodeMarkerLE()) { +- return QString::fromUtf16(reinterpret_cast<const char16_t*>(s->toStr().c_str()), s->toStr().size() / 2); +- } else { + int len = 0; + std::unique_ptr<const char[]> utf16Data(pdfDocEncodingToUTF16(s->toStr(), &len)); + return QString::fromUtf16(reinterpret_cast<const char16_t*>(utf16Data.get()), len / 2); +- } + + return QString::fromUtf8(s->c_str()); + } diff --git a/source/kde/stellarsolver/stellarsolver.SlackBuild b/source/kde/stellarsolver/stellarsolver.SlackBuild index de4dbc90d..f1477c3ed 100755 --- a/source/kde/stellarsolver/stellarsolver.SlackBuild +++ b/source/kde/stellarsolver/stellarsolver.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=stellarsolver VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/GConf/GConf.SlackBuild b/source/l/GConf/GConf.SlackBuild index a8f8962a0..399a92ce9 100755 --- a/source/l/GConf/GConf.SlackBuild +++ b/source/l/GConf/GConf.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/PyQt5_sip/PyQt5_sip.SlackBuild b/source/l/PyQt5_sip/PyQt5_sip.SlackBuild index f10ff7f7e..ad4327b8e 100755 --- a/source/l/PyQt5_sip/PyQt5_sip.SlackBuild +++ b/source/l/PyQt5_sip/PyQt5_sip.SlackBuild @@ -64,6 +64,10 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" +export CFLAGS="$SLKCFLAGS" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/SDL2/SDL2.url b/source/l/SDL2/SDL2.url index 1cfab442e..7b211cb48 100644 --- a/source/l/SDL2/SDL2.url +++ b/source/l/SDL2/SDL2.url @@ -1,2 +1,2 @@ https://github.com/libsdl-org/SDL -https://github.com/libsdl-org/SDL/releases/download/release-2.30.2/SDL2-2.30.2.tar.gz +https://github.com/libsdl-org/SDL/releases/download/release-2.30.3/SDL2-2.30.3.tar.gz diff --git a/source/l/aalib/aalib.SlackBuild b/source/l/aalib/aalib.SlackBuild index 4e1ff6e3b..6fde3f4f4 100755 --- a/source/l/aalib/aalib.SlackBuild +++ b/source/l/aalib/aalib.SlackBuild @@ -84,6 +84,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.SlackBuild b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.SlackBuild new file mode 100755 index 000000000..6ecf9d94a --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.SlackBuild @@ -0,0 +1,149 @@ +#!/bin/bash + +# Copyright 2024 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) + +PKGNAM=adwaita-icon-theme-legacy +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-noarch-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Add some extra icons that are missing for Xfce. +# Copy from the main tree and back to make sure that we +# don't overwrite these if they eventally appear. +( cd $PKG + mkdir tmpicons + cd tmpicons + tar xf $CWD/adwaita-xfce-icons-0.6.tar.xz + rm -f README + mv usr/share/icons/Adwaita usr/share/icons/AdwaitaLegacy + rsync -lprvt --progress ../usr/ usr/ + # Then sync back: + rsync -lprvt --progress usr/ ../usr/ + # And remove the leftovers: + cd .. + rm -r tmpicons +) + +# It's a bad idea to ship these in the packages. If they aren't kept +# updated, there will be missing icons. Let the user create them if +# they care to. +find $PKG -name icon-theme.cache -exec rm "{}" \+ +find $PKG -name .icon-theme.cache -exec rm "{}" \; +find $PKG -name .placeholder -exec rm "{}" \; +find $PKG -name .empty -exec rm "{}" \; + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + COPYING* NEWS* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mv $PKG/usr/share/licenses/*/* $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/share/licenses + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz diff --git a/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.url b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.url new file mode 100644 index 000000000..a18ce55fc --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.url @@ -0,0 +1 @@ +https://gitlab.gnome.org/jimmac/adwaita-icon-theme-legacy diff --git a/source/l/adwaita-icon-theme-legacy/doinst.sh b/source/l/adwaita-icon-theme-legacy/doinst.sh new file mode 100644 index 000000000..be9e95b4f --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/doinst.sh @@ -0,0 +1,6 @@ +if [ -e /usr/share/icons/AdwaitaLegacy/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache /usr/share/icons/AdwaitaLegacy 1> /dev/null 2> /dev/null + fi +fi + diff --git a/source/l/adwaita-icon-theme-legacy/fetch-adwaita-icon-theme-legacy.sh b/source/l/adwaita-icon-theme-legacy/fetch-adwaita-icon-theme-legacy.sh new file mode 100755 index 000000000..9c6307ea4 --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/fetch-adwaita-icon-theme-legacy.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# Copyright 2024 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. + + +PKGNAM=adwaita-icon-theme-legacy + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf ${PKGNAM} + +# Clone repository: +git clone https://gitlab.gnome.org/jimmac/adwaita-icon-theme-legacy + +# checkout $BRANCH: +( cd ${PKGNAM} + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )" +DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv ${PKGNAM} ${PKGNAM}-${DATE}_${HEADISAT} +tar cf ${PKGNAM}-${DATE}_${HEADISAT}.tar ${PKGNAM}-${DATE}_${HEADISAT} +plzip -9 -f ${PKGNAM}-${DATE}_${HEADISAT}.tar +rm -rf ${PKGNAM}-${DATE}_${HEADISAT} +touch -d "$LONGDATE" ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz +echo +echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz" +echo diff --git a/source/l/adwaita-icon-theme-legacy/slack-desc b/source/l/adwaita-icon-theme-legacy/slack-desc new file mode 100644 index 000000000..4912be9ed --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +adwaita-icon-theme-legacy: adwaita-icon-theme-legacy (fallback icons from old Adwaita theme) +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: AdwaitaLegacy theme that provides fallback icons that have been +adwaita-icon-theme-legacy: removed from the main Adwaita theme. +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: Homepage: https://gitlab.gnome.org/jimmac/adwaita-icon-theme-legacy +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: diff --git a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild index 27350f954..4a5b44147 100755 --- a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild +++ b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2018, 2023 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2018, 2023, 2024 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -92,23 +92,13 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. -# Add some extra icons that are missing for Xfce. -# Copy from the main tree and back to make sure that we -# don't overwrite these if they eventally appear. -( cd $PKG - mkdir tmpicons - cd tmpicons - tar xf $CWD/adwaita-xfce-icons-0.6.tar.xz - rm -f README - rsync -lprvt --progress ../usr/ usr/ - # Then sync back: - rsync -lprvt --progress usr/ ../usr/ - # And remove the leftovers: - cd .. - rm -r tmpicons -) - +# It's a bad idea to ship these in the packages. If they aren't kept +# updated, there will be missing icons. Let the user create them if +# they care to. +find $PKG -name icon-theme.cache -exec rm "{}" \+ find $PKG -name .icon-theme.cache -exec rm "{}" \; +find $PKG -name .placeholder -exec rm "{}" \; +find $PKG -name .empty -exec rm "{}" \; mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ @@ -119,10 +109,8 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $PKG/usr/doc/$PKGNAM/ChangeLog fi -# It's a bad idea to ship these in the packages. If they aren't kept -# updated, there will be missing icons. Let the user create them if -# they care to. -find $PKG -name icon-theme.cache -exec rm "{}" \+ +mv $PKG/usr/share/licenses/*/* $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/share/licenses mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -130,4 +118,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz - diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild index f41d51986..87e0660b8 100755 --- a/source/l/apr-util/apr-util.SlackBuild +++ b/source/l/apr-util/apr-util.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + TMP=${TMP:-/tmp} PKG=$TMP/package-apr-util @@ -84,7 +87,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-apr=/usr \ --with-dbm=db44 \ - --with-berkeley-db \ + --with-berkeley-db=/usr \ --with-mysql=/usr \ --disable-util-dso \ --without-gdbm \ diff --git a/source/l/chmlib/chmlib.SlackBuild b/source/l/chmlib/chmlib.SlackBuild index 720e6ccad..0c60b57c3 100755 --- a/source/l/chmlib/chmlib.SlackBuild +++ b/source/l/chmlib/chmlib.SlackBuild @@ -64,6 +64,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/db48/db48.SlackBuild b/source/l/db48/db48.SlackBuild index 9bf8933f9..6390f7d25 100755 --- a/source/l/db48/db48.SlackBuild +++ b/source/l/db48/db48.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/enchant/enchant.url b/source/l/enchant/enchant.url index 97b25b4ba..2d56e310c 100644 --- a/source/l/enchant/enchant.url +++ b/source/l/enchant/enchant.url @@ -1,2 +1,2 @@ https://github.com/AbiWord/enchant -https://github.com/AbiWord/enchant/releases/download/v2.7.2/enchant-2.7.2.tar.gz +https://github.com/AbiWord/enchant/releases/download/v2.8.0/enchant-2.8.0.tar.gz diff --git a/source/l/esound/esound.SlackBuild b/source/l/esound/esound.SlackBuild index ba7b41510..52a52ab4f 100755 --- a/source/l/esound/esound.SlackBuild +++ b/source/l/esound/esound.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 diff --git a/source/l/ffmpeg/FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch b/source/l/ffmpeg/FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch new file mode 100644 index 000000000..f801f2dd6 --- /dev/null +++ b/source/l/ffmpeg/FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch @@ -0,0 +1,305 @@ +From patchwork Wed May 8 07:11:11 2024 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: David Rosca <nowrep@gmail.com> +X-Patchwork-Id: 48663 +Delivered-To: ffmpegpatchwork2@gmail.com +Received: by 2002:a05:6a20:9c8f:b0:1af:cdee:28c5 with SMTP id mj15csp25621pzb; + Wed, 8 May 2024 00:13:15 -0700 (PDT) +X-Forwarded-Encrypted: i=2; + AJvYcCWCijb8ZSk/y8BcczxdaxTNBz7xLlmGjenN9PJh0RzaUJGrdvM2Z+GAPh5e5kTeJCYeN8HiQuAyRm6Zzig7PSUIzb8PhAA2sq2Yzw== +X-Google-Smtp-Source: + AGHT+IHdqdMZBAjvbqLRYHa7Md6t9fwRSoJZl7CE/0w7QXsoqw/TDzXZ6Mpbl7AURm+q/U0l6qor +X-Received: by 2002:a50:8713:0:b0:572:689f:6380 with SMTP id + 4fb4d7f45d1cf-5731d9a29d8mr1644806a12.3.1715152394950; + Wed, 08 May 2024 00:13:14 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1715152394; cv=none; + d=google.com; s=arc-20160816; + b=B6jZA/nq8Ym26kz7+ZsenrfiE6wW++e7SnAGUHwNm/gWod3Yl4PNnHvyeR8S5Zmw9O + 3V09Yv3C5LTean+x2RVayPx0AGzKudIRJyy5IM8OhUNm2W7gc1dSif9DZDSaAXZB+TU/ + ZDXUltX0Mb5q2WOCZvHtP97HInDnGH2/v+H17UVTJrGq3BCsV6G2RfHLMkyA1Bw2Kbvb + JDY0R7esCGVoOeTw60KvlRCJZ4nl8rusR1F0ejIiy2T1+peYjxyBVTlcJSRp9qUKq2vx + qi3YZo7KEJ4GvpWU6gaW+OR2j5IYi9hmTa6I2MBAC9MSaoPTY02I/45L5g8oHpwZSYhs + voxw== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; + s=arc-20160816; + h=sender:errors-to:content-transfer-encoding:cc:reply-to + :list-subscribe:list-help:list-post:list-archive:list-unsubscribe + :list-id:precedence:subject:mime-version:message-id:date:to:from + :dkim-signature:delivered-to; + bh=QyukGgEk1XAr25k9qbILTx4kdg6yKzLRJ3F+p3y8b8E=; + fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; + b=0c8ndpLDPBOwZFnv/cS4Jq7WKrDe+E5pfeQvSMzpmBQnyQCuM4A1kVjtLtnmezYmBb + FwKv+qTrH+qYcoDuDOhMc9q3xAU2PES61rIZZ6wCOxObyaI3I08j4Y717BOHqa6horAH + yWxZwZ/AZVa3WjmYDVCGnYi1BVn2y7fDmeAP9Cm2eGBI96bqRZDFgI+ADa7grssNAyUP + jY8IDHQXDbtIPR7YtOhvJQt9dkZrTuyGyz5hpeUbvxNvFj8uYJo2KOLsvbCBF7IVxj5+ + UxfiIJCu4qGBbz9nYGID0GXtK1+fJfRIk15S62z0pDULbeUHylcXJcXb3eMgWp9KtdnG + 8+ug==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=O+XtIIZD; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> +Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) + by mx.google.com with ESMTP id + w18-20020a056402269200b00571b9f2bd09si7128266edd.34.2024.05.08.00.13.14; + Wed, 08 May 2024 00:13:14 -0700 (PDT) +Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; +Authentication-Results: mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=O+XtIIZD; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Received: from [127.0.1.1] (localhost [127.0.0.1]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED92D68D4CA; + Wed, 8 May 2024 10:13:10 +0300 (EEST) +X-Original-To: ffmpeg-devel@ffmpeg.org +Delivered-To: ffmpeg-devel@ffmpeg.org +Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com + [209.85.167.44]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F82168D48B + for <ffmpeg-devel@ffmpeg.org>; Wed, 8 May 2024 10:13:04 +0300 (EEST) +Received: by mail-lf1-f44.google.com with SMTP id + 2adb3069b0e04-51fea3031c3so5148511e87.0 + for <ffmpeg-devel@ffmpeg.org>; Wed, 08 May 2024 00:13:04 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20230601; t=1715152383; x=1715757183; darn=ffmpeg.org; + h=content-transfer-encoding:mime-version:message-id:date:subject:cc + :to:from:from:to:cc:subject:date:message-id:reply-to; + bh=ffXg2XQu2Z246T8u+pR5mw8scM+kCnRnc2DEIwGVp5Y=; + b=O+XtIIZD3mEw83APJDrBeFsRuzwVt3Kyyg3FuAhCXFxtdsjvkBCUAr7QxcnMv6WelI + 9waHWdeZ3Gr3gKWpesLlrvATXFJ0NXsZu78H9ddX0YWj/zrCU3bafwiQw8YqmuSxvQku + tt2FxjepsnsddQ4Rd9xQQbixME7L88FlPIc5cUbSLO6kWAHWg4yrZ83OgHyoX3y+9tRE + cAZq2q+ieBkSd58/Fi/bIad1FrvE2rHNjD2eC0z84uNjH46OiynFFdJZMBvwEoydjAYs + FPch8HkUBtEcMFbY772efPUD1fUua4ZoJYkMJsU9wweRXf6fzWVs144L8UzMXffVJF7V + /CuA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20230601; t=1715152383; x=1715757183; + h=content-transfer-encoding:mime-version:message-id:date:subject:cc + :to:from:x-gm-message-state:from:to:cc:subject:date:message-id + :reply-to; + bh=ffXg2XQu2Z246T8u+pR5mw8scM+kCnRnc2DEIwGVp5Y=; + b=WORFsv2dMz6yM+ahOJTkfqEjGb37TOSJqIw2Nl55aCSFQOKvma/C8aKz4A1UlIeD6Y + 2QYcGwrGFxynBdkMT9+Sl1fZyhOdcYpYQwFMFtCvLJxUFlDWujzhk4lVjO/XSqJJMV1E + rnMWVOlrkIuwmPnpa6yK8c+10Sq3stzeeOL2+oFcYVWZE6kQhEdEvFyCGAsdhNH0gDlm + LwdTocOaNoI42/FrGVexOMgdRBEpfkrvPJILJR3AFDCwCJD0nFFx5lOh+soX09XC8l7Q + RzaoeGq8qE2OR7TZKOBJiAXKPLFdAUm9Y1DNmS2jW5U3ndmVH/K7C3GbPfOGbICYcle6 + bpHg== +X-Gm-Message-State: AOJu0YxS6mZKvl8CFJt92+Sq4Bu0Q1qCEj4mRz+D6PCG+tLwamYoFb78 + 7SVtiAxsN4Dvyx9PVifcgIXTj1m0AYmwl2tkchF4F+m3SH+lQHxh6Q6bpA== +X-Received: by 2002:ac2:4a71:0:b0:519:e878:9385 with SMTP id + 2adb3069b0e04-5217c5671a9mr1284790e87.18.1715152382619; + Wed, 08 May 2024 00:13:02 -0700 (PDT) +Received: from mitsuki.. (ip-78-45-35-87.bb.vodafone.cz. [78.45.35.87]) + by smtp.gmail.com with ESMTPSA id + t16-20020a170906609000b00a59d7505366sm2872828ejj.62.2024.05.08.00.13.02 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 08 May 2024 00:13:02 -0700 (PDT) +From: David Rosca <nowrep@gmail.com> +To: ffmpeg-devel@ffmpeg.org +Date: Wed, 8 May 2024 09:11:11 +0200 +Message-ID: <20240508071247.133615-2-nowrep@gmail.com> +X-Mailer: git-send-email 2.45.0 +MIME-Version: 1.0 +Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/vaapi_decode: Make it possible + to send multiple slice params buffers +X-BeenThere: ffmpeg-devel@ffmpeg.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> +List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> +List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> +List-Post: <mailto:ffmpeg-devel@ffmpeg.org> +List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> +List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> +Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> +Cc: David Rosca <nowrep@gmail.com> +Errors-To: ffmpeg-devel-bounces@ffmpeg.org +Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> +X-TUID: CXdjf/rnNjyo + +--- +v2: No changes + + libavcodec/vaapi_av1.c | 2 +- + libavcodec/vaapi_decode.c | 3 ++- + libavcodec/vaapi_decode.h | 1 + + libavcodec/vaapi_h264.c | 2 +- + libavcodec/vaapi_hevc.c | 4 ++-- + libavcodec/vaapi_mjpeg.c | 2 +- + libavcodec/vaapi_mpeg2.c | 2 +- + libavcodec/vaapi_mpeg4.c | 2 +- + libavcodec/vaapi_vc1.c | 2 +- + libavcodec/vaapi_vp8.c | 2 +- + libavcodec/vaapi_vp9.c | 2 +- + 11 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c +index 1f563483b9..4a90db1e09 100644 +--- a/libavcodec/vaapi_av1.c ++++ b/libavcodec/vaapi_av1.c +@@ -409,7 +409,7 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx, + .tg_end = s->tg_end, + }; + +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1, + sizeof(VASliceParameterBufferAV1), + buffer, + size); +diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c +index 21b273cd0f..8e9f647c20 100644 +--- a/libavcodec/vaapi_decode.c ++++ b/libavcodec/vaapi_decode.c +@@ -63,6 +63,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, + int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, + VAAPIDecodePicture *pic, + const void *params_data, ++ int nb_params, + size_t params_size, + const void *slice_data, + size_t slice_size) +@@ -88,7 +89,7 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, + + vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, + VASliceParameterBufferType, +- params_size, 1, (void*)params_data, ++ params_size, nb_params, (void*)params_data, + &pic->slice_buffers[index]); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to create slice " +diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h +index 6beda14e52..702171e108 100644 +--- a/libavcodec/vaapi_decode.h ++++ b/libavcodec/vaapi_decode.h +@@ -73,6 +73,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, + int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, + VAAPIDecodePicture *pic, + const void *params_data, ++ int nb_params, + size_t params_size, + const void *slice_data, + size_t slice_size); +diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c +index 55cf5a05ee..b47531ce1c 100644 +--- a/libavcodec/vaapi_h264.c ++++ b/libavcodec/vaapi_h264.c +@@ -375,7 +375,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, + slice_param.chroma_offset_l1); + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c +index 3bdd2dd1b8..3937b7574a 100644 +--- a/libavcodec/vaapi_hevc.c ++++ b/libavcodec/vaapi_hevc.c +@@ -353,7 +353,7 @@ static int vaapi_hevc_end_frame(AVCodecContext *avctx) + if (pic->last_size) { + last_slice_param->LongSliceFlags.fields.LastSliceOfPic = 1; + ret = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic, +- &pic->last_slice_param, slice_param_size, ++ &pic->last_slice_param, 1, slice_param_size, + pic->last_buffer, pic->last_size); + if (ret < 0) + goto fail; +@@ -471,7 +471,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx, + + if (!sh->first_slice_in_pic_flag) { + err = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic, +- &pic->last_slice_param, slice_param_size, ++ &pic->last_slice_param, 1, slice_param_size, + pic->last_buffer, pic->last_size); + pic->last_buffer = NULL; + pic->last_size = 0; +diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c +index 5b8d47bb2a..9557cf5f9b 100644 +--- a/libavcodec/vaapi_mjpeg.c ++++ b/libavcodec/vaapi_mjpeg.c +@@ -131,7 +131,7 @@ static int vaapi_mjpeg_decode_slice(AVCodecContext *avctx, + sp.components[i].ac_table_selector = s->ac_index[i]; + } + +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), buffer, size); ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), buffer, size); + if (err) + goto fail; + +diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c +index eeb4e87321..171a742c7f 100644 +--- a/libavcodec/vaapi_mpeg2.c ++++ b/libavcodec/vaapi_mpeg2.c +@@ -162,7 +162,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer + }; + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err < 0) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c +index 363b686e42..612de10cd7 100644 +--- a/libavcodec/vaapi_mpeg4.c ++++ b/libavcodec/vaapi_mpeg4.c +@@ -169,7 +169,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer + }; + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err < 0) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c +index 5594118a69..abbe877dd8 100644 +--- a/libavcodec/vaapi_vc1.c ++++ b/libavcodec/vaapi_vc1.c +@@ -490,7 +490,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, + }; + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err < 0) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c +index 31137a45bd..66fdde1f39 100644 +--- a/libavcodec/vaapi_vp8.c ++++ b/libavcodec/vaapi_vp8.c +@@ -209,7 +209,7 @@ static int vaapi_vp8_decode_slice(AVCodecContext *avctx, + for (i = 0; i < 8; i++) + sp.partition_size[i+1] = s->coeff_partition_size[i]; + +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), data, data_size); ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), data, data_size); + if (err) + goto fail; + +diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c +index b8e760c807..a28fc75a59 100644 +--- a/libavcodec/vaapi_vp9.c ++++ b/libavcodec/vaapi_vp9.c +@@ -158,7 +158,7 @@ static int vaapi_vp9_decode_slice(AVCodecContext *avctx, + } + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err) { + ff_vaapi_decode_cancel(avctx, pic); diff --git a/source/l/ffmpeg/FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch b/source/l/ffmpeg/FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch new file mode 100644 index 000000000..11beb8791 --- /dev/null +++ b/source/l/ffmpeg/FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch @@ -0,0 +1,233 @@ +From patchwork Wed May 8 07:11:13 2024 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: David Rosca <nowrep@gmail.com> +X-Patchwork-Id: 48664 +Delivered-To: ffmpegpatchwork2@gmail.com +Received: by 2002:a05:6a20:9c8f:b0:1af:cdee:28c5 with SMTP id mj15csp25694pzb; + Wed, 8 May 2024 00:13:24 -0700 (PDT) +X-Forwarded-Encrypted: i=2; + AJvYcCUU0WAejd+vI8Md/fk24xz5o+Vf/o8BRW6HaRPRrGxjq6S//PLkmyUZRPzd+gHeFBzdlMsfYeq9DopcaKEGU11Y8gnU172C7IbtRw== +X-Google-Smtp-Source: + AGHT+IG3oXW6Btb0nOsLsgP/8AeKUJDwzM/PSxrC5jUdm6vhgOZQDuI+wXt7iXGX4rN6ViSYQ3D/ +X-Received: by 2002:a17:906:6b9a:b0:a59:bae0:b12f with SMTP id + a640c23a62f3a-a59fb9ce9d9mr94975366b.57.1715152404530; + Wed, 08 May 2024 00:13:24 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1715152404; cv=none; + d=google.com; s=arc-20160816; + b=TyPiCxBIX4CkQJzb/tN61GGUtaed+8YXJp0fMtMCWRLhJtQcyPEGQfgMMxf8ud7SjV + XasOofP00bXz6aA/3IDgRNOOR8W9kwSTI6uLYm67idB/vFjKHziHELvkE8reWyYGGUnm + 3Wac/MdE30bLkfj5e5xLKTuAjS+tfDiqPQoY+x0bVErkuGZ5kvsVFBY36zForQQI6gI6 + 7KRKgu69eooP/7GjdfgBJDpRoV5cOimWHTnOrFicoplIhvkiGya3wLg8ewhvYd0FvEPl + mV9jr2J4EkZvwXU6mU0H4kfz3XnZ5lm3VcvN1/7IyVvb2vbUar5H/YpFy/Egakk6kZDq + E2WA== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; + s=arc-20160816; + h=sender:errors-to:content-transfer-encoding:cc:reply-to + :list-subscribe:list-help:list-post:list-archive:list-unsubscribe + :list-id:precedence:subject:mime-version:references:in-reply-to + :message-id:date:to:from:dkim-signature:delivered-to; + bh=lG1MGLor19Gww/xCmlAJWXZbhpue6ooFmY8SVpcxzoo=; + fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; + b=Gf3+xGKpwkxLAdDWLnNlyqQItLga7dBAeke4JLFO0nfgfO9y88/lSZaHMQrNLrFA22 + vJ95hHGS2oaiaJcDbE1P6tmZrp0qjDqKSW02GplFORvI92l80hmqZfUjnZ7Ck72ZMj8e + 3xPxoevI40uz1A0v7kgYvTpMvHezDaOOn3/p6/lEDhWNieas1xoZv8/EUvXGVMyyslOJ + BjLbxoV90InDYTDuDSJyFBl91A/gqOWEATTQJk/mABJhXpbljeejfWyg7jaWnbViIoUD + eIDt7wsyJYmNQkCISpWuISkqBrWXlKxkQvB6MihxwIdtPcYmQ6ra6rKNRI924EX2VAEK + yXVA==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=OypvhYGi; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> +Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) + by mx.google.com with ESMTP id + b27-20020a170906151b00b00a59befed255si3984295ejd.576.2024.05.08.00.13.24; + Wed, 08 May 2024 00:13:24 -0700 (PDT) +Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; +Authentication-Results: mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=OypvhYGi; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Received: from [127.0.1.1] (localhost [127.0.0.1]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6258868D5D8; + Wed, 8 May 2024 10:13:16 +0300 (EEST) +X-Original-To: ffmpeg-devel@ffmpeg.org +Delivered-To: ffmpeg-devel@ffmpeg.org +Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com + [209.85.218.42]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8ED3B68D5C6 + for <ffmpeg-devel@ffmpeg.org>; Wed, 8 May 2024 10:13:09 +0300 (EEST) +Received: by mail-ej1-f42.google.com with SMTP id + a640c23a62f3a-a59a934ad50so920836666b.1 + for <ffmpeg-devel@ffmpeg.org>; Wed, 08 May 2024 00:13:09 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20230601; t=1715152388; x=1715757188; darn=ffmpeg.org; + h=content-transfer-encoding:mime-version:references:in-reply-to + :message-id:date:subject:cc:to:from:from:to:cc:subject:date + :message-id:reply-to; + bh=2gr9y0ycJUz7g/8locnNp/xbvm4Xt9bm5oGOJk63n1Q=; + b=OypvhYGiEgVBtlATeDRoSQ8uoRlMpZj4OZFdaLx8eHWuZ+dnUTUL04V8v+psg5iqL9 + A53WZ9lLffgZpj3KrBtoMKXb4wdW7gf4xM5/PKTx5VPQdK6BRLXEKVLSaRzFBWHFu/9b + bkQfxnsTF+tKwKnuxomZEnZKdtxK9GzoMx5uPJnT27LqxU6DGSWe4OY9or5BO4iRGThe + suvUHkZ7K3MRjncUVtPcm2CF8wIXlbDsD2MROp/GnG7UWUwCZlVIwNiyDlfrygvGSqrb + 5hToNlkEs+yKgcH3mQsYQQOOS7zPWj3OZ+3xHufHNmYxXvwlf/l2NVxED2RpgPFHLTIe + mYEQ== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20230601; t=1715152388; x=1715757188; + h=content-transfer-encoding:mime-version:references:in-reply-to + :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc + :subject:date:message-id:reply-to; + bh=2gr9y0ycJUz7g/8locnNp/xbvm4Xt9bm5oGOJk63n1Q=; + b=Bd1s9ViPxXl4TdTBYOfQAT9wrkmI1uBRar/MUyJEIHHv1GVO6yy0mGvKXzK9dA7JRf + ADq8nqUSLuJm7HVqX03X8vNl8lhQzOHeq0lnTNP8OWU3WLn+8vgINDqrg7u2TBhVJChu + fk0aAuG361EckiGCujtlnjWPmUmjaCyWwVqDoPGJQW31L8jqPklOKIEr2Le6Zc7+eX67 + 1tU4u4MMWZqo4UPVdhYopV1em2EVLvq9eu3PdqK9Bx4Q+DwCYyC3KPxZEJm5xt9EAir0 + b4k642TSP4uTtbQCPt/qDI32CsnA+nvz1p5iCJIS3n6WWrKBha+I+Bl1nvtLwQCRCRSP + Ap5A== +X-Gm-Message-State: AOJu0YyCCVm0AjHkgA3h1/7JMutpn1Aexcggxj5vAwjMMJVANDxR5Prh + oeODe3Hr6qmpyzUfxgYYzOINyE0APs4dadLz45mg5zgYptS+BHmNCBegTQ== +X-Received: by 2002:a17:906:80c2:b0:a55:5e89:a158 with SMTP id + a640c23a62f3a-a59fb9e7628mr98238166b.68.1715152388430; + Wed, 08 May 2024 00:13:08 -0700 (PDT) +Received: from mitsuki.. (ip-78-45-35-87.bb.vodafone.cz. [78.45.35.87]) + by smtp.gmail.com with ESMTPSA id + t16-20020a170906609000b00a59d7505366sm2872828ejj.62.2024.05.08.00.13.07 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 08 May 2024 00:13:08 -0700 (PDT) +From: David Rosca <nowrep@gmail.com> +To: ffmpeg-devel@ffmpeg.org +Date: Wed, 8 May 2024 09:11:13 +0200 +Message-ID: <20240508071247.133615-4-nowrep@gmail.com> +X-Mailer: git-send-email 2.45.0 +In-Reply-To: <20240508071247.133615-2-nowrep@gmail.com> +References: <20240508071247.133615-2-nowrep@gmail.com> +MIME-Version: 1.0 +Subject: [FFmpeg-devel] [PATCH v2 2/2] lavc/vaapi_av1: Avoid sending the + same slice buffer multiple times +X-BeenThere: ffmpeg-devel@ffmpeg.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> +List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> +List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> +List-Post: <mailto:ffmpeg-devel@ffmpeg.org> +List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> +List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> +Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> +Cc: David Rosca <nowrep@gmail.com> +Errors-To: ffmpeg-devel-bounces@ffmpeg.org +Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> +X-TUID: q0qvq9b+ZBYX + +When there are multiple tiles in one slice buffer, use multiple slice +params to avoid sending the same slice buffer multiple times and thus +increasing the bitstream size the driver will need to upload to hw. +--- +v2: Avoid allocations every slice. + + libavcodec/vaapi_av1.c | 47 +++++++++++++++++++++++++++++------------- + 1 file changed, 33 insertions(+), 14 deletions(-) + +diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c +index 4a90db1e09..4ee33a3ae3 100644 +--- a/libavcodec/vaapi_av1.c ++++ b/libavcodec/vaapi_av1.c +@@ -19,6 +19,7 @@ + */ + + #include "libavutil/frame.h" ++#include "libavutil/mem.h" + #include "hwaccel_internal.h" + #include "vaapi_decode.h" + #include "internal.h" +@@ -42,6 +43,9 @@ typedef struct VAAPIAV1DecContext { + */ + VAAPIAV1FrameRef ref_tab[AV1_NUM_REF_FRAMES]; + AVFrame *tmp_frame; ++ ++ int nb_slice_params; ++ VASliceParameterBufferAV1 *slice_params; + } VAAPIAV1DecContext; + + static VASurfaceID vaapi_av1_surface_id(AV1Frame *vf) +@@ -97,6 +101,8 @@ static int vaapi_av1_decode_uninit(AVCodecContext *avctx) + for (int i = 0; i < FF_ARRAY_ELEMS(ctx->ref_tab); i++) + av_frame_free(&ctx->ref_tab[i].frame); + ++ av_freep(&ctx->slice_params); ++ + return ff_vaapi_decode_uninit(avctx); + } + +@@ -393,13 +399,24 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx, + { + const AV1DecContext *s = avctx->priv_data; + VAAPIDecodePicture *pic = s->cur_frame.hwaccel_picture_private; +- VASliceParameterBufferAV1 slice_param; +- int err = 0; ++ VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data; ++ int err, nb_params; ++ ++ nb_params = s->tg_end - s->tg_start + 1; ++ if (ctx->nb_slice_params < nb_params) { ++ ctx->slice_params = av_realloc_array(ctx->slice_params, ++ nb_params, ++ sizeof(*ctx->slice_params)); ++ if (!ctx->slice_params) { ++ ctx->nb_slice_params = 0; ++ err = AVERROR(ENOMEM); ++ goto fail; ++ } ++ ctx->nb_slice_params = nb_params; ++ } + + for (int i = s->tg_start; i <= s->tg_end; i++) { +- memset(&slice_param, 0, sizeof(VASliceParameterBufferAV1)); +- +- slice_param = (VASliceParameterBufferAV1) { ++ ctx->slice_params[i - s->tg_start] = (VASliceParameterBufferAV1) { + .slice_data_size = s->tile_group_info[i].tile_size, + .slice_data_offset = s->tile_group_info[i].tile_offset, + .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, +@@ -408,18 +425,20 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx, + .tg_start = s->tg_start, + .tg_end = s->tg_end, + }; +- +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1, +- sizeof(VASliceParameterBufferAV1), +- buffer, +- size); +- if (err) { +- ff_vaapi_decode_cancel(avctx, pic); +- return err; +- } + } + ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, ctx->slice_params, nb_params, ++ sizeof(VASliceParameterBufferAV1), ++ buffer, ++ size); ++ if (err) ++ goto fail; ++ + return 0; ++ ++fail: ++ ff_vaapi_decode_cancel(avctx, pic); ++ return err; + } + + const FFHWAccel ff_av1_vaapi_hwaccel = { diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index ca1e1356c..078b1bef7 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ffmpeg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,6 +59,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion -Wno-error=incompatible-pointer-types" + # If PulseAudio is not found, use the _alsa $TAG and disable it in the build: if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then TAG="_alsa" @@ -216,6 +219,10 @@ zcat $CWD/250471ea1745fc703eb346a2a662304536a311b1.patch | patch -p1 --verbose | # Patch for recent nv-codec-headers: zcat $CWD/0004-support-nv-codec-headers-12.2.patch.gz | patch -p1 --verbose || exit 1 +# Work with recent Mesa: +zcat $CWD/FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/frei0r-plugins/frei0r-plugins.SlackBuild b/source/l/frei0r-plugins/frei0r-plugins.SlackBuild index f214929d9..6454f608b 100755 --- a/source/l/frei0r-plugins/frei0r-plugins.SlackBuild +++ b/source/l/frei0r-plugins/frei0r-plugins.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=frei0r-plugins SRCNAM=frei0r VERSION=${VERSION:-$(echo $SRCNAM-*.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 diff --git a/source/l/gdbm/gdbm.SlackBuild b/source/l/gdbm/gdbm.SlackBuild index 1a446bda5..c0cbc3477 100755 --- a/source/l/gdbm/gdbm.SlackBuild +++ b/source/l/gdbm/gdbm.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gdbm 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 diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild index 59032f628..4c18cb626 100755 --- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild +++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gdk-pixbuf 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/l/gi-docgen/gi-docgen.SlackBuild b/source/l/gi-docgen/gi-docgen.SlackBuild index 4e1156e30..48cbea6af 100755 --- a/source/l/gi-docgen/gi-docgen.SlackBuild +++ b/source/l/gi-docgen/gi-docgen.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gi-docgen VERSION=${VERSION:-$(echo gi-docgen-*.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/l/glib/glib.SlackBuild b/source/l/glib/glib.SlackBuild index c15392644..6fec48212 100755 --- a/source/l/glib/glib.SlackBuild +++ b/source/l/glib/glib.SlackBuild @@ -90,6 +90,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration" + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/glib2/4073.patch b/source/l/glib2/4073.patch new file mode 100644 index 000000000..24156369b --- /dev/null +++ b/source/l/glib2/4073.patch @@ -0,0 +1,290 @@ +From df2c5d925ac4b8f1708bafa5ac1d35acada05d55 Mon Sep 17 00:00:00 2001 +From: Philip Withnall <pwithnall@gnome.org> +Date: Wed, 15 May 2024 12:26:36 +0100 +Subject: [PATCH 1/2] gmenuexporter: Fix a NULL pointer dereference on an error + handling path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This latent bug wasn’t triggered until commit 3f30ec86c (or its +cherry-pick onto `glib-2-80`, 747e3af99, which was first released in +2.80.1). + +That change means that `g_menu_exporter_free()` is now called on the +registration failure path by `g_dbus_connection_register_object()` +before it returns. The caller then tries to call `g_slice_free()` on the +exporter again. The call to `g_menu_exporter_free()` tries to +dereference/free members of the exporter which it expects to be +initialised — but because this is happening in an error handling path, +they are not initialised. + +If it were to get any further, the `g_slice_free()` would then be a +double-free on the exporter allocation. + +Fix that by making `g_menu_exporter_free()` robust to some of the +exporter members being `NULL`, and moving some of the initialisation +code higher in `g_dbus_connection_export_menu_model()`, and removing the +duplicate free code on the error handling path. + +This includes a unit test. + +Signed-off-by: Philip Withnall <pwithnall@gnome.org> + +Fixes: #3366 +--- + gio/gmenuexporter.c | 23 ++++++++--------------- + gio/tests/gmenumodel.c | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+), 15 deletions(-) + +diff --git a/gio/gmenuexporter.c b/gio/gmenuexporter.c +index 909780cb2c..1d4db13523 100644 +--- a/gio/gmenuexporter.c ++++ b/gio/gmenuexporter.c +@@ -707,11 +707,9 @@ g_menu_exporter_create_group (GMenuExporter *exporter) + } + + static void +-g_menu_exporter_free (gpointer user_data) ++g_menu_exporter_free (GMenuExporter *exporter) + { +- GMenuExporter *exporter = user_data; +- +- g_menu_exporter_menu_free (exporter->root); ++ g_clear_pointer (&exporter->root, g_menu_exporter_menu_free); + g_clear_pointer (&exporter->peer_remote, g_menu_exporter_remote_free); + g_hash_table_unref (exporter->remotes); + g_hash_table_unref (exporter->groups); +@@ -794,21 +792,16 @@ g_dbus_connection_export_menu_model (GDBusConnection *connection, + guint id; + + exporter = g_slice_new0 (GMenuExporter); +- +- id = g_dbus_connection_register_object (connection, object_path, org_gtk_Menus_get_interface (), +- &vtable, exporter, g_menu_exporter_free, error); +- +- if (id == 0) +- { +- g_slice_free (GMenuExporter, exporter); +- return 0; +- } +- + exporter->connection = g_object_ref (connection); + exporter->object_path = g_strdup (object_path); + exporter->groups = g_hash_table_new (NULL, NULL); + exporter->remotes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_menu_exporter_remote_free); +- exporter->root = g_menu_exporter_group_add_menu (g_menu_exporter_create_group (exporter), menu); ++ ++ id = g_dbus_connection_register_object (connection, object_path, org_gtk_Menus_get_interface (), ++ &vtable, exporter, (GDestroyNotify) g_menu_exporter_free, error); ++ ++ if (id != 0) ++ exporter->root = g_menu_exporter_group_add_menu (g_menu_exporter_create_group (exporter), menu); + + return id; + } +diff --git a/gio/tests/gmenumodel.c b/gio/tests/gmenumodel.c +index d75f36a297..22d1b4d61e 100644 +--- a/gio/tests/gmenumodel.c ++++ b/gio/tests/gmenumodel.c +@@ -1159,6 +1159,42 @@ test_dbus_peer_subscriptions (void) + #endif + } + ++static void ++test_dbus_export_error_handling (void) ++{ ++ GRand *rand = NULL; ++ RandomMenu *menu = NULL; ++ GDBusConnection *bus; ++ GError *local_error = NULL; ++ guint id1, id2; ++ ++ g_test_summary ("Test that error handling of menu model export failure works"); ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/3366"); ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); ++ ++ rand = g_rand_new_with_seed (g_test_rand_int ()); ++ menu = random_menu_new (rand, 2); ++ ++ id1 = g_dbus_connection_export_menu_model (bus, "/", G_MENU_MODEL (menu), &local_error); ++ g_assert_no_error (local_error); ++ g_assert_cmpuint (id1, !=, 0); ++ ++ /* Trigger a failure by trying to export on a path which is already in use */ ++ id2 = g_dbus_connection_export_menu_model (bus, "/", G_MENU_MODEL (menu), &local_error); ++ g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS); ++ g_assert_cmpuint (id2, ==, 0); ++ g_clear_error (&local_error); ++ ++ g_dbus_connection_unexport_menu_model (bus, id1); ++ ++ while (g_main_context_iteration (NULL, FALSE)); ++ ++ g_clear_object (&menu); ++ g_rand_free (rand); ++ g_clear_object (&bus); ++} ++ + static gpointer + do_modify (gpointer data) + { +@@ -1658,6 +1694,7 @@ main (int argc, char **argv) + g_test_add_func ("/gmenu/dbus/threaded", test_dbus_threaded); + g_test_add_func ("/gmenu/dbus/peer/roundtrip", test_dbus_peer_roundtrip); + g_test_add_func ("/gmenu/dbus/peer/subscriptions", test_dbus_peer_subscriptions); ++ g_test_add_func ("/gmenu/dbus/export/error-handling", test_dbus_export_error_handling); + g_test_add_func ("/gmenu/attributes", test_attributes); + g_test_add_func ("/gmenu/attributes/iterate", test_attribute_iter); + g_test_add_func ("/gmenu/links", test_links); +-- +GitLab + + +From 7a7137838e79e5a98e6f4eab6898e2a0dc6392cd Mon Sep 17 00:00:00 2001 +From: Philip Withnall <pwithnall@gnome.org> +Date: Wed, 15 May 2024 14:00:09 +0100 +Subject: [PATCH 2/2] gactiongroupexporter: Fix memory problems on an error + handling path + +Almost identically to the previous commit, fix a similar latent bug in +`g_dbus_connection_export_action_group()`, which was not ready to handle +the fledgling `GActionGroupExporter` being freed early on an error +handling path. + +See the previous commit message for details of the approach. + +This includes a unit test. + +Signed-off-by: Philip Withnall <pwithnall@gnome.org> + +Fixes: #3366 +--- + gio/gactiongroupexporter.c | 35 ++++++++++++++------------------ + gio/tests/actions.c | 41 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 20 deletions(-) + +diff --git a/gio/gactiongroupexporter.c b/gio/gactiongroupexporter.c +index 3ec1db224e..1e253ec88b 100644 +--- a/gio/gactiongroupexporter.c ++++ b/gio/gactiongroupexporter.c +@@ -531,10 +531,8 @@ org_gtk_Actions_method_call (GDBusConnection *connection, + } + + static void +-g_action_group_exporter_free (gpointer user_data) ++g_action_group_exporter_free (GActionGroupExporter *exporter) + { +- GActionGroupExporter *exporter = user_data; +- + g_signal_handlers_disconnect_by_func (exporter->action_group, + g_action_group_exporter_action_added, exporter); + g_signal_handlers_disconnect_by_func (exporter->action_group, +@@ -616,15 +614,6 @@ g_dbus_connection_export_action_group (GDBusConnection *connection, + } + + exporter = g_slice_new (GActionGroupExporter); +- id = g_dbus_connection_register_object (connection, object_path, org_gtk_Actions, &vtable, +- exporter, g_action_group_exporter_free, error); +- +- if (id == 0) +- { +- g_slice_free (GActionGroupExporter, exporter); +- return 0; +- } +- + exporter->context = g_main_context_ref_thread_default (); + exporter->pending_changes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + exporter->pending_source = NULL; +@@ -632,14 +621,20 @@ g_dbus_connection_export_action_group (GDBusConnection *connection, + exporter->connection = g_object_ref (connection); + exporter->object_path = g_strdup (object_path); + +- g_signal_connect (action_group, "action-added", +- G_CALLBACK (g_action_group_exporter_action_added), exporter); +- g_signal_connect (action_group, "action-removed", +- G_CALLBACK (g_action_group_exporter_action_removed), exporter); +- g_signal_connect (action_group, "action-state-changed", +- G_CALLBACK (g_action_group_exporter_action_state_changed), exporter); +- g_signal_connect (action_group, "action-enabled-changed", +- G_CALLBACK (g_action_group_exporter_action_enabled_changed), exporter); ++ id = g_dbus_connection_register_object (connection, object_path, org_gtk_Actions, &vtable, ++ exporter, (GDestroyNotify) g_action_group_exporter_free, error); ++ ++ if (id != 0) ++ { ++ g_signal_connect (action_group, "action-added", ++ G_CALLBACK (g_action_group_exporter_action_added), exporter); ++ g_signal_connect (action_group, "action-removed", ++ G_CALLBACK (g_action_group_exporter_action_removed), exporter); ++ g_signal_connect (action_group, "action-state-changed", ++ G_CALLBACK (g_action_group_exporter_action_state_changed), exporter); ++ g_signal_connect (action_group, "action-enabled-changed", ++ G_CALLBACK (g_action_group_exporter_action_enabled_changed), exporter); ++ } + + return id; + } +diff --git a/gio/tests/actions.c b/gio/tests/actions.c +index a24c52c5e4..2b7a100fcf 100644 +--- a/gio/tests/actions.c ++++ b/gio/tests/actions.c +@@ -1125,6 +1125,46 @@ test_dbus_export (void) + session_bus_down (); + } + ++static void ++test_dbus_export_error_handling (void) ++{ ++ GDBusConnection *bus = NULL; ++ GSimpleActionGroup *group = NULL; ++ GError *local_error = NULL; ++ guint id1, id2; ++ ++ g_test_summary ("Test that error handling of action group export failure works"); ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/3366"); ++ ++ session_bus_up (); ++ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); ++ ++ group = g_simple_action_group_new (); ++ g_simple_action_group_add_entries (group, ++ exported_entries, ++ G_N_ELEMENTS (exported_entries), ++ NULL); ++ ++ id1 = g_dbus_connection_export_action_group (bus, "/", G_ACTION_GROUP (group), &local_error); ++ g_assert_no_error (local_error); ++ g_assert_cmpuint (id1, !=, 0); ++ ++ /* Trigger a failure by trying to export on a path which is already in use */ ++ id2 = g_dbus_connection_export_action_group (bus, "/", G_ACTION_GROUP (group), &local_error); ++ g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS); ++ g_assert_cmpuint (id2, ==, 0); ++ g_clear_error (&local_error); ++ ++ g_dbus_connection_unexport_action_group (bus, id1); ++ ++ while (g_main_context_iteration (NULL, FALSE)); ++ ++ g_object_unref (group); ++ g_object_unref (bus); ++ ++ session_bus_down (); ++} ++ + static gpointer + do_export (gpointer data) + { +@@ -1448,6 +1488,7 @@ main (int argc, char **argv) + g_test_add_func ("/actions/entries", test_entries); + g_test_add_func ("/actions/parse-detailed", test_parse_detailed); + g_test_add_func ("/actions/dbus/export", test_dbus_export); ++ g_test_add_func ("/actions/dbus/export/error-handling", test_dbus_export_error_handling); + g_test_add_func ("/actions/dbus/threaded", test_dbus_threaded); + g_test_add_func ("/actions/dbus/bug679509", test_bug679509); + g_test_add_func ("/actions/property", test_property_actions); +-- +GitLab + diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index 83bb0ba32..6ad62007b 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glib2 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,6 +77,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Patch regressions: +cat $CWD/4073.patch | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/l/gst-plugins-bad-free/fetch-sources.sh b/source/l/gst-plugins-bad-free/fetch-sources.sh index f17066d3c..44ad88f3e 100755 --- a/source/l/gst-plugins-bad-free/fetch-sources.sh +++ b/source/l/gst-plugins-bad-free/fetch-sources.sh @@ -26,7 +26,7 @@ # # Example: VERSION=1.18.5 ./fetch-sources.sh -VERSION=${VERSION:-1.24.3} +VERSION=${VERSION:-1.24.4} rm -rf rm -rf gst-plugins-bad-free-$VERSION gst-plugins-bad-$VERSION diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild index 17d9735ba..f6e40311b 100755 --- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild +++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-bad-free VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index 2171a194c..bcf4d571b 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,8 +44,9 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + # Looks like this is baseline now... maybe time to bump everything to at least i686 + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -mfpmath=sse -msse -msse2 -fcf-protection=none" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/source/l/gtk+/gtk+.SlackBuild b/source/l/gtk+/gtk+.SlackBuild index 6c03cabdf..54956b383 100755 --- a/source/l/gtk+/gtk+.SlackBuild +++ b/source/l/gtk+/gtk+.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 diff --git a/source/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild index a0ceb0f05..c5f8519c3 100755 --- a/source/l/gtk+2/gtk+2.SlackBuild +++ b/source/l/gtk+2/gtk+2.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-int" + rm -rf $PKG mkdir -p $TMP $PKG/usr cd $TMP diff --git a/source/l/gtksourceview3/gtksourceview3.SlackBuild b/source/l/gtksourceview3/gtksourceview3.SlackBuild index a16b6a2f2..ce47243f5 100755 --- a/source/l/gtksourceview3/gtksourceview3.SlackBuild +++ b/source/l/gtksourceview3/gtksourceview3.SlackBuild @@ -69,6 +69,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild b/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild index 3eaf5cc85..f7a434281 100755 --- a/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild +++ b/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2014, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hicolor-icon-theme -VERSION=${VERSION:-0.17} +VERSION=${VERSION:-0.18} ARCH=noarch -BUILD=${BUILD:-4} +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 @@ -51,11 +51,17 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -./configure \ - --prefix=/usr - -make || exit 1 -make install DESTDIR=$PKG || exit 1 +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. mkdir -p $PKG/var/log/setup cat $CWD/setup.08.gtk-update-icon-cache > $PKG/var/log/setup/setup.08.gtk-update-icon-cache @@ -63,7 +69,7 @@ chmod 0755 $PKG/var/log/setup/setup.08.gtk-update-icon-cache mkdir -p $PKG/usr/doc/hicolor-icon-theme-$VERSION cp -a \ - COPYING NEWS README \ + COPYING* NEWS* README* \ $PKG/usr/doc/hicolor-icon-theme-$VERSION chmod 0644 $PKG/usr/doc/hicolor-icon-theme-$VERSION/* @@ -73,4 +79,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/hicolor-icon-theme-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index c1fb53430..3c3e9e46d 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -121,7 +121,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-fftw \ --with-gcc-arch=$ARCH \ --with-perl \ - --with-perl-options="INSTALLDIRS=vendor" \ + --with-perl-options="INSTALLDIRS=vendor INSTALL_BASE=" \ --with-rsvg \ --with-security-policy=$POLICY \ --build=$ARCH-slackware-linux || exit 1 diff --git a/source/l/lame/lame.SlackBuild b/source/l/lame/lame.SlackBuild index c41b6d436..8cef5ed1c 100755 --- a/source/l/lame/lame.SlackBuild +++ b/source/l/lame/lame.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lame VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/lcms/lcms.SlackBuild b/source/l/lcms/lcms.SlackBuild index 4bd50d511..638a54832 100755 --- a/source/l/lcms/lcms.SlackBuild +++ b/source/l/lcms/lcms.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-lcms diff --git a/source/l/libao/libao.SlackBuild b/source/l/libao/libao.SlackBuild index 05449dd4c..9faddbd11 100755 --- a/source/l/libao/libao.SlackBuild +++ b/source/l/libao/libao.SlackBuild @@ -44,6 +44,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + # If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG: if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then TAG="_alsa" @@ -73,8 +76,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +CFLAGS="$SLKCFLAGS" \ ./autogen.sh || exit 1 +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/l/libappindicator/libappindicator.SlackBuild b/source/l/libappindicator/libappindicator.SlackBuild index 649589179..fe5998e53 100755 --- a/source/l/libappindicator/libappindicator.SlackBuild +++ b/source/l/libappindicator/libappindicator.SlackBuild @@ -68,6 +68,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/libass/libass.SlackBuild b/source/l/libass/libass.SlackBuild index a18f45657..3faf80af7 100755 --- a/source/l/libass/libass.SlackBuild +++ b/source/l/libass/libass.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libass VERSION=${VERSION:-$(echo libass-*.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/l/libcddb/libcddb.SlackBuild b/source/l/libcddb/libcddb.SlackBuild index 3ad6a3a73..ad267d6a6 100755 --- a/source/l/libcddb/libcddb.SlackBuild +++ b/source/l/libcddb/libcddb.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 diff --git a/source/l/libcdio/libcdio.SlackBuild b/source/l/libcdio/libcdio.SlackBuild index 71a3117b5..3127dd18c 100755 --- a/source/l/libcdio/libcdio.SlackBuild +++ b/source/l/libcdio/libcdio.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcdio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/libcupsfilters/libcupsfilters.SlackBuild b/source/l/libcupsfilters/libcupsfilters.SlackBuild index f9be659c5..6947cb16a 100755 --- a/source/l/libcupsfilters/libcupsfilters.SlackBuild +++ b/source/l/libcupsfilters/libcupsfilters.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcupsfilters VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libgnt/libgnt.SlackBuild b/source/l/libgnt/libgnt.SlackBuild index 913d0d90c..f348eaf60 100755 --- a/source/l/libgnt/libgnt.SlackBuild +++ b/source/l/libgnt/libgnt.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgnt -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 | cut -f 2- -d - | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -42,7 +42,7 @@ fi # 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-$ARCH-$BUILD.txz" + echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz" exit 0 fi @@ -134,5 +134,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz diff --git a/source/l/libgpod/libgpod.SlackBuild b/source/l/libgpod/libgpod.SlackBuild index 599c4257f..f180e9247 100755 --- a/source/l/libgpod/libgpod.SlackBuild +++ b/source/l/libgpod/libgpod.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-int" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 diff --git a/source/l/libmcrypt/libmcrypt.SlackBuild b/source/l/libmcrypt/libmcrypt.SlackBuild index a20faa0d2..0f71b6c03 100755 --- a/source/l/libmcrypt/libmcrypt.SlackBuild +++ b/source/l/libmcrypt/libmcrypt.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 diff --git a/source/l/libnjb/libnjb.SlackBuild b/source/l/libnjb/libnjb.SlackBuild index 98784d44f..3b6a3ee0a 100755 --- a/source/l/libnjb/libnjb.SlackBuild +++ b/source/l/libnjb/libnjb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libnjb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libnvme/libnvme.SlackBuild b/source/l/libnvme/libnvme.SlackBuild index c2c277eaf..f9387ff96 100755 --- a/source/l/libnvme/libnvme.SlackBuild +++ b/source/l/libnvme/libnvme.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libnvme 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/l/libqalculate/libqalculate.SlackBuild b/source/l/libqalculate/libqalculate.SlackBuild index 4984f81f0..b49cbf620 100755 --- a/source/l/libqalculate/libqalculate.SlackBuild +++ b/source/l/libqalculate/libqalculate.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libqalculate 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/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild index e0ccc7a32..f95f4b66a 100755 --- a/source/l/libxml2/libxml2.SlackBuild +++ b/source/l/libxml2/libxml2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxml2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/lmdb/lmdb.url b/source/l/lmdb/lmdb.url index 191ce7736..c2f259b7a 100644 --- a/source/l/lmdb/lmdb.url +++ b/source/l/lmdb/lmdb.url @@ -1,2 +1,2 @@ #https://github.com/LMDB/lmdb -https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.32/openldap-LMDB_0.9.32.tar.gz +https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.33/openldap-LMDB_0.9.33.tar.gz diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 49e0c23e5..2b540481c 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.99} +VERSION=${VERSION:-3.100} NSPR=${NSPR:-4.35} BUILD=${BUILD:-1} diff --git a/source/l/mujs/mujs.SlackBuild b/source/l/mujs/mujs.SlackBuild new file mode 100755 index 000000000..6dd121c25 --- /dev/null +++ b/source/l/mujs/mujs.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/bash + +# Copyright 2024 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) + +PKGNAM=mujs +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + #SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + #SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + #SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + #SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + #SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + #SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +make $NUMJOBS prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} || exit 1 +make install-shared prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG || exit 1 + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* COPYING* README* \ + docs \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/mujs/mujs.url b/source/l/mujs/mujs.url new file mode 100644 index 000000000..c3fd3a812 --- /dev/null +++ b/source/l/mujs/mujs.url @@ -0,0 +1 @@ +https://mujs.com/downloads diff --git a/source/l/mujs/slack-desc b/source/l/mujs/slack-desc new file mode 100644 index 000000000..8d49d81e9 --- /dev/null +++ b/source/l/mujs/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +mujs: mujs (lightweight Javascript interpreter) +mujs: +mujs: MuJS is a lightweight Javascript interpreter designed for embedding in +mujs: other software to extend them with scripting capabilities. +mujs: +mujs: Homepage: https://mujs.com +mujs: +mujs: +mujs: +mujs: +mujs: diff --git a/source/l/netpbm/netpbm.SlackBuild b/source/l/netpbm/netpbm.SlackBuild index 7004a028a..84fb12e16 100755 --- a/source/l/netpbm/netpbm.SlackBuild +++ b/source/l/netpbm/netpbm.SlackBuild @@ -88,6 +88,9 @@ zcat $CWD/netpbm-manfix.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/netpbm-manual-pages.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/netpbm-libdir-so.patch.gz | patch -p1 --verbose || exit 1 +# GCC 14 "fix": +cat $CWD/netpbm.gcc14.diff | patch -p1 --verbose || exit 1 + # Send blank lines to "configure" to just take defaults: ./configure << EOF diff --git a/source/l/netpbm/netpbm.gcc14.diff b/source/l/netpbm/netpbm.gcc14.diff new file mode 100644 index 000000000..ad1ee9f0b --- /dev/null +++ b/source/l/netpbm/netpbm.gcc14.diff @@ -0,0 +1,11 @@ +--- ./buildtools/configure.pl.orig 2024-04-12 12:11:55.000000000 -0500 ++++ ./buildtools/configure.pl 2024-05-10 19:05:04.538404953 -0500 +@@ -1537,7 +1537,7 @@ + " -pedantic -fno-common " . + "-Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit " . + "-Wwrite-strings -Wmissing-prototypes -Wundef " . +- "-Wno-unknown-pragmas "; ++ "-Wno-unknown-pragmas -Wno-error=incompatible-pointer-types "; + + if (wnostrictoverflowWorks($gccCommandName)) { + # The compiler generates some optimizations based on the assumption diff --git a/source/l/opencv/opencv.SlackBuild b/source/l/opencv/opencv.SlackBuild index fafc4ac92..5413dfeff 100755 --- a/source/l/opencv/opencv.SlackBuild +++ b/source/l/opencv/opencv.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=opencv VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pilot-link/pilot-link-0.12.1-var.patch b/source/l/pilot-link/pilot-link-0.12.1-var.patch new file mode 100644 index 000000000..e1e6c6c5e --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.1-var.patch @@ -0,0 +1,11 @@ +--- pilot-link-0.12.1/libpisock/dlp.c.pom 2006-08-27 18:20:17.000000000 +0200 ++++ pilot-link-0.12.1/libpisock/dlp.c 2006-11-30 13:39:29.000000000 +0100 +@@ -2268,7 +2268,7 @@ + if (errCode) { + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadFeature FtrGet error 0x%8.8lX\n", +- res)); ++ errCode)); + pi_set_palmos_error(sd, (int)errCode); + return pi_set_error(sd, PI_ERR_DLP_PALMOS); + } diff --git a/source/l/pilot-link/pilot-link-0.12.2-open.patch b/source/l/pilot-link/pilot-link-0.12.2-open.patch new file mode 100644 index 000000000..5766e66be --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.2-open.patch @@ -0,0 +1,42 @@ +diff -up pilot-link-0.12.5/libpisock/serial.c.pom pilot-link-0.12.5/libpisock/serial.c +--- pilot-link-0.12.5/libpisock/serial.c.pom 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/serial.c 2010-06-24 10:35:48.000000000 +0200 +@@ -286,7 +286,7 @@ pi_serial_connect(pi_socket_t *ps, struc + data->establishrate = data->rate = 57600; + } + +- if ((err = data->impl.open(ps, pa, addrlen)) < 0) ++ if ((err = (data->impl.open)(ps, pa, addrlen)) < 0) + return err; /* errno already set */ + + ps->raddr = malloc(addrlen); +@@ -362,7 +362,7 @@ pi_serial_bind(pi_socket_t *ps, struct s + } + + begin: +- if ((err = data->impl.open(ps, pa, addrlen)) < 0) { ++ if ((err = (data->impl.open)(ps, pa, addrlen)) < 0) { + int save_errno = errno; + #ifdef MAXPATHLEN + char realport[MAXPATHLEN]; +diff -up pilot-link-0.12.5/libpisock/usb.c.pom pilot-link-0.12.5/libpisock/usb.c +--- pilot-link-0.12.5/libpisock/usb.c.pom 2010-06-24 09:24:56.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/usb.c 2010-06-24 10:36:08.000000000 +0200 +@@ -267,7 +267,7 @@ pi_usb_connect(pi_socket_t *ps, struct s + data->establishrate = data->rate = 57600; + } + +- result = data->impl.open(ps, pa, addrlen); ++ result = (data->impl.open)(ps, pa, addrlen); + if (result < 0) + goto fail; + +@@ -343,7 +343,7 @@ pi_usb_bind(pi_socket_t *ps, struct sock + data->establishrate = data->rate = 57600; + } + +- result = data->impl.open(ps, pa, addrlen); ++ result = (data->impl.open)(ps, pa, addrlen); + if (result < 0) + return result; + diff --git a/source/l/pilot-link/pilot-link-0.12.3-clio.patch b/source/l/pilot-link/pilot-link-0.12.3-clio.patch new file mode 100644 index 000000000..a752c43d1 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.3-clio.patch @@ -0,0 +1,11 @@ +diff -up pilot-link-0.12.4/libpisock/usb.c.clio pilot-link-0.12.4/libpisock/usb.c +--- pilot-link-0.12.4/libpisock/usb.c.clio 2009-05-28 14:55:43.000000000 +0200 ++++ pilot-link-0.12.4/libpisock/usb.c 2009-05-28 14:56:57.000000000 +0200 +@@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = { + .vendor = 0x054c, + .product = 0x0066, + .idstr = "Sony T, SJ series, and other Palm OS 4.0 devices", ++ .flags = USB_INIT_SONY_CLIE, + }, + + { diff --git a/source/l/pilot-link/pilot-link-0.12.5-aarch64.patch b/source/l/pilot-link/pilot-link-0.12.5-aarch64.patch new file mode 100644 index 000000000..97651e0b9 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-aarch64.patch @@ -0,0 +1,1348 @@ +diff -urN pilot-link-0.12.5/config.guess pilot-link-0.12.5-aarch64/config.guess +--- pilot-link-0.12.5/config.guess 2009-11-03 20:06:26.000000000 -0600 ++++ pilot-link-0.12.5-aarch64/config.guess 2013-03-08 06:00:41.342509645 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-06-10' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -27,16 +25,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner <per@bothner.com>. +-# Please send patches to <config-patches@gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to <config-patches@gnu.org> and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +54,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -333,6 +339,9 @@ + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" +@@ -391,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -477,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -491,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -548,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -591,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- #define _HPUX_SOURCE +- #include <stdlib.h> +- #include <unistd.h> +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -727,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -766,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -785,34 +794,39 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd | genuineintel) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -854,6 +868,27 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -861,20 +896,40 @@ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -901,39 +956,18 @@ + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -942,14 +976,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -957,67 +994,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include <features.h> +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1025,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1061,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1089,13 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i586. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp +- exit ;; ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1130,8 +1118,8 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1174,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says <Richard.M.Bartel@ccMail.Census.GOV> +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel@ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes@openmarket.com>. + # How about differentiating between stratus architectures? -djm +@@ -1203,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1220,6 +1208,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1247,6 +1238,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1262,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1307,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1331,11 +1335,11 @@ + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c <<EOF + #ifdef _SEQUENT_ +@@ -1353,11 +1357,11 @@ + #include <sys/param.h> + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff -urN pilot-link-0.12.5/config.sub pilot-link-0.12.5-aarch64/config.sub +--- pilot-link-0.12.5/config.sub 2009-11-03 20:06:26.000000000 -0600 ++++ pilot-link-0.12.5-aarch64/config.sub 2013-03-08 06:00:41.379505372 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-06-11' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ + + + # Please send patches to <config-patches@gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,8 +73,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -120,13 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -149,12 +156,12 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +- -bluegene*) +- os=-cnk ++ -bluegene*) ++ os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= +@@ -170,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -218,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -242,20 +255,25 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -278,27 +296,39 @@ + | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ +- | v850 | v850e \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -308,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -322,25 +367,30 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -362,24 +412,29 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) +@@ -404,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -474,11 +529,20 @@ + basic_machine=powerpc-ibm + os=-cnk + ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; +- cegcc) ++ cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; +@@ -510,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -668,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -726,6 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -762,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -830,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -912,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -1008,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1064,20 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1147,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1244,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1268,21 +1350,22 @@ + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -kopensolaris* \ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1290,7 +1373,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1329,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1378,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1423,6 +1506,8 @@ + -dicos*) + os=-dicos + ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1445,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1460,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1481,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1515,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) diff --git a/source/l/pilot-link/pilot-link-0.12.5-compiler_warnings.patch b/source/l/pilot-link/pilot-link-0.12.5-compiler_warnings.patch new file mode 100644 index 000000000..017a51c29 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-compiler_warnings.patch @@ -0,0 +1,3067 @@ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/bindings/Perl/Pilot.xs pilot-link-0.12.5/bindings/Perl/Pilot.xs +--- pilot-link-0.12.5-old/bindings/Perl/Pilot.xs 2011-12-19 18:30:45.000000000 +0100 ++++ pilot-link-0.12.5/bindings/Perl/Pilot.xs 2011-12-19 17:51:55.364828217 +0100 +@@ -642,7 +642,7 @@ Unpack(record) + STRLEN len; + int i; + AV * e; +- HV * ret, *h; ++ HV * ret; + struct Appointment a; + char *str; + +@@ -740,7 +740,6 @@ Pack(record) + { + SV ** s; + HV * h; +- long advance; + struct Appointment a; + + if (!SvOK(record) || !SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -881,9 +880,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct AppointmentAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -917,11 +914,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct AppointmentAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -953,8 +948,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; +- AV * e; + HV * ret; + struct ToDo a; + char *str; +@@ -1049,9 +1042,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct ToDoAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -1086,11 +1077,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct ToDoAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -1342,8 +1331,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; +- AV * e; + HV * ret; + struct Memo a; + char *str; +@@ -1422,9 +1409,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MemoAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -1457,11 +1442,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MemoAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -1494,7 +1477,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; + HV * ret; + struct Expense e; + +@@ -1665,15 +1647,15 @@ PackAppBlock(record) + for(i=0;i<4;i++) { + HV * hv; + if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) { +- if (s = hv_fetch(hv, "name", 4, 0)) { ++ if ((s = hv_fetch(hv, "name", 4, 0))) { + strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16); + e.currencies[i].name[15] = 0; + } +- if (s = hv_fetch(hv, "symbol", 6, 0)) { ++ if ((s = hv_fetch(hv, "symbol", 6, 0))) { + strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4); + e.currencies[i].symbol[3] = 0; + } +- if (s = hv_fetch(hv, "rate", 4, 0)) { ++ if ((s = hv_fetch(hv, "rate", 4, 0))) { + strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8); + e.currencies[i].rate[7] = 0; + } +@@ -1794,8 +1776,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; +- AV * e; + HV * ret; + struct Mail a; + +@@ -1897,9 +1877,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MailAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -1935,11 +1913,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MailAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -1973,9 +1949,7 @@ UnpackSyncPref(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MailSyncPref a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -2017,11 +1991,9 @@ PackSyncPref(record, id) + int id + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MailSyncPref a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -2057,9 +2029,7 @@ UnpackSignaturePref(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MailSignaturePref a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -2092,11 +2062,9 @@ PackSignaturePref(record, id) + int id + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MailSignaturePref a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -2599,7 +2567,6 @@ getRecordIDs(self, sort=0) + int start; + int count; + int i; +- AV * list = newAV(); + + start = 0; + for(;;) { +@@ -2784,7 +2751,6 @@ getPref(self, id=0, backup=1) + Char4 creator; + int version, result; + size_t len; +- SV * c, n, v; + int r; + if (self->Class) { + int count; +@@ -2846,7 +2812,7 @@ setPrefRaw(self, data, number, version, + { + STRLEN len; + Char4 creator; +- int version, result; ++ int result; + void * buf; + PackRaw; + buf = SvPV(data, len); +@@ -3063,8 +3029,6 @@ delete(self, name, cardno=0) + int cardno + CODE: + { +- UserInfo info; +- int result; + RETVAL = dlp_DeleteDB(self->socket, cardno, name); + } + OUTPUT: +@@ -3113,7 +3077,6 @@ open(self, name, mode=0, cardno=0) + self->errnop = result; + RETVAL = &PL_sv_undef; + } else { +- int type; + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); + SV * sv = newSViv((IV)(void*)x); + SvREFCNT_inc(ST(0)); +@@ -3205,7 +3168,6 @@ getPref(self, creator, id=0, backup=1) + { + int version, result; + size_t len; +- SV * c, n, v; + result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version); + ReturnReadPref(mybuf, len); + } +@@ -3245,7 +3207,7 @@ setPrefRaw(self, data, creator, number, + PPCODE: + { + STRLEN len; +- int version, result; ++ int result; + void * buf; + PackRaw; + buf = SvPV(data, len); +@@ -3323,8 +3285,6 @@ getDBInfo(self, start, RAM=1, ROM=0, car + int cardno + CODE: + { +- struct DBInfo info; +- + int where = (RAM ? dlpDBListRAM : 0) | (ROM ? dlpDBListROM : 0); + int result = dlp_ReadDBList(self->socket, cardno, where, start, &pibuf); + pack_dbinfo(RETVAL,(*(struct DBInfo *)(pibuf.data)), result); +@@ -3388,7 +3348,6 @@ getROMToken(self,token) + PPCODE: + { + char buffer[50]; +- long long_token; + size_t size; + int result; + +@@ -3592,7 +3551,7 @@ getRecords(self) + PDA::Pilot::File *self + CODE: + { +- int len, result = 0; ++ int len; + pi_file_get_entries(self->pf, &len); + RETVAL = newSViv((int)len); + } +@@ -3715,7 +3674,6 @@ addResource(self, data, type, id) + CODE: + { + STRLEN len; +- int result; + void * buf; + PackResource; + buf = SvPV(data, len); +@@ -3733,7 +3691,6 @@ addRecord(self, data) + STRLEN len; + unsigned long id; + int attr, category; +- int result; + void * buf; + PackRecord; + buf = SvPV(data, len); +@@ -3752,7 +3709,6 @@ addRecordRaw(self, data, uid, attr, cate + CODE: + { + STRLEN len; +- int result; + void * buf; + PackRaw; + buf = SvPV(data, len); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-debug.h pilot-link-0.12.5/include/pi-debug.h +--- pilot-link-0.12.5-old/include/pi-debug.h 2008-11-06 11:45:33.000000000 +0100 ++++ pilot-link-0.12.5/include/pi-debug.h 2011-12-12 16:04:53.892605487 +0100 +@@ -57,10 +57,10 @@ extern void pi_debug_set_file PI_ARGS((c + extern void pi_log PI_ARGS((int type, int level, PI_CONST char *format, ...)); + + extern void pi_dumpline +- PI_ARGS((PI_CONST char *buf, size_t len, unsigned int addr)); ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len, unsigned int addr)); + + extern void pi_dumpdata +- PI_ARGS((PI_CONST char *buf, size_t len)); ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len)); + + #ifdef PI_DEBUG + #define ASSERT(expr) \ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-header.h pilot-link-0.12.5/include/pi-header.h +--- pilot-link-0.12.5-old/include/pi-header.h 2006-10-17 15:24:07.000000000 +0200 ++++ pilot-link-0.12.5/include/pi-header.h 2011-12-19 16:44:54.555489570 +0100 +@@ -25,7 +25,7 @@ + + #ifndef SWIG + /* Print the version splash */ +-void print_splash(const char *progname) PI_DEPRECATED; ++void print_splash(const char *progname); + + /* Connect to the Palm device */ + int pilot_connect(const char *port) PI_DEPRECATED; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-md5.h pilot-link-0.12.5/include/pi-md5.h +--- pilot-link-0.12.5-old/include/pi-md5.h 2010-02-07 04:42:37.000000000 +0100 ++++ pilot-link-0.12.5/include/pi-md5.h 2011-12-14 17:40:52.551602121 +0100 +@@ -23,7 +23,7 @@ + #if HAVE_STDINT_H + #include <stdint.h> + #endif +-#ifdef HAVE_INTTYPES_H || HAVE_STDINT_H ++#if defined(HAVE_INTTYPES_H) || defined(HAVE_STDINT_H) + #define UINT8 uint8_t + #define UINT32 uint32_t + #else +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-md5.h.in pilot-link-0.12.5/include/pi-md5.h.in +--- pilot-link-0.12.5-old/include/pi-md5.h.in 2010-02-07 04:42:49.000000000 +0100 ++++ pilot-link-0.12.5/include/pi-md5.h.in 2011-12-20 16:40:09.826454843 +0100 +@@ -22,7 +22,7 @@ + #if HAVE_STDINT_H + #include <stdint.h> + #endif +-#ifdef HAVE_INTTYPES_H || HAVE_STDINT_H ++#if defined(HAVE_INTTYPES_H) || defined(HAVE_STDINT_H) + #define UINT8 uint8_t + #define UINT32 uint32_t + #else +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-source.h pilot-link-0.12.5/include/pi-source.h +--- pilot-link-0.12.5-old/include/pi-source.h 2006-10-17 15:24:07.000000000 +0200 ++++ pilot-link-0.12.5/include/pi-source.h 2011-12-14 13:03:26.571720585 +0100 +@@ -145,10 +145,10 @@ extern "C" { + pi_dumpline() and pi_dumpdata() */ + + extern void dumpline +- PI_ARGS((PI_CONST char *buf, size_t len, unsigned int addr)) PI_DEPRECATED; ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len, unsigned int addr)) PI_DEPRECATED; + + extern void dumpdata +- PI_ARGS((PI_CONST char *buf, size_t len)) PI_DEPRECATED; ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len)) PI_DEPRECATED; + + + #ifdef __cplusplus +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-util.h pilot-link-0.12.5/include/pi-util.h +--- pilot-link-0.12.5-old/include/pi-util.h 2006-10-17 15:24:07.000000000 +0200 ++++ pilot-link-0.12.5/include/pi-util.h 2011-12-07 21:25:14.513131657 +0100 +@@ -64,19 +64,19 @@ extern "C" { + PI_ARGS((int *establishrate, int *establishhighrate)); + + extern int convert_ToPilotChar_WithCharset +- PI_ARGS((const char *charset, const char *text, int bytes, ++ PI_ARGS((const char *charset, char *text, int bytes, + char **ptext, const char *pi_charset)); + + extern int convert_ToPilotChar +- PI_ARGS((const char *charset, const char *text, int bytes, ++ PI_ARGS((const char *charset, char *text, int bytes, + char **ptext)); + + extern int convert_FromPilotChar_WithCharset +- PI_ARGS((const char *charset, const char *ptext, int bytes, ++ PI_ARGS((const char *charset, char *ptext, int bytes, + char **text, const char *pi_charset)); + + extern int convert_FromPilotChar +- PI_ARGS((const char *charset, const char *ptext, int bytes, ++ PI_ARGS((const char *charset, char *ptext, int bytes, + char **text)); + + /** @brief Convert a milliseconds timeout value to an absolute timespec +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/address.c pilot-link-0.12.5/libpisock/address.c +--- pilot-link-0.12.5-old/libpisock/address.c 2007-01-15 01:29:59.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/address.c 2011-12-07 20:24:45.951236249 +0100 +@@ -209,7 +209,7 @@ unpack_AddressAppInfo(AddressAppInfo_t * + size_t i, + destlen = 4 + 16 * 22 + 2 + 2; + +- unsigned char *start = record; ++ const unsigned char *start = record; + unsigned long r; + + ai->type = address_v1; +@@ -276,11 +276,6 @@ pack_AddressAppInfo(const AddressAppInfo + pos += i; + len -= i; + +- for (i = 3; i < 8; i++) +- strcpy(ai->phoneLabels[i - 3], ai->labels[i]); +- for (i = 19; i < 22; i++) +- strcpy(ai->phoneLabels[i - 19 + 5], ai->labels[i]); +- + memset(pos, 0, destlen); + + r = 0; +@@ -297,11 +292,6 @@ pack_AddressAppInfo(const AddressAppInfo + set_byte(pos, ai->sortByCompany); + pos += 2; + +- for (i = 3; i < 8; i++) +- strcpy(ai->phoneLabels[i - 3], ai->labels[i]); +- for (i = 19; i < 22; i++) +- strcpy(ai->phoneLabels[i - 19 + 5], ai->labels[i]); +- + return (pos - record); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/bluetooth.c pilot-link-0.12.5/libpisock/bluetooth.c +--- pilot-link-0.12.5-old/libpisock/bluetooth.c 2008-05-03 22:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/bluetooth.c 2012-01-04 19:54:41.494267929 +0100 +@@ -286,14 +286,11 @@ static pi_protocol_t* + pi_bluetooth_protocol (pi_device_t *dev) + { + pi_protocol_t *prot; +- struct pi_bluetooth_data *data; + + ASSERT (dev != NULL); + + prot = (pi_protocol_t *) malloc(sizeof (pi_protocol_t)); + +- data = (struct pi_bluetooth_data *)(dev->data); +- + if (prot != NULL) { + prot->level = PI_LEVEL_DEV; + prot->dup = pi_bluetooth_protocol_dup; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/calendar.c pilot-link-0.12.5/libpisock/calendar.c +--- pilot-link-0.12.5-old/libpisock/calendar.c 2010-02-07 03:21:18.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/calendar.c 2012-01-13 16:07:09.096320373 +0100 +@@ -461,7 +461,7 @@ unpack_CalendarEvent(CalendarEvent_t *a, + } + } + if(p2 - buf->data < buf->used) { +- printf("Extra data found %ld bytes\n", (buf->used - (p2 - buf->data))); ++ printf("Extra data found %zu bytes\n", (buf->used - (p2 - buf->data))); + return -1; + } + } else { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/darwinusb.c pilot-link-0.12.5/libpisock/darwinusb.c +--- pilot-link-0.12.5-old/libpisock/darwinusb.c 2007-01-15 01:29:59.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/darwinusb.c 2011-12-13 16:25:22.825510660 +0100 +@@ -1096,7 +1096,7 @@ find_interfaces(usb_connection_t *c, + { + /* got something! */ + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "darwinusb: got %d bytes there!\n", (int)size)); +- CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata(c->read_buffer, size)); ++ CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((unsigned char *)c->read_buffer, size)); + if (!memcmp(c->read_buffer, "VNDR10", 6)) + { + /* VNDR version 1.0 */ +@@ -1235,7 +1235,7 @@ read_visor_connection_information (IOUSB + } + else + { +- CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((const char *)&ci, sizeof(ci))); ++ CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((unsigned char *)&ci, sizeof(ci))); + ci.num_ports = CFSwapInt16LittleToHost(ci.num_ports); /* number of ports is little-endian */ + if (ci.num_ports > 8) + ci.num_ports = 8; +@@ -1280,7 +1280,7 @@ decode_generic_connection_information(pa + { + int i; + +- CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((const char *)ci, sizeof(palm_ext_connection_info))); ++ CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((unsigned char *)ci, sizeof(palm_ext_connection_info))); + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "darwinusb: decode_generic_connection_information num_ports=%d, endpoint_numbers_different=%d\n", ci->num_ports, ci->endpoint_numbers_different)); + + for (i=0; i < ci->num_ports; i++) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/debug.c pilot-link-0.12.5/libpisock/debug.c +--- pilot-link-0.12.5-old/libpisock/debug.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/debug.c 2011-12-14 13:03:16.364897382 +0100 +@@ -173,7 +173,7 @@ pi_log (int type, int level, const char + } + + void +-pi_dumpline(const char *buf, size_t len, unsigned int addr) ++pi_dumpline(const unsigned char *buf, size_t len, unsigned int addr) + { + unsigned int i; + int offset; +@@ -212,14 +212,14 @@ pi_dumpline(const char *buf, size_t len, + } + + void +-dumpline(const char *buf, size_t len, unsigned int addr) ++dumpline(const unsigned char *buf, size_t len, unsigned int addr) + { + /* this function will be removed in 0.13. Use pi_dumpline() instead. */ + pi_dumpline(buf, len, addr); + } + + void +-pi_dumpdata(const char *buf, size_t len) ++pi_dumpdata(const unsigned char *buf, size_t len) + { + unsigned int i; + +@@ -228,7 +228,7 @@ pi_dumpdata(const char *buf, size_t len) + } + + void +-dumpdata(const char *buf, size_t len) ++dumpdata(const unsigned char *buf, size_t len) + { + /* this function will be removed in 0.13. Use pi_dumpdata() instead */ + pi_dumpdata(buf, len); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/dlp.c pilot-link-0.12.5/libpisock/dlp.c +--- pilot-link-0.12.5-old/libpisock/dlp.c 2011-12-19 18:30:44.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/dlp.c 2011-12-13 18:12:50.807265809 +0100 +@@ -173,7 +173,7 @@ static void record_dump (unsigned long r + (flags & dlpRecAttrArchived) ? " Archive" : "", + (!flags) ? " None" : "", + flags, data_len)); +- pi_dumpdata(data, (size_t)data_len); ++ pi_dumpdata((unsigned char *)data, (size_t)data_len); + } + #endif + +@@ -1663,7 +1663,7 @@ dlp_CallApplication(int sd, unsigned lon + get_long(DLP_RESPONSE_DATA(res, 0, 0)), + data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 16), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 16), + (size_t)data_len)); + } + +@@ -1711,7 +1711,7 @@ dlp_CallApplication(int sd, unsigned lon + (unsigned int)get_short(DLP_RESPONSE_DATA(res, 0, 2)), + data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 6), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 6), + (size_t)data_len)); + } + } +@@ -2497,7 +2497,7 @@ dlp_ReadRecordIDList(int sd, int dbhandl + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadRecordIDList %d IDs:\n", ret)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 2), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 2), + (size_t)(ret * 4))); + } + +@@ -2731,7 +2731,7 @@ dlp_ReadResourceByType(int sd, int dbhan + printlong(type), resID, + get_short(DLP_RESPONSE_DATA(res, 0, 6)),(size_t)data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 10),(size_t)data_len)); ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 10),(size_t)data_len)); + } else { + data_len = result; + } +@@ -2830,7 +2830,7 @@ dlp_ReadResourceByIndex(int sd, int dbha + get_short(DLP_RESPONSE_DATA(res, 0, 4)), + resindex, data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, (large ? 12 : 10)), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, (large ? 12 : 10)), + (size_t)data_len)); + } else { + data_len = result; +@@ -2961,7 +2961,7 @@ dlp_ReadAppBlock(int sd, int dbhandle, i + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadAppBlock %d bytes\n", data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 2), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 2), + (size_t)data_len)); + } + } else { +@@ -3048,7 +3048,7 @@ dlp_ReadSortBlock(int sd, int dbhandle, + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadSortBlock %d bytes\n", data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 2), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 2), + (size_t)data_len)); + } + } else { +@@ -3254,7 +3254,7 @@ dlp_ReadNextRecInCategory(int sd, int db + (!flags) ? " None" : "", + flags, data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 10), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 10), + (size_t)data_len)); + } else { + data_len = result; +@@ -3362,7 +3362,7 @@ dlp_ReadAppPreference(int sd, unsigned l + get_short(DLP_RESPONSE_DATA(res, 0, 2)), + get_short(DLP_RESPONSE_DATA(res, 0, 4)))); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 6), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 6), + (size_t)data_len)); + } else { + data_len = result; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/hinote.c pilot-link-0.12.5/libpisock/hinote.c +--- pilot-link-0.12.5-old/libpisock/hinote.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/hinote.c 2012-01-04 20:01:27.297338187 +0100 +@@ -121,8 +121,7 @@ pack_HiNoteNote(HiNoteNote_t *hinote, un + int + unpack_HiNoteAppInfo(HiNoteAppInfo_t *appinfo, unsigned char *record, size_t len) + { +- int i, +- idx; ++ int i; + unsigned char *start; + + start = record; +@@ -133,7 +132,7 @@ unpack_HiNoteAppInfo(HiNoteAppInfo_t *ap + len -= i; + if (len < 48) + return 0; +- for (idx = 0; i < 48; i++) ++ for (i = 0; i < 48; i++) + appinfo->reserved[i] = *record++; + return (record - start); + } +@@ -153,8 +152,7 @@ unpack_HiNoteAppInfo(HiNoteAppInfo_t *ap + int + pack_HiNoteAppInfo(HiNoteAppInfo_t *appinfo, unsigned char *record, size_t len) + { +- int i, +- idx; ++ int i; + unsigned char *start = record; + + i = pack_CategoryAppInfo(&appinfo->category, record, len); +@@ -166,7 +164,7 @@ pack_HiNoteAppInfo(HiNoteAppInfo_t *appi + len -= i; + if (len < 48) + return (record - start); +- for (idx = 0; i < 48; i++) ++ for (i = 0; i < 48; i++) + *record++ = appinfo->reserved[i]; + + return (record - start); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/inet.c pilot-link-0.12.5/libpisock/inet.c +--- pilot-link-0.12.5-old/libpisock/inet.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/inet.c 2012-01-04 19:11:50.256766421 +0100 +@@ -112,12 +112,9 @@ static pi_protocol_t* + pi_inet_protocol (pi_device_t *dev) + { + pi_protocol_t *prot; +- pi_inet_data_t *data; + + ASSERT (dev != NULL); + +- data = dev->data; +- + prot = (pi_protocol_t *)malloc (sizeof (pi_protocol_t)); + + if (prot != NULL) { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/libusb.c pilot-link-0.12.5/libpisock/libusb.c +--- pilot-link-0.12.5-old/libpisock/libusb.c 2007-02-09 17:06:22.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/libusb.c 2012-01-04 19:57:15.495647341 +0100 +@@ -468,7 +468,7 @@ u_write(struct pi_socket *ps, const unsi + if (len <= 0) + return 0; + +- ret = usb_bulk_write (USB_handle, USB_out_endpoint, buf, len, timeout); ++ ret = usb_bulk_write (USB_handle, USB_out_endpoint, (char *)buf, len, timeout); + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "Wrote: %d.\n", ret)); + if (ret > 0) + CHECK (PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata (buf, ret)); +@@ -505,7 +505,6 @@ u_read_i(struct pi_socket *ps, pi_buffer + if (RD_buffer_used < len) { + struct timeval now; + struct timespec when, nownow; +- int last_used; + gettimeofday(&now, NULL); + when.tv_sec = now.tv_sec + timeout / 1000; + when.tv_nsec = (now.tv_usec + (timeout % 1000) * 1000) * 1000; +@@ -516,8 +515,6 @@ u_read_i(struct pi_socket *ps, pi_buffer + + RD_wanted = len; + do { +- last_used = RD_buffer_used; +- + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s %d (%s): %d %d.\n", + __FILE__, __LINE__, __FUNCTION__, len, RD_buffer_used)); + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/linuxusb.c pilot-link-0.12.5/libpisock/linuxusb.c +--- pilot-link-0.12.5-old/libpisock/linuxusb.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/linuxusb.c 2011-12-07 16:52:23.942559596 +0100 +@@ -27,6 +27,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/socket.h> + + #include "pi-debug.h" + #include "pi-source.h" +@@ -48,8 +49,8 @@ + + static int u_open(pi_socket_t *ps, struct pi_sockaddr *addr, size_t addrlen); + static int u_close(pi_socket_t *ps); +-static int u_write(pi_socket_t *ps, unsigned char *buf, size_t len, int flags); +-static int u_read(pi_socket_t *ps, pi_buffer_t *buf, size_t len, int flags); ++static ssize_t u_write(pi_socket_t *ps, const unsigned char *buf, size_t len, int flags); ++static ssize_t u_read(pi_socket_t *ps, pi_buffer_t *buf, size_t len, int flags); + static int u_poll(pi_socket_t *ps, int timeout); + static int u_flush(pi_socket_t *ps, int flags); + +@@ -188,8 +189,8 @@ u_poll(pi_socket_t *ps, int timeout) + * Returns: Nothing + * + ***********************************************************************/ +-static int +-u_write(pi_socket_t *ps, unsigned char *buf, size_t len, int flags) ++static ssize_t ++u_write(pi_socket_t *ps, const unsigned char *buf, size_t len, int flags) + { + int total, + nwrote; +@@ -281,7 +282,7 @@ u_read_buf (pi_socket_t *ps, pi_buffer_t + * Returns: number of bytes read or negative otherwise + * + ***********************************************************************/ +-static int ++static ssize_t + u_read(pi_socket_t *ps, pi_buffer_t *buf, size_t len, int flags) + { + ssize_t rbuf = 0, +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/Makefile.am pilot-link-0.12.5/libpisock/Makefile.am +--- pilot-link-0.12.5-old/libpisock/Makefile.am 2009-05-25 05:22:55.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/Makefile.am 2011-12-19 13:22:17.375486115 +0100 +@@ -1,5 +1,4 @@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include + + bluetooth_FILES = \ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/Makefile.in pilot-link-0.12.5/libpisock/Makefile.in +--- pilot-link-0.12.5-old/libpisock/Makefile.in 2012-01-04 17:53:04.413603881 +0100 ++++ pilot-link-0.12.5/libpisock/Makefile.in 2012-01-04 22:52:56.453905685 +0100 +@@ -317,7 +317,6 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + usb_libs = @usb_libs@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include + + bluetooth_FILES = \ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/memo.c pilot-link-0.12.5/libpisock/memo.c +--- pilot-link-0.12.5-old/libpisock/memo.c 2007-01-15 01:30:00.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/memo.c 2011-12-07 20:35:30.203369247 +0100 +@@ -122,7 +122,7 @@ unpack_MemoAppInfo(struct MemoAppInfo *a + size_t len) + { + int i = unpack_CategoryAppInfo(&appinfo->category, record, len); +- unsigned char *start = record; ++ const unsigned char *start = record; + + appinfo->type = memo_v1; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/net.c pilot-link-0.12.5/libpisock/net.c +--- pilot-link-0.12.5-old/libpisock/net.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/net.c 2011-12-13 18:18:46.987142736 +0100 +@@ -382,7 +382,7 @@ net_tx(pi_socket_t *ps, const unsigned c + } + + CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, net_dump_header(buf, 1, ps->sd)); +- CHECK(PI_DBG_NET, PI_DBG_LVL_DEBUG, pi_dumpdata((char *)msg, len)); ++ CHECK(PI_DBG_NET, PI_DBG_LVL_DEBUG, pi_dumpdata(msg, len)); + + free(buf); + return len; +@@ -513,7 +513,7 @@ net_rx(pi_socket_t *ps, pi_buffer_t *msg + LOG ((PI_DBG_NET, PI_DBG_LVL_ERR, + "NET RX (%i): Unknown packet type\n", + ps->sd)); +- CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, pi_dumpdata((char *)header->data, PI_NET_HEADER_LEN)); ++ CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, pi_dumpdata(header->data, PI_NET_HEADER_LEN)); + pi_buffer_free(header); + return pi_set_error(ps->sd, PI_ERR_PROT_BADPACKET); + } +@@ -704,7 +704,7 @@ net_dump(unsigned char *header, unsigned + size_t size; + + size = get_long(&header[PI_NET_OFFSET_SIZE]); +- pi_dumpdata((char *)data, size); ++ pi_dumpdata(data, size); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/padp.c pilot-link-0.12.5/libpisock/padp.c +--- pilot-link-0.12.5-old/libpisock/padp.c 2007-02-16 17:25:43.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/padp.c 2011-12-12 16:18:02.112726207 +0100 +@@ -959,7 +959,7 @@ padp_dump(const unsigned char *data) + if (size > PI_PADP_MTU) + size = PI_PADP_MTU; + if (type != padAck) +- pi_dumpdata((char *)&data[header_size], size); ++ pi_dumpdata(&data[header_size], size); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/palmpix.c pilot-link-0.12.5/libpisock/palmpix.c +--- pilot-link-0.12.5-old/libpisock/palmpix.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/palmpix.c 2012-01-04 19:26:38.628945553 +0100 +@@ -1609,22 +1609,24 @@ static int + int + unpack_PalmPixHeader (struct PalmPixHeader *h, const unsigned char *p, int len) + { +- int magic1, magic2; ++ /* int magic1, magic2; */ + + if (len != 196) + return 0; + ++ /* + magic1 = p[1]; + magic2 = get_le_short (&p[46]); +- ++ */ ++ + /* FIXME For now, don't check the magic. I've seen 0x0002 and 0x0201. + I'm not sure that the endianness is right on this one. Possibly it + should be interpreted as two bytes instead (major and minor?). */ +- #if 0 ++ /* + if (magic1 != 0 || (magic2 != 0x0102 && magic2 != 0x0002)) + return 0; +- #endif +- ++ */ ++ + h->numRec= p[0]; + h->month= p[2]; + h->day= p[3]; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/pi-file.c pilot-link-0.12.5/libpisock/pi-file.c +--- pilot-link-0.12.5-old/libpisock/pi-file.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/pi-file.c 2011-12-21 16:00:10.858944394 +0100 +@@ -382,7 +382,7 @@ pi_file_read_resource_by_type_id(pi_file + int resid, void **bufp, size_t *sizep, + int *resindex) + { +- int i, ++ int i = 0, + result; + + result = pi_file_find_resource_by_type_id(pf, restype, resid, &i); +@@ -1351,7 +1351,9 @@ pi_file_close_for_write(pi_file_t *pf) + } + + /* This may just be packing */ +- fwrite("\0\0", 1, 2, f); ++ if (fwrite("\0\0", 1, 2, f) != 2) { ++ goto bad; ++ } + + if (pf->app_info + && (fwrite(pf->app_info, 1,(size_t) pf->app_info_size, f) != +@@ -1364,7 +1366,9 @@ pi_file_close_for_write(pi_file_t *pf) + goto bad; + + +- fwrite(pf->tmpbuf->data, pf->tmpbuf->used, 1, f); ++ if (fwrite(pf->tmpbuf->data, pf->tmpbuf->used, 1, f) != 1) { ++ goto bad; ++ } + fflush(f); + + if (ferror(f) || feof(f)) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/serial.c pilot-link-0.12.5/libpisock/serial.c +--- pilot-link-0.12.5-old/libpisock/serial.c 2011-12-19 18:30:44.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/serial.c 2011-12-20 17:38:49.101508096 +0100 +@@ -374,7 +374,9 @@ begin: + # endif /* PATH_MAX */ + #endif /* MAXPATHLEN */ + +- realpath(pa->pi_device, realport); ++ if (!realpath(pa->pi_device, realport)) { ++ strncpy(realport, pa->pi_device, sizeof(pa->pi_device)); ++ } + errno = save_errno; + + if (errno == ENOENT) { +@@ -482,7 +484,7 @@ pi_serial_accept(pi_socket_t *ps, struct + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s: %d, poll result: %d.\n", __FILE__, __LINE__, result)); + + if (result < 0) { +- char buf[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }; ++ unsigned char buf[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }; + data->impl.write(ps, buf, sizeof (buf), 1000); + } + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/slp.c pilot-link-0.12.5/libpisock/slp.c +--- pilot-link-0.12.5-old/libpisock/slp.c 2006-10-17 15:19:53.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/slp.c 2011-12-12 16:18:40.700958799 +0100 +@@ -362,7 +362,7 @@ slp_rx(pi_socket_t *ps, pi_buffer_t *buf + } else { + LOG((PI_DBG_SLP, PI_DBG_LVL_WARN, + "SLP RX Header checksum failed for header:\n")); +- pi_dumpdata((const char *)slp_buf->data, PI_SLP_HEADER_LEN); ++ pi_dumpdata(slp_buf->data, PI_SLP_HEADER_LEN); + pi_buffer_free (slp_buf); + return 0; + } +@@ -646,7 +646,7 @@ slp_dump_header(const unsigned char *dat + void + slp_dump(const unsigned char *data) + { +- pi_dumpdata((char *)&data[PI_SLP_HEADER_LEN], get_short(&data[PI_SLP_OFFSET_SIZE])); ++ pi_dumpdata(&data[PI_SLP_HEADER_LEN], get_short(&data[PI_SLP_OFFSET_SIZE])); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/socket.c pilot-link-0.12.5/libpisock/socket.c +--- pilot-link-0.12.5-old/libpisock/socket.c 2007-01-15 01:30:00.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/socket.c 2012-01-12 19:43:34.935489417 +0100 +@@ -1106,7 +1106,9 @@ pi_listen(int pi_sd, int backlog) + { + pi_socket_t *ps; + +- if (!(ps = find_pi_socket(pi_sd))) { ++ ps = find_pi_socket(pi_sd); ++ ++ if (!ps || !ps->device) { + errno = ESRCH; + return PI_ERR_SOCK_INVALID; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/sys.c pilot-link-0.12.5/libpisock/sys.c +--- pilot-link-0.12.5-old/libpisock/sys.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/sys.c 2012-01-04 19:27:23.408239457 +0100 +@@ -241,14 +241,12 @@ sys_rx(pi_socket_t *ps, pi_buffer_t *buf + pi_protocol_t *next, + *prot; + +- pi_sys_data_t *data; + size_t data_len; + + prot = pi_protocol(ps->sd, PI_LEVEL_SYS); + if (prot == NULL) + return pi_set_error(ps->sd, PI_ERR_SOCK_INVALID); + +- data = (pi_sys_data_t *)prot->data; + next = pi_protocol_next(ps->sd, PI_LEVEL_SYS); + if (next == NULL) + return pi_set_error(ps->sd, PI_ERR_SOCK_INVALID); +@@ -360,7 +358,7 @@ sys_dump_header(const unsigned char *dat + void + sys_dump(const unsigned char *data, size_t len) + { +- pi_dumpdata((char *)&data[PI_SYS_HEADER_LEN], len); ++ pi_dumpdata(&data[PI_SYS_HEADER_LEN], len); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/todo.c pilot-link-0.12.5/libpisock/todo.c +--- pilot-link-0.12.5-old/libpisock/todo.c 2007-01-15 01:30:00.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/todo.c 2011-12-07 20:47:25.134224235 +0100 +@@ -232,7 +232,7 @@ int + unpack_ToDoAppInfo(ToDoAppInfo_t *appinfo, const unsigned char *record, size_t len) + { + int i; +- unsigned char *start = record; ++ const unsigned char *start = record; + + appinfo->type = todo_v1; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/Makefile.am pilot-link-0.12.5/libpisync/Makefile.am +--- pilot-link-0.12.5-old/libpisync/Makefile.am 2005-02-17 20:01:35.000000000 +0100 ++++ pilot-link-0.12.5/libpisync/Makefile.am 2011-12-19 13:22:30.210258195 +0100 +@@ -1,5 +1,4 @@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(ICONV_CFLAGS) + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/Makefile.in pilot-link-0.12.5/libpisync/Makefile.in +--- pilot-link-0.12.5-old/libpisync/Makefile.in 2012-01-04 17:53:04.463602027 +0100 ++++ pilot-link-0.12.5/libpisync/Makefile.in 2012-01-04 22:52:56.503897733 +0100 +@@ -284,7 +284,6 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + usb_libs = @usb_libs@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(ICONV_CFLAGS) + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/sync.c pilot-link-0.12.5/libpisync/sync.c +--- pilot-link-0.12.5-old/libpisync/sync.c 2006-08-06 17:55:57.000000000 +0200 ++++ pilot-link-0.12.5/libpisync/sync.c 2011-12-07 21:09:46.536334579 +0100 +@@ -330,7 +330,7 @@ static int open_db(SyncHandler * sh, int + { + if (sh->secret) + return dlp_OpenDB(sh->sd, 0, dlpOpenReadWrite +- && dlpOpenSecret, sh->name, dbhandle); ++ | dlpOpenSecret, sh->name, dbhandle); + else + return dlp_OpenDB(sh->sd, 0, dlpOpenReadWrite, sh->name, + dbhandle); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/util.c pilot-link-0.12.5/libpisync/util.c +--- pilot-link-0.12.5-old/libpisync/util.c 2006-08-25 14:33:25.000000000 +0200 ++++ pilot-link-0.12.5/libpisync/util.c 2011-12-07 21:25:04.906262096 +0100 +@@ -60,7 +60,7 @@ + * + ***********************************************************************/ + int +-convert_ToPilotChar(const char *charset, const char *text, ++convert_ToPilotChar(const char *charset, char *text, + int bytes, char **ptext) + { + #ifdef HAVE_ICONV +@@ -100,7 +100,7 @@ convert_ToPilotChar(const char *charset, + * + ***********************************************************************/ + int +-convert_ToPilotChar_WithCharset(const char *charset, const char *text, ++convert_ToPilotChar_WithCharset(const char *charset, char *text, + int bytes, char **ptext, const char * pi_charset) + { + #ifdef HAVE_ICONV +@@ -155,7 +155,7 @@ convert_ToPilotChar_WithCharset(const ch + * + ***********************************************************************/ + int +-convert_FromPilotChar(const char *charset, const char *ptext, ++convert_FromPilotChar(const char *charset, char *ptext, + int bytes, char **text) + { + #ifdef HAVE_ICONV +@@ -191,7 +191,7 @@ convert_FromPilotChar(const char *charse + * + ***********************************************************************/ + int +-convert_FromPilotChar_WithCharset(const char *charset, const char *ptext, ++convert_FromPilotChar_WithCharset(const char *charset, char *ptext, + int bytes, char **text, const char * pi_charset) + { + #ifdef HAVE_ICONV +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/popt/popt.c pilot-link-0.12.5/popt/popt.c +--- pilot-link-0.12.5-old/popt/popt.c 2004-08-27 18:27:48.000000000 +0200 ++++ pilot-link-0.12.5/popt/popt.c 2012-01-04 19:47:06.517804911 +0100 +@@ -367,7 +367,6 @@ static int execCommand(poptContext con) + poptItem item = con->doExec; + const char ** argv; + int argc = 0; +- int rc; + + if (item == NULL) /*XXX can't happen*/ + return POPT_ERROR_NOARG; +@@ -411,8 +410,7 @@ static int execCommand(poptContext con) + argv[argc] = NULL; + + #ifdef __hpux +- rc = setresuid(getuid(), getuid(),-1); +- if (rc) return POPT_ERROR_ERRNO; ++ if (setresuid(getuid(), getuid(),-1)) return POPT_ERROR_ERRNO; + #else + /* + * XXX " ... on BSD systems setuid() should be preferred over setreuid()" +@@ -420,11 +418,10 @@ static int execCommand(poptContext con) + * XXX from Norbert Warmuth <nwarmuth@privat.circular.de> + */ + #if defined(HAVE_SETUID) +- rc = setuid(getuid()); +- if (rc) return POPT_ERROR_ERRNO; ++ if (setuid(getuid())) return POPT_ERROR_ERRNO; + #elif defined (HAVE_SETREUID) +- rc = setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */ +- if (rc) return POPT_ERROR_ERRNO; ++ /*hlauer: not portable to hpux9.01 */ ++ if (setreuid(getuid(), getuid())) return POPT_ERROR_ERRNO; + #else + ; /* Can't drop privileges */ + #endif +@@ -443,7 +440,7 @@ if (_popt_debug) + } + #endif + +- rc = execvp(argv[0], (char *const *)argv); ++ execvp(argv[0], (char *const *)argv); + + return POPT_ERROR_ERRNO; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/Makefile.am pilot-link-0.12.5/src/Makefile.am +--- pilot-link-0.12.5-old/src/Makefile.am 2007-11-12 15:52:14.000000000 +0100 ++++ pilot-link-0.12.5/src/Makefile.am 2011-12-16 17:42:55.878155194 +0100 +@@ -72,6 +72,8 @@ libpiuserland_la_SOURCES = \ + userland.c + libpiuserland_la_LDFLAGS = \ + -static ++libpiuserland_la_LIBADD = \ ++ $(POPT_LIBS) + + #getrom_SOURCES = \ + # getrom.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/Makefile.in pilot-link-0.12.5/src/Makefile.in +--- pilot-link-0.12.5-old/src/Makefile.in 2012-01-04 17:53:04.645595287 +0100 ++++ pilot-link-0.12.5/src/Makefile.in 2012-01-04 22:52:56.694867357 +0100 +@@ -87,7 +87,9 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libpiuserland_la_LIBADD = ++am__DEPENDENCIES_1 = ++@ENABLE_CONDUITS_TRUE@libpiuserland_la_DEPENDENCIES = \ ++@ENABLE_CONDUITS_TRUE@ $(am__DEPENDENCIES_1) + am__libpiuserland_la_SOURCES_DIST = plu_args.c userland.c + @ENABLE_CONDUITS_TRUE@am_libpiuserland_la_OBJECTS = plu_args.lo \ + @ENABLE_CONDUITS_TRUE@ userland.lo +@@ -102,7 +104,6 @@ am__pilot_addresses_SOURCES_DIST = pilot + @ENABLE_CONDUITS_TRUE@am_pilot_addresses_OBJECTS = \ + @ENABLE_CONDUITS_TRUE@ pilot-addresses.$(OBJEXT) + pilot_addresses_OBJECTS = $(am_pilot_addresses_OBJECTS) +-am__DEPENDENCIES_1 = + @ENABLE_CONDUITS_TRUE@pilot_addresses_DEPENDENCIES = libpiuserland.la \ + @ENABLE_CONDUITS_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_CONDUITS_TRUE@ $(top_builddir)/libpisock/libpisock.la +@@ -689,6 +690,9 @@ SUBDIRS = prc pix + @ENABLE_CONDUITS_TRUE@libpiuserland_la_LDFLAGS = \ + @ENABLE_CONDUITS_TRUE@ -static + ++@ENABLE_CONDUITS_TRUE@libpiuserland_la_LIBADD = \ ++@ENABLE_CONDUITS_TRUE@ $(POPT_LIBS) ++ + + #getrom_SOURCES = \ + # getrom.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-addresses.c pilot-link-0.12.5/src/pilot-addresses.c +--- pilot-link-0.12.5-old/src/pilot-addresses.c 2009-06-04 15:32:30.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-addresses.c 2011-12-21 16:08:30.778052438 +0100 +@@ -613,7 +613,8 @@ int main(int argc, const char *argv[]) { + int c, /* switch */ + db, + l, +- sd = -1; ++ sd = -1, ++ old_quiet = 0; + + enum { mode_none, mode_read, mode_write, mode_delete_all, mode_delete } + run_mode = mode_none; +@@ -744,7 +745,7 @@ int main(int argc, const char *argv[]) { + " tool. The data format of the AddressBook has changed. The legacy format\n" + " is called \"Classic\" and PalmOS 5.x and later uses \"Extended\" databases\n" + " with a different structure. Your Palm has \"Contacts\", and this tool reads\n" +- " the \"AddressBook\" database. (Found OS version: %x)\n\n" ++ " the \"AddressBook\" database. (Found OS version: %lu)\n\n" + + " Due to this change, pilot-addresses and other tools must be rewritten to\n" + " compensate. Sorry about the inconvenience.\n\n", info.romVersion); +@@ -775,7 +776,6 @@ int main(int argc, const char *argv[]) { + switch(run_mode) { + FILE *f; + int i; +- int old_quiet; + case mode_none: + /* impossible */ + fprintf(stderr,"%s",mode_error); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-clip.c pilot-link-0.12.5/src/pilot-clip.c +--- pilot-link-0.12.5-old/src/pilot-clip.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-clip.c 2011-12-20 17:46:26.422661747 +0100 +@@ -189,7 +189,9 @@ int main(int argc, const char *argv[]) + if (b == NULL) + goto error_close; + if (ret > 0) +- write(fileno(stdout), b, ret); ++ if (write(fileno(stdout), b, ret) < 0) { ++ goto error_close; ++ } + } + + if (pi_close(sd) < 0) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-csd.c pilot-link-0.12.5/src/pilot-csd.c +--- pilot-link-0.12.5-old/src/pilot-csd.c 2009-06-04 15:32:31.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-csd.c 2011-12-19 14:45:25.245377872 +0100 +@@ -383,7 +383,7 @@ int main(int argc, const char *argv[]) + + if ((get_byte(mesg + 2) == 0x01) && (n > 12)) { + struct in_addr ip, mask; +- char *name = mesg + 12; ++ char *name = (char *)mesg + 12; + + memcpy(&ip, mesg + 4, 4); + memcpy(&mask, mesg + 8, 4); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-debug.c pilot-link-0.12.5/src/pilot-debug.c +--- pilot-link-0.12.5-old/src/pilot-debug.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-debug.c 2011-12-13 18:20:08.241744455 +0100 +@@ -253,7 +253,7 @@ Read_Pilot(ClientData clientData, int ma + return; + + /* puts("From Palm:"); +- pi_dumpdata((unsigned char *)buf, l); */ ++ pi_dumpdata(buf, l); */ + + if (buf[2] == 0) { /* SysPkt command */ + if (buf[0] == 2) { /* UI */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-dlpsh.c pilot-link-0.12.5/src/pilot-dlpsh.c +--- pilot-link-0.12.5-old/src/pilot-dlpsh.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-dlpsh.c 2012-01-04 20:04:15.478831743 +0100 +@@ -378,7 +378,6 @@ int rm_fn(int sd, int argc, const char * + ***********************************************************************/ + int time_fn(int sd, int argc, const char *argv[]) + { +- int s; + time_t ltime; + struct tm *tm_ptr; + struct timeval tv; +@@ -389,11 +388,11 @@ int time_fn(int sd, int argc, const char + + strftime(timebuf, 80, "Now setting Palm time from desktop to: " + "%a %b %d %H:%M:%S %Z %Y\n", tm_ptr); +- printf(timebuf); ++ printf("%s", timebuf); + gettimeofday(&tv, 0); + ltime = tv.tv_sec + 1; + usleep(1000000 - tv.tv_usec); +- s = dlp_SetSysDateTime(sd, ltime); ++ dlp_SetSysDateTime(sd, ltime); + + return 0; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-file.c pilot-link-0.12.5/src/pilot-file.c +--- pilot-link-0.12.5-old/src/pilot-file.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-file.c 2011-12-20 18:05:28.584045279 +0100 +@@ -243,9 +243,12 @@ static void list_records(struct pi_file + sprintf(name, "%4s%04x.bin", + printlong(type), id_); + fp = fopen(name, "w"); +- fwrite(buf, size, 1, fp); ++ if (fwrite(buf, size, 1, fp) == 1) { ++ printf("(written to %s)\n", name); ++ } else { ++ printf("(failed to write to %s)\n", name); ++ } + fclose(fp); +- printf("(written to %s)\n", name); + } + } + } +@@ -326,9 +329,12 @@ static void dump_record(struct pi_file * + + sprintf(name, "%4s%04x.bin", printlong(type), id_); + fp = fopen(name, "w"); +- fwrite(buf, size, 1, fp); ++ if (fwrite(buf, size, 1, fp) == 1) { ++ printf("(written to %s)\n", name); ++ } else { ++ printf("(failed to write to %s)\n", name); ++ } + fclose(fp); +- printf("(written to %s)\n", name); + } + } else { + printf("entries\n"); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-foto.c pilot-link-0.12.5/src/pilot-foto.c +--- pilot-link-0.12.5-old/src/pilot-foto.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-foto.c 2011-12-20 18:49:18.859925180 +0100 +@@ -85,9 +85,15 @@ int get_jpg_info(FILE * in, char *type, + rewind(in); + + /* marker identifier, application use marker */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + word1 = htons(word); +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + word2 = htons(word); + /* printf("start of image 0x%02x 0x%02x\n", str[0], str[1]); */ + /* printf("application use marker 0x%02x 0x%02x\n", str[2], str[3]); */ +@@ -101,7 +107,10 @@ int get_jpg_info(FILE * in, char *type, + + *height = *width = -1; + /* length of application block */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + len = htons(word); + /* printf("len %d\n", len); */ + if (len > 65535) { +@@ -110,7 +119,10 @@ int get_jpg_info(FILE * in, char *type, + return -1; + } + +- fread(str, 5, 1, in); ++ if (fread(str, 5, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + str[6] = '\0'; + /* printf("%s\n", str); */ + if (strncmp(str, "JFIF", 4) && strncmp(str, "Exif", 4) +@@ -123,18 +135,27 @@ int get_jpg_info(FILE * in, char *type, + type[4] = '\0'; + + /* Version */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + *version = htons(word); + /* printf("version %d.%02d\n", ((*version)&0xFF00)>>8, (*version)&0xFF); */ + +- fread(str, len - 9, 1, in); ++ if (fread(str, len - 9, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + /* Units 1 byte + * X and Y density, 1 byte each + * X and Y thumbnail size, 2 bytes each + */ + while (!feof(in)) { + /* marker identifier */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + word1 = htons(word); + m1 = (word1 & 0xFF00) >> 8; + m2 = word1 & 0xFF; +@@ -143,18 +164,30 @@ int get_jpg_info(FILE * in, char *type, + if ((m1 == 0xFF) && (m2 == 0xC0)) { + /* The SOF0 marker (Start of Frame 0) */ + /* length(2 bytes) and data precision(1 byte) */ +- fread(str, 3, 1, in); ++ if (fread(str, 3, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + /* Height */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + *height = htons(word); + /* printf("height %d\n", *height); */ + /* Width */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + *width = htons(word); + /* printf("width %d\n", *width); */ + break; + } +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + len = htons(word); + /* printf("len %d\n", len); */ + if (len > 65535) { +@@ -162,7 +195,10 @@ int get_jpg_info(FILE * in, char *type, + rewind(in); + return -1; + } +- fread(str, len - 2, 1, in); ++ if (fread(str, len - 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + } + + rewind(in); +@@ -432,7 +468,9 @@ int do_fetch(int sd, const char **fetch_ + &attr, &category); + index++; + if (ret > 0 && buffer->used > 8) +- fwrite(buffer->data + 8, buffer->used - 8, 1, out); ++ if (fwrite(buffer->data + 8, buffer->used - 8, 1, out) != 1) { ++ fprintf(stderr, "Failed, unable to write data.\n"); ++ } + } while (ret > 0); + + dlp_CloseDB(sd, db); +@@ -691,7 +729,7 @@ int pdb_to_jpg(const char *filename) + int ret; + void *Pbuf; + size_t size; +- int total_size; ++ int total_size, actual_size; + int attr; + int cat; + recordid_t uid; +@@ -712,19 +750,24 @@ int pdb_to_jpg(const char *filename) + + index = 0; + total_size = 0; ++ actual_size = 0; + ret = 1; + while (ret >= 0) { + ret = pi_file_read_record(pi_fp, index, &Pbuf, &size, &attr, + &cat, &uid); + index++; + if ((ret >= 0) && (size > 8)) { +- fwrite(((char *) Pbuf) + 8, size - 8, 1, out); +- total_size += size - 8; ++ total_size += size - 8; ++ if (fwrite(((char *) Pbuf) + 8, size - 8, 1, out) != 1) { ++ printf("FAILED: could not write data.\n"); ++ continue; ++ } ++ actual_size += size - 8; + } + } + fclose(out); + +- printf("OK, wrote %d bytes to %s\n", total_size, info.name); ++ printf("OK, wrote %d of %d bytes to %s\n", actual_size, total_size, info.name); + return 0; + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-foto-treo600.c pilot-link-0.12.5/src/pilot-foto-treo600.c +--- pilot-link-0.12.5-old/src/pilot-foto-treo600.c 2009-06-04 15:32:30.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-foto-treo600.c 2011-12-20 20:26:16.865031433 +0100 +@@ -82,12 +82,15 @@ int extract_image(struct pi_file *pi_fp, + if (pi_file_read_record + (pi_fp, i, &Pbuf, &size, &attr, &cat, &uid) < 0) { + fprintf(stderr," WARNING: Error reading image record %d\n\n", i); ++ close(fd); + return -1; + } + + if (req_uid && uid == req_uid) { + memcpy(&req_uid, Pbuf, 4); /* get next req_uid for image 'block' */ +- write(fd, Pbuf + 4, size - 4); /* The rest is just jpeg data */ ++ if (write(fd, Pbuf + 4, size - 4) < 0) { /* The rest is just jpeg data */ ++ fprintf(stderr," WARNING: Error writing image data to %s\n", imgfilename); ++ } + } + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-foto-treo650.c pilot-link-0.12.5/src/pilot-foto-treo650.c +--- pilot-link-0.12.5-old/src/pilot-foto-treo650.c 2009-06-04 15:32:30.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-foto-treo650.c 2012-01-04 22:12:18.456346583 +0100 +@@ -41,13 +41,11 @@ + static int + pi_file_retrieve_VFS(const int fd, const int socket, FileRef file, const char *rpath ) + { +- int rpathlen = vfsMAXFILENAME; +- long attributes; +- pi_buffer_t *buffer; +- ssize_t readsize,writesize; +- int filesize; +- int original_filesize; +- int written_so_far; ++ unsigned long attributes; ++ pi_buffer_t *buffer; ++ ssize_t readsize,writesize; ++ int filesize; ++ int written_so_far; + pi_progress_t progress; + + enum +@@ -60,8 +58,6 @@ static int + internal_=-6 + }; + +- rpathlen=strlen(rpath); +- + if (dlp_VFSFileGetAttributes(socket,file,&attributes) < 0) + { + fprintf(stderr," Could not get attributes of VFS file.\n"); +@@ -78,7 +74,6 @@ static int + } + + dlp_VFSFileSize(socket,file,&filesize); +- original_filesize = filesize; + + memset(&progress, 0, sizeof(progress)); + progress.type = PI_PROGRESS_RECEIVE_VFS; +@@ -226,7 +221,7 @@ static void + } + else + { +- if( index = rindex( infos[i].name, '.' )) ++ if(( index = rindex( infos[i].name, '.' ))) + { + // printf( "index: %s %d strlen %d\n", infos[i].name, index, strlen( infos[i].name ) ); + if(( index + 4 ) == (infos[i].name + strlen( infos[i].name ))) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-getrom.c pilot-link-0.12.5/src/pilot-getrom.c +--- pilot-link-0.12.5-old/src/pilot-getrom.c 2009-06-04 15:32:31.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-getrom.c 2011-12-20 18:56:35.349427789 +0100 +@@ -176,7 +176,10 @@ int do_get_rom(int sd,const char *filena + if (j == len) + lseek(file, len, SEEK_CUR); + else +- write(file, buffer, len); ++ if (write(file, buffer, len) < 0) { ++ printf("\n Failed to write to file!\n"); ++ goto cancel; ++ } + offset += len; + if (cancel || !(i++ % 8)) + if (cancel || (dlp_OpenConduit(sd) < 0)) { +@@ -272,7 +275,7 @@ int do_get_ram(int sd, const char *filen + PackRPC(&p, 0xA026, RPC_IntReply, RPC_Ptr(print, 8), + RPC_Long(penPtr), RPC_Long(8), RPC_End); + /* err = */ dlp_RPC(sd, &p, 0); +- pi_dumpdata(print, 8); ++ pi_dumpdata((unsigned char *)print, 8); + #endif + + signal(SIGINT, sighandler); +@@ -304,7 +307,10 @@ int do_get_ram(int sd, const char *filen + if (j == len) + lseek(file, len, SEEK_CUR); + else +- write(file, buffer, len); ++ if (write(file, buffer, len) < 0) { ++ printf("\n Failed to write to file!\n"); ++ goto cancel; ++ } + + offset += len; + if (cancel || !(i++ % 4)) +@@ -414,27 +420,31 @@ int main(int argc, const char *argv[]) + const char *opthelp = NULL; + + /* These are optimized away compile-time */ +- if (DEFAULT_MODE == mode_getrom) { +- progname = "pilot-getrom"; +- opthelp= +- "[filename]\n\n" +- " Retrieves the ROM image from your Palm device.\n\n"; +- } else if (DEFAULT_MODE == mode_gettoken) { +- progname="pilot-getromtoken"; +- opthelp= +- "\n\n" +- " Reads a ROM token from a Palm Handheld device.\n" +- " Tokens you may currently extract are:\n" +- " adcc: Entropy for internal A->D convertor calibration\n" +- " irda: Present only on memory card w/IrDA support\n" +- " snum: Device serial number (from Memory Card Flash ID)\n\n" +- " Example arguments:\n" +- " -p /dev/pilot -t snum\n\n"; +- } else if (DEFAULT_MODE == mode_getram) { +- progname="pilot-getram"; +- opthelp= +- "[filename]\n\n" +- " Retrieves the RAM image from your Palm device\n\n"; ++ switch (DEFAULT_MODE) { ++ case mode_getrom: ++ progname = "pilot-getrom"; ++ opthelp= ++ "[filename]\n\n" ++ " Retrieves the ROM image from your Palm device.\n\n"; ++ break; ++ case mode_gettoken: ++ progname="pilot-getromtoken"; ++ opthelp= ++ "\n\n" ++ " Reads a ROM token from a Palm Handheld device.\n" ++ " Tokens you may currently extract are:\n" ++ " adcc: Entropy for internal A->D convertor calibration\n" ++ " irda: Present only on memory card w/IrDA support\n" ++ " snum: Device serial number (from Memory Card Flash ID)\n\n" ++ " Example arguments:\n" ++ " -p /dev/pilot -t snum\n\n"; ++ break; ++ case mode_getram: ++ progname="pilot-getram"; ++ opthelp= ++ "[filename]\n\n" ++ " Retrieves the RAM image from your Palm device\n\n"; ++ break; + } + + if (!progname) { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-hinotes.c pilot-link-0.12.5/src/pilot-hinotes.c +--- pilot-link-0.12.5-old/src/pilot-hinotes.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-hinotes.c 2012-01-04 20:08:29.926499751 +0100 +@@ -51,13 +51,11 @@ void write_memo_mbox(struct PilotUser Us + + time_t ltime; + struct tm *tm_ptr; +- char c, +- fromtmbuf[80], +- recvtmbuf[80]; ++ char fromtmbuf[80], ++ recvtmbuf[80]; + + time(<ime); + tm_ptr = localtime(<ime); +- c = *asctime(tm_ptr); + + strftime(fromtmbuf, 80, "%a, %d %b %H:%M:%S %Y (%Z)\n", tm_ptr); + strftime(recvtmbuf, 80, "%d %b %H:%M:%S %Y\n", tm_ptr); +@@ -80,7 +78,7 @@ void write_memo_mbox(struct PilotUser Us + else + printf("\n"); + printf("\n"); +- printf(m.text); ++ printf("%s", m.text); + printf("\n"); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-datebook.c pilot-link-0.12.5/src/pilot-install-datebook.c +--- pilot-link-0.12.5-old/src/pilot-install-datebook.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-datebook.c 2011-12-20 19:00:42.654177819 +0100 +@@ -106,7 +106,11 @@ int main(int argc, const char *argv[]) + return 1; + } + +- fread(file_text, filelen, 1, f); ++ if (fread(file_text, filelen, 1, f) != 1) { ++ fprintf(stderr," ERROR: Failed to read the %s file.\n", filename); ++ fclose(f); ++ return 1; ++ } + fclose(f); + f = NULL; + +@@ -252,13 +256,13 @@ int main(int argc, const char *argv[]) + dlp_WriteUserInfo(sd, &User); + + if (dlp_AddSyncLogEntry(sd, "Successfully wrote Appointment to Palm.\n" +- "Thank you for using pilot-link.\n") < 0); ++ "Thank you for using pilot-link.\n") < 0) + goto error_close; + +- if(dlp_EndOfSync(sd, 0) < 0); ++ if (dlp_EndOfSync(sd, 0) < 0) + goto error_close; + +- if(pi_close(sd) < 0) ++ if (pi_close(sd) < 0) + goto error; + + error_close: +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-expenses.c pilot-link-0.12.5/src/pilot-install-expenses.c +--- pilot-link-0.12.5-old/src/pilot-install-expenses.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-expenses.c 2011-12-19 16:05:49.391042875 +0100 +@@ -45,8 +45,8 @@ int main(int argc, const char *argv[]) + size_t size; + int found; + +- unsigned char buf[0xffff]; +- unsigned char *b; ++ char buf[0xffff]; ++ char *b; + pi_buffer_t *appblock; + + struct PilotUser User; +@@ -214,8 +214,7 @@ int main(int argc, const char *argv[]) + b += strlen(theExpense.note) + 1; + + size = b - buf; +- dlp_WriteRecord(sd, (unsigned char)db, 0, 0, category, +- (unsigned char *)buf, size, 0); ++ dlp_WriteRecord(sd, db, 0, 0, category, buf, size, 0); + + /* Close the database */ + dlp_CloseDB(sd, db); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-hinote.c pilot-link-0.12.5/src/pilot-install-hinote.c +--- pilot-link-0.12.5-old/src/pilot-install-hinote.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-hinote.c 2011-12-20 19:05:05.836653456 +0100 +@@ -164,7 +164,11 @@ int main(int argc, const char *argv[]) + strcpy(file_text, file_arg); + file_text[filenamelen] = '\n'; + +- fread(file_text + filenamelen + 1, filelen, 1, f); ++ if (fread(file_text + filenamelen + 1, filelen, 1, f) != 1) { ++ fprintf(stderr," WARNING: Failed to read from file.\n"); ++ file_text[filenamelen + 1] = '\0'; ++ continue; ++ } + file_text[filenamelen + 1 + filelen] = '\0'; + + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-memo.c pilot-link-0.12.5/src/pilot-install-memo.c +--- pilot-link-0.12.5-old/src/pilot-install-memo.c 2009-06-04 15:32:32.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-memo.c 2011-12-20 19:26:49.803270983 +0100 +@@ -89,7 +89,6 @@ int install_memo(int sd, int db, int cat + { + struct stat sbuf; + FILE *f = NULL; +- char *tmp = NULL; + char *memo_buf = NULL; + int memo_size, preamble; + +@@ -125,7 +124,11 @@ int install_memo(int sd, int db, int cat + filename, strerror(errno)); + return 1; + } +- fread(memo_buf + preamble, memo_size, 1, f); ++ if (fread(memo_buf + preamble, memo_size, 1, f) != 1) { ++ fprintf(stderr," ERROR: Unable to read from %s\n\n", filename); ++ fclose(f); ++ return 1; ++ } + fclose(f); + + dlp_WriteRecord(sd, db, 0, 0, category, memo_buf, -1, 0); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-todo.c pilot-link-0.12.5/src/pilot-install-todo.c +--- pilot-link-0.12.5-old/src/pilot-install-todo.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-todo.c 2011-12-20 19:36:06.838721596 +0100 +@@ -76,7 +76,13 @@ int read_file(char *filename, char **tex + return -1; + } + +- fread(*text, filelen, 1, f); ++ if (fread(*text, filelen, 1, f) != 1) { ++ fprintf(stderr," ERROR: Could not read the file %s.\n", filename); ++ fclose(f); ++ return -1; ++ } ++ ++ fclose(f); + + return 0; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-todos.c pilot-link-0.12.5/src/pilot-install-todos.c +--- pilot-link-0.12.5-old/src/pilot-install-todos.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-todos.c 2011-12-20 19:38:49.488931153 +0100 +@@ -63,7 +63,13 @@ void install_ToDos(int sd, int db, char + exit(EXIT_FAILURE); + } + +- fread(file_text, filelen, 1, f); ++ if (fread(file_text, filelen, 1, f) != 1) { ++ fprintf(stderr," ERROR: Failed to read from file %s.\n", filename); ++ fclose(f); ++ exit(EXIT_FAILURE); ++ } ++ ++ fclose(f); + + cPtr = file_text; + begPtr = cPtr; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-memos.c pilot-link-0.12.5/src/pilot-memos.c +--- pilot-link-0.12.5-old/src/pilot-memos.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-memos.c 2011-12-21 16:46:00.842502232 +0100 +@@ -113,27 +113,27 @@ write_memo_in_directory(char *dirname, s + mkdir(dirname, 0700); + + /* Create a directory for the category */ +- strncat(pathbuffer, dirname, MAXDIRNAMELEN); +- strncat(pathbuffer, "/", 1); ++ strncat(pathbuffer, dirname, sizeof(pathbuffer) - strlen(pathbuffer) - 1); ++ strncat(pathbuffer, "/", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + + /* Should make sure category doesn't have slashes in it */ +- strncat(pathbuffer, mai.category.name[category], 60); ++ strncat(pathbuffer, mai.category.name[category], sizeof(pathbuffer) - strlen(pathbuffer) - 1); + + /* Should check if pathbuffer exists and is a directory */ + mkdir(pathbuffer, 0700); + + /* Should check if there were problems creating directory */ + /* open the actual file to write */ +- strncat(pathbuffer, "/", 1); ++ strncat(pathbuffer, "/", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + for (j = 0; j < 40; j++) { + if ((!m.text[j]) || (m.text[j] == '\n')) + break; + if (m.text[j] == '/') { +- strncat(pathbuffer, "=2F", 3); ++ strncat(pathbuffer, "=2F", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + continue; + } + if (m.text[j] == '=') { +- strncat(pathbuffer, "=3D", 3); ++ strncat(pathbuffer, "=3D", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + continue; + } + #ifdef OS2 +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-port.c pilot-link-0.12.5/src/pilot-port.c +--- pilot-link-0.12.5-old/src/pilot-port.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-port.c 2011-12-12 16:11:16.697469186 +0100 +@@ -41,7 +41,7 @@ + #include "pi-userland.h" + + +-void do_read(struct pi_socket *ps, int type, char *buffer, int length); ++void do_read(struct pi_socket *ps, int type, unsigned char *buffer, int length); + + /*********************************************************************** + * +@@ -54,7 +54,7 @@ void do_read(struct pi_socket *ps, int t + * Returns: Nothing + * + ***********************************************************************/ +-void do_read(struct pi_socket *ps, int type, char *buffer, int length) ++void do_read(struct pi_socket *ps, int type, unsigned char *buffer, int length) + { + int len; + +@@ -92,8 +92,8 @@ int main(int argc, char *argv[]) + struct pi_socket *ps; + struct sockaddr_in serv_addr; + +- char *buffer, +- *slpbuffer; ++ char *slpbuffer; ++ unsigned char *buffer; + + poptContext pc; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-expenses.c pilot-link-0.12.5/src/pilot-read-expenses.c +--- pilot-link-0.12.5-old/src/pilot-read-expenses.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-expenses.c 2011-12-13 18:24:19.844407496 +0100 +@@ -41,8 +41,8 @@ int main(int argc, const char *argv[]) + sd = -1; + enum { mode_none, mode_write = 257 } run_mode = mode_none; + +- char buffer[0xffff]; +- char buffer2[0xffff]; ++ unsigned char buffer[0xffff]; ++ unsigned char buffer2[0xffff]; + pi_buffer_t *recbuf, + *appblock; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-notepad.c pilot-link-0.12.5/src/pilot-read-notepad.c +--- pilot-link-0.12.5-old/src/pilot-read-notepad.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-notepad.c 2012-01-04 21:20:20.727758321 +0100 +@@ -39,7 +39,7 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) ++#if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + #define png_voidp_NULL (png_voidp)NULL + #define png_error_ptr_NULL (png_error_ptr)NULL + #endif +@@ -115,10 +115,15 @@ void write_ppm( FILE *f, struct NotePad + + for( k=0; k<8; k++ ) + { +- if( n->data[i].data & 1<<(7-k) ) +- fwrite( &black, 3, 1, f ); +- else +- fwrite( &white, 3, 1, f ); ++ if( n->data[i].data & 1<<(7-k) ) { ++ if (fwrite( &black, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } else { ++ if (fwrite( &white, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } + } + } + } +@@ -127,17 +132,27 @@ void write_ppm( FILE *f, struct NotePad + { + for( k=0; k<8; k++ ) + { +- if( n->data[i].repeat & 1<<(7-k) ) +- fwrite( &black, 3, 1, f ); +- else +- fwrite( &white, 3, 1, f ); ++ if( n->data[i].repeat & 1<<(7-k) ) { ++ if (fwrite( &black, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } else { ++ if (fwrite( &white, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } + } + for( k=0; k<8; k++ ) + { +- if( n->data[i].data & 1<<(7-k) ) +- fwrite( &black, 3, 1, f ); +- else +- fwrite( &white, 3, 1, f ); ++ if( n->data[i].data & 1<<(7-k) ) { ++ if (fwrite( &black, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } else { ++ if (fwrite( &white, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } + } + } + +@@ -257,7 +272,9 @@ void write_png_v2( FILE *f, struct NoteP + return; + } + +- fwrite( n->data, n->body.dataLen, 1, f ); ++ if (fwrite( n->data, n->body.dataLen, 1, f ) != 1) { ++ fprintf(stderr, "Failed to write."); ++ } + fflush( f ); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-palmpix.c pilot-link-0.12.5/src/pilot-read-palmpix.c +--- pilot-link-0.12.5-old/src/pilot-read-palmpix.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-palmpix.c 2012-01-04 21:20:45.604415083 +0100 +@@ -42,7 +42,7 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) ++#if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + #define png_voidp_NULL (png_voidp)NULL + #define png_error_ptr_NULL (png_error_ptr)NULL + #endif +@@ -125,7 +125,7 @@ static int getrecord_pi_socket (struct P + void **buf, size_t *bufsize) + { + +- static char buffer[65536]; ++ static unsigned char buffer[65536]; + static pi_buffer_t fakebuf; + + struct PalmPixState_pi_socket *state = +@@ -199,7 +199,9 @@ void write_ppm (FILE *f, const struct Pa + fprintf (f, "P6\n# %s (taken at %s)\n%d %d\n255\n", + state->pixname, fmt_date (header), header->w, header->h); + +- fwrite (state->pixmap, header->w * header->h * 3, 1, f); ++ if (fwrite (state->pixmap, header->w * header->h * 3, 1, f) != 1) { ++ fprintf(stderr, "ERROR: Failed to write.\n"); ++ } + } + + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-screenshot.c pilot-link-0.12.5/src/pilot-read-screenshot.c +--- pilot-link-0.12.5-old/src/pilot-read-screenshot.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-screenshot.c 2012-01-04 21:55:29.073067865 +0100 +@@ -40,7 +40,7 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) ++# if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + # define png_voidp_NULL (png_voidp)NULL + # define png_error_ptr_NULL (png_error_ptr)NULL + # endif +@@ -77,7 +77,7 @@ struct ss_state { + #ifdef HAVE_PNG + void write_png ( char *fname, struct ss_state *state ) + { +- unsigned char *gray_buf; ++ unsigned char *gray_buf = 0; + int i, j; + png_structp png_ptr; + png_infop info_ptr; +@@ -103,7 +103,6 @@ void write_png ( char *fname, struct ss_ + if (setjmp (png_jmpbuf (png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); +- fclose (f); + return; + } + +@@ -169,7 +168,9 @@ void write_ppm ( char *fname, struct ss_ + fprintf (f, "255\n" ); + + for( i = 0; i < 3*state->h*state->w; i += 3 ) +- fwrite( &state->pix_map[i], 3, 1, f); ++ if (fwrite( &state->pix_map[i], 3, 1, f) != 1) { ++ fprintf(stderr, "Failed to write to %s\n", fname); ++ } + + fclose( f ); + } +@@ -194,7 +195,7 @@ void WritePictures (int sd, int db, int + // unsigned char inBuf[61440], *pixelBuf; + pi_buffer_t *inBuf, *pixelBuf; + unsigned long clut[256], magic; +- int attr, category, val, mask, j, k; ++ int attr, category, val, mask = 0, j, k; + struct ss_state state; + + if( type == OUT_PPM ) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-todos.c pilot-link-0.12.5/src/pilot-read-todos.c +--- pilot-link-0.12.5-old/src/pilot-read-todos.c 2009-06-04 15:32:32.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-todos.c 2011-12-19 16:14:28.191121790 +0100 +@@ -202,8 +202,8 @@ int main(int argc, const char *argv[]) + + for (i = 0;; i++) { + int attr, +- category, +- len; ++ category; ++ size_t len; + + struct ToDo todo; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-veo.c pilot-link-0.12.5/src/pilot-read-veo.c +--- pilot-link-0.12.5-old/src/pilot-read-veo.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-veo.c 2012-01-04 22:08:08.269082847 +0100 +@@ -41,7 +41,7 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) ++# if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + # define png_voidp_NULL (png_voidp)NULL + # define png_error_ptr_NULL (png_error_ptr)NULL + # endif +@@ -676,13 +676,12 @@ int ColourCorrect (struct Veo *v, uint8_ + ***********************************************************************/ + int Gen24bitRow (long flags, int r, struct Veo *v, unsigned char *row) + { +- int i, rawW, rawH, modR = r % 4; ++ int i, rawW, modR = r % 4; + + unsigned char rowA[2560], rowB[2560]; + unsigned char *rAP, *rBP, *rCP; + + rawW = v->width / 2; +- rawH = v->height / 2; + + if (r == 0) + { +@@ -924,7 +923,9 @@ void write_ppm (FILE * f, struct Veo *v, + { + Gen24bitRow (flags, i, v, outBuf); + +- fwrite (outBuf, v->width * 3, 1, f); ++ if (fwrite (outBuf, v->width * 3, 1, f) != 1) { ++ fprintf(stderr, "WARNING: Failed to write.\n"); ++ } + } + } + +@@ -944,7 +945,6 @@ void WritePicture (int sd, int db, int t + char fname[FILENAME_MAX]; + FILE *f; + char extension[8]; +- static int len; + struct Veo v; + pi_buffer_t *inBuf; + int attr, category; +@@ -971,8 +971,7 @@ void WritePicture (int sd, int db, int t + if (sd) + { + inBuf = pi_buffer_new (2560); +- len = +- dlp_ReadRecordByIndex (sd, db, 0, inBuf, 0, &attr, &category); ++ dlp_ReadRecordByIndex (sd, db, 0, inBuf, 0, &attr, &category); + unpack_Veo (&v, inBuf->data, inBuf->used); + pi_buffer_free (inBuf); + v.sd = sd; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-wav.c pilot-link-0.12.5/src/pilot-wav.c +--- pilot-link-0.12.5-old/src/pilot-wav.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-wav.c 2012-01-04 22:23:44.024691316 +0100 +@@ -107,31 +107,54 @@ long write_header(FILE * out) + wWaveLength = 0; + + /* RIFF Header */ +- fwrite("RIFF", 4, 1, out); +- fwrite(&wWaveLength, 4, 1, out); +- fwrite("WAVE", 4, 1, out); ++ if ( ++ fwrite("RIFF", 4, 1, out) != 1 ++ || fwrite(&wWaveLength, 4, 1, out) != 1 ++ || fwrite("WAVE", 4, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Format Chunk */ +- fwrite(formatChunkID, 4, 1, out); ++ if (fwrite(formatChunkID, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Length of Format Chunk - 4 (fmt ) - 4 (length value itself) */ +- fwrite(&formatChunkSize, 4, 1, out); +- fwrite(&wFormatTag, 2, 1, out); +- fwrite(&wChannels, 2, 1, out); +- fwrite(&dwSamplesPerSec, 4, 1, out); +- fwrite(&dwAvgBytesPerSec, 4, 1, out); +- fwrite(&wBlockAlign, 2, 1, out); +- fwrite(&wBitsPerSample, 2, 1, out); ++ if ( ++ fwrite(&formatChunkSize, 4, 1, out) != 1 ++ || fwrite(&wFormatTag, 2, 1, out) != 1 ++ || fwrite(&wChannels, 2, 1, out) != 1 ++ || fwrite(&dwSamplesPerSec, 4, 1, out) != 1 ++ || fwrite(&dwAvgBytesPerSec, 4, 1, out) != 1 ++ || fwrite(&wBlockAlign, 2, 1, out) != 1 ++ || fwrite(&wBitsPerSample, 2, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Extended Format Chunk Fields */ + + /* Extended format block size including(it appears) cbSize itself */ +- fwrite(&cbSize, 2, 1, out); +- fwrite(&wSamplesPerBlock, 2, 1, out); ++ if ( ++ fwrite(&cbSize, 2, 1, out) != 1 ++ || fwrite(&wSamplesPerBlock, 2, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Data Chunk */ +- fwrite(dataChunkID, 4, 1, out); +- fwrite(&dataChunkSize, 4, 1, out); ++ if ( ++ fwrite(dataChunkID, 4, 1, out) != 1 ++ || fwrite(&dataChunkSize, 4, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + return formatChunkSize; + } +@@ -154,10 +177,16 @@ long write_header(FILE * out) + long write_data(char *buffer, int index, int size, long dataChunkSize, FILE *out) + { + if (index == 0) { +- fwrite(buffer + 122, size - 122, 1, out); ++ if (fwrite(buffer + 122, size - 122, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ return 0; ++ } + dataChunkSize += size - 122; + } else { +- fwrite(buffer + 8, size - 8, 1, out); ++ if (fwrite(buffer + 8, size - 8, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ return 0; ++ } + dataChunkSize += size - 8; + } + return dataChunkSize; +@@ -254,15 +283,19 @@ int fetch_wavs(int sd, char *dbname) + PI_ARGS((sd, db, index, buffer, &id_, + &attr, &category)); + if (ret > 0) { +- dataChunkSize = write_data(buffer->data, index, buffer->used, dataChunkSize, out); ++ dataChunkSize = write_data((char *)buffer->data, index, buffer->used, dataChunkSize, out); + } + index++; + } + wWaveLength = 4 + 4 + 4 + formatChunkSize + 4 + 4 + dataChunkSize; + fseek(out, 44, SEEK_SET); +- fwrite(&dataChunkSize, 4, 1, out); ++ if (fwrite(&dataChunkSize, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + fseek(out, 4, SEEK_SET); +- fwrite(&wWaveLength, 4, 1, out); ++ if (fwrite(&wWaveLength, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + dlp_CloseDB(sd, db); + fclose(out); + if (!plu_quiet) { +@@ -288,12 +321,11 @@ int fetch_wavs(int sd, char *dbname) + ***********************************************************************/ + int do_fetch(char *dbname) + { +- int sd = -1, +- ret; ++ int sd = -1; + + sd = plu_connect(); + +- ret = fetch_wavs(sd, dbname); ++ fetch_wavs(sd, dbname); + + dlp_EndOfSync(sd, dlpEndCodeNormal); + pi_close(sd); +@@ -364,9 +396,13 @@ int pdb_to_wav(char *filename) + } + wWaveLength = 4 + 4 + 4 + formatChunkSize + 4 + 4 + dataChunkSize; + fseek(out, 44, SEEK_SET); +- fwrite(&dataChunkSize, 4, 1, out); ++ if (fwrite(&dataChunkSize, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + fseek(out, 4, SEEK_SET); +- fwrite(&wWaveLength, 4, 1, out); ++ if (fwrite(&wWaveLength, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + fclose(out); + pi_file_close(pi_fp); + if (!plu_quiet) { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-xfer.c pilot-link-0.12.5/src/pilot-xfer.c +--- pilot-link-0.12.5-old/src/pilot-xfer.c 2010-02-07 03:21:18.000000000 +0100 ++++ pilot-link-0.12.5/src/pilot-xfer.c 2012-01-04 22:28:32.040166439 +0100 +@@ -713,7 +713,6 @@ pi_file_retrieve_VFS(const int fd, const + pi_buffer_t *buffer; + ssize_t readsize,writesize; + int filesize; +- int original_filesize; + int written_so_far; + pi_progress_t progress; + +@@ -762,7 +761,6 @@ pi_file_retrieve_VFS(const int fd, const + } + + dlp_VFSFileSize(socket,file,&filesize); +- original_filesize = filesize; + + memset(&progress, 0, sizeof(progress)); + progress.type = PI_PROGRESS_RECEIVE_VFS; +@@ -2478,7 +2476,7 @@ main(int argc, const char *argv[]) + fprintf(stderr, " ERROR: '%s' is not a directory or does not exist.\n" + " Please supply a directory name when performing a " + "backup or restore and try again.\n\n", dirname); +- fprintf(stderr,gracias); ++ fprintf(stderr, "%s", gracias); + return 1; + } + } +@@ -2488,13 +2486,13 @@ main(int argc, const char *argv[]) + if (rargc > 0) + { + fprintf(stderr," ERROR: Do not pass additional arguments to -busrlLC.\n"); +- fprintf(stderr,gracias); ++ fprintf(stderr, "%s", gracias); + return 1; + } + break; + case palm_op_noop: + fprintf(stderr," ERROR: Must specify one of -bursimfdlC.\n"); +- fprintf(stderr,gracias); ++ fprintf(stderr, "%s", gracias); + return 1; + break; + case palm_op_merge: +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/calendardb-test.c pilot-link-0.12.5/tests/calendardb-test.c +--- pilot-link-0.12.5-old/tests/calendardb-test.c 2010-02-07 03:21:18.000000000 +0100 ++++ pilot-link-0.12.5/tests/calendardb-test.c 2012-01-13 16:04:45.000000000 +0100 +@@ -225,7 +225,7 @@ void parse(pi_file_t *pf) + + if(pi_buf->used != test->used) { + int i; +- printf("Error: Different record sizes unpack: %ld pack: %ld last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); ++ printf("Error: Different record sizes unpack: %zd pack: %zd last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); + for(i=0; i<pi_buf->used; ++i) { + if(pi_buf->data[i] != test->data[i]) { + printf("Error: Byte %d is different unpack: 0x%02X pack: 0x%02X\n", i, pi_buf->data[i], test->data[i]); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/contactsdb-test.c pilot-link-0.12.5/tests/contactsdb-test.c +--- pilot-link-0.12.5-old/tests/contactsdb-test.c 2009-05-25 05:22:56.000000000 +0200 ++++ pilot-link-0.12.5/tests/contactsdb-test.c 2011-12-14 17:30:21.000000000 +0100 +@@ -31,6 +31,7 @@ + #include "pi-header.h" + #include "pi-appinfo.h" + #include "pi-contact.h" ++#include "pi-userland.h" + + #undef PRINT_USELESS_INFO + #undef SAVE_PICTURES +@@ -319,7 +320,7 @@ print_records (int sd, int db, struct Co + fclose (f); + } + #else +- printf (" Picture : JPEG (%zu bytes)\n", ++ printf (" Picture : JPEG (%u bytes)\n", + c.picture->length); + #endif /* SAVE_PICTURES */ + } +@@ -345,7 +346,8 @@ main (const int argc, const char **argv) + return 1; + } + +- sd = pilot_connect (argv[1]); ++ setenv("PILOTPORT", argv[1], 1); ++ sd = plu_connect(); + + if (sd < 0) + goto error; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/locationdb-test.c pilot-link-0.12.5/tests/locationdb-test.c +--- pilot-link-0.12.5-old/tests/locationdb-test.c 2009-02-22 09:09:02.000000000 +0100 ++++ pilot-link-0.12.5/tests/locationdb-test.c 2012-01-13 16:05:12.000000000 +0100 +@@ -149,7 +149,7 @@ void parse(pi_file_t *pf) + + if(pi_buf->used != test->used) { + int i; +- printf("Error: Different record sizes unpack: %d pack: %d last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); ++ printf("Error: Different record sizes unpack: %zu pack: %zu last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); + for(i=0; i<pi_buf->used; ++i) { + if(pi_buf->data[i] != test->data[i]) { + printf("Error: Byte %d is different unpack: 0x%02X pack: 0x%02X\n", i, pi_buf->data[i], test->data[i]); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/Makefile.am pilot-link-0.12.5/tests/Makefile.am +--- pilot-link-0.12.5-old/tests/Makefile.am 2009-05-25 06:32:06.000000000 +0200 ++++ pilot-link-0.12.5/tests/Makefile.am 2011-12-19 13:21:52.692923303 +0100 +@@ -1,5 +1,4 @@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(POPT_INCLUDES) + +@@ -24,7 +23,8 @@ locationdb_test_LDADD = \ + contactsdb_test_SOURCES = \ + contactsdb-test.c + contactsdb_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + dlp_test_SOURCES = \ + dlp-test.c +@@ -34,7 +34,8 @@ dlp_test_LDADD = \ + vfs_test_SOURCES = \ + vfs-test.c + vfs_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + versamail_test_SOURCES = \ + versamail-test.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/Makefile.in pilot-link-0.12.5/tests/Makefile.in +--- pilot-link-0.12.5-old/tests/Makefile.in 2012-01-04 17:53:04.788589991 +0100 ++++ pilot-link-0.12.5/tests/Makefile.in 2012-01-04 22:52:56.840844137 +0100 +@@ -63,7 +63,8 @@ calendardb_test_OBJECTS = $(am_calendard + calendardb_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la + am_contactsdb_test_OBJECTS = contactsdb-test.$(OBJEXT) + contactsdb_test_OBJECTS = $(am_contactsdb_test_OBJECTS) +-contactsdb_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la ++contactsdb_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + am_dlp_test_OBJECTS = dlp-test.$(OBJEXT) + dlp_test_OBJECTS = $(am_dlp_test_OBJECTS) + dlp_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la +@@ -78,7 +79,8 @@ versamail_test_OBJECTS = $(am_versamail_ + versamail_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la + am_vfs_test_OBJECTS = vfs-test.$(OBJEXT) + vfs_test_OBJECTS = $(am_vfs_test_OBJECTS) +-vfs_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la ++vfs_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -288,7 +290,6 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + usb_libs = @usb_libs@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(POPT_INCLUDES) + +@@ -308,7 +309,8 @@ contactsdb_test_SOURCES = \ + contactsdb-test.c + + contactsdb_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + dlp_test_SOURCES = \ + dlp-test.c +@@ -320,7 +322,8 @@ vfs_test_SOURCES = \ + vfs-test.c + + vfs_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + versamail_test_SOURCES = \ + versamail-test.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/packers.c pilot-link-0.12.5/tests/packers.c +--- pilot-link-0.12.5-old/tests/packers.c 2005-06-16 17:38:28.000000000 +0200 ++++ pilot-link-0.12.5/tests/packers.c 2011-12-20 16:33:46.072123761 +0100 +@@ -20,13 +20,14 @@ + #include "pi-dlp.h" + #include "pi-expense.h" + #include "pi-mail.h" ++#include "pi-debug.h" + + unsigned char seed; +-char *target; ++unsigned char *target; + int targetlen; + + +-void reset_block(char *buffer, int len) ++void reset_block(unsigned char *buffer, int len) + { + unsigned int i; + +@@ -34,19 +35,19 @@ void reset_block(char *buffer, int len) + buffer[i] = (i + seed) & 0xff; + } + +-int check_block(int test, const char *buffer, int len, int start, ++int check_block(int test, const unsigned char *buffer, int len, int start, + int count, const char *name) + { + unsigned int i; + int fore = 0, aft = 0; + + for (i = 0; i < start; i++) +- if (buffer[i] != (char) ((i + seed) & 0xff)) { ++ if (buffer[i] != ((i + seed) & 0xff)) { + fore = start - i; + break; + } + for (i = start + count; i < len; i++) +- if (buffer[i] != (char) ((i + seed) & 0xff)) { ++ if (buffer[i] != ((i + seed) & 0xff)) { + aft = i - start; + break; + } +@@ -64,7 +65,7 @@ int check_block(int test, const char *bu + return 0; + } + +-char MemoAppBlock[17 * 16 + 10] = "\ ++unsigned char MemoAppBlock[17 * 16 + 10] = "\ + \x00\x00\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x42\x75\x73\x69\x6e\x65\x73\x73\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x65\x72\x73\x6f\x6e\x61\x6c\x00\x00\x00\x00\x00\x00\ +@@ -84,7 +85,7 @@ char MemoAppBlock[17 * 16 + 10] = "\ + \x00\x00\x00\x01\x02\x10\x11\x12\x13\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x13\x00\x00\x00\x00\x00\x01\x00"; + +-char MemoRecord[3 * 16 + 7] = "\ ++unsigned char MemoRecord[3 * 16 + 7] = "\ + \x61\x61\x4d\x61\x6b\x65\x66\x69\x6c\x65\x0a\x52\x45\x41\x44\x4d\ + \x45\x0a\x6c\x69\x63\x65\x6e\x73\x65\x2e\x74\x65\x72\x6d\x73\x0a\ + \x70\x69\x6c\x6f\x74\x6c\x69\x6e\x6b\x2e\x63\x0a\x74\x65\x73\x74\ +@@ -103,7 +104,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("1: unpack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -112,7 +113,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("2: unpack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -141,7 +142,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("5: unpack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -205,7 +206,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("7: pack_MemoAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_MemoAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -230,7 +231,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("10: pack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -271,7 +272,7 @@ int test_memo() + if (RecordBuffer->used != sizeof(MemoRecord)) { + errors++; + printf +- ("15: pack_MemoRecord returned incorrect allocation length (got %d, expected %d)\n", ++ ("15: pack_MemoRecord returned incorrect allocation length (got %lu, expected %lu)\n", + RecordBuffer->used, sizeof(MemoRecord)); + } + +@@ -290,7 +291,7 @@ int test_memo() + return errors; + } + +-char AddressAppBlock[39 * 16 + 14] = "\ ++unsigned char AddressAppBlock[39 * 16 + 14] = "\ + \x00\x10\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x42\x75\x73\x69\x6e\x65\x73\x73\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x65\x72\x73\x6f\x6e\x61\x6c\x00\x00\x00\x00\x00\x00\ +@@ -332,7 +333,7 @@ char AddressAppBlock[39 * 16 + 14] = "\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x4d\x6f\x62\x69\x6c\x65\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x17\x00\x00\x00"; + +-char AddressRecord[2 * 16 + 12] = "\ ++unsigned char AddressRecord[2 * 16 + 12] = "\ + \x00\x14\x32\x10\x00\x04\x41\x03\x00\x53\x68\x61\x77\x00\x42\x65\ + \x72\x6e\x61\x72\x64\x00\x4e\x6f\x6e\x65\x20\x6b\x6e\x6f\x77\x6e\ + \x00\x43\x31\x00\x41\x20\x6e\x6f\x74\x65\x2e\x00"; +@@ -352,7 +353,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("1: unpack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -363,7 +364,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("2: unpack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -396,7 +397,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("5: unpack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -458,7 +459,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("7: pack_AddressAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_AddressAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -484,7 +485,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("10: pack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -534,7 +535,7 @@ int test_address() + if (RecordBuffer->used != sizeof(AddressRecord)) { + errors++; + printf +- ("15: pack_Address returned incorrect length (got %d, expected %d)\n", ++ ("15: pack_Address returned incorrect length (got %lu, expected %lu)\n", + RecordBuffer->used, sizeof(AddressRecord)); + } + +@@ -553,7 +554,7 @@ int test_address() + return errors; + } + +-char AppointmentAppBlock[17 * 16 + 8] = "\ ++unsigned char AppointmentAppBlock[17 * 16 + 8] = "\ + \x00\x00\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +@@ -577,7 +578,7 @@ char AppointmentAppBlock[17 * 16 + 8] = + and thus have a floating value. This sample record has + been altered to make theses bytes zero, to match what our + packing code generates. */ +-char AppointmentRecord[2 * 16 + 3] = "\ ++unsigned char AppointmentRecord[2 * 16 + 3] = "\ + \x09\x00\x0d\x28\xbb\x02\x7c\x00\x1d\x02\x02\x00\xbd\x24\x02\x55\ + \x00\x00\x00\x01\xbb\x0c\x47\x65\x6f\x72\x67\x65\x00\x4e\x6f\x74\ + \x65\x21\x00"; +@@ -598,7 +599,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("1: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -609,7 +610,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("2: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -642,7 +643,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("5: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -707,7 +708,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("7: pack_AppointmentAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_AppointmentAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -733,7 +734,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("10: pack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -785,7 +786,7 @@ int test_appointment() + if (RecordBuffer->used != sizeof(AppointmentRecord)) { + errors++; + printf +- ("15: pack_Appointment returned incorrect length (got %d, expected %d)\n", ++ ("15: pack_Appointment returned incorrect length (got %lu, expected %lu)\n", + RecordBuffer->used, sizeof(AppointmentRecord)); + } + +@@ -804,7 +805,7 @@ int test_appointment() + return errors; + } + +-char ToDoAppBlock[17 * 16 + 10] = "\ ++unsigned char ToDoAppBlock[17 * 16 + 10] = "\ + \x00\x08\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x42\x75\x73\x69\x6e\x65\x73\x73\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x65\x72\x73\x6f\x6e\x61\x6c\x00\x00\x00\x00\x00\x00\ +@@ -824,7 +825,7 @@ char ToDoAppBlock[17 * 16 + 10] = "\ + \x00\x00\x00\x01\x02\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x11\x00\x00\x00\xff\xff\x01\x00"; + +-char ToDoRecord[1 * 16 + 1] = "\ ++unsigned char ToDoRecord[1 * 16 + 1] = "\ + \xbb\x09\x05\x54\x6f\x64\x6f\x33\x00\x41\x20\x6e\x6f\x74\x65\x2e\ + \x00"; + +@@ -841,7 +842,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("1: unpack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -850,7 +851,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("2: unpack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -877,7 +878,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("5: unpack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -941,7 +942,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("7: pack_ToDoAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_ToDoAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -966,7 +967,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("10: pack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -1020,7 +1021,7 @@ int test_todo() + if (RecordBuffer->used != sizeof(ToDoRecord)) { + errors++; + printf +- ("15: pack_ToDo returned incorrect length (got %d, expected %d)\n", ++ ("15: pack_ToDo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoRecord)); + } + +@@ -1039,7 +1040,7 @@ int test_todo() + return errors; + } + +-char ExpenseAppBlock[24 * 16 + 8] = "\ ++unsigned char ExpenseAppBlock[24 * 16 + 8] = "\ + \x00\x00\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x4e\x65\x77\x20\x59\x6f\x72\x6b\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x61\x72\x69\x73\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +@@ -1067,7 +1068,7 @@ char ExpenseAppBlock[24 * 16 + 8] = "\ + \x00\x00\x00\x00\x00\x00\x00\x00"; + + /* Byte five is floating */ +-char ExpenseRecord[1 * 16 + 14] = "\ ++unsigned char ExpenseRecord[1 * 16 + 14] = "\ + \xbb\x2a\x09\x01\x08\x00\x32\x39\x2e\x37\x32\x00\x55\x00\x43\x00\ + \x41\x74\x74\x00\x54\x68\x65\x20\x6e\x6f\x74\x65\x2e\x00"; + +@@ -1086,7 +1087,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("1: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1097,7 +1098,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("2: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1115,7 +1116,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("3: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("3: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1180,7 +1181,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("5: pack_ExpenseAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("5: pack_ExpenseAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1206,7 +1207,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("8: pack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("8: pack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1229,7 +1230,7 @@ int test_expense() + if (l != sizeof(ExpenseRecord)) { + errors++; + printf +- ("11: unpack_Expense returned incorrect length (got %d, expected %d)\n", ++ ("11: unpack_Expense returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseRecord)); + } + +@@ -1256,7 +1257,7 @@ int test_expense() + if (l != sizeof(ExpenseRecord)) { + errors++; + printf +- ("13: pack_Expense returned incorrect allocation length (got %d, expected %d)\n", ++ ("13: pack_Expense returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(ExpenseRecord)); + } + +@@ -1281,7 +1282,7 @@ int test_expense() + if (l != sizeof(ExpenseRecord)) { + errors++; + printf +- ("16: pack_Expense returned incorrect length (got %d, expected %d)\n", ++ ("16: pack_Expense returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseRecord)); + } + +@@ -1302,7 +1303,7 @@ int test_expense() + return errors; + } + +-char MailAppBlock[18 * 16 + 1] = "\ ++unsigned char MailAppBlock[18 * 16 + 1] = "\ + \x00\x1f\x49\x6e\x62\x6f\x78\x00\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x4f\x75\x74\x62\x6f\x78\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x44\x65\x6c\x65\x74\x65\x64\x00\x00\x00\x00\x00\x00\x00\ +@@ -1323,14 +1324,14 @@ char MailAppBlock[18 * 16 + 1] = "\ + \x0e\x0f\x0f\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x01\x20\ + \x00"; + +-char MailRecord[1 * 16 + 2] = "\ ++unsigned char MailRecord[1 * 16 + 2] = "\ + \x00\x00\x00\x00\x78\x00\x43\x00\x00\x61\x00\x62\x00\x00\x00\x00\ + \x44\x00"; /*\x27"; This byte seems to be spurious */ + +-char MailSigPreference[3] = "\ ++unsigned char MailSigPreference[3] = "\ + \x61\x62\x00"; + +-char MailSyncPreference[13] = "\ ++unsigned char MailSyncPreference[13] = "\ + \x02\x01\x00\x00\x17\x70\x61\x74\x00\x6c\x64\x00\x00"; + + int test_mail() +@@ -1347,7 +1348,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("1: unpack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1356,7 +1357,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("2: unpack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1372,7 +1373,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("3: unpack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("3: unpack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1437,7 +1438,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("5: pack_MailAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("5: pack_MailAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1462,7 +1463,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("8: pack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("8: pack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1485,7 +1486,7 @@ int test_mail() + if (l != sizeof(MailRecord)) { + errors++; + printf +- ("11: unpack_Mail returned incorrect length (got %d, expected %d)\n", ++ ("11: unpack_Mail returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailRecord)); + } + +@@ -1512,7 +1513,7 @@ int test_mail() + if (l != sizeof(MailRecord)) { + errors++; + printf +- ("13: pack_Mail returned incorrect allocation length (got %d, expected %d)\n", ++ ("13: pack_Mail returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailRecord)); + } + +@@ -1536,7 +1537,7 @@ int test_mail() + if (l != sizeof(MailRecord)) { + errors++; + printf +- ("16: pack_Mail returned incorrect length (got %d, expected %d)\n", ++ ("16: pack_Mail returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailRecord)); + } + +@@ -1560,7 +1561,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("19: unpack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("19: unpack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1571,7 +1572,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("20: unpack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("20: unpack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1582,7 +1583,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("21: unpack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("21: unpack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1609,7 +1610,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("23: pack_MailSyncPref returned incorrect allocation length (got %d, expected %d)\n", ++ ("23: pack_MailSyncPref returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1635,7 +1636,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("26: pack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("26: pack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1661,7 +1662,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("29: unpack_MailSigPref returned incorrect length (got %d, expected %d)\n", ++ ("29: unpack_MailSigPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1672,7 +1673,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("30: unpack_MailSigPref returned incorrect length (got %d, expected %d)\n", ++ ("30: unpack_MailSigPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1683,7 +1684,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("31: unpack_MailSigPref returned incorrect length (got %d, expected %d)\n", ++ ("31: unpack_MailSigPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1710,7 +1711,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("33: pack_MailSignaturePref returned incorrect allocation length (got %d, expected %d)\n", ++ ("33: pack_MailSignaturePref returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailSigPreference)); + } + +@@ -1736,7 +1737,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("36: pack_MailSignaturePref returned incorrect length (got %d, expected %d)\n", ++ ("36: pack_MailSignaturePref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSigPreference)); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/versamail-test.c pilot-link-0.12.5/tests/versamail-test.c +--- pilot-link-0.12.5-old/tests/versamail-test.c 2005-04-21 17:21:30.000000000 +0200 ++++ pilot-link-0.12.5/tests/versamail-test.c 2011-12-14 16:39:27.926393327 +0100 +@@ -186,7 +186,7 @@ int main(int argc, char *argv[]) + { + struct pi_file *pi_fp; + char *DBname; +- int r; ++ int r = 0; + int idx; + size_t size; + int attr; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/vfs-test.c pilot-link-0.12.5/tests/vfs-test.c +--- pilot-link-0.12.5-old/tests/vfs-test.c 2007-02-05 10:48:10.000000000 +0100 ++++ pilot-link-0.12.5/tests/vfs-test.c 2011-12-14 20:07:53.702893697 +0100 +@@ -35,6 +35,7 @@ + #include "pi-error.h" + #include "pi-source.h" + #include "pi-header.h" ++#include "pi-userland.h" + + + /* For various protocol versions, set to 0 to not test those versions */ +@@ -77,7 +78,8 @@ int main (int argc, char **argv) + + unsigned long flags; + +- sd = pilot_connect (argv[1]); ++ setenv("PILOTPORT", argv[1], 1); ++ sd = plu_connect(); + if (sd < 0) return 1; + + t1 = time (NULL); +@@ -297,7 +299,7 @@ int main (int argc, char **argv) + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* ERROR: File read: read %d instead of the expected %d\n", len, strlen (name))); + } else if (memcmp (name, fileBuf->data, fileBuf->used)) { + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* ERROR: File read: read data mismatch\n", fileBuf->used, strlen (name))); +- pi_dumpdata (name, fileBuf->used); ++ pi_dumpdata ((unsigned char*)name, fileBuf->used); + pi_dumpdata (fileBuf->data, fileBuf->used); + } else { + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* File read: successfully read the data back\n")); diff --git a/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f19.patch b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f19.patch new file mode 100644 index 000000000..5dfff20ab --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f19.patch @@ -0,0 +1,24 @@ +diff -up pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 pilot-link-0.12.5/libpisock/md5.c +--- pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 2013-02-25 15:17:31.708780677 +0100 ++++ pilot-link-0.12.5/libpisock/md5.c 2013-02-25 15:15:07.771861922 +0100 +@@ -125,7 +125,7 @@ void MD5Final(UINT8 digest[16], struct M + + byteSwap(ctx->buf, 4); + memcpy(digest, ctx->buf, 16); +- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ++ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + } + + #ifndef ASM_MD5 +diff -up pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 pilot-link-0.12.5/popt/popthelp.c +--- pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 2004-08-25 17:06:39.000000000 +0200 ++++ pilot-link-0.12.5/popt/popthelp.c 2013-02-25 15:16:34.593606516 +0100 +@@ -683,7 +683,7 @@ static int showShortOptions(const struct + s[0] = '\0'; + /*@-branchstate@*/ /* FIX: W2DO? */ + if (str == NULL) { +- memset(s, 0, sizeof(s)); ++ memset(s, 0, sizeof(*s)); + str = s; + } + /*@=branchstate@*/ diff --git a/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f21.patch b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f21.patch new file mode 100644 index 000000000..772c68a3a --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f21.patch @@ -0,0 +1,22 @@ +diff -ur pilot-link-0.12.5.orig/configure pilot-link-0.12.5/configure +--- pilot-link-0.12.5.orig/configure 2010-02-07 04:42:29.000000000 +0100 ++++ pilot-link-0.12.5/configure 2014-05-09 15:36:30.466127800 +0200 +@@ -2604,12 +2604,12 @@ + + + enable_werror=no +-save_CFLAGS="$CFLAGS" +-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` +-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` +-if test "x$CFLAGS" != "x$save_CFLAGS"; then +- enable_werror="yes" +-fi ++#save_CFLAGS="$CFLAGS" ++#CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` ++#CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` ++#if test "x$CFLAGS" != "x$save_CFLAGS"; then ++# enable_werror="yes" ++#fi + + + ac_aux_dir= diff --git a/source/l/pilot-link/pilot-link-0.12.5-mp.patch b/source/l/pilot-link/pilot-link-0.12.5-mp.patch new file mode 100644 index 000000000..c2d302615 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-mp.patch @@ -0,0 +1,13 @@ +diff -up pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom pilot-link-0.12.5/doc/man/pilot-install-expenses.1 +--- pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom 2010-02-07 04:43:11.000000000 +0100 ++++ pilot-link-0.12.5/doc/man/pilot-install-expenses.1 2011-03-09 17:12:30.000000000 +0100 +@@ -76,7 +76,7 @@ Add the number of attendees to the expen + \fB\-\-city\fR \fBSTRING\fR + + .PP +-Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occured in\&. ++Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occurred in\&. + + \fB\-n\fR, + \fB\-\-note\fR \fBSTRING\fR +diff -up pilot-link-0.12.5/doc/man/pilot-install-netsync.1.pom pilot-link-0.12.5/doc/man/pilot-install-netsync.1 diff --git a/source/l/pilot-link/pilot-link-c99.patch b/source/l/pilot-link/pilot-link-c99.patch new file mode 100644 index 000000000..4e69bc866 --- /dev/null +++ b/source/l/pilot-link/pilot-link-c99.patch @@ -0,0 +1,28 @@ +Fix return types for PDA::Pilot::getRecords in the Perl bindings. + +diff --git a/bindings/Perl/Pilot.xs b/bindings/Perl/Pilot.xs +index ef6865b710557fe8..424a24e64df8d2ae 100644 +--- a/bindings/Perl/Pilot.xs ++++ b/bindings/Perl/Pilot.xs +@@ -2542,16 +2542,18 @@ resetNext(self) + OUTPUT: + RETVAL + +-int ++SV * + getRecords(self) + PDA::Pilot::DLP::DB *self + CODE: + { +- int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &RETVAL); ++ int retval; ++ int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &retval); + if (result < 0) { + RETVAL = newSVsv(&PL_sv_undef); + self->errnop = result; +- } ++ } else ++ RETVAL = newSViv(retval); + } + OUTPUT: + RETVAL diff --git a/source/l/pilot-link/pilot-link-configure-c99.patch b/source/l/pilot-link/pilot-link-configure-c99.patch new file mode 100644 index 000000000..7ce8d0eed --- /dev/null +++ b/source/l/pilot-link/pilot-link-configure-c99.patch @@ -0,0 +1,30 @@ +The standard iconv function expects a char ** type for its input +argument. Adjust the configure probe to avoid build failures +with future compilers. + +diff --git a/configure b/configure +index d4031564da7e2184..a2e5877f8588059d 100755 +--- a/configure ++++ b/configure +@@ -15859,7 +15859,7 @@ else + + int main (int argc, char **argv) + { +- const char *pc = "\x66\x66\x66\x66\x66\x66\x66\xA9"; ++ char *pc = (char *) "\x66\x66\x66\x66\x66\x66\x66\xA9"; + const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9"; + char transbuf[10], *trans = transbuf; + iconv_t cd; +diff --git a/configure.ac b/configure.ac +index dc19311ce99f888a..ce9b310527e1a8dc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -458,7 +458,7 @@ AC_CHECK_LIB( + + int main (int argc, char **argv) + { +- const char *pc = "\x66\x66\x66\x66\x66\x66\x66\xA9"; ++ char *pc = (char *) "\x66\x66\x66\x66\x66\x66\x66\xA9"; + const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9"; + char transbuf[10], *trans = transbuf; + iconv_t cd; diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild index 80e15ce26..1e149534e 100755 --- a/source/l/pilot-link/pilot-link.SlackBuild +++ b/source/l/pilot-link/pilot-link.SlackBuild @@ -70,8 +70,17 @@ rm -rf pilot-link-$VERSION tar xvf $CWD/pilot-link-$VERSION.tar.bz2 || exit 1 cd pilot-link-$VERSION || exit 1 -zcat $CWD/pilot-link.png14.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/pilot-link-0.12.5-redefinePerlsymbols.patch.gz | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.1-var.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.2-open.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.3-clio.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-mp.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-redefinePerlsymbols.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-compiler_warnings.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-ftbfs-f19.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-aarch64.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-ftbfs-f21.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-configure-c99.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-c99.patch | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/source/l/pilot-link/pilot-link.png14.diff b/source/l/pilot-link/pilot-link.png14.diff deleted file mode 100644 index bc1cba25d..000000000 --- a/source/l/pilot-link/pilot-link.png14.diff +++ /dev/null @@ -1,96 +0,0 @@ ---- ./src/pilot-read-veo.c.orig 2007-02-04 17:06:03.000000000 -0600 -+++ ./src/pilot-read-veo.c 2010-02-19 12:52:30.000000000 -0600 -@@ -41,10 +41,6 @@ - - #ifdef HAVE_PNG - # include "png.h" --# if (PNG_LIBPNG_VER < 10201) --# define png_voidp_NULL (png_voidp)NULL --# define png_error_ptr_NULL (png_error_ptr)NULL --# endif - #endif - - #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) -@@ -856,8 +852,8 @@ - png_infop info_ptr; - - png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if (!png_ptr) - return; ---- ./src/pilot-read-notepad.c.orig 2007-02-04 17:06:02.000000000 -0600 -+++ ./src/pilot-read-notepad.c 2010-02-19 12:53:03.000000000 -0600 -@@ -39,10 +39,6 @@ - - #ifdef HAVE_PNG - #include "png.h" --#if (PNG_LIBPNG_VER < 10201) -- #define png_voidp_NULL (png_voidp)NULL -- #define png_error_ptr_NULL (png_error_ptr)NULL --#endif - #endif - - const char *progname; -@@ -166,8 +162,8 @@ - width = n->body.width + 8; - - png_ptr = png_create_write_struct -- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ ( PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if(!png_ptr) - return; ---- ./src/pilot-read-screenshot.c.orig 2006-11-02 08:54:31.000000000 -0600 -+++ ./src/pilot-read-screenshot.c 2010-02-19 12:50:44.000000000 -0600 -@@ -40,10 +40,6 @@ - - #ifdef HAVE_PNG - # include "png.h" --# if (PNG_LIBPNG_VER < 10201) --# define png_voidp_NULL (png_voidp)NULL --# define png_error_ptr_NULL (png_error_ptr)NULL --# endif - #endif - - #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) -@@ -87,8 +83,8 @@ - gray_buf = malloc( state->w ); - - png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if (!png_ptr) - return; ---- ./src/pilot-read-palmpix.c.orig 2007-02-04 17:06:03.000000000 -0600 -+++ ./src/pilot-read-palmpix.c 2010-02-19 12:51:10.000000000 -0600 -@@ -42,10 +42,6 @@ - - #ifdef HAVE_PNG - #include "png.h" --#if (PNG_LIBPNG_VER < 10201) -- #define png_voidp_NULL (png_voidp)NULL -- #define png_error_ptr_NULL (png_error_ptr)NULL --#endif - #endif - - const char *progname; -@@ -223,8 +219,8 @@ - png_infop info_ptr; - - png_ptr = png_create_write_struct -- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ ( PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if(!png_ptr) - return; diff --git a/source/l/pipewire/pipewire.url b/source/l/pipewire/pipewire.url index c9f6477ee..74aa879fd 100644 --- a/source/l/pipewire/pipewire.url +++ b/source/l/pipewire/pipewire.url @@ -1 +1,2 @@ https://gitlab.freedesktop.org/pipewire/pipewire +https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.0.7/pipewire-1.0.7.tar.gz diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index 81a5ba020..9b0d6593f 100755 --- a/source/l/poppler/poppler.SlackBuild +++ b/source/l/poppler/poppler.SlackBuild @@ -30,7 +30,7 @@ QT6OPT=${QT6OPT:--DENABLE_QT6=ON} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -50,6 +50,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + # Looks like this is baseline now... maybe time to bump everything to at least i686 + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -mfpmath=sse -msse -msse2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/pygtk/pygtk.SlackBuild b/source/l/pygtk/pygtk.SlackBuild index c25f4c588..3c1657dc8 100755 --- a/source/l/pygtk/pygtk.SlackBuild +++ b/source/l/pygtk/pygtk.SlackBuild @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=int-conversion" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 @@ -86,6 +89,7 @@ zcat $CWD/pygtk-fix-pango-object-leaks.patch.gz | patch -p1 --verbose || exit 1 # Fix build against recent pango: zcat $CWD/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch.gz | patch -p1 --verbose || exit 1 +PYTHON=python2 \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/python-Jinja2/Jinja2.url b/source/l/python-Jinja2/jinja2.url index f978be6b1..f978be6b1 100644 --- a/source/l/python-Jinja2/Jinja2.url +++ b/source/l/python-Jinja2/jinja2.url diff --git a/source/l/python-Jinja2/python-Jinja2.SlackBuild b/source/l/python-Jinja2/python-Jinja2.SlackBuild index 863b9a22a..1dcf52dfe 100755 --- a/source/l/python-Jinja2/python-Jinja2.SlackBuild +++ b/source/l/python-Jinja2/python-Jinja2.SlackBuild @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-Jinja2 -SRCNAM=Jinja2 +SRCNAM=jinja2 VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-babel/Babel.url b/source/l/python-babel/babel.url index a0bee683f..a0bee683f 100644 --- a/source/l/python-babel/Babel.url +++ b/source/l/python-babel/babel.url diff --git a/source/l/python-babel/python-babel.SlackBuild b/source/l/python-babel/python-babel.SlackBuild index 6b16f7775..00e4648bc 100755 --- a/source/l/python-babel/python-babel.SlackBuild +++ b/source/l/python-babel/python-babel.SlackBuild @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-babel -SRCNAM=Babel +SRCNAM=babel VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-certifi/python-certifi.SlackBuild b/source/l/python-certifi/python-certifi.SlackBuild index d9de3040c..a104dbc93 100755 --- a/source/l/python-certifi/python-certifi.SlackBuild +++ b/source/l/python-certifi/python-certifi.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-certifi VERSION=${VERSION:-$(echo certifi-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} SRCNAM=certifi diff --git a/source/l/python-pygments/python-pygments.SlackBuild b/source/l/python-pygments/python-pygments.SlackBuild index d6eda7db6..f0da3eff8 100755 --- a/source/l/python-pygments/python-pygments.SlackBuild +++ b/source/l/python-pygments/python-pygments.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pygments SRCNAM=pygments VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild index bd9f89ba3..cd667504c 100755 --- a/source/l/python-requests/python-requests.SlackBuild +++ b/source/l/python-requests/python-requests.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-requests VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} SRCNAM=requests diff --git a/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild b/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild index 710a50973..5e694846b 100755 --- a/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild +++ b/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-setuptools_scm -SRCNAM=setuptools-scm +SRCNAM=setuptools_scm VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-setuptools_scm/setuptools-scm.url b/source/l/python-setuptools_scm/setuptools_scm.url index 71af39a71..71af39a71 100644 --- a/source/l/python-setuptools_scm/setuptools-scm.url +++ b/source/l/python-setuptools_scm/setuptools_scm.url diff --git a/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild b/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild index c66ac9763..ec367a83a 100755 --- a/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild +++ b/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild @@ -23,7 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-trove-classifiers -VERSION=${VERSION:-$(echo trove-classifiers-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +SRCNAM=trove_classifiers +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -65,9 +66,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf trove-classifiers-$VERSION -tar xvf $CWD/trove-classifiers-$VERSION.tar.?z || exit 1 -cd trove-classifiers-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/python-trove-classifiers/trove-classifiers.url b/source/l/python-trove-classifiers/trove_classifiers.url index 964f8a77b..964f8a77b 100644 --- a/source/l/python-trove-classifiers/trove-classifiers.url +++ b/source/l/python-trove-classifiers/trove_classifiers.url diff --git a/source/l/python-typing_extensions/python-typing_extensions.SlackBuild b/source/l/python-typing_extensions/python-typing_extensions.SlackBuild deleted file mode 100755 index a782e9c7d..000000000 --- a/source/l/python-typing_extensions/python-typing_extensions.SlackBuild +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Copyright 2024 Patrick J. Volkerding, Sebeka, MN, 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) - -PKGNAM=python-typing_extensions -SRCNAM=typing_extensions -VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -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. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 -cd $SRCNAM-$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 \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ - -unshare -n python3 -m build --wheel --no-isolation || exit 1 - -python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a *.rst LICENSE* NOTICE PKG-INFO README* \ - $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ - -# If there's a HISTORY.rst, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r HISTORY.rst ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat HISTORY.rst | head -n 1000 > $DOCSDIR/HISTORY.rst - touch -r HISTORY.rst $DOCSDIR/HISTORY.rst -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/python-typing_extensions/slack-desc b/source/l/python-typing_extensions/slack-desc deleted file mode 100644 index 755ad4bfd..000000000 --- a/source/l/python-typing_extensions/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -python-typing_extensions: python-typing_extensions (experimental type hints) -python-typing_extensions: -python-typing_extensions: Enable use of new type system features on older Python versions. For -python-typing_extensions: example, typing.TypeGuard is new in Python 3.10, but typing_extensions -python-typing_extensions: allows users on previous Python versions to use it too. -python-typing_extensions: -python-typing_extensions: Homepage: https://pypi.org/project/typing-extensions -python-typing_extensions: -python-typing_extensions: -python-typing_extensions: -python-typing_extensions: diff --git a/source/l/python-typing_extensions/typing_extensions.url b/source/l/python-typing_extensions/typing_extensions.url deleted file mode 100644 index 28ef321a0..000000000 --- a/source/l/python-typing_extensions/typing_extensions.url +++ /dev/null @@ -1 +0,0 @@ -https://pypi.org/project/typing-extensions diff --git a/source/l/python-zipp/python-zipp.SlackBuild b/source/l/python-zipp/python-zipp.SlackBuild index 85fa96583..dd5dbbe56 100755 --- a/source/l/python-zipp/python-zipp.SlackBuild +++ b/source/l/python-zipp/python-zipp.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-zipp SRCNAM=zipp VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/qt6/fetch_sources.sh b/source/l/qt6/fetch_sources.sh index 780905738..c10d9b688 100755 --- a/source/l/qt6/fetch_sources.sh +++ b/source/l/qt6/fetch_sources.sh @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="6.6.3" +BRANCH="6.7.1" rm -f qt-everywhere-src-*.tar* @@ -34,11 +34,12 @@ cd qt5 # Sync qtwebengine version with the rest of qt5 sed -i -E "s/6.6.(.*)/$BRANCH\"\)/" qtwebengine/.cmake.conf - for i in $(find . -type d -name "qt*" -maxdepth 1); do - cd $i - ../qtbase/libexec/syncqt.pl -version $BRANCH - cd .. - done + ## Hmmm... syncqt.pl appears to be no more in 6.7.0: + #for i in $(find . -type d -name "qt*" -maxdepth 1); do + # cd $i + # ../qtbase/libexec/syncqt.pl -version $BRANCH + # cd .. + #done # Not in the release tarball for 6.6.1: rm -rf README.git init-repository \ diff --git a/source/l/qt6/patches/qt6-3d_gcc13.patch b/source/l/qt6/patches/qt6-3d_gcc13.patch deleted file mode 100644 index 7128597de..000000000 --- a/source/l/qt6/patches/qt6-3d_gcc13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp.orig 2023-09-24 13:38:48.000000000 +0200 -+++ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-10-04 14:00:15.901256244 +0200 -@@ -51,6 +51,7 @@ - #include "FBXUtil.h" - #include <assimp/defs.h> - #include <stdint.h> -+#include <cstdint> - #include <assimp/Exceptional.h> - #include <assimp/ByteSwapper.h> - #include <assimp/DefaultLogger.hpp> - diff --git a/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch b/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch new file mode 100644 index 000000000..84dce821f --- /dev/null +++ b/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch @@ -0,0 +1,12 @@ +TODO: merge with glx-headers patch in patchset, similar +issues that seem to stem from Qt's GLX restoration. + +https://bugs.gentoo.org/930107#c8 +--- a/src/3rdparty/chromium/ui/gl/gl_display.h ++++ b/src/3rdparty/chromium/ui/gl/gl_display.h +@@ -12,4 +12,5 @@ + + #include "ui/gl/gl_export.h" ++#include "ui/gl/gpu_preference.h" + + #if defined(USE_EGL) diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index f40431fc8..60df74702 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -42,7 +42,7 @@ SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-YES} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -66,6 +66,11 @@ elif [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + # Looks like this is baseline now... maybe time to bump everything to at least i686 + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -mfpmath=sse -msse -msse2 -fcf-protection=none" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" SLKLDFLAGS="" @@ -147,14 +152,16 @@ pushd qtwebengine popd cat $CWD/patches/nodejs-allow-32bit.patch | patch -p1 --verbose || exit 1 -# GCC13 requires this include: -cat $CWD/patches/qt6-3d_gcc13.patch | patch -p0 --verbose || exit 1 +# Patch header issue that causes the compile to fail with "x11 not defined" +pushd qtwebengine + cat $CWD/patches/qtwebengine-6.7.0-displaykey-header.patch | patch -p1 --verbose || exit 1 +popd # Previously we didn't have a protobuf package in Slackware. # Now that we do, it's apparently too new to use with Qt6, so let's just # disable it to get the same features that we previously did. # Patches would be accepted here. :-) -PROTOBUF="-DQT_FEATURE_qtprotobufgen=OFF" +#PROTOBUF="-DQT_FEATURE_qtprotobufgen=OFF" # The qtquick3dphysics only compiles on a limited set of architectures: case "${ARCH}" in diff --git a/source/l/readline/readline.SlackBuild b/source/l/readline/readline.SlackBuild index 9f1e1f124..de9658082 100755 --- a/source/l/readline/readline.SlackBuild +++ b/source/l/readline/readline.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=readline VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -109,7 +109,7 @@ make install DESTDIR=$PKG || exit 1 # NOTE: This will link against the currently installed libreadline! # Build/install this package twice whenever there is an .soname bump. ( cd examples/rlfe || exit 1 - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=int-conversion" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/l/sdl/sdl.SlackBuild b/source/l/sdl/sdl.SlackBuild index cbbedaf3e..95011b741 100755 --- a/source/l/sdl/sdl.SlackBuild +++ b/source/l/sdl/sdl.SlackBuild @@ -66,6 +66,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-sdl diff --git a/source/l/slang1/slang1.SlackBuild b/source/l/slang1/slang1.SlackBuild index 97ae70c94..b90daf181 100755 --- a/source/l/slang1/slang1.SlackBuild +++ b/source/l/slang1/slang1.SlackBuild @@ -61,6 +61,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + TMP=${TMP:-/tmp} PKG=$TMP/package-slang1 rm -rf $PKG @@ -83,7 +86,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --includedir=/usr/include/slang1 \ --disable-static \ - $ARCH-slackware-linux + $ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/svgalib/svgalib.SlackBuild b/source/l/svgalib/svgalib.SlackBuild index 880c7c6bd..e83392096 100755 --- a/source/l/svgalib/svgalib.SlackBuild +++ b/source/l/svgalib/svgalib.SlackBuild @@ -58,6 +58,12 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=return-mismatch" + +# From the Makefile.cfg: +SLKCFLAGS="$SLKCFLAGS -fomit-frame-pointer -O2 -fno-strength-reduce -pipe" + TMP=${TMP:-/tmp} PKG=$TMP/package-svgalib rm -rf $PKG @@ -92,6 +98,7 @@ zcat $CWD/svgalib-1.9.25-quickmath-h-redefinitions.patch.gz | patch -p1 --verbos zcat $CWD/svgalib-1.9.21-demos.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/svgalib-1.9.25.no_asm.patch.gz | patch -p1 --verbose || exit 1 +export CFLAGS="$SLKCFLAGS" # Build and install - spamming your partition first...: make install NO_HELPER=y || exit 1 make install \ diff --git a/source/l/t1lib/t1lib.SlackBuild b/source/l/t1lib/t1lib.SlackBuild index ae7ade14c..ad5ff3266 100755 --- a/source/l/t1lib/t1lib.SlackBuild +++ b/source/l/t1lib/t1lib.SlackBuild @@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} diff --git a/source/l/vte/vte.url b/source/l/vte/vte.url index b9a7d0ce2..014e0e4e1 100644 --- a/source/l/vte/vte.url +++ b/source/l/vte/vte.url @@ -1 +1,2 @@ https://gitlab.gnome.org/GNOME/vte +https://gitlab.gnome.org/GNOME/vte/-/archive/0.76.2/vte-0.76.2.tar.gz diff --git a/source/l/wireplumber/wireplumber.url b/source/l/wireplumber/wireplumber.url index 69f04fa02..666c242d0 100644 --- a/source/l/wireplumber/wireplumber.url +++ b/source/l/wireplumber/wireplumber.url @@ -1 +1,2 @@ https://gitlab.freedesktop.org/pipewire/wireplumber +https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.5.3/wireplumber-0.5.3.tar.gz diff --git a/source/n/FTBFSlog b/source/n/FTBFSlog index bea9fa2dc..2ec852076 100644 --- a/source/n/FTBFSlog +++ b/source/n/FTBFSlog @@ -1,3 +1,6 @@ +Mon May 20 18:05:03 UTC 2024 + nmap: Fix build without network access. Thanks to lucabon. ++--------------------------+ Thu Dec 21 19:06:04 UTC 2023 bind: fix build without krb5. Thanks to teoberi and Windu. +--------------------------+ diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index 7fa8d4a56..eea327693 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=NetworkManager 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: MARCH=$( uname -m ) diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild index 152f25c7f..3e3f3d084 100755 --- a/source/n/alpine/alpine.SlackBuild +++ b/source/n/alpine/alpine.SlackBuild @@ -65,6 +65,9 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + cd $TMP rm -rf alpine-${VERSION} tar xvf $CWD/alpine-$VERSION.tar.?z || exit 1 diff --git a/source/n/bluez/b94f1be656f34ea1363f5566ef63b847234c6dea.patch b/source/n/bluez/b94f1be656f34ea1363f5566ef63b847234c6dea.patch deleted file mode 100644 index 129c7b045..000000000 --- a/source/n/bluez/b94f1be656f34ea1363f5566ef63b847234c6dea.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b94f1be656f34ea1363f5566ef63b847234c6dea Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Date: Mon, 15 Apr 2024 10:48:58 -0400 -Subject: [PATCH] shared/uhid: Fix crash if bt_uhid_destroy free replay - structure - -Id replay structured has been allocated it shall be set back to NULL -after calling uhid_replay_free otherwise it may cause the following -crash: - -Invalid read of size 1 - at 0x1D8FC4: bt_uhid_record (uhid.c:116) - by 0x1D912C: uhid_read_handler (uhid.c:158) - by 0x201A64: watch_callback (io-glib.c:157) - by 0x48D4198: g_main_dispatch.lto_priv.0 (gmain.c:3344) - by 0x49333BE: UnknownInlinedFun (gmain.c:4152) - by 0x49333BE: g_main_context_iterate_unlocked.isra.0 (gmain.c:4217) - by 0x48D4DC6: g_main_loop_run (gmain.c:4419) - by 0x2020F4: mainloop_run (mainloop-glib.c:66) - by 0x20254B: mainloop_run_with_signal (mainloop-notify.c:188) - by 0x12D6D4: main (main.c:1456) - Address 0x53ae9c0 is 0 bytes inside a block of size 40 free'd - at 0x48468CF: free (vg_replace_malloc.c:985) - by 0x1D8E19: uhid_replay_free (uhid.c:68) - by 0x1D8E19: uhid_replay_free (uhid.c:59) - by 0x1D8E19: bt_uhid_destroy (uhid.c:509) - by 0x1591F5: uhid_disconnect (device.c:183) - -Fixes: https://github.com/bluez/bluez/issues/815 ---- - src/shared/uhid.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shared/uhid.c b/src/shared/uhid.c -index c1092b707..1f071b958 100644 ---- a/src/shared/uhid.c -+++ b/src/shared/uhid.c -@@ -507,6 +507,7 @@ int bt_uhid_destroy(struct bt_uhid *uhid) - - uhid->created = false; - uhid_replay_free(uhid->replay); -+ uhid->replay = NULL; - - return err; - } diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index 3597c4fd4..0925b1aa5 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bluez 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) "} @@ -78,8 +78,6 @@ find . \ sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools} -cat $CWD/b94f1be656f34ea1363f5566ef63b847234c6dea.patch | patch -p1 --verbose || exit 1 - autoreconf -vif # We're adding --enable-deprecated due to this commit: diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild index 89bbf6b5e..e2e628721 100755 --- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/n/elm/config.sh b/source/n/elm/config.sh index 52bca7a95..1db7ecca3 100644 --- a/source/n/elm/config.sh +++ b/source/n/elm/config.sh @@ -257,7 +257,7 @@ small='' medium='' large='' huge='' -optimize='-O' +optimize='-O -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch' ccflags='' cppflags='' ldflags='' diff --git a/source/n/elm/elm.SlackBuild b/source/n/elm/elm.SlackBuild index 56dc99d47..defbe62db 100755 --- a/source/n/elm/elm.SlackBuild +++ b/source/n/elm/elm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=elm VERSION=2.5.8 -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index 2514961e6..a7888aa28 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} ## Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible. ## Patches to fix this are welcome, otherwise we'll keep an eye on upstream. diff --git a/source/n/getmail/getmail.SlackBuild b/source/n/getmail/getmail.SlackBuild index 47daff253..1830c241d 100755 --- a/source/n/getmail/getmail.SlackBuild +++ b/source/n/getmail/getmail.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=getmail VERSION=${VERSION:-$(echo getmail6-*.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/n/htdig/htdig.SlackBuild b/source/n/htdig/htdig.SlackBuild index 1ca8264ff..5a1bedda8 100755 --- a/source/n/htdig/htdig.SlackBuild +++ b/source/n/htdig/htdig.SlackBuild @@ -64,6 +64,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 diff --git a/source/n/icmpinfo/icmpinfo.SlackBuild b/source/n/icmpinfo/icmpinfo.SlackBuild index f5233971e..05883aaa8 100755 --- a/source/n/icmpinfo/icmpinfo.SlackBuild +++ b/source/n/icmpinfo/icmpinfo.SlackBuild @@ -69,6 +69,8 @@ zcat $CWD/icmpinfo-1.11.diff.gz | patch -p1 --backup || exit 1 # Patch to prevent segfault: zcat $CWD/icmpinfo-1.11-time.diff.gz | patch -p1 --backup || exit 1 +export CFLAGS="-O2 -Wno-error=implicit-function-declaration" + make $NUMJOBS || make || exit 1 strip --strip-unneeded icmpinfo diff --git a/source/n/iftop/iftop.SlackBuild b/source/n/iftop/iftop.SlackBuild index 177cabf0b..be17ada3c 100755 --- a/source/n/iftop/iftop.SlackBuild +++ b/source/n/iftop/iftop.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=iftop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/inetd/inetd.SlackBuild b/source/n/inetd/inetd.SlackBuild index f61982aee..b0417dd5c 100755 --- a/source/n/inetd/inetd.SlackBuild +++ b/source/n/inetd/inetd.SlackBuild @@ -60,6 +60,7 @@ cd inetd zcat $CWD/inetd-OpenBSD-1.79.diff.gz | patch -p1 --backup --suffix=.orig --verbose -E zcat $CWD/inetd.loopingdos.diff.gz | patch -p1 --backup --suffix=.orig --verbose -E zcat $CWD/inetd.libtirpc.diff.gz | patch -p1 --backup --suffix=.orig --verbose -E +zcat $CWD/inetd.gcc14.diff.gz | patch -p1 --backup --suffix=.orig --verbose -E # GCC 4 fix (thanks Fred Emmott) sed -i 's#(type)\([a-z]\)=(type)\([a-z]\)#\1=(type)\2#g' inetd.c diff --git a/source/n/inetd/inetd.gcc14.diff b/source/n/inetd/inetd.gcc14.diff new file mode 100644 index 000000000..4053cf978 --- /dev/null +++ b/source/n/inetd/inetd.gcc14.diff @@ -0,0 +1,9 @@ +--- ./Makefile.orig 2024-05-11 12:41:56.282823472 -0500 ++++ ./Makefile 2024-05-11 12:43:08.540825089 -0500 +@@ -1,5 +1,5 @@ + CC = gcc +-CFLAGS = -O2 -I/usr/include/tirpc ++CFLAGS = -O2 -I/usr/include/tirpc -Wno-error=implicit-function-declaration + LDFLAGS = -s -ltirpc + + all: diff --git a/source/n/lftp/lftp.SlackBuild b/source/n/lftp/lftp.SlackBuild index 152f7eb51..cbc5c3648 100755 --- a/source/n/lftp/lftp.SlackBuild +++ b/source/n/lftp/lftp.SlackBuild @@ -73,6 +73,9 @@ rm -rf lftp-$VERSION tar xvf $CWD/lftp-$VERSION.tar.xz || exit 1 cd lftp-$VERSION || exit 1 +zcat $CWD/lftp.c99.patch.gz | patch -p1 --verbose || exit 1 +touch -r aclocal.m4 configure m4/needtrio.m4 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/n/lftp/lftp.c99.patch b/source/n/lftp/lftp.c99.patch new file mode 100644 index 000000000..3e3ec17ec --- /dev/null +++ b/source/n/lftp/lftp.c99.patch @@ -0,0 +1,22 @@ +diff -rup a/configure b/configure +--- a/configure 2023-02-08 21:27:48.733647760 -0500 ++++ b/configure 2023-02-08 21:28:31.201222024 -0500 +@@ -57429,6 +57429,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ #include <stdio.h> + int main() + { + unsigned long long x=0,x1; +diff -rup a/m4/needtrio.m4 b/m4/needtrio.m4 +--- a/m4/needtrio.m4 2016-02-20 08:57:52.000000000 -0500 ++++ b/m4/needtrio.m4 2023-02-08 21:28:13.642571126 -0500 +@@ -9,6 +9,7 @@ AC_DEFUN([LFTP_NEED_TRIO],[ + else + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ #include <stdio.h> + int main() + { + unsigned long long x=0,x1; diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild index ce9ac21a6..a1c31724e 100755 --- a/source/n/links/links.SlackBuild +++ b/source/n/links/links.SlackBuild @@ -72,6 +72,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + # We are configuring this without X as there are MANY browser choices for # X already. If you need a browser for X, either use something else or # recompile. :-) diff --git a/source/n/metamail/metamail.SlackBuild b/source/n/metamail/metamail.SlackBuild index 2697163a0..96cac1bc6 100755 --- a/source/n/metamail/metamail.SlackBuild +++ b/source/n/metamail/metamail.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=metamail VERSION=2.7 -BUILD=${BUILD:-10} +BUILD=${BUILD:-11} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,6 +80,7 @@ cd metamail-$VERSION || exit 1 xz -dc $CWD/metamail_2.7-54.diff.xz | patch -p1 || exit 1 xz -dc $CWD/metamail.automake.diff.xz | patch -p1 || exit 1 zcat $CWD/metamail.uue.getline.diff.gz | patch -p1 || exit 1 +cat $CWD/metamail.gcc14.diff | patch -p1 || exit 1 chmod 755 configure @@ -93,7 +94,7 @@ find . \ # Fix misnamed man page: mv man/mmencode.1 man/mimencode.1 -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=implicit-int" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -113,7 +114,7 @@ CFLAGS="$SLKCFLAGS" \ mv m.c mailto.c ) -make $NUMJOBS || make || exit 1 +CFLAGS="$SLKCFLAGS -Wno-error=implicit-int" make $NUMJOBS || make || exit 1 ( cd bin cat mailto-hebrew | perl -pi -e 's|/usr/lib/X11/fonts/misc|/usr/share/metamail/fonts|' > mh diff --git a/source/n/metamail/metamail.gcc14.diff b/source/n/metamail/metamail.gcc14.diff new file mode 100644 index 000000000..0c539da9d --- /dev/null +++ b/source/n/metamail/metamail.gcc14.diff @@ -0,0 +1,22 @@ +--- ./src/metamail/Makefile.in.orig 2024-05-10 16:12:29.131173303 -0500 ++++ ./src/metamail/Makefile.in 2024-05-10 16:18:58.068182003 -0500 +@@ -82,7 +82,7 @@ + + MAINTAINERCLEANFILES = Makefile.in + +-CFLAGS = -lncurses ++CFLAGS = -lncurses -Wno-error=return-mismatch -Wno-error=implicit-function-declaration -Wno-error=implicit-int + + INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail -I$(top_srcdir) -I$(top_srcdir)/metamail + +--- ./src/richmail/Makefile.in.orig 2024-05-10 16:12:29.130173303 -0500 ++++ ./src/richmail/Makefile.in 2024-05-10 16:20:28.612184029 -0500 +@@ -82,7 +82,7 @@ + + MAINTAINERCLEANFILES = Makefile.in + +-CFLAGS = -lncurses ++CFLAGS = -lncurses -Wno-error=return-mismatch -Wno-error=implicit-function-declaration -Wno-error=implicit-int + + INCLUDES = -I$(top_builddir) -I$(top_builddir)/metamail -I$(top_srcdir) -I$(top_srcdir)/metamail + diff --git a/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild index ef8d9d12e..539369b5d 100755 --- a/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild +++ b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for mobile-broadband-provider-info - # Copyright 2010, 2011, 2015 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2019, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -49,7 +47,7 @@ fi # 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-$DATE-$ARCH-$BUILD.txz" + echo "$PKGNAM-$DATE-noarch-$BUILD.txz" exit 0 fi @@ -93,37 +91,38 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -[ ! -x configure ] && ./autogen.sh - -sed -i -e \ - 's#pkgconfigdir = $(datadir)/pkgconfig#pkgconfigdir = $(libdir)/pkgconfig#' \ - Makefile.in - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$DATE \ - --build=$TARGET || exit 1 - -make || exit 1 -make install DESTDIR=$PKG || exit 1 + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PKGNAM-$DATE cp -a \ - COPYING* ChangeLog NEWS README* \ + CONTRIBUTING* COPYING* ChangeLog* MAINTAINERS* NEWS* README* \ $PKG/usr/doc/$PKGNAM-$DATE mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$DATE-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$DATE-noarch-$BUILD.txz diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild index 3c9c6da6f..948f3a599 100755 --- a/source/n/mtr/mtr.SlackBuild +++ b/source/n/mtr/mtr.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mtr VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/nc/nc.SlackBuild b/source/n/nc/nc.SlackBuild index dbd003dfc..0e3c4da3a 100755 --- a/source/n/nc/nc.SlackBuild +++ b/source/n/nc/nc.SlackBuild @@ -55,6 +55,9 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int" + TMP=${TMP:-/tmp} PKG=$TMP/package-nc rm -rf $PKG diff --git a/source/n/ncftp/ncftp.SlackBuild b/source/n/ncftp/ncftp.SlackBuild index a749c0eb2..2daf6f2c1 100755 --- a/source/n/ncftp/ncftp.SlackBuild +++ b/source/n/ncftp/ncftp.SlackBuild @@ -47,13 +47,13 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon -std=gnu90" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2 -fcommon" + SLKCFLAGS="-O2 -fcommon -std=gnu90" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC -fcommon" + SLKCFLAGS="-O2 -fPIC -fcommon -std=gnu90" else - SLKCFLAGS="-O2 -fcommon" + SLKCFLAGS="-O2 -fcommon -std=gnu90" fi TMP=${TMP:-/tmp} diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild index f4ff315c7..7b2a899cd 100755 --- a/source/n/net-snmp/net-snmp.SlackBuild +++ b/source/n/net-snmp/net-snmp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=net-snmp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/netdate/netdate.SlackBuild b/source/n/netdate/netdate.SlackBuild index b84d4d69a..16f6a7d93 100755 --- a/source/n/netdate/netdate.SlackBuild +++ b/source/n/netdate/netdate.SlackBuild @@ -56,6 +56,7 @@ cd netdate || exit 1 zcat $CWD/netdate.diff.gz | patch -p1 --backup || exit zcat $CWD/netdate.diff2.gz | patch -p1 --backup || exit +zcat $CWD/netdate.gcc14.diff.gz | patch -p1 --backup || exit chown -R root:root . find . \ diff --git a/source/n/netdate/netdate.gcc14.diff b/source/n/netdate/netdate.gcc14.diff new file mode 100644 index 000000000..7478afb22 --- /dev/null +++ b/source/n/netdate/netdate.gcc14.diff @@ -0,0 +1,11 @@ +--- ./Makefile.orig 2024-05-11 13:17:31.232871231 -0500 ++++ ./Makefile 2024-05-11 13:18:04.399871973 -0500 +@@ -3,7 +3,7 @@ + + WARNINGS=-Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual \ + -Wstrict-prototypes -Wmissing-prototypes \ +- -Wmissing-declarations -Wnested-externs -Winline -Wcast-align ++ -Wmissing-declarations -Wnested-externs -Winline -Wcast-align -Wno-error=implicit-int + + CFLAGS = -g $(WARNINGS) + diff --git a/source/n/netkit-ftp/netkit-ftp.SlackBuild b/source/n/netkit-ftp/netkit-ftp.SlackBuild index f500f2784..21d8391ce 100755 --- a/source/n/netkit-ftp/netkit-ftp.SlackBuild +++ b/source/n/netkit-ftp/netkit-ftp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=netkit-ftp VERSION=0.17 -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/netkit-ntalk/netkit-ntalk.SlackBuild b/source/n/netkit-ntalk/netkit-ntalk.SlackBuild index 08b71f996..e1e595272 100755 --- a/source/n/netkit-ntalk/netkit-ntalk.SlackBuild +++ b/source/n/netkit-ntalk/netkit-ntalk.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=netkit-ntalk VERSION=0.17 -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/netkit-rsh/netkit-rsh.SlackBuild b/source/n/netkit-rsh/netkit-rsh.SlackBuild index 92a1541f0..cf92c6f99 100755 --- a/source/n/netkit-rsh/netkit-rsh.SlackBuild +++ b/source/n/netkit-rsh/netkit-rsh.SlackBuild @@ -60,7 +60,7 @@ zcat $CWD/netkit-rsh.arg_max.diff.gz | patch -p1 -l --verbose || exit 1 zcat $CWD/netkit-rsh.union_wait.diff.gz | patch -p1 -l --verbose || exit 1 zcat $CWD/netkit-rsh.auth.c.stddef.diff.gz | patch -p1 -l --verbose || exit 1 chown -R root:root . -./configure --prefix=/usr || exit 1 +CC="gcc -std=gnu89" ./configure --prefix=/usr || exit 1 make || exit 1 cd rsh strip rsh diff --git a/source/n/netkit-rusers/netkit-rusers.SlackBuild b/source/n/netkit-rusers/netkit-rusers.SlackBuild index e0ca90e6c..96047f507 100755 --- a/source/n/netkit-rusers/netkit-rusers.SlackBuild +++ b/source/n/netkit-rusers/netkit-rusers.SlackBuild @@ -55,7 +55,7 @@ tar xzvf $CWD/netkit-rusers-$VERSION.tar.gz cd netkit-rusers-$VERSION chown -R root:root . zcat $CWD/netkit-rusers-0.17.diff.gz | patch -p1 || exit 1 -./configure --prefix=/usr +CC="gcc -std=gnu89" ./configure --prefix=/usr # Fixes for libtirpc: sed -i -e 's/Winline/Winline -I\/usr\/include\/tirpc/' MCONFIG diff --git a/source/n/netkit-rwho/netkit-rwho.SlackBuild b/source/n/netkit-rwho/netkit-rwho.SlackBuild index 89c4e8b17..277ccaa63 100755 --- a/source/n/netkit-rwho/netkit-rwho.SlackBuild +++ b/source/n/netkit-rwho/netkit-rwho.SlackBuild @@ -44,6 +44,9 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# GCC 14 "fix": +export CFLAGS="-Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-netkit-rwho diff --git a/source/n/netkit-timed/netkit-timed.SlackBuild b/source/n/netkit-timed/netkit-timed.SlackBuild index 569105a38..b34c18315 100755 --- a/source/n/netkit-timed/netkit-timed.SlackBuild +++ b/source/n/netkit-timed/netkit-timed.SlackBuild @@ -55,7 +55,7 @@ tar xzvf $CWD/netkit-timed-$VERSION.tar.gz || exit 1 cd netkit-timed-$VERSION chown -R root:root . zcat $CWD/netkit-timed-0.17.diff.gz | patch -p1 --backup --verbose --suffix=.orig -E || exit -CFLAGS="-DCLK_TCK=CLOCKS_PER_SEC" ./configure --prefix=/usr +CFLAGS="-DCLK_TCK=CLOCKS_PER_SEC -Wno-error=incompatible-pointer-types" ./configure --prefix=/usr make || exit 1 cd timed/timed strip timed diff --git a/source/n/netpipes/netpipes.SlackBuild b/source/n/netpipes/netpipes.SlackBuild index 43d6c7e92..f5e9a5db1 100755 --- a/source/n/netpipes/netpipes.SlackBuild +++ b/source/n/netpipes/netpipes.SlackBuild @@ -57,6 +57,7 @@ echo "+==============+" echo "| netpipes-$VERSION |" echo "+==============+" cd $TMP +rm -rf netpipes-${VERSION}-export tar xvf $CWD/netpipes-${VERSION}-export.tar.gz || exit 1 cd netpipes-${VERSION}-export mkdir -p $PKG/usr/doc/netpipes-${VERSION}-export @@ -64,7 +65,7 @@ cp -a COPYING README *.html $PKG/usr/doc/netpipes-${VERSION}-export chown root:root $PKG/usr/doc/netpipes-${VERSION}-export/* chmod 644 $PKG/usr/doc/netpipes-${VERSION}-export/* -make || exit 1 +CC="gcc -std=gnu89" make || exit 1 strip encapsulate faucet getpeername hose sockdown timelimit for file in encapsulate faucet getpeername hose sockdown timelimit ; do diff --git a/source/n/netwatch/netwatch.SlackBuild b/source/n/netwatch/netwatch.SlackBuild index 563433ab8..4d32c16ef 100755 --- a/source/n/netwatch/netwatch.SlackBuild +++ b/source/n/netwatch/netwatch.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=netwatch VERSION=1.3.1 EXTRAVERSION=${EXTRAVERSION:-2} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -57,6 +57,9 @@ else SLKCFLAGS="-O2 -fcommon" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-netwatch rm -rf $PKG diff --git a/source/n/nghttp2/nghttp2.url b/source/n/nghttp2/nghttp2.url index 9175dce90..c9b6c6d93 100644 --- a/source/n/nghttp2/nghttp2.url +++ b/source/n/nghttp2/nghttp2.url @@ -1,2 +1,2 @@ https://github.com/nghttp2/nghttp2 -https://github.com/nghttp2/nghttp2/releases/download/v1.61.0/nghttp2-1.61.0.tar.xz +https://github.com/nghttp2/nghttp2/releases/download/v1.62.1/nghttp2-1.62.1.tar.xz diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild index b35e41337..d5171ad3a 100755 --- a/source/n/nmap/nmap.SlackBuild +++ b/source/n/nmap/nmap.SlackBuild @@ -82,6 +82,9 @@ find . \ sed -i "s,share/man/man1,man/man1,g" ndiff/setup.py +# Don't require a network connection to build zenmap: +cat $CWD/nmap.no.internet.requirement.for.build.diff | patch -p1 --verbose || exit 1 + # --without-nmap-update is needed below to avoid depending on apr and subversion libraries. # It's not worth the feature IMHO. LIBS="-lnl" \ diff --git a/source/n/nmap/nmap.no.internet.requirement.for.build.diff b/source/n/nmap/nmap.no.internet.requirement.for.build.diff new file mode 100644 index 000000000..5e80c9a13 --- /dev/null +++ b/source/n/nmap/nmap.no.internet.requirement.for.build.diff @@ -0,0 +1,16 @@ +--- ./Makefile.in.orig 2024-04-18 11:19:35.000000000 -0500 ++++ ./Makefile.in 2024-05-20 13:00:18.665855374 -0500 +@@ -361,11 +361,11 @@ + DEFAULT_PYTHON_PATH = /usr/bin/env python3 + + build-zenmap: $(ZENMAPDIR)/pyproject.toml $(ZENMAPDIR)/zenmapCore/Version.py +- $(PYTHON) -m build $(ZENMAPDIR)/ ++ $(PYTHON) -m build --wheel --no-isolation $(ZENMAPDIR)/ + + install-zenmap: $(ZENMAPDIR)/pyproject.toml + $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(deskdir) +- $(PYTHON) -m pip install $(ZENMAPDIR)/ $(if $(DESTDIR),--root "$(DESTDIR)") ++ $(PYTHON) -m pip install --no-build-isolation $(ZENMAPDIR)/ $(if $(DESTDIR),--root "$(DESTDIR)") + $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ + $(INSTALL) -c -m 644 $(ZENMAPDIR)/install_scripts/unix/*.desktop $(DESTDIR)$(deskdir) + # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is diff --git a/source/n/nn/nn.SlackBuild b/source/n/nn/nn.SlackBuild index 48552b196..ab9c7a257 100755 --- a/source/n/nn/nn.SlackBuild +++ b/source/n/nn/nn.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=nn VERSION=6.7.3 -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -58,6 +58,9 @@ else MFILE="m-i80386.h" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-nn diff --git a/source/n/ntp/doinst.sh b/source/n/ntp/doinst.sh index 3f1589bda..58b72de05 100644 --- a/source/n/ntp/doinst.sh +++ b/source/n/ntp/doinst.sh @@ -20,6 +20,7 @@ preserve_perms() { config ${NEW} } +config etc/default/ntp.new config etc/logrotate.d/ntp.new config etc/ntp.conf.new config etc/ntp.keys.new diff --git a/source/n/ntp/ntp b/source/n/ntp/ntp new file mode 100644 index 000000000..26d9c37af --- /dev/null +++ b/source/n/ntp/ntp @@ -0,0 +1,12 @@ +# Default options for the ntpd daemon: +# +# -g: allow initial time correction to be Big (once only) +# -p /run/ntpd.pid: write ntpd PID to this location +# -u ntp:ntp: run ntpd as user ntp, group ntp +# +# Depending on your network, you might want to add -4 (ipv4 only) +# or -6 (ipv6 only). +# +# For other available options, see "man ntpd". + +NTPD_OPTS="-g -p /run/ntpd.pid -u ntp:ntp" diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index 1155df285..10408ee42 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ntp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -56,6 +56,9 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion" + TMP=${TMP:-/tmp} PKG=$TMP/package-ntp @@ -105,9 +108,14 @@ mkdir -p $PKG/usr/bin rmdir $PKG/usr/libexec || exit 1 # Install default conf and keys files: -mkdir -p $PKG/etc -cat $CWD/ntp.conf > $PKG/etc/ntp.conf.new -cat $CWD/ntp.keys > $PKG/etc/ntp.keys.new +mkdir -p $PKG/etc/default +cp -a $CWD/ntp $PKG/etc/default/ntp.new +chown root:root $PKG/etc/default/ntp.new +chmod 644 $PKG/etc/default/ntp.new +cp -a $CWD/ntp.conf $PKG/etc/ntp.conf.new +chown root:root $PKG/etc/ntp.conf.new +chmod 644 $PKG/etc/ntp.conf.new +cp -a $CWD/ntp.keys $PKG/etc/ntp.keys.new chown root:ntp $PKG/etc/ntp.keys.new chmod 640 $PKG/etc/ntp.keys.new diff --git a/source/n/ntp/rc.ntpd b/source/n/ntp/rc.ntpd index 9d1e3e88f..4f598f71e 100644 --- a/source/n/ntp/rc.ntpd +++ b/source/n/ntp/rc.ntpd @@ -1,21 +1,25 @@ #!/bin/sh # Start/stop/restart ntpd. +# Load options from /etc/default/ntp: +. /etc/default/ntp + # Start ntpd: ntpd_start() { - echo -n "Starting NTP daemon: /usr/sbin/ntpd -g -u ntp:ntp" - /usr/sbin/ntpd -g -u ntp:ntp + echo -n "Starting NTP daemon: /usr/sbin/ntpd $NTPD_OPTS" + /usr/sbin/ntpd $NTPD_OPTS echo } # Stop ntpd: ntpd_stop() { - echo -n "Stopping NTP daemon..." + echo -n "Stopping NTP daemon... " if [ -r /run/ntpd.pid ]; then + echo -n "(PID $(cat /run/ntpd.pid))" kill -HUP $(cat /run/ntpd.pid) rm -f /run/ntpd.pid else - killall -HUP -q ntpd + killall --ns $$ -HUP -q ntpd fi echo } @@ -30,7 +34,7 @@ ntpd_restart() { # Check if ntpd is running ntpd_status() { if [ -e /run/ntpd.pid ]; then - echo "ntpd is running as pid $(cat /run/ntpd.pid)." + echo "ntpd is running as PID $(cat /run/ntpd.pid)." else echo "ntpd is stopped." exit 1 diff --git a/source/n/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild index d63c6dd6f..2e68f31f9 100755 --- a/source/n/obexftp/obexftp.SlackBuild +++ b/source/n/obexftp/obexftp.SlackBuild @@ -62,6 +62,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +export CC="gcc -Wno-error=int-conversion -Wno-error=implicit-function-declaration" + PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) rm -rf $PKG diff --git a/source/n/openldap/openldap.SlackBuild b/source/n/openldap/openldap.SlackBuild index 4eab73442..783526f36 100755 --- a/source/n/openldap/openldap.SlackBuild +++ b/source/n/openldap/openldap.SlackBuild @@ -68,6 +68,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index 642194ff7..161ee7bf0 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -107,7 +107,6 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc/ssh \ $PAM_OPTIONS \ $SHADOW_OPTIONS \ - --with-md5-passwords \ --with-libedit \ --with-tcp-wrappers \ --with-default-path=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin \ diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index aec301cb7..5c366cced 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-8.3.6.tar.xz.asc -lftpget http://us.php.net/distributions/php-8.3.6.tar.xz +lftpget http://us.php.net/distributions/php-8.3.7.tar.xz.asc +lftpget http://us.php.net/distributions/php-8.3.7.tar.xz diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index a37ab12dd..425dc4ed8 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -75,6 +75,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + # Look for Kerberos on the machine and in any precompiled c-client.a: if /bin/ls /lib${LIBDIRSUFFIX}/libkrb5.so.? 1> /dev/null 2> /dev/null ; then # Remove the c-client library if it doesn't contain Kerberos support: diff --git a/source/n/pidentd/pidentd.SlackBuild b/source/n/pidentd/pidentd.SlackBuild index 56ba4a1a3..c1bae462a 100755 --- a/source/n/pidentd/pidentd.SlackBuild +++ b/source/n/pidentd/pidentd.SlackBuild @@ -66,7 +66,7 @@ find . \ zcat $CWD/pidentd.conf.diff.gz | patch -p1 --backup --verbose || exit 1 zcat $CWD/pidentd.openssl-1.1.diff.gz | patch -p1 --backup --verbose || exit 1 -CFLAGS=-O2 \ +CFLAGS="-O2 -Wno-error=implicit-function-declaration" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild index c3cd6543b..91b1b6436 100755 --- a/source/n/popa3d/popa3d.SlackBuild +++ b/source/n/popa3d/popa3d.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=popa3d VERSION=1.0.3 -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -46,6 +46,20 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} +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 + TMP=${TMP:-/tmp} PKG=$TMP/package-popa3d rm -rf $PKG @@ -56,12 +70,10 @@ rm -rf popa3d-$VERSION tar xvf $CWD/popa3d-$VERSION.tar.?z || exit 1 cd popa3d-$VERSION || exit 1 -# Choose correct options depending on whether PAM is installed: -if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - zcat $CWD/popa3d.pam.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -else - zcat $CWD/popa3d.shadow.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -fi +# Choose correct options for PAM: +zcat $CWD/popa3d.pam.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + +zcat $CWD/popa3d.gcc14.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/source/n/popa3d/popa3d.gcc14.diff b/source/n/popa3d/popa3d.gcc14.diff new file mode 100644 index 000000000..932b57741 --- /dev/null +++ b/source/n/popa3d/popa3d.gcc14.diff @@ -0,0 +1,11 @@ +--- ./Makefile.orig 2024-05-11 14:15:26.383948970 -0500 ++++ ./Makefile 2024-05-11 14:16:03.483949800 -0500 +@@ -3,7 +3,7 @@ + RM = rm -f + MKDIR = mkdir -p + INSTALL = install -c +-CFLAGS = -Wall -O2 -fomit-frame-pointer ++CFLAGS = -Wall -O2 -fomit-frame-pointer -Wno-error=implicit-function-declaration -Wno-error=int-conversion + # You may use OpenSSL's MD5 routines instead of the ones supplied here + CFLAGS += -DHAVE_OPENSSL + LDFLAGS = -s diff --git a/source/n/popa3d/popa3d.pam.diff b/source/n/popa3d/popa3d.pam.diff index c0b643844..700dd40d6 100644 --- a/source/n/popa3d/popa3d.pam.diff +++ b/source/n/popa3d/popa3d.pam.diff @@ -1,7 +1,6 @@ -diff -up ../popa3d-1.0.3.orig/Makefile ./Makefile ---- ../popa3d-1.0.3.orig/Makefile 2006-03-05 05:36:54.000000000 -0500 -+++ ./Makefile 2018-09-18 12:56:05.412312376 -0400 -@@ -5,26 +5,26 @@ MKDIR = mkdir -p +--- ./Makefile.orig 2006-03-05 04:36:54.000000000 -0600 ++++ ./Makefile 2024-05-15 19:42:54.924020444 -0500 +@@ -5,26 +5,26 @@ INSTALL = install -c CFLAGS = -Wall -O2 -fomit-frame-pointer # You may use OpenSSL's MD5 routines instead of the ones supplied here @@ -33,10 +32,8 @@ diff -up ../popa3d-1.0.3.orig/Makefile ./Makefile SBINDIR = $(PREFIX)/sbin MANDIR = $(PREFIX)/man -Common subdirectories: ../popa3d-1.0.3.orig/md5 and ./md5 -diff -up ../popa3d-1.0.3.orig/params.h ./params.h ---- ../popa3d-1.0.3.orig/params.h 2006-03-05 08:18:32.000000000 -0500 -+++ ./params.h 2018-09-18 12:55:55.953210742 -0400 +--- ./params.h.orig 2006-03-05 07:18:32.000000000 -0600 ++++ ./params.h 2024-05-15 19:43:21.877021047 -0500 @@ -13,7 +13,7 @@ /* * Are we going to be a standalone server or start via an inetd clone? @@ -55,6 +52,17 @@ diff -up ../popa3d-1.0.3.orig/params.h ./params.h /* * An empty directory to chroot to before authentication. The directory +@@ -155,8 +155,8 @@ + * Note that there's no built-in password aging support. + */ + #define AUTH_PASSWD 0 +-#define AUTH_SHADOW 1 +-#define AUTH_PAM 0 ++#define AUTH_SHADOW 0 ++#define AUTH_PAM 1 + #define AUTH_PAM_USERPASS 0 + #define USE_LIBPAM_USERPASS 0 + @@ -191,7 +191,7 @@ * * #undef this for qmail-style $HOME/Mailbox mailboxes. diff --git a/source/n/popa3d/popa3d.shadow.diff b/source/n/popa3d/popa3d.shadow.diff deleted file mode 100644 index 773f90856..000000000 --- a/source/n/popa3d/popa3d.shadow.diff +++ /dev/null @@ -1,58 +0,0 @@ ---- ./Makefile.orig 2006-03-05 04:36:20.000000000 -0600 -+++ ./Makefile 2006-03-12 16:20:44.000000000 -0600 -@@ -5,11 +5,11 @@ - INSTALL = install -c - CFLAGS = -Wall -O2 -fomit-frame-pointer - # You may use OpenSSL's MD5 routines instead of the ones supplied here --#CFLAGS += -DHAVE_OPENSSL -+CFLAGS += -DHAVE_OPENSSL - LDFLAGS = -s - LIBS = - # Linux with glibc, FreeBSD, NetBSD --#LIBS += -lcrypt -+LIBS += -lcrypt - # HP-UX trusted system - #LIBS += -lsec - # Solaris (POP_STANDALONE, POP_VIRTUAL) -@@ -21,10 +21,10 @@ - # libwrap may also want this - #LIBS += -lnsl - # OpenSSL (-DHAVE_OPENSSL) --#LIBS += -lcrypto -+LIBS += -lcrypto - - DESTDIR = --PREFIX = /usr/local -+PREFIX = /usr - SBINDIR = $(PREFIX)/sbin - MANDIR = $(PREFIX)/man - ---- ./params.h.orig 2006-03-05 06:44:52.000000000 -0600 -+++ ./params.h 2006-03-12 16:23:16.000000000 -0600 -@@ -13,7 +13,7 @@ - /* - * Are we going to be a standalone server or start via an inetd clone? - */ --#define POP_STANDALONE 0 -+#define POP_STANDALONE 1 - - #if POP_STANDALONE - -@@ -103,7 +103,7 @@ - * A pseudo-user to run as before authentication. The user and its UID - * must not be used for any other purpose. - */ --#define POP_USER POP_SERVER -+#define POP_USER "pop" - - /* - * An empty directory to chroot to before authentication. The directory -@@ -191,7 +191,7 @@ - * - * #undef this for qmail-style $HOME/Mailbox mailboxes. - */ --#define MAIL_SPOOL_PATH "/var/mail" -+#define MAIL_SPOOL_PATH "/var/spool/mail" - - #ifndef MAIL_SPOOL_PATH - /* diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild index 9504fca35..a71345dbd 100755 --- a/source/n/ppp/ppp.SlackBuild +++ b/source/n/ppp/ppp.SlackBuild @@ -82,6 +82,8 @@ rm -f include/linux/if_pppol2tp.h zcat $CWD/ppp.CVE-2015-3310.diff.gz | patch -p1 --verbose || exit 1 +cat $CWD/ppp.gcc14.diff | patch -p1 --verbose || exit 1 + # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then PAM_OPTIONS="USE_PAM=y" diff --git a/source/n/ppp/ppp.gcc14.diff b/source/n/ppp/ppp.gcc14.diff new file mode 100644 index 000000000..a8c12efc8 --- /dev/null +++ b/source/n/ppp/ppp.gcc14.diff @@ -0,0 +1,11 @@ +--- ./configure.orig 2021-01-04 17:06:37.000000000 -0600 ++++ ./configure 2024-05-10 20:18:35.477503626 -0500 +@@ -20,7 +20,7 @@ + makext="linux"; + ksrc="linux"; + state="known"; +- CFLAGS="-O2 -g -pipe";; ++ CFLAGS="-O2 -g -pipe -Wno-error=incompatible-pointer-types";; + SunOS) + karch=`/usr/bin/isainfo -k` + case $release in diff --git a/source/n/procmail/procmail.SlackBuild b/source/n/procmail/procmail.SlackBuild index 8e8821ad6..ab6ce8440 100755 --- a/source/n/procmail/procmail.SlackBuild +++ b/source/n/procmail/procmail.SlackBuild @@ -57,7 +57,10 @@ cd $TMP rm -rf procmail-$VERSION tar xvf $CWD/procmail-$VERSION.tar.?z || exit 1 cd procmail-$VERSION || exit 1 + zcat $CWD/procmail.lfs.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/procmail.gcc14.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/n/procmail/procmail.gcc14.diff b/source/n/procmail/procmail.gcc14.diff new file mode 100644 index 000000000..1fcc8fd26 --- /dev/null +++ b/source/n/procmail/procmail.gcc14.diff @@ -0,0 +1,12 @@ +--- ./Makefile.orig 2024-05-11 14:25:05.399961923 -0500 ++++ ./Makefile 2024-05-11 14:25:19.301962234 -0500 +@@ -86,7 +86,8 @@ + #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized + + # The place to put your favourite extra cc flag +-CFLAGS0 = -O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 #$(GCC_WARNINGS) ++CFLAGS0 = -O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wno-error=implicit-int -Wno-error=implicit-function-declaration #$(GCC_WARNINGS) ++ + LDFLAGS0= -s + # Read my libs :-) + LIBS= diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild index 902c1de66..b918d1a57 100755 --- a/source/n/proftpd/proftpd.SlackBuild +++ b/source/n/proftpd/proftpd.SlackBuild @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=proftpd VERSION=1.3.8b DIRVER=1.3.8b -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl:mod_ldap" +PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap2:mod_wrap2_file:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl:mod_ldap" # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild index d777bfebc..a0e0d04b0 100755 --- a/source/n/rp-pppoe/rp-pppoe.SlackBuild +++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild @@ -56,6 +56,9 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-rp-pppoe diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 099c1079f..7eed0b774 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # This option may be set to "heimdal" or "mit". # Upstream considers the use of MIT Kerberos for provisioning an AD DC diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 2874964b3..24e351aa8 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.20.0.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.20.0.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.20.1.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.20.1.tar.asc diff --git a/source/n/slrn/slrn.SlackBuild b/source/n/slrn/slrn.SlackBuild index ff6225c5b..060d751d4 100755 --- a/source/n/slrn/slrn.SlackBuild +++ b/source/n/slrn/slrn.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-slrn rm -rf $PKG diff --git a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild index 8ab33d2d8..17ed0da43 100755 --- a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild +++ b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild @@ -74,7 +74,7 @@ sh extract-and-patch.sh cd tcp_wrappers_$VERSION || exit 1 # Fix for glibc-2.32: sed -i "s/-DHAVE_WEAKSYMS/-DHAVE_WEAKSYMS -DHAVE_STRERROR/g" Makefile -make REAL_DAEMON_DIR=/usr/sbin linux || exit 1 +make CC="gcc -std=gnu90" REAL_DAEMON_DIR=/usr/sbin linux || exit 1 strip tcpd safe_finger tcpdchk tcpdmatch try-from mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} cat libwrap.a > $PKG/usr/lib${LIBDIRSUFFIX}/libwrap.a diff --git a/source/n/telnet/telnet.SlackBuild b/source/n/telnet/telnet.SlackBuild index 0b721cce3..efddb6512 100755 --- a/source/n/telnet/telnet.SlackBuild +++ b/source/n/telnet/telnet.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=telnet VERSION=0.17 -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -57,6 +57,7 @@ cd netkit-telnet-$VERSION || exit 1 chown -R root:root . zcat $CWD/netkit-telnet-0.17.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 zcat $CWD/netkit-telnet-0.17-ayt.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +CFLAGS="-Wno-error=implicit-int" \ ./configure --prefix=/usr || exit 1 cd telnetd make || exit 1 diff --git a/source/n/tftp-hpa/tftp-hpa.SlackBuild b/source/n/tftp-hpa/tftp-hpa.SlackBuild index d31ad247d..9d4bc95c8 100755 --- a/source/n/tftp-hpa/tftp-hpa.SlackBuild +++ b/source/n/tftp-hpa/tftp-hpa.SlackBuild @@ -67,6 +67,9 @@ find . \ # Add -fcommon to CFLAGS: zcat $CWD/tftp-hpa.fcommon.diff.gz | patch -p1 --verbose || exit 1 +# Unerror what was a warning prior to GCC 14: +zcat $CWD/tftp-hpa.gcc14.diff.gz | patch -p1 --verbose || exit 1 + ./configure --prefix=/usr make $NUMJOBS || make || exit 1 diff --git a/source/n/tftp-hpa/tftp-hpa.gcc14.diff b/source/n/tftp-hpa/tftp-hpa.gcc14.diff new file mode 100644 index 000000000..2b786cb79 --- /dev/null +++ b/source/n/tftp-hpa/tftp-hpa.gcc14.diff @@ -0,0 +1,11 @@ +--- ./MCONFIG.in.orig 2024-05-12 00:09:10.358745878 -0500 ++++ ./MCONFIG.in 2024-05-12 00:10:29.981747659 -0500 +@@ -51,7 +51,7 @@ + + # Compiler and compiler flags + CC = @CC@ +-CFLAGS = @CFLAGS@ -I$(SRCROOT) -fcommon ++CFLAGS = @CFLAGS@ -I$(SRCROOT) -fcommon -Wno-error=implicit-function-declaration + + # Link flags + LDFLAGS = @LDFLAGS@ diff --git a/source/n/uucp/uucp-configure-c99.patch b/source/n/uucp/uucp-configure-c99.patch new file mode 100644 index 000000000..480d6225a --- /dev/null +++ b/source/n/uucp/uucp-configure-c99.patch @@ -0,0 +1,140 @@ +Fix several C99 compatibility issues in the configure script. Most +of them are specific to the uucp package. + +Submitted upstream: <https://savannah.gnu.org/bugs/index.php?63647> + +diff --git a/configure b/configure +index 4cced27226101612..77336b5f0a1ba20d 100755 +--- a/configure ++++ b/configure +@@ -1280,7 +1280,7 @@ cat > conftest.$ac_ext << EOF + #line 1281 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -3025,6 +3025,7 @@ else + cat > conftest.$ac_ext <<EOF + #line 3027 "configure" + #include "confdefs.h" ++extern void exit (); + + int main() { + extern void foo (); (void) exit (0); +@@ -3153,6 +3154,7 @@ else + cat > conftest.$ac_ext <<EOF + #line 3155 "configure" + #include "confdefs.h" ++#include <string.h> + + int main() { + char *i; int j, k; memset(i, j, k); +@@ -3185,6 +3187,7 @@ else + cat > conftest.$ac_ext <<EOF + #line 3187 "configure" + #include "confdefs.h" ++#include <string.h> + + int main() { + char *i, *j; int k; memcmp(i, j, k); +@@ -3217,6 +3220,7 @@ else + cat > conftest.$ac_ext <<EOF + #line 3219 "configure" + #include "confdefs.h" ++#include <string.h> + + int main() { + char *i, *j; int k; memcpy(i, j, k); +@@ -3894,7 +3898,7 @@ else + + #include <sys/types.h> + #include <sys/timeb.h> +-main () ++int main () + { + struct timeb s, slast; + int c = 0; +@@ -3904,13 +3908,13 @@ main () + ftime (&s); + if (s.time < slast.time + || (s.time == slast.time && s.millitm < slast.millitm)) +- exit (1); ++ return 1; + if (s.time != slast.time) + ++c; + slast.time = s.time; + slast.millitm = s.millitm; + } +- exit (0); ++ return 0; + } + + EOF +diff --git a/configure.in b/configure.in +index 452cf793f9ecc575..a788d07d123c7744 100644 +--- a/configure.in ++++ b/configure.in +@@ -278,7 +278,7 @@ fi + dnl + AC_MSG_CHECKING(for void) + AC_CACHE_VAL(uucp_cv_c_void, +-[AC_TRY_COMPILE([], [extern void foo (); (void) exit (0);], ++[AC_TRY_COMPILE([extern void exit ();], [extern void foo (); (void) exit (0);], + uucp_cv_c_void=yes, uucp_cv_c_void=no)]) + AC_MSG_RESULT($uucp_cv_c_void) + if test $uucp_cv_c_void = yes; then +@@ -318,7 +318,7 @@ dnl On some systems, memset, memcmp, and memcpy must be called with + dnl the right number of arguments. + AC_MSG_CHECKING(for memset) + AC_CACHE_VAL(ac_cv_func_memset, +-[AC_TRY_LINK([], [ char *i; int j, k; memset(i, j, k); ], ++[AC_TRY_LINK([#include <string.h>], [ char *i; int j, k; memset(i, j, k); ], + ac_cv_func_memset=yes, ac_cv_func_memset=no)]) + AC_MSG_RESULT($ac_cv_func_memset) + if test $ac_cv_func_memset = yes; then +@@ -327,7 +327,7 @@ fi + dnl + AC_MSG_CHECKING(for memcmp) + AC_CACHE_VAL(ac_cv_func_memcmp, +-[AC_TRY_LINK([], [ char *i, *j; int k; memcmp(i, j, k); ], ++[AC_TRY_LINK([#include <string.h>], [ char *i, *j; int k; memcmp(i, j, k); ], + ac_cv_func_memcmp=yes, ac_cv_func_memcmp=no)]) + AC_MSG_RESULT($ac_cv_func_memcmp) + if test $ac_cv_func_memcmp = yes; then +@@ -336,7 +336,7 @@ fi + dnl + AC_MSG_CHECKING(for memcpy) + AC_CACHE_VAL(ac_cv_func_memcpy, +-[AC_TRY_LINK([], [ char *i, *j; int k; memcpy(i, j, k); ], ++[AC_TRY_LINK([#include <string.h>], [ char *i, *j; int k; memcpy(i, j, k); ], + ac_cv_func_memcpy=yes, ac_cv_func_memcpy=no)]) + AC_MSG_RESULT($ac_cv_func_memcpy) + if test $ac_cv_func_memcpy = yes; then +@@ -373,7 +373,7 @@ AC_CACHE_VAL(uucp_cv_sys_ftime_ok, + [AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/timeb.h> +-main () ++int main () + { + struct timeb s, slast; + int c = 0; +@@ -383,13 +383,13 @@ main () + ftime (&s); + if (s.time < slast.time + || (s.time == slast.time && s.millitm < slast.millitm)) +- exit (1); ++ return 1; + if (s.time != slast.time) + ++c; + slast.time = s.time; + slast.millitm = s.millitm; + } +- exit (0); ++ return 0; + } + ], + uucp_cv_sys_ftime_ok=yes, diff --git a/source/n/uucp/uucp.SlackBuild b/source/n/uucp/uucp.SlackBuild index f27d57555..1cd43740d 100755 --- a/source/n/uucp/uucp.SlackBuild +++ b/source/n/uucp/uucp.SlackBuild @@ -54,6 +54,9 @@ else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-uucp @@ -68,6 +71,9 @@ cd $TMP rm -rf uucp-$VERSION tar xvf $CWD/uucp-$VERSION.tar.gz || exit 1 cd uucp-$VERSION || exit 1 + +cat $CWD/uucp-configure-c99.patch | patch -p1 --verbose || exit 1 + zcat $CWD/policy.h.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index f99324697..6e8071a17 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wpa_supplicant VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} SRCVERSION=$(printf $VERSION | tr _ -) diff --git a/source/n/wsdd2/doinst.sh b/source/n/wsdd2/doinst.sh new file mode 100644 index 000000000..194630ea2 --- /dev/null +++ b/source/n/wsdd2/doinst.sh @@ -0,0 +1,26 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + chmod +x $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.wsdd2.new diff --git a/source/n/wsdd2/rc.wsdd2 b/source/n/wsdd2/rc.wsdd2 new file mode 100644 index 000000000..6e2a6b838 --- /dev/null +++ b/source/n/wsdd2/rc.wsdd2 @@ -0,0 +1,40 @@ +#!/bin/sh +# +# /etc/rc.d/rc.wsdd2 +# +# start/stop/restart the wsdd2 daemon. +# +# This init script ships as executable, and will start automatically if Samba +# is configured to start. + +wsdd2_start() { + if [ -r /etc/samba/smb.conf -a -x /etc/rc.d/rc.samba -a -x /usr/sbin/wsdd2 ]; then + echo "Starting wsdd2: /usr/bin/wsdd2 -d" + /usr/sbin/wsdd2 -d + fi +} + +wsdd2_stop() { + killall --ns $$ -TERM wsdd2 2> /dev/null +} + +wsdd2_restart() { + wsdd2_stop + sleep 1 + wsdd2_start +} + +case "$1" in +'start') + # We don't want to run this more than once, so just use restart to start it: + wsdd2_restart + ;; +'stop') + wsdd2_stop + ;; +'restart') + wsdd2_restart + ;; +*) + wsdd2_start +esac diff --git a/source/n/wsdd2/slack-desc b/source/n/wsdd2/slack-desc new file mode 100644 index 000000000..fcbdc69a0 --- /dev/null +++ b/source/n/wsdd2/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +wsdd2: wsdd2 (Web Services for Devices daemon) +wsdd2: +wsdd2: The primary purpose of this package is to enable WSD on Samba servers +wsdd2: so that network shares hosted on a Linux box can appear in Windows +wsdd2: File Explorer / Network. +wsdd2: Don't forget to allow local ip6 connections in your smb.conf file, +wsdd2: specifically: fc00::/7 fe80::/64 ::1 +wsdd2: Also, in your firewall, make sure ports 3702 and 5355 are open. +wsdd2: +wsdd2: Homepage: https://github.com/Netgear/wsdd2 +wsdd2: diff --git a/source/n/wsdd2/wsdd2.SlackBuild b/source/n/wsdd2/wsdd2.SlackBuild new file mode 100755 index 000000000..a15826132 --- /dev/null +++ b/source/n/wsdd2/wsdd2.SlackBuild @@ -0,0 +1,128 @@ +#!/bin/bash + +# Copyright 2020, 2022 Tim Dickson Scotland +# Copyright 2024 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) + +PKGNAM=wsdd2 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +# This doesn't contain enough source files for $NUMJOBS to matter. +#NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Don't warn about missing optional config lines: +cat $CWD/wsdd2.nowarn.optional.smb.conf.options.patch | patch -p1 --verbose || exit 1 + +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +make || exit 1 +make install debug_W=-1 debug_L=-1 DESTDIR=$PKG MANDIR="/usr/man" INSTALLPREFIX="usr" + +# Add a compatibilty symlink for gvfs: +ln -sf wsdd2 $PKG/usr/sbin/wsdd + +# Install the rc script: +mkdir -p $PKG/etc/rc.d +cp -a $CWD/rc.wsdd2 $PKG/etc/rc.d/rc.wsdd2.new +chown root:root $PKG/etc/rc.d/rc.wsdd2.new +chmod 755 $PKG/etc/rc.d/rc.wsdd2.new + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + LICENSE* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/wsdd2/wsdd2.nowarn.optional.smb.conf.options.patch b/source/n/wsdd2/wsdd2.nowarn.optional.smb.conf.options.patch new file mode 100644 index 000000000..3de8e0975 --- /dev/null +++ b/source/n/wsdd2/wsdd2.nowarn.optional.smb.conf.options.patch @@ -0,0 +1,11 @@ +--- ./wsdd2.c.orig 2022-04-25 07:30:50.000000000 -0500 ++++ ./wsdd2.c 2024-05-24 13:51:20.210623306 -0500 +@@ -601,7 +601,7 @@ + + char buf[PAGE_SIZE]; + if (!fgets(buf, sizeof(buf), pp) || !buf[0] || buf[0] == '\n') { +- DEBUG(0, W, "cannot read %s from testparm", name); ++ DEBUG(1, W, "cannot read %s from testparm", name); + result = strdup(_default); + } else { // trim whitespace + char *p; diff --git a/source/n/wsdd2/wsdd2.url b/source/n/wsdd2/wsdd2.url new file mode 100644 index 000000000..37ac6e2af --- /dev/null +++ b/source/n/wsdd2/wsdd2.url @@ -0,0 +1 @@ +https://github.com/Netgear/wsdd2 diff --git a/source/n/ytalk/ytalk.SlackBuild b/source/n/ytalk/ytalk.SlackBuild index f7382565f..f6a2a453e 100755 --- a/source/n/ytalk/ytalk.SlackBuild +++ b/source/n/ytalk/ytalk.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ytalk VERSION=${VERSION:-3.3.0} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/tcl/expect/expect.SlackBuild b/source/tcl/expect/expect.SlackBuild index 2a179b50c..fbc7e740f 100755 --- a/source/tcl/expect/expect.SlackBuild +++ b/source/tcl/expect/expect.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=incompatible-pointer-types" + cd $TMP rm -rf ${PKGNAM}${VERSION} tar xvf $CWD/${PKGNAM}$VERSION.tar.?z || exit 1 diff --git a/source/tcl/hfsutils/hfsutils.SlackBuild b/source/tcl/hfsutils/hfsutils.SlackBuild index 5354de67f..5c9907711 100755 --- a/source/tcl/hfsutils/hfsutils.SlackBuild +++ b/source/tcl/hfsutils/hfsutils.SlackBuild @@ -79,6 +79,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types" + # Configure: CFLAGS="$SLKCFLAGS" \ CPPFLAGS="-DUSE_INTERP_RESULT" \ diff --git a/source/tcl/tix/tix.SlackBuild b/source/tcl/tix/tix.SlackBuild index c6e86a47f..6adcdda1a 100755 --- a/source/tcl/tix/tix.SlackBuild +++ b/source/tcl/tix/tix.SlackBuild @@ -58,6 +58,9 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG diff --git a/source/x/OpenCC/3b2441b8.patch b/source/x/OpenCC/3b2441b8.patch new file mode 100644 index 000000000..0799d22aa --- /dev/null +++ b/source/x/OpenCC/3b2441b8.patch @@ -0,0 +1,22 @@ +From 3b2441b87f99ab65f37b141a7b548ebadb607b96 Mon Sep 17 00:00:00 2001 +From: Janusz Chorko <janusz.chorko@apdu.pl> +Date: Fri, 26 Aug 2016 21:17:38 +0200 +Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718 + +--- + include/rapidjson/document.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h +index e3e20dfbd..b0f1f70be 100644 +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } + diff --git a/source/x/OpenCC/OpenCC.SlackBuild b/source/x/OpenCC/OpenCC.SlackBuild index da26ff8ff..5e3f86c92 100755 --- a/source/x/OpenCC/OpenCC.SlackBuild +++ b/source/x/OpenCC/OpenCC.SlackBuild @@ -78,6 +78,11 @@ rm -rf OpenCC-ver.$VERSION tar xvf $CWD/OpenCC-ver.$VERSION.tar.?z || exit 1 cd OpenCC-ver.$VERSION || exit 1 +# GCC 14 fix: +pushd deps/rapidjson-1.1.0/rapidjson + cat $CWD/3b2441b8.patch | patch -p3 --verbose || exit 1 +popd + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/x/anthy-unicode/anthy-unicode.SlackBuild b/source/x/anthy-unicode/anthy-unicode.SlackBuild index af7fa15fe..fd73ca256 100755 --- a/source/x/anthy-unicode/anthy-unicode.SlackBuild +++ b/source/x/anthy-unicode/anthy-unicode.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2008, 2009, 2010, 2018, 2024 Patrick J. Volkerding, Sebeka, MN USA # Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL # All rights reserved. # @@ -79,6 +79,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/x/compiz/compiz.SlackBuild b/source/x/compiz/compiz.SlackBuild index 9e34a28ac..de9111f2e 100755 --- a/source/x/compiz/compiz.SlackBuild +++ b/source/x/compiz/compiz.SlackBuild @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.5_dict.tar.zst b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.6_dict.tar.zst Binary files differindex 2bf0bda2d..d91effbbe 100644 --- a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.5_dict.tar.zst +++ b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.6_dict.tar.zst diff --git a/source/x/fcitx5-hangul/fcitx5-hangul-5.1.3.tar.zst b/source/x/fcitx5-hangul/fcitx5-hangul-5.1.3.tar.zst Binary files differdeleted file mode 100644 index ebd3371af..000000000 --- a/source/x/fcitx5-hangul/fcitx5-hangul-5.1.3.tar.zst +++ /dev/null diff --git a/source/x/fcitx5-hangul/fcitx5-hangul-5.1.4.tar.zst b/source/x/fcitx5-hangul/fcitx5-hangul-5.1.4.tar.zst Binary files differnew file mode 100644 index 000000000..3151f57e0 --- /dev/null +++ b/source/x/fcitx5-hangul/fcitx5-hangul-5.1.4.tar.zst diff --git a/source/x/fcitx5-kkc/fcitx5-kkc-5.1.3.tar.zst b/source/x/fcitx5-kkc/fcitx5-kkc-5.1.3.tar.zst Binary files differdeleted file mode 100644 index f12b63e70..000000000 --- a/source/x/fcitx5-kkc/fcitx5-kkc-5.1.3.tar.zst +++ /dev/null diff --git a/source/x/fcitx5-kkc/fcitx5-kkc-5.1.4.tar.zst b/source/x/fcitx5-kkc/fcitx5-kkc-5.1.4.tar.zst Binary files differnew file mode 100644 index 000000000..bfe2158cb --- /dev/null +++ b/source/x/fcitx5-kkc/fcitx5-kkc-5.1.4.tar.zst diff --git a/source/x/fcitx5-table-extra/fcitx5-table-extra-5.1.5.tar.zst b/source/x/fcitx5-table-extra/fcitx5-table-extra-5.1.6.tar.zst Binary files differindex 388fbe905..f80bb9204 100644 --- a/source/x/fcitx5-table-extra/fcitx5-table-extra-5.1.5.tar.zst +++ b/source/x/fcitx5-table-extra/fcitx5-table-extra-5.1.6.tar.zst diff --git a/source/x/fcitx5-table-other/fcitx5-table-other-5.1.2.tar.zst b/source/x/fcitx5-table-other/fcitx5-table-other-5.1.2.tar.zst Binary files differdeleted file mode 100644 index 4268d71d5..000000000 --- a/source/x/fcitx5-table-other/fcitx5-table-other-5.1.2.tar.zst +++ /dev/null diff --git a/source/x/fcitx5-table-other/fcitx5-table-other-5.1.3.tar.zst b/source/x/fcitx5-table-other/fcitx5-table-other-5.1.3.tar.zst Binary files differnew file mode 100644 index 000000000..f95a071af --- /dev/null +++ b/source/x/fcitx5-table-other/fcitx5-table-other-5.1.3.tar.zst diff --git a/source/x/fcitx5/fcitx5-5.1.9_dict.tar.zst b/source/x/fcitx5/fcitx5-5.1.10_dict.tar.zst Binary files differindex 06c48916f..19712d4bc 100644 --- a/source/x/fcitx5/fcitx5-5.1.9_dict.tar.zst +++ b/source/x/fcitx5/fcitx5-5.1.10_dict.tar.zst diff --git a/source/x/ibus-kkc/ibus-kkc.SlackBuild b/source/x/ibus-kkc/ibus-kkc.SlackBuild index b3cdc91f1..0bde5da2c 100755 --- a/source/x/ibus-kkc/ibus-kkc.SlackBuild +++ b/source/x/ibus-kkc/ibus-kkc.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + # 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. diff --git a/source/x/ibus/ibus.SlackBuild b/source/x/ibus/ibus.SlackBuild index f63aa805b..d24b5500f 100755 --- a/source/x/ibus/ibus.SlackBuild +++ b/source/x/ibus/ibus.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus 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/x/libXaw3dXft/libXaw3dXft.SlackBuild b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild index 49fbdb5e6..7da1ed5f0 100755 --- a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild +++ b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild @@ -58,6 +58,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/x/libgee/libgee.SlackBuild b/source/x/libgee/libgee.SlackBuild index 832fa2233..7c31b5b3a 100755 --- a/source/x/libgee/libgee.SlackBuild +++ b/source/x/libgee/libgee.SlackBuild @@ -61,6 +61,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + # 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. diff --git a/source/x/libime/libime-1.1.7_dict.tar.zst b/source/x/libime/libime-1.1.8_dict.tar.zst Binary files differindex 37ff9f6ce..8561dd54a 100644 --- a/source/x/libime/libime-1.1.7_dict.tar.zst +++ b/source/x/libime/libime-1.1.8_dict.tar.zst diff --git a/source/x/libkkc/libkkc.SlackBuild b/source/x/libkkc/libkkc.SlackBuild index 0db5617af..96007dabb 100755 --- a/source/x/libkkc/libkkc.SlackBuild +++ b/source/x/libkkc/libkkc.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion" + # 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. diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index d36d456b9..96a868f1c 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -138,7 +138,7 @@ meson setup \ -Dvulkan-drivers=amd,intel,intel_hasvk,swrast \ -Dvulkan-layers=device-select,intel-nullhw,overlay \ -Dvideo-codecs="$CODECS" \ - -Dglvnd=true \ + -Dglvnd=enabled \ -Dllvm=enabled \ -Dshared-llvm=enabled \ -Dshared-glapi=enabled \ diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild index 27091980f..e741004fd 100755 --- a/source/x/motif/motif.SlackBuild +++ b/source/x/motif/motif.SlackBuild @@ -70,6 +70,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/x/x11/build/igt-gpu-tools b/source/x/x11/build/igt-gpu-tools index 0cfbf0888..00750edc0 100644 --- a/source/x/x11/build/igt-gpu-tools +++ b/source/x/x11/build/igt-gpu-tools @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau index a9dcd059b..7e378ee13 100644 --- a/source/x/x11/configure/xf86-video-nouveau +++ b/source/x/x11/configure/xf86-video-nouveau @@ -1,4 +1,4 @@ -CFLAGS=$SLKCFLAGS \ +CFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" \ CXXFLAGS=$SLKCFLAGS \ ./autogen.sh \ --prefix=/usr \ diff --git a/source/x/xcb-imdkit/xcb-imdkit-1.0.8.tar.zst b/source/x/xcb-imdkit/xcb-imdkit-1.0.8.tar.zst Binary files differdeleted file mode 100644 index 29e70513c..000000000 --- a/source/x/xcb-imdkit/xcb-imdkit-1.0.8.tar.zst +++ /dev/null diff --git a/source/x/xcb-imdkit/xcb-imdkit-1.0.9.tar.zst b/source/x/xcb-imdkit/xcb-imdkit-1.0.9.tar.zst Binary files differnew file mode 100644 index 000000000..a19bd3230 --- /dev/null +++ b/source/x/xcb-imdkit/xcb-imdkit-1.0.9.tar.zst diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild index 06948306c..749114169 100755 --- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild +++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild @@ -80,6 +80,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# This is needed to fix a missing define (at least on 32-bit): +cat $CWD/xwayland.CARD32.define.diff | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -97,7 +100,6 @@ meson setup \ --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ - -Dxwayland_eglstream=true \ -Ddefault_font_path="${DEF_FONTPATH}" \ -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \ -Dxkb_dir=/usr/share/X11/xkb \ diff --git a/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff b/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff new file mode 100644 index 000000000..10b3df156 --- /dev/null +++ b/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff @@ -0,0 +1,10 @@ +--- ./os/osdep.h.orig 2024-05-15 01:21:39.000000000 -0500 ++++ ./os/osdep.h 2024-05-22 13:08:46.015040109 -0500 +@@ -52,6 +52,7 @@ + #define _OSDEP_H_ 1 + + #include <X11/Xdefs.h> ++#include <X11/Xtrans/Xtrans.h> + + #if defined(XDMCP) || defined(HASXDMAUTH) + #include <X11/Xdmcp.h> diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild index 6987654f1..f4eb6b5b3 100755 --- a/source/xap/MPlayer/MPlayer.SlackBuild +++ b/source/xap/MPlayer/MPlayer.SlackBuild @@ -29,7 +29,7 @@ VERSION=${VERSION:-20240403} # Need to build trunk until there's a stable branch compatible with the # latest ffmpeg stable release: #BRANCH=${BRANCH:-1.3} # leave empty if you want to build MPlayer trunk -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -272,6 +272,7 @@ echo Building ... --disable-ffmpeg_a \ --codecsdir=${CODECSDIR} \ --language="${LANGUAGES}" \ + --extra-cflags="-Wno-error=incompatible-pointer-types -Wno-error=int-conversion" \ ${EXTRACONFIGUREOPTIONS} \ ${DO_PATENTED} || exit 1 diff --git a/source/xap/ddd/ddd.SlackBuild b/source/xap/ddd/ddd.SlackBuild index 48df65226..e724eee92 100755 --- a/source/xap/ddd/ddd.SlackBuild +++ b/source/xap/ddd/ddd.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ddd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/electricsheep/electricsheep.SlackBuild b/source/xap/electricsheep/electricsheep.SlackBuild index 0c151d0e5..d513e8c41 100755 --- a/source/xap/electricsheep/electricsheep.SlackBuild +++ b/source/xap/electricsheep/electricsheep.SlackBuild @@ -140,6 +140,9 @@ case "$ARCH" in ;; esac +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration" + # Create working directories: mkdir -p $OUTPUT # place for the package to be saved mkdir -p $TMP/tmp-$PKGNAM # location to build the source @@ -205,6 +208,9 @@ cd client # We do not use gnome: cat $SRCDIR/electricsheep_gnome-open.patch | patch -p1 --verbose \ 2>&1 | tee $OUTPUT/patch-$PKGNAM.log + # This optimization is broken, oh well + cat $SRCDIR/electricsheep.evil.gcc14.diff | patch -p2 --verbose \ + 2>&1 | tee $OUTPUT/patch-$PKGNAM.log # Prevent install errors due to missing gnome sed -i -e "/^install-data-local:/,/^$/d" Makefile.in LDFLAGS="$SLKLDFLAGS" \ diff --git a/source/xap/electricsheep/electricsheep.evil.gcc14.diff b/source/xap/electricsheep/electricsheep.evil.gcc14.diff new file mode 100644 index 000000000..981a4814f --- /dev/null +++ b/source/xap/electricsheep/electricsheep.evil.gcc14.diff @@ -0,0 +1,11 @@ +--- ./client/ffmpeg/libavcodec/bitstream.h.orig 2024-05-10 17:20:22.784264430 -0500 ++++ ./client/ffmpeg/libavcodec/bitstream.h 2024-05-10 17:20:14.597264247 -0500 +@@ -53,7 +53,7 @@ + + extern const uint8_t ff_reverse[256]; + +-#if defined(ARCH_X86) ++#if defined(ARCH_X8666) + // avoid +32 for shift optimization (gcc should do that ...) + static inline int32_t NEG_SSR32( int32_t a, int8_t s){ + asm ("sarl %1, %0\n\t" diff --git a/source/xap/freerdp/freerdp.SlackBuild b/source/xap/freerdp/freerdp.SlackBuild index 21e78ee05..32dd124a9 100755 --- a/source/xap/freerdp/freerdp.SlackBuild +++ b/source/xap/freerdp/freerdp.SlackBuild @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xap/fvwm/fvwm.SlackBuild b/source/xap/fvwm/fvwm.SlackBuild index 5a41c9c3a..9de111625 100755 --- a/source/xap/fvwm/fvwm.SlackBuild +++ b/source/xap/fvwm/fvwm.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xap/gftp/gftp.SlackBuild b/source/xap/gftp/gftp.SlackBuild index 9431f3ac4..7d42bd65b 100755 --- a/source/xap/gftp/gftp.SlackBuild +++ b/source/xap/gftp/gftp.SlackBuild @@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-gftp diff --git a/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch b/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch deleted file mode 100644 index 615e77608..000000000 --- a/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0a67fb0484001e7a0bf14eb73c67f9e74325d524 Mon Sep 17 00:00:00 2001 -From: Luca Bacci <luca.bacci982@gmail.com> -Date: Tue, 2 Apr 2024 11:31:08 +0200 -Subject: [PATCH] QuitDialog: disconnect signal handler on dialog destroy - -...rather than finalize. - -Fixes #10785 ---- - app/dialogs/quit-dialog.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c -index 11737f9ad51..435ea4961a3 100644 ---- a/app/dialogs/quit-dialog.c -+++ b/app/dialogs/quit-dialog.c -@@ -273,7 +273,7 @@ quit_close_all_dialog_new (Gimp *gimp, - - closure = g_cclosure_new (G_CALLBACK (quit_close_all_dialog_container_changed), - private, NULL); -- g_object_watch_closure (G_OBJECT (private->dialog), closure); -+ g_signal_connect_swapped (private->dialog, "destroy", G_CALLBACK (g_closure_invalidate), closure); - g_signal_connect_closure (private->images, "add", closure, FALSE); - g_signal_connect_closure (private->images, "remove", closure, FALSE); - --- -GitLab - diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild index f4590d257..55fe46b4a 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gimp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + cd $TMP rm -rf gimp-$VERSION tar xvf $CWD/gimp-$VERSION.tar.?z || exit 1 @@ -77,9 +80,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Patch for recent glib: -cat $CWD/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/xap/gnuchess/gnuchess.SlackBuild b/source/xap/gnuchess/gnuchess.SlackBuild index 31da21c5c..cac5e2091 100755 --- a/source/xap/gnuchess/gnuchess.SlackBuild +++ b/source/xap/gnuchess/gnuchess.SlackBuild @@ -27,7 +27,7 @@ VERGNUCHESS=6.2.9 VERSJENG=11.2 VEREBOARD=1.1.1 VERXBOARD=4.9.1 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -65,6 +65,9 @@ PKG=/tmp/package-gnuchess rm -rf $PKG mkdir -p $TMP $PKG +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration" + ### gnuchess cd $TMP rm -rf gnuchess-$VERGNUCHESS diff --git a/source/xap/mpv/doinst.sh b/source/xap/mpv/doinst.sh new file mode 100644 index 000000000..f125cba0e --- /dev/null +++ b/source/xap/mpv/doinst.sh @@ -0,0 +1,26 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +for config in etc/mpv/*.conf.new ; do + config $config +done + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/source/xap/mpv/dynamically_generate_desktop_file_protocols.patch b/source/xap/mpv/dynamically_generate_desktop_file_protocols.patch new file mode 100644 index 000000000..33320e1bc --- /dev/null +++ b/source/xap/mpv/dynamically_generate_desktop_file_protocols.patch @@ -0,0 +1,462 @@ +From f59d358752c2a63c94635511cd963bebb2706d64 Mon Sep 17 00:00:00 2001 +From: Dudemanguy <random342@airmail.cc> +Date: Wed, 15 May 2024 09:03:14 -0500 +Subject: [PATCH 1/4] av_common: parent mp_get_lavf_demuxer contents to the + list + +The only usage of this function is freed in mpv's generic property code, +so no other changes are needed. +--- + common/av_common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/av_common.c b/common/av_common.c +index 1a23d766b365..142699d4b4c6 100644 +--- a/common/av_common.c ++++ b/common/av_common.c +@@ -265,7 +265,7 @@ char **mp_get_lavf_demuxers(void) + const AVInputFormat *cur = av_demuxer_iterate(&iter); + if (!cur) + break; +- MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(NULL, cur->name)); ++ MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(list, cur->name)); + } + MP_TARRAY_APPEND(NULL, list, num, NULL); + return list; + +From 6692f87b61d48e1523d6e0ef3d311ffff6e89a6e Mon Sep 17 00:00:00 2001 +From: Dudemanguy <random342@airmail.cc> +Date: Wed, 15 May 2024 19:22:32 -0500 +Subject: [PATCH 2/4] stream: implement get_protocols method for stream_lavf + +Previously, all stream protocols were a static list in mpv. This is okay +for own builtin stuff, but for protocols that depend on ffmpeg it's not +so great. Support for certain protocols may or may not be enabled in a +user's ffmpeg and the protocol list that mpv generates should ideally +match this. Fix this by implementing a get_protocols method for +stream_lavf that will have different results depending on the ffmpeg mpv +is built against. We keep the safe and unsafe protocols separation. The +former is essentially a whitelist. Any protocol that is found in ffmpeg +but is not in the safe whitelist is considered unsafe. In the stream +list, ffmpeg is moved to the bottom so any possible protocols that are +added in the future don't automatically take precedence over any builtin +mpv ones. +--- + common/av_common.c | 12 +++++ + common/av_common.h | 1 + + stream/stream.c | 44 ++++++++++++------- + stream/stream.h | 2 + + stream/stream_lavf.c | 102 ++++++++++++++++++++++++++++++++++++++----- + 5 files changed, 136 insertions(+), 25 deletions(-) + +diff --git a/common/av_common.c b/common/av_common.c +index 142699d4b4c6..a4fa5981ff9f 100644 +--- a/common/av_common.c ++++ b/common/av_common.c +@@ -271,6 +271,18 @@ char **mp_get_lavf_demuxers(void) + return list; + } + ++char **mp_get_lavf_protocols(void) ++{ ++ char **list = NULL; ++ int num = 0; ++ void *opaque = NULL; ++ const char *name; ++ while ((name = avio_enum_protocols(&opaque, 0))) ++ MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(list, name)); ++ MP_TARRAY_APPEND(NULL, list, num, NULL); ++ return list; ++} ++ + int mp_codec_to_av_codec_id(const char *codec) + { + int id = AV_CODEC_ID_NONE; +diff --git a/common/av_common.h b/common/av_common.h +index c584085890c2..b019aa88e17a 100644 +--- a/common/av_common.h ++++ b/common/av_common.h +@@ -42,6 +42,7 @@ void mp_set_avcodec_threads(struct mp_log *l, AVCodecContext *avctx, int threads + void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type); + void mp_add_lavc_encoders(struct mp_decoder_list *list); + char **mp_get_lavf_demuxers(void); ++char **mp_get_lavf_protocols(void); + int mp_codec_to_av_codec_id(const char *codec); + const char *mp_codec_from_av_codec_id(int codec_id); + bool mp_codec_is_lossless(const char *codec); +diff --git a/stream/stream.c b/stream/stream.c +index 06dd92930c01..eca44e4afb37 100644 +--- a/stream/stream.c ++++ b/stream/stream.c +@@ -66,8 +66,6 @@ static const stream_info_t *const stream_list[] = { + #if HAVE_CDDA + &stream_info_cdda, + #endif +- &stream_info_ffmpeg, +- &stream_info_ffmpeg_unsafe, + &stream_info_avdevice, + #if HAVE_DVBIN + &stream_info_dvb, +@@ -92,6 +90,8 @@ static const stream_info_t *const stream_list[] = { + &stream_info_slice, + &stream_info_fd, + &stream_info_cb, ++ &stream_info_ffmpeg, ++ &stream_info_ffmpeg_unsafe, + }; + + // Because of guarantees documented on STREAM_BUFFER_SIZE. +@@ -325,12 +325,17 @@ static int stream_create_instance(const stream_info_t *sinfo, + if (!sinfo->local_fs) + return STREAM_NO_MATCH; + } else { +- for (int n = 0; sinfo->protocols && sinfo->protocols[n]; n++) { +- path = match_proto(url, sinfo->protocols[n]); ++ char **get_protocols = sinfo->get_protocols ? sinfo->get_protocols() : NULL; ++ char **protocols = get_protocols ? get_protocols : (char **)sinfo->protocols; ++ ++ for (int n = 0; protocols && protocols[n]; n++) { ++ path = match_proto(url, protocols[n]); + if (path) + break; + } + ++ talloc_free(get_protocols); ++ + if (!path) + return STREAM_NO_MATCH; + } +@@ -864,16 +869,17 @@ char **stream_get_proto_list(void) + for (int i = 0; i < MP_ARRAY_SIZE(stream_list); i++) { + const stream_info_t *stream_info = stream_list[i]; + +- if (!stream_info->protocols) +- continue; ++ char **get_protocols = stream_info->get_protocols ? stream_info->get_protocols() : NULL; ++ char **protocols = get_protocols ? get_protocols : (char **)stream_info->protocols; + +- for (int j = 0; stream_info->protocols[j]; j++) { +- if (*stream_info->protocols[j] == '\0') +- continue; ++ for (int j = 0; protocols && protocols[j]; j++) { ++ if (*protocols[j] == '\0') ++ continue; + +- MP_TARRAY_APPEND(NULL, list, num, +- talloc_strdup(NULL, stream_info->protocols[j])); ++ MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(list, protocols[j])); + } ++ ++ talloc_free(get_protocols); + } + MP_TARRAY_APPEND(NULL, list, num, NULL); + return list; +@@ -888,7 +894,6 @@ void stream_print_proto_list(struct mp_log *log) + for (int i = 0; list[i]; i++) { + mp_info(log, " %s://\n", list[i]); + count++; +- talloc_free(list[i]); + } + talloc_free(list); + mp_info(log, "\nTotal: %d protocols\n", count); +@@ -899,10 +904,19 @@ bool stream_has_proto(const char *proto) + for (int i = 0; i < MP_ARRAY_SIZE(stream_list); i++) { + const stream_info_t *stream_info = stream_list[i]; + +- for (int j = 0; stream_info->protocols && stream_info->protocols[j]; j++) { +- if (strcmp(stream_info->protocols[j], proto) == 0) +- return true; ++ bool match = false; ++ char **get_protocols = stream_info->get_protocols ? stream_info->get_protocols() : NULL; ++ char **protocols = get_protocols ? get_protocols : (char **)stream_info->protocols; ++ ++ for (int j = 0; protocols && protocols[j]; j++) { ++ if (strcmp(protocols[j], proto) == 0) { ++ match = true; ++ break; ++ } + } ++ ++ talloc_free(get_protocols); ++ return match; + } + + return false; +diff --git a/stream/stream.h b/stream/stream.h +index 58b55e1a43ca..866affe1fef0 100644 +--- a/stream/stream.h ++++ b/stream/stream.h +@@ -114,6 +114,8 @@ typedef struct stream_info_st { + // Alternative to open(). Only either open() or open2() can be set. + int (*open2)(struct stream *st, const struct stream_open_args *args); + const char *const *protocols; ++ // Alternative to protocols. For stream_lavf. ++ char **(*get_protocols)(void); + bool can_write; // correctly checks for READ/WRITE modes + bool local_fs; // supports STREAM_LOCAL_FS_ONLY + int stream_origin; // 0 or set of STREAM_ORIGIN_*; if 0, the same origin +diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c +index a2db55146668..30c823c58f62 100644 +--- a/stream/stream_lavf.c ++++ b/stream/stream_lavf.c +@@ -238,6 +238,96 @@ void mp_setup_av_network_options(AVDictionary **dict, const char *target_fmt, + talloc_free(temp); + } + ++#define PROTO(...) (const char *[]){__VA_ARGS__, NULL} ++ ++// List of safe protocols and their aliases ++static const char **safe_protos[] = { ++ PROTO("data"), ++ PROTO("gopher"), ++ PROTO("gophers"), ++ PROTO("http", "dav", "webdav"), ++ PROTO("httpproxy"), ++ PROTO("https", "davs", "webdavs"), ++ PROTO("ipfs"), ++ PROTO("ipns"), ++ PROTO("mmsh", "mms", "mmshttp"), ++ PROTO("mmst"), ++ PROTO("rist"), ++ PROTO("rtmp"), ++ PROTO("rtmpe"), ++ PROTO("rtmps"), ++ PROTO("rtmpt"), ++ PROTO("rtmpte"), ++ PROTO("rtmpts"), ++ PROTO("rtp"), ++ PROTO("srt"), ++ PROTO("srtp"), ++ NULL, ++}; ++ ++static char **get_safe_protocols(void) ++{ ++ int num = 0; ++ char **protocols = NULL; ++ char **ffmpeg_demuxers = mp_get_lavf_demuxers(); ++ char **ffmpeg_protos = mp_get_lavf_protocols(); ++ ++ for (int i = 0; ffmpeg_protos[i]; i++) { ++ for (int j = 0; safe_protos[j]; j++) { ++ if (strcmp(ffmpeg_protos[i], safe_protos[j][0]) != 0) ++ continue; ++ for (int k = 0; safe_protos[j][k]; k++) ++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, safe_protos[j][k])); ++ break; ++ } ++ } ++ ++ // rtsp is a demuxer not protocol in ffmpeg so it is handled separately ++ for (int i = 0; ffmpeg_demuxers[i]; i++) { ++ if (strcmp("rtsp", ffmpeg_demuxers[i]) == 0) { ++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "rtsp")); ++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "rtsps")); ++ break; ++ } ++ } ++ ++ MP_TARRAY_APPEND(NULL, protocols, num, NULL); ++ ++ talloc_free(ffmpeg_demuxers); ++ talloc_free(ffmpeg_protos); ++ ++ return protocols; ++} ++ ++static char **get_unsafe_protocols(void) ++{ ++ int num = 0; ++ char **protocols = NULL; ++ char **safe_protocols = get_safe_protocols(); ++ char **ffmpeg_protos = mp_get_lavf_protocols(); ++ ++ for (int i = 0; ffmpeg_protos[i]; i++) { ++ bool safe_protocol = false; ++ for (int j = 0; safe_protocols[j]; j++) { ++ if (strcmp(ffmpeg_protos[i], safe_protocols[j]) == 0) { ++ safe_protocol = true; ++ break; ++ } ++ } ++ if (!safe_protocol) ++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, ffmpeg_protos[i])); ++ } ++ ++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "ffmpeg")); ++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "lavf")); ++ ++ MP_TARRAY_APPEND(NULL, protocols, num, NULL); ++ ++ talloc_free(ffmpeg_protos); ++ talloc_free(safe_protocols); ++ return protocols; ++} ++ + // Escape http URLs with unescaped, invalid characters in them. + // libavformat's http protocol does not do this, and a patch to add this + // in a 100% safe case (spaces only) was rejected. +@@ -431,12 +431,7 @@ done: + const stream_info_t stream_info_ffmpeg = { + .name = "ffmpeg", + .open = open_f, +- .protocols = (const char *const[]){ +- "rtmp", "rtsp", "rtsps", "http", "https", "mms", "mmst", "mmsh", "mmshttp", +- "rtp", "httpproxy", "rtmpe", "rtmps", "rtmpt", "rtmpte", "rtmpts", "srt", +- "rist", "srtp", "gopher", "gophers", "data", "ipfs", "ipns", "dav", +- "davs", "webdav", "webdavs", +- NULL }, ++ .get_protocols = get_safe_protocols, + .can_write = true, + .stream_origin = STREAM_ORIGIN_NET, + }; +@@ -448,10 +443,7 @@ const stream_info_t stream_info_ffmpeg = { + const stream_info_t stream_info_ffmpeg_unsafe = { + .name = "ffmpeg", + .open = open_f, +- .protocols = (const char *const[]){ +- "lavf", "ffmpeg", "udp", "ftp", "tcp", "tls", "unix", "sftp", "md5", +- "concat", "smb", +- NULL }, ++ .get_protocols = get_unsafe_protocols, + .stream_origin = STREAM_ORIGIN_UNSAFE, + .can_write = true, + }; + +From 0f4fa329357f27d0c57f8f13b426d7450a29cfa4 Mon Sep 17 00:00:00 2001 +From: Dudemanguy <random342@airmail.cc> +Date: Tue, 14 May 2024 13:32:18 -0500 +Subject: [PATCH 3/4] build: dynamically generate mpv.desktop file protocols + +If we can run the built mpv binary, then it is possible to use a custom +target that reads the protocols we have available in mpv and write the +mpv.desktop file based on the output. For cases where this is not +possible (e.g. cross compiling), then just install the unmodified +mpv.desktop file like before. Fixes #8731 and fixes #14124. +--- + TOOLS/gen-mpv-desktop.py | 45 ++++++++++++++++++++++++++++++++++++++++ + meson.build | 17 ++++++++++++++- + 2 files changed, 61 insertions(+), 1 deletion(-) + create mode 100755 TOOLS/gen-mpv-desktop.py + +diff --git a/TOOLS/gen-mpv-desktop.py b/TOOLS/gen-mpv-desktop.py +new file mode 100755 +index 000000000000..2b05de1ec4cc +--- /dev/null ++++ b/TOOLS/gen-mpv-desktop.py +@@ -0,0 +1,45 @@ ++#!/usr/bin/env python3 ++ ++# Modify X-KDE-Protocols in the mpv.desktop file based on output from ++# mpv --list-protocols. ++ ++# ++# This file is part of mpv. ++# ++# mpv is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Lesser General Public ++# License as published by the Free Software Foundation; either ++# version 2.1 of the License, or (at your option) any later version. ++# ++# mpv is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU Lesser General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public ++# License along with mpv. If not, see <http://www.gnu.org/licenses/>. ++# ++ ++import sys ++from subprocess import check_output ++ ++if __name__ == "__main__": ++ with open(sys.argv[1], "r", encoding="UTF-8") as f: ++ next(f) ++ mpv_desktop = dict([line.split("=", 1) for line in f]) ++ ++ if not mpv_desktop["X-KDE-Protocols"]: ++ raise ValueError("Missing X-KDE-Protocols entry in mpv.desktop file") ++ ++ mpv_protocols = check_output([sys.argv[2], "--list-protocols"], encoding="UTF-8") ++ mpv_protocols = set(line.strip(" :/") for line in mpv_protocols.splitlines() if "://" in line) ++ if len(mpv_protocols) == 0: ++ raise ValueError("Unable to parse any protocols from mpv '--list-protocols'") ++ ++ protocol_list = set(mpv_desktop["X-KDE-Protocols"].strip().split(",")) ++ mpv_desktop["X-KDE-Protocols"] = ",".join(sorted(mpv_protocols & protocol_list)) + "\n" ++ ++ with open(sys.argv[3], "w", encoding="UTF-8") as f: ++ f.write("[Desktop Entry]" + "\n") ++ for key, value in mpv_desktop.items(): ++ f.write(f"{key}={value}") +diff --git a/meson.build b/meson.build +index c14bf47d5614..ae1eb9cfd903 100644 +--- a/meson.build ++++ b/meson.build +@@ -581,6 +581,7 @@ tools_directory = join_paths(source_root, 'TOOLS') + docutils_wrapper = find_program(join_paths(tools_directory, 'docutils-wrapper.py')) + file2string = find_program(join_paths(tools_directory, 'file2string.py')) + matroska = find_program(join_paths(tools_directory, 'matroska.py')) ++mpv_desktop = find_program(join_paths(tools_directory, 'gen-mpv-desktop.py')) + + ebml_defs = custom_target('ebml_defs.inc', + output: 'ebml_defs.inc', +@@ -1796,7 +1797,6 @@ if get_option('cplayer') + zsh_install_dir = join_paths(datadir, 'zsh', 'site-functions') + install_data('etc/_mpv.zsh', install_dir: zsh_install_dir, rename: '_mpv') + +- install_data('etc/mpv.desktop', install_dir: join_paths(datadir, 'applications')) + install_data('etc/mpv.metainfo.xml', install_dir: join_paths(datadir, 'metainfo')) + install_data('etc/encoding-profiles.conf', install_dir: join_paths(confdir, 'mpv')) + +@@ -1827,6 +1827,21 @@ if get_option('cplayer') + command: [osxbundle, mpv.full_path(), '@SOURCE_ROOT@'], + ) + endif ++ ++ if not win32 and not darwin ++ if meson.can_run_host_binaries() ++ mpv_desktop_path = join_paths(source_root, 'etc', 'mpv.desktop') ++ custom_target('mpv.desktop', ++ depends: mpv, ++ output: 'mpv.desktop', ++ command: [mpv_desktop, mpv_desktop_path, mpv.full_path(), '@OUTPUT@'], ++ install: true, ++ install_dir: join_paths(datadir, 'applications'), ++ ) ++ else ++ install_data('etc/mpv.desktop', install_dir: join_paths(datadir, 'applications')) ++ endif ++ endif + endif + + if get_option('tests') + +From 00506d51892c48cd91d3c88423f31df7b9328499 Mon Sep 17 00:00:00 2001 +From: Dudemanguy <random342@airmail.cc> +Date: Wed, 22 May 2024 10:27:40 -0500 +Subject: [PATCH 4/4] stream_lavf: don't add ffmpeg bluray or dvd protocols + +The naming of these conflict with existing mpv protocols, so skip if we +get them. Users can still use them via lavf://bluray: or lavf://dvd: if +they wish. +--- + stream/stream_lavf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c +index 30c823c58f62..369f9cecc402 100644 +--- a/stream/stream_lavf.c ++++ b/stream/stream_lavf.c +@@ -314,6 +314,10 @@ static char **get_unsafe_protocols(void) + break; + } + } ++ // Skip to avoid name conflict with builtin mpv protocol. ++ if (strcmp(ffmpeg_protos[i], "bluray") == 0 || strcmp(ffmpeg_protos[i], "dvd") == 0) ++ continue; ++ + if (!safe_protocol) + MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, ffmpeg_protos[i])); + } diff --git a/source/xap/mpv/mpv.SlackBuild b/source/xap/mpv/mpv.SlackBuild new file mode 100755 index 000000000..b91d20f9e --- /dev/null +++ b/source/xap/mpv/mpv.SlackBuild @@ -0,0 +1,167 @@ +#!/bin/bash + +# Copyright 2015 John Vogel Corning, NY USA +# Copyright 2017, 2018 (versions 0.25.0-0.29.1) Andreas Guldstrand +# Copyright 2020-2023 Christoph Willing Brisbane Australia +# Copyright 2024 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) + +PKGNAM=mpv +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +cat $CWD/dynamically_generate_desktop_file_protocols.patch | patch -p1 --verbose || exit 1 + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dmanpage-build=enabled \ + -Dlibmpv=true \ + -Dcdda=enabled \ + -Ddvdnav=enabled \ + -Ddvbin=enabled \ + -Dcplugins=enabled \ + -Diconv=enabled \ + -Dlibarchive=enabled \ + -Dlibbluray=enabled \ + -Dsdl2=enabled \ + -Dgl-x11=enabled \ + -Dsdl2-gamepad=enabled \ + -Dpulse=enabled \ + -Dpipewire=enabled \ + -Dsdl2-audio=enabled \ + -Dopenal=enabled \ + -Dlua=luajit \ + -Djavascript=enabled \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# This seems like a silly place to put the config files: +rm -rf $PKG/usr/share/doc + +# Install all sample config files: +cp -a etc/*.conf $PKG/etc/mpv +chmod 644 $PKG/etc/mpv/* + +# Make config files .new: +for config in $PKG/etc/mpv/* ; do + mv $config ${config}.new +done + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + Copyright* LICENSE* README* RELEASE_NOTES* \ + DOCS/*.{md,rst,txt} \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/mpv/mpv.url b/source/xap/mpv/mpv.url new file mode 100644 index 000000000..8c68abff1 --- /dev/null +++ b/source/xap/mpv/mpv.url @@ -0,0 +1 @@ +https://github.com/mpv-player/mpv diff --git a/source/xap/mpv/slack-desc b/source/xap/mpv/slack-desc new file mode 100644 index 000000000..dd1606f6c --- /dev/null +++ b/source/xap/mpv/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +mpv: mpv (a command-line media player) +mpv: +mpv: mpv is a free (as in freedom) media player for the command line. It +mpv: supports a wide variety of media file formats, audio and video codecs, +mpv: and subtitle types. Powerful scripting capabilities can make the +mpv: player do almost anything. While mpv strives for minimalism and +mpv: provides no real GUI, it has a small controller on top of the video +mpv: for basic control. +mpv: +mpv: Homepage: https://mpv.io/ +mpv: diff --git a/source/xap/pavucontrol/pavucontrol.SlackBuild b/source/xap/pavucontrol/pavucontrol.SlackBuild index db8b576ba..ba9f78fb7 100755 --- a/source/xap/pavucontrol/pavucontrol.SlackBuild +++ b/source/xap/pavucontrol/pavucontrol.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2015, 2018, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -76,25 +76,38 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++11" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --build=$ARCH-slackware-linux || exit 1 + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 +# move this stuff +mkdir -p $PKG/usr/doc +mv $PKG/usr/share/doc/pavucontrol $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/share/doc find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING* doc/README* LICENSE $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSE* $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild index 18362ef80..627d1b1bf 100755 --- a/source/xap/pidgin/pidgin.SlackBuild +++ b/source/xap/pidgin/pidgin.SlackBuild @@ -74,6 +74,9 @@ else ARCHQUADLET="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 @@ -173,6 +176,8 @@ done PIDGIN_LIBS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \ PURPLE_CFLAGS="-I${PKG}/usr/include/libpurple" \ PURPLE_LIBS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild index 63086bb5b..ce1b5235f 100755 --- a/source/xap/rdesktop/rdesktop.SlackBuild +++ b/source/xap/rdesktop/rdesktop.SlackBuild @@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild index 3e700ba30..d8e40d7f3 100755 --- a/source/xap/sane/sane.SlackBuild +++ b/source/xap/sane/sane.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sane -BACKVER=1.3.0 +BACKVER=1.3.1 FRONTVER=1.0.14 VERSION=${VERSION:-$BACKVER} BUILD=${BUILD:-1} @@ -62,6 +62,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-sane @@ -70,9 +73,9 @@ mkdir -p $TMP $PKG # First, we'll build the backends cd $TMP -rm -rf backends-$BACKVER -tar xvf $CWD/backends-$BACKVER.tar.?z || exit 1 -cd backends-$BACKVER || exit 1 +rm -rf sane-backends-$BACKVER +tar xvf $CWD/sane-backends-$BACKVER.tar.?z || exit 1 +cd sane-backends-$BACKVER || exit 1 chown -R root:root . # Put the SANE_CAP_ALWAYS_SETTABLE definition back until diff --git a/source/xap/seyon/seyon.SlackBuild b/source/xap/seyon/seyon.SlackBuild index ae3087113..9b478f420 100755 --- a/source/xap/seyon/seyon.SlackBuild +++ b/source/xap/seyon/seyon.SlackBuild @@ -93,7 +93,7 @@ sed -i "s/getline/seyon_getline/g" * chmod 755 makever.sh xmkmf # Add -fcommon to CFLAGS: -sed -i -e 's/-fno-strict-aliasing/-fno-strict-aliasing -fcommon/' Makefile +sed -i -e 's/-fno-strict-aliasing/-fno-strict-aliasing -fcommon -Wno-error=implicit-function-declaration/' Makefile make || exit 1 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/X11 diff --git a/source/xap/xgames/xgames.SlackBuild b/source/xap/xgames/xgames.SlackBuild index bcccbb5b3..52b817910 100755 --- a/source/xap/xgames/xgames.SlackBuild +++ b/source/xap/xgames/xgames.SlackBuild @@ -58,6 +58,7 @@ cd spider || exit 1 zcat $CWD/spider.diff.gz | patch -p1 --verbose || exit 1 xmkmf zcat $CWD/spider.gcc10.diff.gz | patch -p1 --verbose || exit 1 +sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch |g" Makefile make $NUMJOBS || make || exit 1 mkdir -p $PKG/usr/bin cat spider > $PKG/usr/bin/spider @@ -72,6 +73,7 @@ tar xvf $CWD/maze.tar.lz || exit 1 cd maze || exit 1 zcat $CWD/maze.diff.gz | patch -p1 || exit 1 xmkmf +sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile make $NUMJOBS || make || exit 1 cat maze > $PKG/usr/bin/maze cat maze.man | gzip -9c > $PKG/usr/man/man6/maze.6.gz @@ -83,6 +85,7 @@ cd $TMP tar xvf $CWD/xcolormap.tar.lz || exit 1 cd xcolormap || exit 1 zcat $CWD/xcolormap.diff.gz | patch -p1 || exit 1 +sed -i "s|CFLAGS = |CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion -Wno-error=incompatible-pointer-types |g" Makefile make $NUMJOBS || make || exit 1 cat xcolormap > $PKG/usr/bin/xcolormap mkdir -p $PKG/usr/doc/xgames-$VERSION/xcolormap @@ -94,6 +97,7 @@ tar xvf $CWD/xcuckoo-1.1.tar.lz || exit 1 cd xcuckoo || exit 1 zcat $CWD/xcuckoo.diff.gz | patch -p1 --verbose || exit 1 xmkmf +sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile make $NUMJOBS || make || exit 1 cat xcuckoo > $PKG/usr/bin/xcuckoo cat xcuckoo.man | gzip -9c > $PKG/usr/man/man6/xcuckoo.6.gz @@ -107,6 +111,7 @@ cd xlander || exit 1 zcat $CWD/xlander.fixes.diff.gz | patch -p1 || exit 1 zcat $CWD/xlander-2009-07-18.diff.gz | patch -p1 || exit 1 xmkmf +sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile make $NUMJOBS || make || exit 1 cat xlander > $PKG/usr/bin/xlander cat xlander.man | gzip -9c > $PKG/usr/man/man6/xlander.6.gz @@ -118,6 +123,7 @@ cd $TMP tar xvf $CWD/xminesweep3.0.tar.lz || exit 1 cd xminesweep3.0 || exit 1 xmkmf +sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile make $NUMJOBS || make || exit 1 cat xminesweep > $PKG/usr/bin/xminesweep cat xminesweep.man | gzip -9c > $PKG/usr/man/man6/xminesweep.6.gz @@ -129,6 +135,7 @@ cd $TMP tar xvf $CWD/xneko.tar.lz || exit 1 cd xneko || exit 1 xmkmf +sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile make $NUMJOBS || make || exit 1 cat xneko > $PKG/usr/bin/xneko cat xneko.man | gzip -9c > $PKG/usr/man/man6/xneko.6.gz @@ -140,6 +147,7 @@ cd $TMP tar xvf $CWD/xroach.tar.lz || exit 1 cd xroach || exit 1 xmkmf +sed -i "s| CFLAGS = | CFLAGS = -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=return-mismatch -Wno-error=int-conversion |g" Makefile make $NUMJOBS || make || exit 1 cat xroach > $PKG/usr/bin/xroach cat xroach.man | gzip -9c > $PKG/usr/man/man6/xroach.6.gz diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild index 287bbb2b9..a25a74a14 100755 --- a/source/xap/xine-ui/xine-ui.SlackBuild +++ b/source/xap/xine-ui/xine-ui.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=xine-ui VERSION=${VERSION:-$(echo xine-ui-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # I would use "-march=i586 -mcpu=i686" here as usual, but with XINE it's all or nothing. # I'd rather have it work well for the i686/Athlon crowd than suck for everyone. -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/xmms/xmms.SlackBuild b/source/xap/xmms/xmms.SlackBuild index 63f4cbeda..2ee85e524 100755 --- a/source/xap/xmms/xmms.SlackBuild +++ b/source/xap/xmms/xmms.SlackBuild @@ -62,6 +62,9 @@ else ARCHOPTS="" fi +# GCC^H^H^Hclang "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} @@ -85,6 +88,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +CC=clang \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LIBS="-ldl" \ @@ -93,6 +97,7 @@ LIBS="-ldl" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var/lib \ --disable-static \ + --disable-simd \ --enable-ipv6 \ $ARCHOPTS \ --build=$ARCH-slackware-linux || exit 1 diff --git a/source/xap/xsane/xsane.SlackBuild b/source/xap/xsane/xsane.SlackBuild index 4f71ff8cf..0a3d9fb96 100755 --- a/source/xap/xsane/xsane.SlackBuild +++ b/source/xap/xsane/xsane.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/xap/xsnow/xsnow.SlackBuild b/source/xap/xsnow/xsnow.SlackBuild index def5c0d2f..dc4f87749 100755 --- a/source/xap/xsnow/xsnow.SlackBuild +++ b/source/xap/xsnow/xsnow.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xsnow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/y/bsd-games/bsd-games.SlackBuild b/source/y/bsd-games/bsd-games.SlackBuild index 282c92927..d4d87b2a5 100755 --- a/source/y/bsd-games/bsd-games.SlackBuild +++ b/source/y/bsd-games/bsd-games.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bsd-games VERSION=${VERSION:-2.17} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -74,6 +74,7 @@ zcat $CWD/patches/0016-Better-explanation-how-to-read-the-documentation.patch.gz zcat $CWD/patches/0017-hack-Fix-segv-when-i-inventory-done-after-load-from-.patch.gz | patch -p1 --backup --suffix=.orig --verbose || exit 1 zcat $CWD/patches/bsd-games.factor.no.ubig.diff.gz | patch -p1 --backup --suffix=.orig --verbose || exit 1 zcat $CWD/patches/bsd-games.fortunepath.diff.gz | patch -p1 --backup --suffix=.orig --verbose || exit 1 +zcat $CWD/patches/bsd-games.gcc14.diff.gz | patch -p1 --backup --suffix=.orig --verbose || exit 1 ./configure || exit 1 diff --git a/source/y/bsd-games/patches/bsd-games.gcc14.diff b/source/y/bsd-games/patches/bsd-games.gcc14.diff new file mode 100644 index 000000000..644faa4d4 --- /dev/null +++ b/source/y/bsd-games/patches/bsd-games.gcc14.diff @@ -0,0 +1,11 @@ +--- ./configure.orig 2024-05-10 22:59:06.160719064 -0500 ++++ ./configure 2024-05-10 23:00:09.194720474 -0500 +@@ -333,7 +333,7 @@ + echo "The default warning flags should give a compile with few warnings." + # -Wbad-function-cast and -Wshadow give lots of warnings that are basically + # harmless. +-ask "C compiler warning flags" warning_flags "-Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings" ++ask "C compiler warning flags" warning_flags "-Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wno-error=implicit-function-declaration" + if building_in dab; then + ask "C++ compiler warning flags" cxx_warning_flags "-Wall -W -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings" + fi diff --git a/source/y/nethack/nethack.SlackBuild b/source/y/nethack/nethack.SlackBuild index d4ec99843..784327a6e 100755 --- a/source/y/nethack/nethack.SlackBuild +++ b/source/y/nethack/nethack.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=nethack VERSION=3.6.7 SRCVER=367 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |