Merge branch '0.9'

000-kernel/64bit.config

@@ -46,7 +46,7 @@ CONFIG_HAVE_KERNEL_ZSTD=y
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_KERNEL_ZSTD=y
 CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="porteus"
+CONFIG_DEFAULT_HOSTNAME="porteux"
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYSVIPC_COMPAT=y

000-kernel/createModule.sh

@@ -73,12 +73,12 @@ rm -fr ../aufs_sources
 
 echo "Building vmlinuz (this may take a while)..."
 CPUTHREADS=$(nproc --all)
-make olddefconfig > /dev/null 2>&1 && make INSTALL_MOD_STRIP=1 -j$CPUTHREADS "KCFLAGS=-g -O3 -feliminate-unused-debug-types -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -m64 -fasynchronous-unwind-tables -Wp,-D_REENTRANT -ftree-loop-distribute-patterns -Wl,-z -Wl,now -Wl,-z -Wl,relro -fno-semantic-interposition -ffat-lto-objects -fno-trapping-math -Wl,-sort-common -Wl,--enable-new-dtags -mtune=skylake -flto -fwhole-program" || { echo "Fail to build kernel."; exit 1; }
+make olddefconfig > /dev/null 2>&1 && make INSTALL_MOD_STRIP=1 -j$CPUTHREADS "KCFLAGS=-g -O3 -s -feliminate-unused-debug-types -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -m64 -fasynchronous-unwind-tables -Wp,-D_REENTRANT -ftree-loop-distribute-patterns -Wl,-z -Wl,now -Wl,-z -Wl,relro -fno-semantic-interposition -ffat-lto-objects -fno-trapping-math -Wl,-sort-common -Wl,--enable-new-dtags -mtune=skylake -flto -fwhole-program" || { echo "Fail to build kernel."; exit 1; }
 cp -f arch/x86/boot/bzImage ../vmlinuz
 make clean
 
 echo "Building modules (this may take a while)..."
-make olddefconfig > /dev/null 2>&1 && make INSTALL_MOD_STRIP=1 -j$CPUTHREADS "KCFLAGS=-O3 -mtune=skylake" || { echo "Fail to build kernel."; exit 1; }
+make olddefconfig > /dev/null 2>&1 && make INSTALL_MOD_STRIP=1 -j$CPUTHREADS "KCFLAGS=-O3 -s -mtune=skylake" || { echo "Fail to build kernel."; exit 1; }
 make -j$CPUTHREADS modules_install INSTALL_MOD_PATH=../ > /dev/null 2>&1
 make -j$CPUTHREADS firmware_install INSTALL_MOD_PATH=../ > /dev/null 2>&1
 

001-core/createModule.sh

@@ -62,6 +62,17 @@ cd $MODULEPATH/${currentPackage}/${currentPackage}-stripped-$version
 /sbin/makepkg -l y -c n $MODULEPATH/packages/${currentPackage}-stripped-$version.txz > /dev/null 2>&1
 rm -fr $MODULEPATH/${currentPackage}
 
+currentPackage=fftw
+mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
+mv ../packages/${currentPackage}-[0-9]* .
+version=`ls * -a | cut -d'-' -f2- | sed 's/\.txz$//'`
+ROOT=./ installpkg ${currentPackage}-*.txz
+mkdir ${currentPackage}-stripped-$version
+cp --parents -P usr/lib64/libfftw3f.* ${currentPackage}-stripped-$version/
+cd $MODULEPATH/${currentPackage}/${currentPackage}-stripped-$version
+/sbin/makepkg -l y -c n $MODULEPATH/packages/${currentPackage}-stripped-$version.txz > /dev/null 2>&1
+rm -fr $MODULEPATH/${currentPackage}
+
 currentPackage=ntp
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 mv ../packages/${currentPackage}-[0-9]* .
@@ -103,7 +114,7 @@ installpkg $MODULEPATH/packages/ncurses*.txz || exit 1
 currentPackage=procps
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 cp $SCRIPTPATH/extras/procps/* .
-version=$(curl -s https://gitlab.com/${currentPackage}-ng/${currentPackage}/-/tags?format=atom | grep ' <title>' | grep -v rc | head -1 | cut -d '>' -f 2 | cut -d '<' -f 1)
+version=$(curl -s https://gitlab.com/${currentPackage}-ng/${currentPackage}/-/tags?format=atom | grep ' <title>' | grep -v rc | sort -V -r | head -1 | cut -d '>' -f 2 | cut -d '<' -f 1)
 sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-${version//[vV]}}|g" ${currentPackage}.SlackBuild
 wget https://gitlab.com/${currentPackage}-ng/procps/-/archive/${version}/procps-${version}.tar.gz
 sh ${currentPackage}.SlackBuild || exit 1
@@ -230,6 +241,10 @@ chmod 644 etc/rc.d/rc.wireless
 
 CopyToDevel
 
+### copy language files to 08-multilanguage
+
+CopyToMultiLanguage
+
 ### module clean up
 
 cd $MODULEPATH/packages/
@@ -241,13 +256,17 @@ rm -R usr/etc
 rm -R usr/lib/ldscripts
 rm -R usr/lib/modprobe.d
 rm -R usr/lib/udev
+rm -R usr/lib64/guile
+rm -R usr/lib64/services
+rm -R usr/lib64/krb5/plugins
 rm -R usr/lib64/locale/C.utf8
 rm -R usr/lib64/p7zip/Codecs
 rm -R usr/lib64/python2.7
 rm -R usr/lib64/python3.9/idlelib
 rm -R usr/lib64/python3.9/lib2to3
 rm -R usr/lib64/python3.9/site-packages/demo
 rm -R usr/lib64/python3.9/turtledemo
+rm -R usr/lib64/sasl2
 rm -R usr/lib64/systemd
 rm -R usr/local/etc
 rm -R usr/local/games
@@ -324,12 +343,15 @@ rm usr/bin/js[0-9]*
 rm usr/bin/7za
 rm usr/bin/7zr
 rm usr/bin/smbtorture
-rm usr/lib64/p7zip/7za
-rm usr/lib64/p7zip/7zr
+rm usr/bin/wpa_gui
 rm usr/lib64/liblibboost_*
+rm usr/lib64/libqgpgme.*
 rm usr/lib64/libslang.so.1*
+rm usr/lib64/p7zip/7za
+rm usr/lib64/p7zip/7zr
 rm usr/libexec/samba/rpcd_*
 rm usr/local/bin/webfsd
+rm usr/share/pixmaps/wpa_gui.png
 rm var/db/Makefile
 
 find usr/lib64/python* -type d -name 'test' -prune -exec rm -rf {} +

001-core/downloadPackages.sh

@@ -30,7 +30,6 @@ wait
 DownloadPackage "cracklib" &
 DownloadPackage "curl" &
 DownloadPackage "cyrus-sasl" &
-DownloadPackage "db48" &
 DownloadPackage "dbus" &
 DownloadPackage "dbus-glib" &
 DownloadPackage "dcron" &
@@ -53,13 +52,13 @@ wait
 DownloadPackage "eudev" &
 DownloadPackage "exfatprogs" &
 DownloadPackage "f2fs-tools" &
-DownloadPackage "fftw" &
 DownloadPackage "file" &
 DownloadPackage "findutils" &
 DownloadPackage "flex" &
 DownloadPackage "floppy" &
 DownloadPackage "fuse3" &
 DownloadPackage "gawk" &
+DownloadPackage "gd" &
 wait
 DownloadPackage "gdbm" &
 DownloadPackage "gettext" &
@@ -124,12 +123,12 @@ DownloadPackage "libpwquality" &
 DownloadPackage "libqmi" &
 DownloadPackage "libraw1394" &
 DownloadPackage "libseccomp" &
-DownloadPackage "libsoup" &
 wait
 DownloadPackage "libssh2" &
 DownloadPackage "libtasn1" &
 DownloadPackage "libtirpc" &
 DownloadPackage "libunistring" &
+DownloadPackage "liburing" & # required by samba
 DownloadPackage "libusb" &
 DownloadPackage "libusb-compat" &
 DownloadPackage "libusbmuxd" &
@@ -215,6 +214,7 @@ DownloadPackage "telnet" &
 DownloadPackage "tevent" &
 DownloadPackage "traceroute" &
 wait
+DownloadPackage "uring" &
 DownloadPackage "usb_modeswitch" &
 DownloadPackage "usbmuxd" &
 DownloadPackage "usbutils" &
@@ -240,12 +240,14 @@ if [ $SLACKWAREVERSION == "current" ]; then
 	DownloadPackage "lua" &
 	DownloadPackage "lzlib" &
 	DownloadPackage "mozjs102" &
+	DownloadPackage "userspace-rcu" &
 	wait
 fi
 
 ### packages that require specific striping
 
 DownloadPackage "binutils" &
+DownloadPackage "fftw" & # required by pulse plugins
 DownloadPackage "ntp" &
 DownloadPackage "openldap" &
 wait

002-xorg/createModule.sh

@@ -39,7 +39,6 @@ mv ../packages/${currentPackage}-[0-9]* .
 version=`ls * -a | cut -d'-' -f2- | sed 's/\.txz$//'`
 ROOT=./ installpkg ${currentPackage}-*.txz
 mkdir ${currentPackage}-stripped-$version
-cp --parents -P usr/lib$SYSTEMBITS/LLVMgold.so ${currentPackage}-stripped-$version
 cp --parents -P usr/lib$SYSTEMBITS/libLLVM*.so* ${currentPackage}-stripped-$version
 cd ${currentPackage}-stripped-$version
 /sbin/makepkg -l y -c n $MODULEPATH/packages/${currentPackage}-stripped-$version.txz > /dev/null 2>&1
@@ -72,11 +71,8 @@ sh ${currentPackage}.SlackBuild || exit 1
 mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
 rm -fr $MODULEPATH/${currentPackage}
 
-# todo: get gtk version from slackware and use it to download the matched gtk classic version
 currentPackage=gtk+3
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
-#version=`ls *.tar.?z -a | cut -d'-' -f2- | cut -d'-' -f1`
-#wget https://github.com/lah7/gtk3-classic/releases/download/$version/gtk3-classic-$version-1-x86_64.pkg.tar.zst
 info=$(DownloadLatestSourceFromGithub "lah7" "gtk3-classic")
 filename=${info% *}
 tar xvf "$filename" && rm "$filename" || exit 1
@@ -119,30 +115,6 @@ sh ${currentPackage}.SlackBuild || exit 1
 mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
 rm -fr $MODULEPATH/${currentPackage}
 
-currentPackage=libdaemon
-version=0.14
-mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
-wget -r -nd --no-parent $SLACKBUILDREPOSITORY/libraries/${currentPackage}/ -A * || exit 1
-wget http://0pointer.de/lennart/projects/libdaemon/${currentPackage}-$version.tar.gz || exit 1
-sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-$version}|g" ${currentPackage}.SlackBuild
-sed -i "s|TAG=\${TAG:-_SBo}|TAG=|g" ${currentPackage}.SlackBuild
-sed -i "s|PKGTYPE=\${PKGTYPE:-tgz}|PKGTYPE=\${PKGTYPE:-txz}|g" ${currentPackage}.SlackBuild
-sh ${currentPackage}.SlackBuild || exit 1
-mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
-rm -fr $MODULEPATH/${currentPackage}
-
-currentPackage=nss-mdns
-mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
-wget -r -nd --no-parent $SLACKBUILDREPOSITORY/network/${currentPackage}/ -A * || exit 1
-info=$(DownloadLatestFromGithub "lathiat" "nss-mdns")
-version=${info#* }
-sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-$version}|g" ${currentPackage}.SlackBuild
-sed -i "s|TAG=\${TAG:-_SBo}|TAG=|g" ${currentPackage}.SlackBuild
-sed -i "s|PKGTYPE=\${PKGTYPE:-tgz}|PKGTYPE=\${PKGTYPE:-txz}|g" ${currentPackage}.SlackBuild
-sh ${currentPackage}.SlackBuild || exit 1
-mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
-rm -fr $MODULEPATH/${currentPackage}
-
 currentPackage=openbox
 version=3.6.1
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
@@ -171,18 +143,6 @@ sh ${currentPackage}.SlackBuild || exit 1
 mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
 rm -fr $MODULEPATH/${currentPackage}
 
-currentPackage=xclip
-mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
-wget -r -nd --no-parent $SLACKBUILDREPOSITORY/misc/${currentPackage}/ -A * || exit 1
-info=$(DownloadLatestFromGithub "astrand" "xclip")
-version=${info#* }
-sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-$version}|g" ${currentPackage}.SlackBuild
-sed -i "s|TAG=\${TAG:-_SBo}|TAG=|g" ${currentPackage}.SlackBuild
-sed -i "s|PKGTYPE=\${PKGTYPE:-tgz}|PKGTYPE=\${PKGTYPE:-txz}|g" ${currentPackage}.SlackBuild
-sh ${currentPackage}.SlackBuild || exit 1
-mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
-rm -fr $MODULEPATH/${currentPackage}
-
 currentPackage=paper-icon-theme
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 wget https://github.com/snwh/${currentPackage}/archive/refs/heads/master.tar.gz || exit 1
@@ -228,6 +188,12 @@ sed -i "s|GtkEntry::inner-border = {7, 7, 4, 5}|GtkEntry::inner-border = {2, 2,
 
 CopyToDevel
 
+### copy language files to 08-multilanguage
+
+CopyToMultiLanguage
+
+mv $MODULEPATH/packages/usr/lib64/gobject-introspection $PORTEUXBUILDERPATH/05-devel/packages/usr/lib64
+
 ### module clean up
 
 cd $MODULEPATH/packages/
@@ -246,8 +212,10 @@ rm -R usr/lib64/gdkmm-*
 rm -R usr/lib64/giomm-*
 rm -R usr/lib64/glibmm-*
 rm -R usr/lib64/gnome-settings-daemon-*
+rm -R usr/lib64/graphene-1.0
 rm -R usr/lib64/gtkmm-*
 rm -R usr/lib64/openjpeg-*
+rm -R usr/lib64/libxslt-plugins
 rm -R usr/lib64/pangomm-*
 rm -R usr/lib64/python2*
 rm -R usr/lib64/sigc++-*
@@ -319,6 +287,15 @@ rm usr/bin/qv4l2
 rm usr/bin/qvidcap
 rm usr/bin/rsvg-convert
 rm usr/bin/Xdmx
+rm usr/lib64/libbd_crypto.*
+rm usr/lib64/libbd_nvdimm.*
+rm usr/lib64/libbd_vdo.*
+rm usr/lib64/libLLVMExtensions*
+rm usr/lib64/libLLVMLTO*
+rm usr/lib64/libMesaOpenCL*
+rm usr/lib64/libpoppler-cpp*
+rm usr/lib64/libRusticlOpenCL*
+rm usr/lib64/mpg123/output_sdl.so
 rm usr/share/applications/gcr-prompter.desktop
 rm usr/share/applications/gcr-viewer.desktop
 rm usr/share/applications/mimeinfo.cache

002-xorg/downloadPackages.sh

@@ -19,6 +19,7 @@ DownloadPackage "cairo" &
 DownloadPackage "cairomm" &
 wait
 DownloadPackage "cdparanoia-III" &
+DownloadPackage "db48" & # required by bluez (obexd)
 DownloadPackage "dejavu-fonts-ttf" &
 DownloadPackage "desktop-file-utils" &
 DownloadPackage "djvulibre" &
@@ -39,6 +40,7 @@ DownloadPackage "glu" &
 DownloadPackage "gnome-themes-extra" &
 DownloadPackage "gobject-introspection" &
 DownloadPackage "gparted" &
+DownloadPackage "graphene" & # required by libgstopengl
 DownloadPackage "graphite2" &
 wait
 DownloadPackage "gsettings-desktop-schemas" &
@@ -95,7 +97,6 @@ DownloadPackage "libopusenc" &
 DownloadPackage "libpciaccess" &
 wait
 DownloadPackage "libpng" &
-DownloadPackage "libproxy" &
 DownloadPackage "librsvg" &
 DownloadPackage "libsamplerate" &
 DownloadPackage "libsecret" &
@@ -116,8 +117,6 @@ DownloadPackage "libwacom" &
 DownloadPackage "libwebp" &
 DownloadPackage "libX11" &
 DownloadPackage "libXau" &
-DownloadPackage "libXaw3d" &
-DownloadPackage "libXaw3dXft" &
 DownloadPackage "libXaw" &
 DownloadPackage "libxcb" &
 DownloadPackage "libXcomposite" &
@@ -161,7 +160,6 @@ DownloadPackage "mobile-broadband-provider-info" &
 DownloadPackage "mpg123" &
 DownloadPackage "mtdev" &
 wait
-DownloadPackage "ndctl" &
 DownloadPackage "ocl-icd" &
 DownloadPackage "openjpeg" &
 DownloadPackage "opus" &
@@ -171,6 +169,7 @@ DownloadPackage "orc" &
 DownloadPackage "pamixer" &
 DownloadPackage "pango" &
 DownloadPackage "pangomm" &
+DownloadPackage "pipewire" & # required by xdg-desktop-portal
 DownloadPackage "pixman" &
 DownloadPackage "poppler" &
 wait
@@ -180,19 +179,15 @@ DownloadPackage "pygobject3" &
 DownloadPackage "pyxdg" &
 DownloadPackage "rdesktop" &
 DownloadPackage "sbc" &
-DownloadPackage "SDL2" &
-DownloadPackage "sdl" &
 DownloadPackage "setxkbmap" &
 DownloadPackage "shared-mime-info" &
 DownloadPackage "speex" &
 DownloadPackage "speexdsp" &
-DownloadPackage "startup-notification" &
 wait
-DownloadPackage "taglib" &
+DownloadPackage "startup-notification" &
 DownloadPackage "udisks2" &
 DownloadPackage "upower" &
 DownloadPackage "v4l-utils" &
-DownloadPackage "volume_key" &
 DownloadPackage "vorbis-tools" &
 DownloadPackage "vte" &
 DownloadPackage "wavpack" &
@@ -247,6 +242,17 @@ DownloadPackage "xterm" &
 DownloadPackage "xvinfo" &
 wait
 
+### slackware specific version packages
+
+if [ $SLACKWAREVERSION == "current" ]; then
+	DownloadPackage "libdeflate" & # required by libtiff 
+	DownloadPackage "libsoup3" & # required by gvfs (gvfsd-http)
+	wait
+else
+	DownloadPackage "libsoup" & # required by gvfs (gvfsd-http)
+	wait
+fi
+
 ### packages that require specific striping
 
 DownloadPackage "boost" &