# HG changeset patch # User Stanislas Leduc # Date 1759218184 0 # Node ID 6cbabf87b12b61cec44adbbc9b264f54d16f1726 # Parent cfabeb5f68364750b8a10e99671df52ccfe4be81 Mass update to fix build with gcc10 and up others packages diff -r cfabeb5f6836 -r 6cbabf87b12b apache-mod-wsgi-python3/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/apache-mod-wsgi-python3/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,63 @@ +# SliTaz package receipt. + +PACKAGE="apache-mod-wsgi-python3" +SOURCE="apache-mod-wsgi" +VERSION="5.0.2" +CATEGORY="network" +SHORT_DESC="Python WSGI adapter module for Apache." +MAINTAINER="erjo@slitaz.org" +LICENSE="Apache" +WEB_SITE="https://github.com/GrahamDumpleton/mod_wsgi" +REPOLOGY="apmod:wsgi" + +TARBALL="$SOURCE-$VERSION.tar.gz" +WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz" + +DEPENDS="apache python3" +BUILD_DEPENDS="acl acl-dev apache apache-dev apr-dev \ +apr-util-dev python3-dev sed" + +HOST_ARCH="i486 x86_64" + +current_version() +{ + wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/\(.*\).tar.*|\1|;q' +} + +# Rules to configure and make the package. +compile_rules() +{ + ./configure \ + --prefix=/usr \ + --with-python=python3 && + make && + make install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/etc/apache/extra $fs/usr/share/apache/modules + + cp -a $install/usr/share/apache/modules/mod_wsgi.so \ + $fs/usr/share/apache/modules/mod_wsgi_py3.so + cp $stuff/httpd-mod-wsgi-py3.conf $fs/etc/apache/extra +} + +post_install() +{ + if ! grep -q WSGI_PY3 "$1/etc/apache/httpd.conf"; then + # Enable WSGI_PY3 module + echo "# Python WSGI_PY3 module" >> "$1/etc/apache/httpd.conf" + echo "Include /etc/apache/extra/httpd-mod-wsgi-py3.conf" >> "$1/etc/apache/httpd.conf" + fi +} + +post_remove() +{ + # Remove WSGI configuration + sed -i -e s/\# Python WSGI_PY3.*// \ + -e s/.*httpd-mod-wsgi-py3.conf// \ + "$1/etc/apache/httpd.conf" +} diff -r cfabeb5f6836 -r 6cbabf87b12b apache-mod-wsgi-python3/stuff/httpd-mod-wsgi-py3.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/apache-mod-wsgi-python3/stuff/httpd-mod-wsgi-py3.conf Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,3 @@ +# Enable Python WSGI adapter module for Apache. +# +LoadModule wsgi_module share/apache/modules/mod_wsgi_py3.so diff -r cfabeb5f6836 -r 6cbabf87b12b apache-mod-wsgi/receipt --- a/apache-mod-wsgi/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/apache-mod-wsgi/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="apache-mod-wsgi" -VERSION="4.6.5" +VERSION="4.9.4" CATEGORY="network" SHORT_DESC="Python WSGI adapter module for Apache." MAINTAINER="erjo@slitaz.org" @@ -27,9 +27,11 @@ # Rules to configure and make the package. compile_rules() { - ./configure --prefix=/usr && + ./configure \ + --prefix=/usr \ + --with-python=python && make && - make install + make DESTDIR=$install install } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -43,15 +45,17 @@ post_install() { - # Enable WSGI module - echo "# Python WSGI module" >> "$1/etc/apache/httpd.conf" - echo "Include /etc/apache/extra/httpd-mod-wsgi.conf " >> "$1/etc/apache/httpd.conf" + if ! grep -q WSGI_PY2 "$1/etc/apache/httpd.conf"; then + # Enable WSGI_PY2 module + echo "# Python WSGI_PY2 module" >> "$1/etc/apache/httpd.conf" + echo "Include /etc/apache/extra/httpd-mod-wsgi.conf" >> "$1/etc/apache/httpd.conf" + fi } post_remove() { # Remove WSGI configuration - sed -i -e s/\# Python.*// \ + sed -i -e s/\# Python WSGI_PY2.*// \ -e s/.*httpd-mod-wsgi.conf// \ "$1/etc/apache/httpd.conf" } diff -r cfabeb5f6836 -r 6cbabf87b12b apache/receipt --- a/apache/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/apache/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -37,6 +37,7 @@ ./configure \ --mandir=/usr/share/man \ + --enable-mpms-shared=all \ --enable-mods-shared=all \ --enable-proxy \ --enable-proxy-fcgi \ diff -r cfabeb5f6836 -r 6cbabf87b12b binutils/receipt --- a/binutils/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/binutils/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -41,12 +41,15 @@ i?86|x86_64) ARCH_ARGS="--disable-werror --enable-64-bit-bfd" ;; esac + # Fix unstable state when build glibc > 2.31 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100896 + # reenable initfini-array (--disable-initfini-array) + mkdir ../binutils-build && cd ../binutils-build && $src/configure \ --program-prefix=$TOOLPREFIX \ --enable-shared \ - --disable-initfini-array \ --with-bugurl="http://bugs.slitaz.org/" \ $CONFIGURE_ARGS \ $ARCH_ARGS && diff -r cfabeb5f6836 -r 6cbabf87b12b bluez-alsa/receipt --- a/bluez-alsa/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/bluez-alsa/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -29,6 +29,9 @@ # Rules to configure and make the package. compile_rules() { + # Workaround to be build with gcc 10 + export CFLAGS="$CFLAGS -fcommon" + mkdir m4 2> /dev/null autoreconf --install && mkdir build && diff -r cfabeb5f6836 -r 6cbabf87b12b broadcom-wl64/receipt --- a/broadcom-wl64/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/broadcom-wl64/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -42,6 +42,7 @@ 014-linux414.patch 017-linux56.patch 018-linux59.patch +fix_time_macros_gcc10.patch EOT # Use cross toolchain x86_64 diff -r cfabeb5f6836 -r 6cbabf87b12b broadcom-wl64/stuff/fix_time_macros_gcc10.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/broadcom-wl64/stuff/fix_time_macros_gcc10.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,22 @@ +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -728,7 +728,7 @@ + WL_ALL_PASSIVE_ENAB(wl) ? ", Passive Mode" : "", EPI_VERSION_STR); + + #ifdef BCMDBG +- printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")"); ++ printf(" (Compiled in " SRCBASE ")"); + #endif + printf("\n"); + +@@ -2087,8 +2087,8 @@ + void + wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b) + { +- bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit, +- __DATE__, __TIME__, EPI_VERSION_STR); ++ bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit, ++ EPI_VERSION_STR); + } + + #if defined(BCMDBG) diff -r cfabeb5f6836 -r 6cbabf87b12b busybox/receipt --- a/busybox/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/busybox/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -11,9 +11,9 @@ WGET_URL="https://busybox.net/downloads/$TARBALL" HOST_ARCH="i486 arm x86_64" -DEPENDS="slitaz-base-files glibc-base ncurses-common" +DEPENDS="slitaz-base-files glibc-base ncurses-common libtirpc" BUILD_DEPENDS="bzip2 pam pam-dev uclibc-cross-compiler-i486 \ -musl-libc-dev dietlibc gettext-tools" +musl-libc-dev dietlibc gettext-tools libtirpc-dev" CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf \ /etc/resolv.conf /etc/httpd.conf" @@ -26,7 +26,7 @@ # Handle cross compilation case "$ARCH" in arm*) BUILD_DEPENDS="bzip2" ;; - x86_64) BUILD_DEPENDS="bzip2 gettext-tools" ;; + x86_64) BUILD_DEPENDS="bzip2 gettext-tools libtirpc-dev" ;; esac # What is the latest version available today? @@ -69,6 +69,10 @@ # Rules to configure and make the package. compile_rules() { + # With glibc > 2.31 rpc removed, need to use libtirpc + export CFLAGS="$CFLAGS -I/usr/include/tirpc" + export LDFLAGS="$LDFLAGS -ltirpc" + case "$ARCH" in arm*) echo "cook: CROSS_COMPILE=$CROSS_COMPILE" diff -r cfabeb5f6836 -r 6cbabf87b12b cdrkit/receipt --- a/cdrkit/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/cdrkit/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -30,6 +30,7 @@ wget -P $SOURCES_REPOSITORY https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch patch -p1 < $SOURCES_REPOSITORY/cdrkit-1.1.9-efi-boot.patch patch -p1 < $stuff/cdrkit-1.1.9-sort-catalog.patch + patch -p1 < $stuff/cdrkit-1.1.11-gcc10.patch # see https://sources.debian.org/patches/cdrkit/9:1.1.11-3.4 make PREFIX=/usr && make install PREFIX=/usr } diff -r cfabeb5f6836 -r 6cbabf87b12b cdrkit/stuff/cdrkit-1.1.11-gcc10.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cdrkit/stuff/cdrkit-1.1.11-gcc10.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,12 @@ +diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h +--- a/genisoimage/genisoimage.h 2020-02-24 15:10:35.542998992 +0100 ++++ b/genisoimage/genisoimage.h 2020-02-24 15:10:50.011130450 +0100 +@@ -377,7 +377,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ diff -r cfabeb5f6836 -r 6cbabf87b12b conky/receipt --- a/conky/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/conky/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -31,6 +31,9 @@ # Rules to configure and make the package. compile_rules() { + # Workaround to be build with gcc 10 + export CFLAGS="$CFLAGS -fcommon" + export LDFLAGS="$LDFLAGS -ltinfo" ./configure \ --prefix=/usr \ diff -r cfabeb5f6836 -r 6cbabf87b12b cookutils/receipt --- a/cookutils/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/cookutils/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -39,6 +39,7 @@ patch -p1 -i $stuff/cook-x86_64.patch patch -p1 -i $stuff/cook-git-branch.patch patch -p1 -i $stuff/cook-overlay.patch + patch -p1 -i $stuff/fix-svgcleaner_compressor.patch sed -i 's|preinit core-4in1|preinit core-4in1 core-5in1|' cookiso mkdir -p $DESTDIR/usr/bin $DESTDIR/etc/slitaz make DESTDIR=$DESTDIR install diff -r cfabeb5f6836 -r 6cbabf87b12b cookutils/stuff/fix-svgcleaner_compressor.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cookutils/stuff/fix-svgcleaner_compressor.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,11 @@ +--- a/modules/compressor ++++ b/modules/compressor +@@ -229,7 +229,7 @@ + IFS=$'\n' + for i in $(find $install -type f -name '*.svg'); do + echo -n "$i: " >> "$cleaner_log" +- svgcleaner "$i" "$i" --remove-unresolved-classes false --quiet true >> "$cleaner_log" ++ svgcleaner "$i" "$i" --quiet --remove-unresolved-classes false >> "$cleaner_log" + done + + comp_summary "$time0" "$size0" "$(sizes svg)" diff -r cfabeb5f6836 -r 6cbabf87b12b dmsetup/receipt --- a/dmsetup/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/dmsetup/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="dmsetup" -VERSION="2.03.08" +VERSION="2.03.15" CATEGORY="system-tools" SHORT_DESC="Linux device mapper setup tool." MAINTAINER="b1+slitaz@nagel.org" @@ -11,6 +11,8 @@ DEPENDS="libdevmapper" +HOST_ARCH="i486 x86_64" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r cfabeb5f6836 -r 6cbabf87b12b docker-official/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docker-official/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,48 @@ +# SliTaz package receipt. + +PACKAGE="docker-official" +VERSION="28.4.0" +CATEGORY="network" +SHORT_DESC="Docker (manager for applications in Linux containers)." +MAINTAINER="shann@slitaz.org" +WEB_SITE="https://www.docker.com" +TARBALL="docker-$VERSION.tgz" +WGET_URL="https://download.docker.com/linux/static/stable/x86_64/$TARBALL" +HOST_ARCH="x86_64" + +DEPENDS="linux64-ipv6 linux64-bridge linux64-overlayfs iptables" +BUILD_DEPENDS="" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin $fs/etc/init.d + cp -a $src/* $fs/usr/bin + cp -a $stuff/daemon $fs/etc/init.d/dockerd +} + +# Pre and post install command for Tazpkg. +post_install() +{ + local group + + group=docker + + if ! grep -q ${group} "$1/etc/passwd"; then + echo + echo -n "Adding docker group..." + chroot "$1/" /usr/sbin/addgroup -S ${group} + status + fi + + if ! grep -q ^DOCKERD_OPTIONS $1/etc/daemons.conf; then + echo '# Dockerd daemon options.' >> $1/etc/daemons.conf + echo 'DOCKERD_OPTIONS="-G docker"' >> $1/etc/daemons.conf + echo '' >> $1/etc/daemons.conf + fi + + # Ensure br_netfilter module loaded at startup + if ! grep -q br_netfilter $1/etc/rcS.conf; then + sed -i 's/LOAD_MODULES="/&br_netfilter /' "$1/etc/rcS.conf" + fi +} diff -r cfabeb5f6836 -r 6cbabf87b12b docker-official/stuff/daemon --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docker-official/stuff/daemon Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,64 @@ +#!/bin/sh +# /etc/init.d/dockerd: Start, stop and restart dockerd on SliTaz, +# at boot time or with the command line. Daemons options are configured +# with /etc/daemons.conf +# +. /etc/init.d/rc.functions +. /etc/daemons.conf + +NAME=dockerd +DESC="$(_ 'Docker')" +DAEMON=/usr/bin/dockerd +OPTIONS=$DOCKERD_OPTIONS +PIDFILE=/run/dockerd.pid +LOGFILE=/var/log/dockerd.log + +if ! grep -q ^cgroup /etc/mtab; then + mount -t cgroup cgroup /sys/fs/cgroup + echo 1 > /sys/fs/cgroup/memory.use_hierarchy +fi + +if ! grep -q ^br_netfilter /proc/modules; then + modprobe br_netfilter +fi + +case "$1" in + start) + if active_pidfile $PIDFILE dockerd ; then + _ '%s is already running.' $NAME + exit 1 + fi + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS -p $PIDFILE >> $LOGFILE 2>&1 & + status + ;; + stop) + if ! active_pidfile $PIDFILE dockerd ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm $PIDFILE + status + ;; + restart) + if ! active_pidfile $PIDFILE dockerd ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm $PIDFILE + sleep 2 + $DAEMON $OPTIONS -p $PIDFILE >> $LOGFILE 2>&1 & + status + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 + ;; +esac + +exit 0 diff -r cfabeb5f6836 -r 6cbabf87b12b dovecot/receipt --- a/dovecot/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/dovecot/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -11,9 +11,9 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://www.dovecot.org/releases/${VERSION:0:3}/$TARBALL" -DEPENDS="libcap libmysqlclient libssl openldap pam postgresql" +DEPENDS="libcap libmysqlclient libssl openldap libpostgresqlclient" BUILD_DEPENDS="libcap-dev libmysqlclient libpostgresqlclient - mysql-dev openldap-dev openssl-dev pam-dev + mysql-dev openldap-dev openssl-dev postgresql-dev sqlite-dev" HOST_ARCH="i486 x86_64" @@ -33,6 +33,7 @@ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/$PACKAGE \ + --without-pam \ --with-ldap=plugin \ --with-mysql \ --with-pgsql \ diff -r cfabeb5f6836 -r 6cbabf87b12b efivar/receipt --- a/efivar/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/efivar/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -29,6 +29,14 @@ # replace char16_t by wchar_t: sed -i 's|char16_t|wchar_t|g' src/export.c + # Patch to be build with gcc >= 9 + # see https://gitlab.gnome.org/sthursfield/buildroot-minimal-iso/-/tree/2022.02.10/package/efivar?ref_type=tags + # see https://github.com/rhboot/efivar/issues/123 + # see https://patchwork.ozlabs.org/project/buildroot/patch/20190623024614.53491-1-james.hilliard1@gmail.com/#2200411 + patch -p1 < $stuff/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch + patch -p1 < $stuff/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch + patch -p1 < $stuff/0004-Fix-another-error-of-Werror-address-of-packed-member.patch + make libdir=/usr/lib && make libdir=/usr/lib DESTDIR=$DESTDIR install } diff -r cfabeb5f6836 -r 6cbabf87b12b efivar/stuff/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/efivar/stuff/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,62 @@ +From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 7 Jan 2019 10:30:59 -0500 +Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers + safely. + +GCC 9 adds -Werror=address-of-packed-member, which causes us to see the +build error reported at + https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 . + +That bug report shows us the following: + +In file included from dp.c:26: +dp.h: In function 'format_vendor_helper': +dp.h:120:37: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] + 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +dp.h:74:25: note: in definition of macro 'format_guid' + 74 | _rc = efi_guid_to_str(guid, &_guidstr); \ + | ^~~~ +cc1: all warnings being treated as errors + +This patch makes format_guid() use a local variable as a bounce buffer +in the case that the guid we're passed is aligned as chaotic neutral. + +Note that this only fixes this instance and there may be others that bz +didn't show because it exited too soon, and I don't have a gcc 9 build +in front of me right now. + +Signed-off-by: Peter Jones +[james.hilliard1@gmail.com: backport from upstream commit +b98ba8921010d03f46704a476c69861515deb1ca] +Signed-off-by: James Hilliard +--- + src/dp.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/dp.h b/src/dp.h +index aa4e390..20cb608 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -70,8 +70,15 @@ + #define format_guid(buf, size, off, dp_type, guid) ({ \ + int _rc; \ + char *_guidstr = NULL; \ +- \ +- _rc = efi_guid_to_str(guid, &_guidstr); \ ++ efi_guid_t _guid; \ ++ const efi_guid_t * const _guid_p = \ ++ likely(__alignof__(guid) == sizeof(guid)) \ ++ ? guid \ ++ : &_guid; \ ++ \ ++ if (unlikely(__alignof__(guid) == sizeof(guid))) \ ++ memmove(&_guid, guid, sizeof(_guid)); \ ++ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ + dp_type); \ +-- +2.20.1 + diff -r cfabeb5f6836 -r 6cbabf87b12b efivar/stuff/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/efivar/stuff/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,175 @@ +From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 21 Feb 2019 15:20:12 -0500 +Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches. + +This gets rid of all the places GCC 9's -Werror=address-of-packed-member +flags as problematic. + +Fixes github issue #123 + +Signed-off-by: Peter Jones +[james.hilliard1@gmail.com: backport from upstream commit +c3c553db85ff10890209d0fe48fb4856ad68e4e0] +Signed-off-by: James Hilliard +--- + src/dp-message.c | 6 ++++-- + src/dp.h | 12 ++++-------- + src/guid.c | 2 +- + src/include/efivar/efivar.h | 2 +- + src/ucs2.h | 27 +++++++++++++++++++-------- + 5 files changed, 29 insertions(+), 20 deletions(-) + +diff --git a/src/dp-message.c b/src/dp-message.c +index 3724e5f..9f96466 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) + ) / sizeof(efi_ip_addr_t); + format(buf, size, off, "Dns", "Dns("); + for (int i=0; i < end; i++) { +- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; ++ efi_ip_addr_t addr; ++ ++ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); + if (i != 0) + format(buf, size, off, "Dns", ","); + format_ip_addr(buf, size, off, "Dns", +- dp->dns.is_ipv6, addr); ++ dp->dns.is_ipv6, &addr); + } + format(buf, size, off, "Dns", ")"); + break; +diff --git a/src/dp.h b/src/dp.h +index 20cb608..1f921d5 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -71,13 +71,9 @@ + int _rc; \ + char *_guidstr = NULL; \ + efi_guid_t _guid; \ +- const efi_guid_t * const _guid_p = \ +- likely(__alignof__(guid) == sizeof(guid)) \ +- ? guid \ +- : &_guid; \ +- \ +- if (unlikely(__alignof__(guid) == sizeof(guid))) \ +- memmove(&_guid, guid, sizeof(_guid)); \ ++ const efi_guid_t * const _guid_p = &_guid; \ ++ \ ++ memmove(&_guid, guid, sizeof(_guid)); \ + _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ +@@ -86,7 +82,7 @@ + _guidstr = onstack(_guidstr, \ + strlen(_guidstr)+1); \ + _rc = format(buf, size, off, dp_type, "%s", \ +- _guidstr); \ ++ _guidstr); \ + } \ + _rc; \ + }) +diff --git a/src/guid.c b/src/guid.c +index 306c9ff..3156b3b 100644 +--- a/src/guid.c ++++ b/src/guid.c +@@ -31,7 +31,7 @@ + extern const efi_guid_t efi_guid_zero; + + int NONNULL(1, 2) PUBLIC +-efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) ++efi_guid_cmp(const void * const a, const void * const b) + { + return memcmp(a, b, sizeof (efi_guid_t)); + } +diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h +index 316891c..ad6449d 100644 +--- a/src/include/efivar/efivar.h ++++ b/src/include/efivar/efivar.h +@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid) + + extern int efi_guid_is_zero(const efi_guid_t *guid); + extern int efi_guid_is_empty(const efi_guid_t *guid); +-extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); ++extern int efi_guid_cmp(const void * const a, const void * const b); + + /* import / export functions */ + typedef struct efi_variable efi_variable_t; +diff --git a/src/ucs2.h b/src/ucs2.h +index dbb5900..edd8367 100644 +--- a/src/ucs2.h ++++ b/src/ucs2.h +@@ -23,16 +23,21 @@ + (((val) & ((mask) << (shift))) >> (shift)) + + static inline size_t UNUSED +-ucs2len(const uint16_t * const s, ssize_t limit) ++ucs2len(const void *vs, ssize_t limit) + { + ssize_t i; +- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) ++ const uint16_t *s = vs; ++ const uint8_t *s8 = vs; ++ ++ for (i = 0; ++ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; ++ i++, s8 += 2, s++) + ; + return i; + } + + static inline size_t UNUSED +-ucs2size(const uint16_t * const s, ssize_t limit) ++ucs2size(const void *s, ssize_t limit) + { + size_t rc = ucs2len(s, limit); + rc *= sizeof (uint16_t); +@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) + } + + static inline unsigned char * UNUSED +-ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) ++ucs2_to_utf8(const void * const voidchars, ssize_t limit) + { + ssize_t i, j; + unsigned char *ret; ++ const uint16_t * const chars = voidchars; + + if (limit < 0) + limit = ucs2len(chars, -1); +@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) + } + + static inline ssize_t UNUSED NONNULL(4) +-utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) ++utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) + { + ssize_t req; + ssize_t i, j; ++ uint16_t *ucs2 = ucs2void; ++ uint16_t val16; + + if (!ucs2 && size > 0) { + errno = EINVAL; +@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) + val = utf8[i] & 0x7f; + i += 1; + } +- ucs2[j] = val; ++ val16 = val; ++ ucs2[j] = val16; ++ } ++ if (terminate) { ++ val16 = 0; ++ ucs2[j++] = val16; + } +- if (terminate) +- ucs2[j++] = (uint16_t)0; + return j; + }; + +-- +2.20.1 + + diff -r cfabeb5f6836 -r 6cbabf87b12b efivar/stuff/0004-Fix-another-error-of-Werror-address-of-packed-member.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/efivar/stuff/0004-Fix-another-error-of-Werror-address-of-packed-member.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,58 @@ +From 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865 Mon Sep 17 00:00:00 2001 +From: Chih-Wei Huang +Date: Tue, 26 Feb 2019 18:42:20 +0800 +Subject: [PATCH] Fix another error of -Werror=address-of-packed-member + +Android 9 clang complains: + +external/efivar/src/dp-message.c:367:24: error: taking address of packed member '' of class or structure 'efidp_infiniband' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] + (efi_guid_t *)&dp->infiniband.ioc_guid); + ^~~~~~~~~~~~~~~~~~~~~~~ +external/efivar/src/dp.h:76:19: note: expanded from macro 'format_guid' + memmove(&_guid, guid, sizeof(_guid)); \ + ^~~~ +1 error generated. + +Since commit c3c553d the fifth parameter of format_guid() is treated as +a const void *. The casting is unnecessary. + +Signed-off-by: Chih-Wei Huang +[james.hilliard1@gmail.com: backport from upstream commit +0dad6d78a7fb5f6c5fb4a1d646040539db6cf865] +Signed-off-by: James Hilliard +--- + src/dp-media.c | 3 +-- + src/dp-message.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/dp-media.c b/src/dp-media.c +index 96a576f..be691c4 100644 +--- a/src/dp-media.c ++++ b/src/dp-media.c +@@ -46,8 +46,7 @@ _format_media_dn(char *buf, size_t size, const_efidp dp) + break; + case EFIDP_HD_SIGNATURE_GUID: + format(buf, size, off, "HD", "GPT,"); +- format_guid(buf, size, off, "HD", +- (efi_guid_t *)dp->hd.signature); ++ format_guid(buf, size, off, "HD", dp->hd.signature); + format(buf, size, off, "HD", + ",0x%"PRIx64",0x%"PRIx64")", + dp->hd.start, dp->hd.size); +diff --git a/src/dp-message.c b/src/dp-message.c +index 9f96466..6b8e907 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -364,7 +364,7 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) + dp->infiniband.port_gid[1], + dp->infiniband.port_gid[0]); + format_guid(buf, size, off, "Infiniband", +- (efi_guid_t *)&dp->infiniband.ioc_guid); ++ &dp->infiniband.ioc_guid); + format(buf, size, off, "Infiniband", + ",%"PRIu64",%"PRIu64")", + dp->infiniband.target_port_id, +-- +2.20.1 + + diff -r cfabeb5f6836 -r 6cbabf87b12b fcgi/receipt --- a/fcgi/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/fcgi/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fcgi" -VERSION="2.4.2" +VERSION="2.4.6" CATEGORY="development" TAGS="CGI" SHORT_DESC="Fast CGI binary and library." @@ -12,8 +12,10 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/FastCGI-Archives/${PACKAGE}2/archive/$VERSION.tar.gz" -DEPENDS="gcc83-lib-base" -BUILD_DEPENDS="autoconf automake gcc83 libtool" +DEPENDS="gcc-lib-base" +BUILD_DEPENDS="autoconf automake gcc libtool" + +HOST_ARCH="i486 x86_64" current_version() { @@ -29,8 +31,6 @@ ./autogen.sh && ./configure \ - CC=gcc-83 \ - CXX=g++-83 \ --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man \ diff -r cfabeb5f6836 -r 6cbabf87b12b firefox-official/receipt --- a/firefox-official/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/firefox-official/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="firefox-official" -VERSION="128.11.0esr" +VERSION="128.13.0esr" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (English language)." diff -r cfabeb5f6836 -r 6cbabf87b12b foomatic-filters/receipt --- a/foomatic-filters/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/foomatic-filters/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -27,6 +27,12 @@ # Rules to configure and make the package. compile_rules() { + # Workaround with gcc 10, multiple definition see as error + # multiple definition of `postpipe'; + # multiple definition of `printer_model'; + # multiple definition of `cupsfilter'; + export CFLAGS="$CFLAGS -fcommon" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff -r cfabeb5f6836 -r 6cbabf87b12b fuse2/receipt --- a/fuse2/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/fuse2/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -15,6 +15,8 @@ PROVIDE="fuse" +BUILD_DEPENDS="automake libtool" + HOST_ARCH="i486 arm x86_64" # What is the latest version available today? @@ -27,6 +29,11 @@ # Rules to configure and make the package. compile_rules() { + # Patch to be build with glibc 2.34 + # see https://bugs.gentoo.org/803923 + patch -p1 < $stuff/fuse-closefrom-glibc-2-34.patch + autoreconf -vif + ./configure \ $CONFIGURE_ARGS && make && diff -r cfabeb5f6836 -r 6cbabf87b12b fuse2/stuff/fuse-closefrom-glibc-2-34.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fuse2/stuff/fuse-closefrom-glibc-2-34.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,61 @@ +From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 24 Jul 2021 22:02:45 +0100 +Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix + glibc-2.34+) + +closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since +it's available in glibc 2.34+, we want to detect it and only define our +fallback if the libc doesn't provide it. + +Bug: https://bugs.gentoo.org/803923 +Signed-off-by: Sam James +--- + configure.ac | 1 + + util/ulockmgr_server.c | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 9946a0efa..a2d481aa9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,7 @@ fi + + AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat]) + AC_CHECK_FUNCS([posix_fallocate]) ++AC_CHECK_FUNCS([closefrom]) + AC_CHECK_MEMBERS([struct stat.st_atim]) + AC_CHECK_MEMBERS([struct stat.st_atimespec]) + +diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c +index 273c7d923..a04dac5c6 100644 +--- a/util/ulockmgr_server.c ++++ b/util/ulockmgr_server.c +@@ -22,6 +22,10 @@ + #include + #include + ++#ifdef HAVE_CONFIG_H ++ #include "config.h" ++#endif ++ + struct message { + unsigned intr : 1; + unsigned nofd : 1; +@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp, + return res; + } + ++#if !defined(HAVE_CLOSEFROM) + static int closefrom(int minfd) + { + DIR *dir = opendir("/proc/self/fd"); +@@ -141,6 +146,7 @@ static int closefrom(int minfd) + } + return 0; + } ++#endif + + static void send_reply(int cfd, struct message *msg) + { + diff -r cfabeb5f6836 -r 6cbabf87b12b galculator/receipt --- a/galculator/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/galculator/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -30,6 +30,10 @@ # Binutils 2.22 break many packages build without LDFLAGS set correctly. export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" + # Fix multiple definition of prefs + # see https://github.com/galculator/galculator/pull/45 + sed -i 's/s_preferences/extern s_preferences/g' src/main.c + mkdir m4 ./autogen.sh \ --enable-gtk3=no \ diff -r cfabeb5f6836 -r 6cbabf87b12b gc-dev/receipt --- a/gc-dev/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gc-dev/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gc-dev" -VERSION="7.2g" +VERSION="8.0.6" CATEGORY="development" SHORT_DESC="A garbage collector for C and C++ devel files (with libatomic_ops)." MAINTAINER="pankso@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b gc/receipt --- a/gc/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gc/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gc" -VERSION="7.2g" +VERSION="8.0.6" CATEGORY="development" SHORT_DESC="A garbage collector for C and C++." MAINTAINER="pankso@slitaz.org" @@ -39,7 +39,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib $fs/usr/share - cp -a $install/usr/share/gc $fs/usr/share + mkdir -p $fs/usr/lib $fs/usr/share/doc + cp -a $install/usr/share/doc/gc $fs/usr/share/doc cp -a $install/usr/lib/*.so* $fs/usr/lib } diff -r cfabeb5f6836 -r 6cbabf87b12b gcc-lib-base/receipt --- a/gcc-lib-base/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gcc-lib-base/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gcc-lib-base" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="development" SHORT_DESC="GCC base libraries, libgcc_s and libstdc++." WEB_SITE="http://gcc.gnu.org/" diff -r cfabeb5f6836 -r 6cbabf87b12b gcc-lib-math/receipt --- a/gcc-lib-math/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gcc-lib-math/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gcc-lib-math" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="development" SHORT_DESC="GCC math libraries, libquadmath." WEB_SITE="http://gcc.gnu.org/" diff -r cfabeb5f6836 -r 6cbabf87b12b gcc/receipt --- a/gcc/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gcc/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gcc" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="development" SHORT_DESC="The GNU Compiler Collection." MAINTAINER="pankso@slitaz.org" @@ -53,14 +53,6 @@ #sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - # Allow build gcc 6.3.0 from gcc > 6.3.0 - patch -p1 < $stuff/gcc-6.3.0-ubsan.patch - - # Patch libsanitizer to be build with glibc > 2.30 - # see https://bugs.gentoo.org/708346 - patch -p1 < $stuff/glibc-2.31-libsanitizer-1.patch - patch -p1 < $stuff/glibc-2.31-libsanitizer-2.patch - mkdir -p ../gcc-build && cd ../gcc-build # This is the default GCC and we want a native build to cross compile after. diff -r cfabeb5f6836 -r 6cbabf87b12b gcolor2/receipt --- a/gcolor2/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gcolor2/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -31,6 +31,10 @@ cp $stuff/*.po* $src/po sed -i 's|@CATALOGS@|ru.gmo|' $src/po/Makefile.in.in + # Patch to be build with gcc 10 + # see https://bugs.gentoo.org/708752 + patch -p1 < $stuff/gcolor2-0.4-fno-common.patch + ./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install diff -r cfabeb5f6836 -r 6cbabf87b12b gcolor2/stuff/gcolor2-0.4-fno-common.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gcolor2/stuff/gcolor2-0.4-fno-common.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,27 @@ +--- a/src/callbacks.c ++++ b/src/callbacks.c +@@ -13,6 +13,9 @@ + #include "support.h" + + ++GtkWidget *gcolor2; ++GtkWidget *menu; ++GdkColor colorvalue; + GtkWidget *savedialog; + gchar *colorname; + static GtkWidget *aboutdialog = NULL; +--- a/src/callbacks.h ++++ b/src/callbacks.h +@@ -42,9 +42,9 @@ + "\302\267 Usability / user interface enhancements\n" \ + "\302\267 Code cleanup" + +-GtkWidget *gcolor2; +-GtkWidget *menu; +-GdkColor colorvalue; ++extern GtkWidget *gcolor2; ++extern GtkWidget *menu; ++extern GdkColor colorvalue; + + enum + { diff -r cfabeb5f6836 -r 6cbabf87b12b gfortran/receipt --- a/gfortran/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gfortran/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gfortran" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="development" SHORT_DESC="GCC fortran extension." WEB_SITE="http://gcc.gnu.org/" diff -r cfabeb5f6836 -r 6cbabf87b12b glibc-base/receipt --- a/glibc-base/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/glibc-base/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc-base" -VERSION="2.31" +VERSION="2.34" CATEGORY="base-system" SHORT_DESC="GNU libc minimal libraries and UTF-8 support for SliTaz." WEB_SITE="http://www.gnu.org/software/libc/" diff -r cfabeb5f6836 -r 6cbabf87b12b glibc-dev/receipt --- a/glibc-dev/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/glibc-dev/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc-dev" -VERSION="2.31" +VERSION="2.34" CATEGORY="development" SHORT_DESC="The GNU C libraries devel files (Part of SliTaz toolchain)." MAINTAINER="pankso@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b glibc-locale/receipt --- a/glibc-locale/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/glibc-locale/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc-locale" -VERSION="2.31" +VERSION="2.34" CATEGORY="system-tools" SHORT_DESC="The GNU C libraries locale files and utilities (see also locale-*)." MAINTAINER="pankso@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b glibc/receipt --- a/glibc/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/glibc/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc" -VERSION="2.31" +VERSION="2.34" CATEGORY="meta" SHORT_DESC="The GNU C libraries. This package is used to compile the libc." MAINTAINER="pankso@slitaz.org" @@ -79,82 +79,16 @@ [ -d "/var/lib/tazpkg/installed/gawk" ] || tazpkg get-install gawk fi - # Make 4.x support... - sed -i 's/3\.79/4.* | &/' configure* # Fixes and patches from LFS, Redhat sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in - # Fix a bug that prevents Glibc from building with GCC-6.3.0 - # https://bugzilla.redhat.com/show_bug.cgi?id=1312963 (-Werror=parentheses) - # https://sourceware.org/pipermail/libc-alpha/2015-April/059886.html (array-bounds) - #patch -p1 -i $stuff/glibc-2.21-gcc6_fix-1.patch - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024 (patch for style-definition) - #patch -p1 -i $stuff/glibc-2.21-gcc6_fix-2.patch - # https://gcc.gnu.org/legacy-ml/gcc-patches/2015-11/msg00105.html - #patch -p1 -i $stuff/glibc-2.21-gcc6_fix-3.patch - - # Glibc misc Bug Fixes - # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae - #patch -p1 -i $stuff/glibc-2.19-xattr_header.patch - - # fix issues in sin/cos slow path calculation - commit ffe768a9 - #patch -p1 -i $stuff/glibc-2.19-fix-sign-in-bsloww1-input.patch - - # fix tzselect with missing TZDIR - commit 893b4f37/c72399fb - #patch -p1 -i $stuff/glibc-2.19-tzselect-default.patch - - # Glibc misc Bug Fixes - #patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch - - # Glibc Bug Sort Relocatable Objects Patch - #patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch - - # Fix a bug that prevents Glibc from building with GCC-4.6.2 - #patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch - - # Revert commit causing issues with crappy DNS servers - #patch -Np1 -i $stuff/glibc-2.14-revert-4768ae77.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) - #patch -Np1 -i $stuff/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) - #patch -Np1 -i $stuff/glibc-2.14-reinstall-nis-rpc-headers.patch - # GHOST - #patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch - - # https://sourceware.org/bugzilla/show_bug.cgi?id=21661 - #patch -p1 -i $stuff/glibc-2.23-gcc.patch - # Patch for reenable C.UTF8 patch -p1 -i $stuff/glibc-c-utf8-locale.patch - # Patch for CVE-2024-2961 - # see https://sourceware.org/git/?p=glibc.git;a=blob;f=advisories/GLIBC-SA-2024-0004;h=23a8115d;hb=HEAD - # https://sourceware.org/git/?p=glibc.git;a=patch;h=682ad4c8 (adjust little for 2.28) - patch -p1 < $stuff/glibc-2.28-CVE-2024-2961.patch - #patch -p1 < $stuff/glibc-2.34-CVE-2024-2961.patch - - # Patch for CVE-2025-4802, adjust for backport to 2.28 and 2.31 - # see https://www.cve.org/CVERecord?id=CVE-2025-4802 - # see https://sourceware.org/cgit/glibc/commit/?id=1e18586c - #patch -p1 -i $stuff/glibc-2.28-CVE-2025-4802.patch - patch -p1 -i $stuff/CVE-2025-4802.patch - - # Update for binutils 2.29, see https://sourceware.org/bugzilla/show_bug.cgi?id=21661 - sed -i 's|obstack_compat;|obstack_compat __attribute__ ((nocommon));|' malloc/obstack.c - - # Fix unused const variable - sed -i 's|static const float one=1.0;|static const float __attribute__ ((unused)) one=1.0;|' \ - sysdeps/ieee754/flt-32/s_cosf.c - sed -i 's|static const char rcsid\[\] =|static const char __attribute__ ((unused)) rcsid\[\] =|' \ - resolv/base64.c - - # Fix a stack imbalance that occurs under some conditions: - #sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \ - # nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S \ - # nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S + # Fix CVE-2021-38604 + sed -e '/NOTIFY_REMOVED)/s/)/ \&\& data.attr != NULL)/' \ + -i sysdeps/unix/sysv/linux/mq_notify.c # Glibc needs ld.so.conf in the install destdir. mkdir -p $WOK/$PACKAGE/install/etc diff -r cfabeb5f6836 -r 6cbabf87b12b gmtp/receipt --- a/gmtp/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gmtp/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -28,6 +28,9 @@ # Rules to configure and make the package. compile_rules() { + # Workaround to be build with gcc 10 + export CFLAGS="$CFLAGS -fcommon" + ./configure $CONFIGURE_ARGS && make && make install diff -r cfabeb5f6836 -r 6cbabf87b12b gpm/receipt --- a/gpm/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gpm/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -33,6 +33,9 @@ # Patch for new gcc patch -p1 < $stuff/gpm.gcc7.diff + # Patch for new gcc 10 + # see https://sources.debian.org/patches/gpm/1.20.7-10/ + patch -p1 < $stuff/gpm.gcc10.patch ./autogen.sh ln -s headers/gpm.h src # ??? diff -r cfabeb5f6836 -r 6cbabf87b12b gpm/stuff/gpm.gcc10.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gpm/stuff/gpm.gcc10.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,20 @@ +Description: FTBFS with gcc-10 due to -fno-commons +Author: Sergei Trofimovich +Reviewed-By: Helmut Grohne +Origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7e2ac82fc5a1847c132057fb7de1a996d66c76 +Forwarded: https://github.com/telmich/gpm/pull/37 +Bug: https://github.com/telmich/gpm/pull/37 +Bug-Gentoo: https://bugs.gentoo.org/705878 +Bug-Debian: https://bugs.debian.org/953266 + +--- a/src/headers/daemon.h ++++ b/src/headers/daemon.h +@@ -176,7 +176,7 @@ + extern Gpm_Type mice[]; + extern Gpm_Type *repeated_type; + +-time_t last_selection_time; ++extern time_t last_selection_time; + + + diff -r cfabeb5f6836 -r 6cbabf87b12b graphviz/receipt --- a/graphviz/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/graphviz/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -16,7 +16,7 @@ BUILD_DEPENDS="automake expat-dev gdk-pixbuf-dev guile-dev jpeg-dev libgd-dev libpng-dev librsvg-dev libxml2-dev lua-dev ocaml pango-dev pcre-dev php-cli - php-dev pkg-config py3k-dev ruby-dev sed swig tcl-dev + php-dev pkg-config python3-dev ruby-dev sed swig tcl-dev tiff-dev tk-dev util-linux-uuid-dev xorg-dev zlib-dev" # libcroco (unmaintained) diff -r cfabeb5f6836 -r 6cbabf87b12b gvfs-afp/receipt --- a/gvfs-afp/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gvfs-afp/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gvfs-afp" -VERSION="1.22.1" +VERSION="1.36.3" CATEGORY="system-tools" SHORT_DESC="Apple Filing Protocol support for gvfs (afp:///)" MAINTAINER="al.bobylev@gmail.com" diff -r cfabeb5f6836 -r 6cbabf87b12b gvfs-archive/receipt --- a/gvfs-archive/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gvfs-archive/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gvfs-archive" -VERSION="1.22.1" +VERSION="1.36.3" CATEGORY="system-tools" SHORT_DESC="Archive support for gvfs (archive:///)" MAINTAINER="al.bobylev@gmail.com" diff -r cfabeb5f6836 -r 6cbabf87b12b gvfs-cdda/receipt --- a/gvfs-cdda/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gvfs-cdda/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gvfs-cdda" -VERSION="1.22.1" +VERSION="1.36.3" CATEGORY="system-tools" SHORT_DESC="CDDA support for gvfs" MAINTAINER="al.bobylev@gmail.com" diff -r cfabeb5f6836 -r 6cbabf87b12b gvfs-gphoto2/receipt --- a/gvfs-gphoto2/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gvfs-gphoto2/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gvfs-gphoto2" -VERSION="1.22.1" +VERSION="1.36.3" CATEGORY="system-tools" SHORT_DESC="Gphoto2 support for gvfs" MAINTAINER="al.bobylev@gmail.com" diff -r cfabeb5f6836 -r 6cbabf87b12b gvfs-gtk/receipt --- a/gvfs-gtk/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gvfs-gtk/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gvfs-gtk" -VERSION="1.22.1" +VERSION="1.36.3" CATEGORY="system-tools" SHORT_DESC="Recent files support for gvfs (GTK+3) (recent:///)" MAINTAINER="al.bobylev@gmail.com" diff -r cfabeb5f6836 -r 6cbabf87b12b gvfs-http/receipt --- a/gvfs-http/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gvfs-http/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gvfs-http" -VERSION="1.22.1" +VERSION="1.36.3" CATEGORY="system-tools" SHORT_DESC="HTTP/WebDAV support for gvfs" MAINTAINER="al.bobylev@gmail.com" diff -r cfabeb5f6836 -r 6cbabf87b12b gvfs-smb/receipt --- a/gvfs-smb/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/gvfs-smb/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gvfs-smb" -VERSION="1.22.1" +VERSION="1.36.3" CATEGORY="system-tools" SHORT_DESC="Samba support for gvfs (smb:///)" MAINTAINER="pankso@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b haproxy/stuff/daemon --- a/haproxy/stuff/daemon Tue Jul 29 18:07:04 2025 +0000 +++ b/haproxy/stuff/daemon Tue Sep 30 07:43:04 2025 +0000 @@ -1,54 +1,54 @@ -#!/bin/sh -# /etc/init.d/haproxy: Start, stop and restart web server on SliTaz, -# at boot time or with the command line. Daemons options are configured -# with /etc/daemons.conf -# -. /etc/init.d/rc.functions -. /etc/daemons.conf - -NAME=haproxy -DESC="$(_ 'load balancer')" -DAEMON=/usr/sbin/haproxy -OPTIONS=$HAPROXY_OPTIONS -PIDFILE=/run/haproxy.pid - -case "$1" in - start) - if active_pidfile $PIDFILE haproxy ; then - _ '%s is already running.' $NAME - exit 1 - fi - action 'Starting %s: %s...' "$DESC" $NAME - $DAEMON $OPTIONS - status - ;; - stop) - if ! active_pidfile $PIDFILE haproxy ; then - _ '%s is not running.' $NAME - exit 1 - fi - action 'Stopping %s: %s...' "$DESC" $NAME - kill $(cat $PIDFILE) - rm $PIDFILE - status - ;; - restart) - if ! active_pidfile $PIDFILE haproxy ; then - _ '%s is not running.' $NAME - exit 1 - fi - action 'Restarting %s: %s...' "$DESC" $NAME - kill $(cat $PIDFILE) - rm $PIDFILE - sleep 2 - $DAEMON $OPTIONS - status - ;; - *) - emsg "$(_ 'Usage:') $0 [start|stop|restart]" - newline - exit 1 - ;; -esac - +#!/bin/sh +# /etc/init.d/haproxy: Start, stop and restart web server on SliTaz, +# at boot time or with the command line. Daemons options are configured +# with /etc/daemons.conf +# +. /etc/init.d/rc.functions +. /etc/daemons.conf + +NAME=haproxy +DESC="$(_ 'load balancer')" +DAEMON=/usr/sbin/haproxy +OPTIONS=$HAPROXY_OPTIONS +PIDFILE=/run/haproxy.pid + +case "$1" in + start) + if active_pidfile $PIDFILE haproxy ; then + _ '%s is already running.' $NAME + exit 1 + fi + action 'Starting %s: %s...' "$DESC" $NAME + $DAEMON $OPTIONS + status + ;; + stop) + if ! active_pidfile $PIDFILE haproxy ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm $PIDFILE + status + ;; + restart) + if ! active_pidfile $PIDFILE haproxy ; then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rm $PIDFILE + sleep 2 + $DAEMON $OPTIONS + status + ;; + *) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 + ;; +esac + exit 0 diff -r cfabeb5f6836 -r 6cbabf87b12b haproxy/stuff/haproxy.cfg --- a/haproxy/stuff/haproxy.cfg Tue Jul 29 18:07:04 2025 +0000 +++ b/haproxy/stuff/haproxy.cfg Tue Sep 30 07:43:04 2025 +0000 @@ -13,7 +13,7 @@ ssl-default-bind-options no-sslv3 no-tlsv10 no-tlsv11 no-tls-tickets frontend main - bind 141.94.188.37:80 + bind 127.0.0.1:80 mode http log global option httplog @@ -32,9 +32,9 @@ use_backend static if url_static default_backend app -frontend main-ssl - bind 141.94.188.37:443 ssl crt /etc/haproxy/ssl - mode http +#frontend main-ssl +# bind 127.0.0.1:443 ssl crt /etc/haproxy/ssl +# mode http backend static mode http diff -r cfabeb5f6836 -r 6cbabf87b12b libatomic/receipt --- a/libatomic/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libatomic/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # Slitaz package receipt. PACKAGE="libatomic" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="development" SHORT_DESC="GCC libatomic (required for firefox)." WEB_SITE="https://gcc.gnu.org/" diff -r cfabeb5f6836 -r 6cbabf87b12b libdrm/receipt --- a/libdrm/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libdrm/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -12,9 +12,9 @@ WGET_URL="$WEB_SITE/$PACKAGE/$TARBALL" DEPENDS="glibc-base udev xorg-libpciaccess" -BUILD_DEPENDS="gc-dev libpthread-stubs-dev pkg-config \ +BUILD_DEPENDS="gc-dev pkg-config \ udev-dev xorg-libpciaccess-dev meson" - #xorg-dev xorg-dev-proto + #xorg-dev xorg-dev-proto libpthread-stubs-dev case $SLITAZ_ARCH in i?86) diff -r cfabeb5f6836 -r 6cbabf87b12b libgfortran/receipt --- a/libgfortran/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libgfortran/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgfortran" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="misc" SHORT_DESC="GCC fortran runtime." WEB_SITE="http://gcc.gnu.org/" diff -r cfabeb5f6836 -r 6cbabf87b12b libgomp/receipt --- a/libgomp/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libgomp/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgomp" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="development" SHORT_DESC="API specification for parallel programming." MAINTAINER="pascal.bellard@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b libnsl-dev/receipt --- a/libnsl-dev/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libnsl-dev/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -10,7 +10,7 @@ HOST_ARCH="i486 x86_64" -DEPENDS="libnsl" +DEPENDS="libnsl libtirpc-dev" WANTED="libnsl" # Rules to gen a SliTaz package suitable for Tazpkg. diff -r cfabeb5f6836 -r 6cbabf87b12b libnsl/receipt --- a/libnsl/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libnsl/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -13,6 +13,9 @@ HOST_ARCH="i486 x86_64" +DEPENDS="libtirpc" +BUILD_DEPENDS="libtirpc-dev" + # What is the latest version available today? current_version() { diff -r cfabeb5f6836 -r 6cbabf87b12b libobjc/receipt --- a/libobjc/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libobjc/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libobjc" -VERSION="8.3.0" +VERSION="10.2.0" CATEGORY="development" SHORT_DESC="API for gcc object" MAINTAINER="slaxemulator@gmail.com" diff -r cfabeb5f6836 -r 6cbabf87b12b libpthread-stubs/receipt --- a/libpthread-stubs/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libpthread-stubs/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libpthread-stubs" -VERSION="0.2" +VERSION="0.4" CATEGORY="x-window" SHORT_DESC="Weak aliases for pthread functions." MAINTAINER="pascal.bellard@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b libupnp/receipt --- a/libupnp/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libupnp/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -12,7 +12,7 @@ WGET_URL="https://github.com/pupnp/pupnp/releases/download/release-$VERSION/$TARBALL" DEPENDS="libxml2" -BUILD_DEPENDS="libpthread-stubs libxml2-dev" +BUILD_DEPENDS="libxml2-dev" HOST_ARCH="i486 x86_64" diff -r cfabeb5f6836 -r 6cbabf87b12b libwrap/receipt --- a/libwrap/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/libwrap/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -31,7 +31,11 @@ patch -p1 -i $stuff/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch touch done.tcp_wrappers-7.6-shared_lib_plus_plus-1.patch sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c - + + # Fix remove sys_errlist sys_nerr call from glibc > 2.31 + # see https://www.linuxquestions.org/questions/slackware-14/slackware-from-scratch-and-x11-4175560702/page49.html#post6154760 + sed -i -e 's/-DHAVE_WEAKSYMS/-DHAVE_WEAKSYMS -DHAVE_STRERROR/' Makefile + make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux } diff -r cfabeb5f6836 -r 6cbabf87b12b lilo/receipt --- a/lilo/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/lilo/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -29,6 +29,9 @@ # Patches from slackware for mem > 4G and nvme patch -p1 < $stuff/lilo.ignore.usable.memory.above.4G.diff patch -p1 < $stuff/lilo.nvme.support.diff + # Patch to be build with gcc 10 + # see https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-boot/lilo/files + patch -p1 < $stuff/lilo.gcc10.patch make alles && make install } diff -r cfabeb5f6836 -r 6cbabf87b12b lilo/stuff/lilo.gcc10.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lilo/stuff/lilo.gcc10.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,52 @@ +Description: Fix ftbfs with GCC-10 + +Author: Ryan Finnie +Bug-Debian: https://bugs.debian.org/957490 +Forwarded: no + +--- + +--- a/src/raid.h ++++ b/src/raid.h +@@ -8,7 +8,7 @@ + * in the source directory. + */ + +-int do_md_install, ndisk, md_bios; ++extern int ndisk, md_bios; + + int raid_setup(void); + void raid_final(void); +--- a/src/bsect.c ++++ b/src/bsect.c +@@ -54,8 +54,6 @@ + #endif + + +-int boot_dev_nr; +- + static BOOT_SECTOR bsect,bsect_orig; + static MENUTABLE menuparams; + static DESCR_SECTORS descrs; +--- a/src/identify.c ++++ b/src/identify.c +@@ -19,7 +19,6 @@ + #include "common.h" + #include "cfg.h" + +-char *identify; + static char *opt; + static char *first, *dflt; + static int idefault; +--- a/src/raid.c ++++ b/src/raid.c +@@ -41,7 +41,7 @@ + static int raid_bios[MAX_RAID+1]; + static int device; + enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED}; +-int do_md_install, ndisk, md_bios; ++int ndisk, md_bios; + static char *raid_list[MAX_RAID]; + static int list_index[MAX_RAID]; + static int nlist, faulty; + diff -r cfabeb5f6836 -r 6cbabf87b12b lua5.1-filesystem/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lua5.1-filesystem/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,38 @@ +# SliTaz package receipt. + +PACKAGE="lua5.1-filesystem" +SOURCE="luafilesystem" +VERSION="1.7.0.2" +CATEGORY="development" +SHORT_DESC="File System Library for the Lua Programming Language (5.2)." +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="MIT" +WEB_SITE="https://github.com/keplerproject/luafilesystem" + +TARBALL="$SOURCE-$VERSION.tar.gz" +WGET_URL="$WEB_SITE/archive/refs/tags/v${VERSION//./_}.tar.gz" + +HOST_ARCH="i486 x86_64" + +# What is the latest version available today? +current_version() +{ + wget -O - $WEB_SITE/tags 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/[A-Za-z_-]*\(.*\).tar.*|\1|;s|_|.|g;q' +} + +SUGGESTED="lua5.1" +BUILD_DEPENDS="lua5.1-dev" + +# Rules to configure and make the package. +compile_rules() +{ + make CFLAGS="$CFLAGS -I/usr/include/lua/5.1" +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib/lua/5.1/ + cp -a $src/src/lfs.so $fs/usr/lib/lua/5.1/ +} diff -r cfabeb5f6836 -r 6cbabf87b12b luafilesystem/receipt --- a/luafilesystem/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/luafilesystem/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -11,6 +11,8 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$WEB_SITE/archive/refs/tags/v${VERSION//./_}.tar.gz" +HOST_ARCH="i486 x86_64" + # What is the latest version available today? current_version() { diff -r cfabeb5f6836 -r 6cbabf87b12b luajit-dev/receipt --- a/luajit-dev/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/luajit-dev/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -11,14 +11,14 @@ DEPENDS="luajit pkg-config" WANTED="luajit" -#HOST_ARCH="i486 arm" +HOST_ARCH="i486 arm x86_64" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.*a $fs/usr/lib + cp -a $install/usr/lib/*.a $fs/usr/lib cp -a $install/usr/lib/pkgconfig $fs/usr/lib cp -a $install/usr/include $fs/usr } diff -r cfabeb5f6836 -r 6cbabf87b12b luajit/receipt --- a/luajit/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/luajit/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -12,7 +12,7 @@ TARBALL="${SOURCE}-${VERSION}.tar.gz" WGET_URL="https://luajit.org/download/$TARBALL" -#HOST_ARCH="i486 arm" +HOST_ARCH="i486 arm x86_64" # What is the latest version available today? current_version() diff -r cfabeb5f6836 -r 6cbabf87b12b luakit/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/luakit/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,35 @@ +# SliTaz package receipt. + +PACKAGE="luakit" +VERSION="2.3.3" +CATEGORY="network" +SHORT_DESC="Fast, small, webkit based browser framework extensible by Lua." +MAINTAINER="shann@slitaz.org" +LICENSE="GPL3" +WEB_SITE="https://luakit.github.io" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://github.com/luakit/luakit/archive/refs/tags/$VERSION.tar.gz" + +HOST_ARCH="x86_64" + +DEPENDS="webkit2gtk gtk+3 luajit lua5.1-filesystem" +BUILD_DEPENDS="webkit2gtk-dev gtk+3-dev lua5.1-dev lua5.1-filesystem luajit-dev" + +# Rules to configure and make the package. +compile_rules() +{ + make DEVELOPMENT_PATHS=0 PREFIX=/usr USE_LUAJIT=1 luakit + make DESTDIR=$DESTDIR PREFIX=/usr luakit install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib + mkdir -p $fs/usr/share + + cp -a $install/etc $fs + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/lib/luakit $fs/usr/lib + cp -a $install/usr/share/luakit $fs/usr/share +} diff -r cfabeb5f6836 -r 6cbabf87b12b mailx/receipt --- a/mailx/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/mailx/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -25,7 +25,13 @@ # Rules to configure and make the package. compile_rules() { - sed -i 's|uname -m|echo i486|' Makefile + case "$HOST_ARCH" in + i?86) + sed -i 's|uname -m|echo i486|' Makefile ;; + x86_64) + sed -i 's|uname -m|echo x86_64|' Makefile ;; + esac + sed -i 's|STACK|STACK_OF(X509)|' openssl.c make SENDMAIL=/usr/sbin/sendmail && make PREFIX=/usr UCBINSTALL=/usr/bin/install \ diff -r cfabeb5f6836 -r 6cbabf87b12b make/receipt --- a/make/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/make/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -26,10 +26,6 @@ # Rules to configure and make the package. compile_rules() { - #patch -p1 < $stuff/make-4.2.1.patch - #patch -p1 < $stuff/make-glob.patch - #autoreconf -vif - ./configure $CONFIGURE_ARGS && make -j 1 && make install diff -r cfabeb5f6836 -r 6cbabf87b12b man-pages/receipt --- a/man-pages/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/man-pages/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -11,6 +11,8 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="https://www.kernel.org/pub/linux/docs/man-pages/$TARBALL" +HOST_ARCH="i486 x86_64" + # What is the latest version available today? current_version() { diff -r cfabeb5f6836 -r 6cbabf87b12b menu-cache/receipt --- a/menu-cache/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/menu-cache/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -24,6 +24,10 @@ # Rules to configure and make the package. compile_rules() { + # Patch to be build with gcc 10 + # see https://sources.debian.org/patches/menu-cache/1.1.0-1.1/ + patch -p1 < $stuff/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff -r cfabeb5f6836 -r 6cbabf87b12b menu-cache/stuff/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/menu-cache/stuff/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,108 @@ +From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 24 Jan 2020 13:33:00 +0900 +Subject: [PATCH] Support gcc10 compilation + +gcc10 now defaults to -fno-common, and with gcc10 menu-cache compilation fails like + +/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:167: multiple definition of `DirDirs'; main.o:menu-cache-gen/menu-tags.h:167: first defined here +/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:164: multiple definition of `AppDirs'; main.o:menu-cache-gen/menu-tags.h:164: first defined here +/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:52: multiple definition of `menuTag_Layout'; main.o:menu-cache-gen/menu-tags.h:52: first defined here +.... + +This patch fixes compilation with gcc10: properly declaring variables in header with "extern", and also removing some unneeded variables in header files. +--- + menu-cache-gen/menu-tags.h | 55 ++++++++++++-------------------------- + 1 file changed, 17 insertions(+), 38 deletions(-) + +diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h +index f3fd7d3..f71c0bc 100644 +--- a/menu-cache-gen/menu-tags.h ++++ b/menu-cache-gen/menu-tags.h +@@ -22,38 +22,17 @@ + #include + #include + +-FmXmlFileTag menuTag_Menu; +-FmXmlFileTag menuTag_AppDir; +-FmXmlFileTag menuTag_DefaultAppDirs; +-FmXmlFileTag menuTag_DirectoryDir; +-FmXmlFileTag menuTag_DefaultDirectoryDirs; +-FmXmlFileTag menuTag_Include; +-FmXmlFileTag menuTag_Exclude; +-FmXmlFileTag menuTag_Filename; +-FmXmlFileTag menuTag_Or; +-FmXmlFileTag menuTag_And; +-FmXmlFileTag menuTag_Not; +-FmXmlFileTag menuTag_Category; +-FmXmlFileTag menuTag_MergeFile; +-FmXmlFileTag menuTag_MergeDir; +-FmXmlFileTag menuTag_DefaultMergeDirs; +-FmXmlFileTag menuTag_Directory; +-FmXmlFileTag menuTag_Name; +-FmXmlFileTag menuTag_Deleted; +-FmXmlFileTag menuTag_NotDeleted; +-FmXmlFileTag menuTag_OnlyUnallocated; +-FmXmlFileTag menuTag_NotOnlyUnallocated; +-FmXmlFileTag menuTag_All; +-FmXmlFileTag menuTag_LegacyDir; +-FmXmlFileTag menuTag_KDELegacyDirs; +-FmXmlFileTag menuTag_Move; +-FmXmlFileTag menuTag_Old; +-FmXmlFileTag menuTag_New; +-FmXmlFileTag menuTag_Layout; +-FmXmlFileTag menuTag_DefaultLayout; +-FmXmlFileTag menuTag_Menuname; +-FmXmlFileTag menuTag_Separator; +-FmXmlFileTag menuTag_Merge; ++extern FmXmlFileTag menuTag_AppDir; ++extern FmXmlFileTag menuTag_DirectoryDir; ++extern FmXmlFileTag menuTag_Include; ++extern FmXmlFileTag menuTag_Exclude; ++extern FmXmlFileTag menuTag_Filename; ++extern FmXmlFileTag menuTag_Or; ++extern FmXmlFileTag menuTag_And; ++extern FmXmlFileTag menuTag_Not; ++extern FmXmlFileTag menuTag_Category; ++extern FmXmlFileTag menuTag_All; ++extern FmXmlFileTag menuTag_LegacyDir; + + typedef enum { + MERGE_NONE, /* starting value */ +@@ -152,19 +131,19 @@ typedef struct { + } MenuRule; + + /* requested language(s) */ +-char **languages; ++extern char **languages; + + /* list of menu files to monitor */ +-GSList *MenuFiles; ++extern GSList *MenuFiles; + + /* list of menu dirs to monitor */ +-GSList *MenuDirs; ++extern GSList *MenuDirs; + + /* list of available app dirs */ +-GSList *AppDirs; ++extern GSList *AppDirs; + + /* list of available dir dirs */ +-GSList *DirDirs; ++extern GSList *DirDirs; + + /* parse and merge menu files */ + MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error); +@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil + void _free_layout_items(GList *data); + + /* verbosity level */ +-gint verbose; ++extern gint verbose; + + #define DBG if (verbose) g_debug + #define VDBG if (verbose > 1) g_debug +-- +2.24.1 + diff -r cfabeb5f6836 -r 6cbabf87b12b mercurial-python3/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial-python3/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,65 @@ +# SliTaz package receipt. + +PACKAGE="mercurial-python3" +SOURCE="mercurial" +VERSION="6.1.1" +CATEGORY="development" +SHORT_DESC="Revision tools system." +MAINTAINER="pankso@slitaz.org" +LICENSE="GPL2" +WEB_SITE="https://www.mercurial-scm.org/" + +TARBALL="$SOURCE-$VERSION.tar.gz" +WGET_URL="${WEB_SITE}release/$TARBALL" + +PROVIDE="hg" +SUGGESTED="cacerts" +DEPENDS="libssl patch python3" +BUILD_DEPENDS="openssl-dev patch python3-dev" + +CONFIG_FILES="/etc/mercurial/hgweb.config" + +HOST_ARCH="i486 arm x86_64" + +# What is the latest version available today? +current_version() +{ + wget -O - ${WGET_URL%/*} 2>/dev/null | \ + sed "/snapshot/d;/latest/d;/$PACKAGE-/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*\".*|\\1|" | sort -Vr | sed q +} + +# Rules to configure and make the package. +compile_rules() +{ + # Cross compilation hack to avoid using compiler which build python + # itself. + case "$ARCH" in + arm*) + mv /usr/bin/i486-slitaz-linux-gcc /tmp && + ln -s /cross/${ARCH}/tools/bin/${HOST_SYSTEM}-gcc \ + /usr/bin/i486-slitaz-linux-gcc ;; + esac && + + python3 setup.py install \ + --root="$DESTDIR" \ + --optimize=1 && + mkdir -p $DESTDIR/usr/share/examples/mercurial && + cp -a $src/hgweb.cgi $DESTDIR/usr/share/examples/mercurial && + + case "$ARCH" in + arm*) + rm /usr/bin/i486-slitaz-linux-gcc && + mv /tmp/i486-slitaz-linux-gcc /usr/bin ;; + esac +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin + + cp -a $install/usr/bin/hg $fs/usr/bin/hg-python3 + cp -a $install/usr/lib $fs/usr + + chown -R root.root $fs +} diff -r cfabeb5f6836 -r 6cbabf87b12b mpd/receipt --- a/mpd/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/mpd/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mpd" -VERSION="0.21.8" +VERSION="0.21.26" CATEGORY="multimedia" SHORT_DESC="Music Player Daemon (MPD)." MAINTAINER="paul@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b mysql/receipt --- a/mysql/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/mysql/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -17,7 +17,7 @@ DEPENDS="busybox libmysqlclient mysql-client zlib slitaz-base-files \ gcc-lib-base openssl readline" BUILD_DEPENDS="cmake openssl-dev zlib-dev ncurses-dev readline-dev \ -libtirpc-dev" +libtirpc-dev rpcsvc-proto" HOST_ARCH="i486 x86_64" diff -r cfabeb5f6836 -r 6cbabf87b12b nfs-utils/receipt --- a/nfs-utils/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/nfs-utils/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -14,8 +14,8 @@ WGET_URL="$SF_MIRROR/nfs/$PACKAGE/$VERSION/$TARBALL" DEPENDS="libcap libtirpc libwrap rpcbind util-linux-blkid util-linux-uuid" -BUILD_DEPENDS="libcap-dev libtirpc-dev libwrap-dev util-linux-blkid - util-linux-blkid-dev util-linux-uuid-dev" +BUILD_DEPENDS="libcap-dev libtirpc-dev rpcsvc-proto libwrap-dev \ +util-linux-blkid-dev util-linux-uuid-dev" CONFIG_FILES="/etc/exports" diff -r cfabeb5f6836 -r 6cbabf87b12b nss/receipt --- a/nss/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/nss/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -34,6 +34,9 @@ ARCH_ARGS="USE_64=1" ;; esac + # We set NSS_ENABLE_WERROR=0 to avoid issue with new gcc 10 / glibc 2.34 + # see BLFS and https://bugs.gentoo.org/567158 + sed -i "s|uname -m|echo $cpu|" nss/coreconf/arch.mk nss/tests/run_niscc.sh patch -Np1 -i $stuff/nss-$VERSION-standalone-1.patch && cd nss && @@ -41,6 +44,7 @@ NSPR_INCLUDE_DIR=/usr/include/nspr \ USE_SYSTEM_ZLIB=1 \ ZLIB_LIBS=-lz \ + NSS_ENABLE_WERROR=0 \ $ARCH_ARGS \ $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) && mkdir -p $install/usr/lib $install/usr/include/nss && diff -r cfabeb5f6836 -r 6cbabf87b12b php56-apache/receipt --- a/php56-apache/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/php56-apache/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -44,9 +44,9 @@ [ -f "$1/etc/apache/conf.d/phpinfo" ] || cat > "$1/etc/apache/conf.d/phpinfo" < - Alias /phpinfo /usr/share/php56info + Alias /phpinfo /usr/share/phpinfo - + DirectoryIndex index.php Options +FollowSymLinks AllowOverride None diff -r cfabeb5f6836 -r 6cbabf87b12b php56-fpm/stuff/init.d/php56-fpm --- a/php56-fpm/stuff/init.d/php56-fpm Tue Jul 29 18:07:04 2025 +0000 +++ b/php56-fpm/stuff/init.d/php56-fpm Tue Sep 30 07:43:04 2025 +0000 @@ -14,6 +14,8 @@ OPTIONS=$PHP56FPM_OPTIONS PIDFILE=/var/run/php/php5.6-fpm.pid +[ -d /var/run/php ] || mkdir -p /var/run/php + case "$1" in start) if active_pidfile $PIDFILE php-fpm56 ; then diff -r cfabeb5f6836 -r 6cbabf87b12b php56/receipt --- a/php56/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/php56/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -11,7 +11,7 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="https://packages.sury.org/php/pool/main/p/php5.6/php5.6_5.6.40.orig.tar.xz" -DEPENDS="libssl libzip libxml2 lighttpd php-common sqlite" +DEPENDS="libssl libzip libxml2 lighttpd php56-common sqlite" BUILD_DEPENDS="apache apache-dev apr-dev apr-util-dev c-client coreutils-conditions curl-dev cyrus-sasl-dev gettext jpeg-dev libldap libmcrypt-dev libmysqlclient libpng-dev diff -r cfabeb5f6836 -r 6cbabf87b12b postfix/receipt --- a/postfix/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/postfix/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -31,8 +31,21 @@ # Rules to configure and make the package. compile_rules() { + # Patch to be build with glibc >= 2.30 + # see https://bugs.gentoo.org/692144 + patch -p1 < $stuff/fix_glibc230.patch + + # Patch to be build with gcc 10 + # see https://bugs.gentoo.org/803929 + # Thanks Openembedded team for patch + patch -p1 < $stuff/fix_gcc10.patch + patch -p1 < $stuff/fix_gcc10_2.patch + + export CFLAGS="$CFLAGS -fcommon" + export CCFLAGS="$CCFLAGS -fcommon" + make makefiles \ - CCARGS='-DHAS_DB -DHAS_LDAP \ + CCARGS='-fcommon -DHAS_DB -DHAS_LDAP \ -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I /usr/include/sasl \ -DHAS_MYSQL -I/usr/include/mysql \ -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ diff -r cfabeb5f6836 -r 6cbabf87b12b postfix/stuff/fix_gcc10.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/postfix/stuff/fix_gcc10.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,102 @@ +From 1e451ddc15af1a4e19318c8b1ced46c5c41610d3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 14 Jul 2021 18:08:30 -0700 +Subject: [PATCH] correct signature of closefrom() API + +glibc 2.34 introduced this function and finds this error which has been +all along. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/util/sys_compat.c | 6 +++--- + src/util/sys_defs.h | 12 ++++++------ + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/util/sys_compat.c b/src/util/sys_compat.c +index 8bf8e58..c87f043 100644 +--- a/src/util/sys_compat.c ++++ b/src/util/sys_compat.c +@@ -286,7 +286,7 @@ int dup2_pass_on_exec(int oldd, int newd) + + /* closefrom() - closes all file descriptors from the given one up */ + +-int closefrom(int lowfd) ++void closefrom(int lowfd) + { + int fd_limit = open_limit(0); + int fd; +@@ -298,14 +298,14 @@ int closefrom(int lowfd) + */ + if (lowfd < 0) { + errno = EBADF; +- return (-1); ++ return; + } + if (fd_limit > 500) + fd_limit = 500; + for (fd = lowfd; fd < fd_limit; fd++) + (void) close(fd); + +- return (0); ++ return; + } + + #endif +diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h +index 2e1c953..515de6c 100644 +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -1509,7 +1509,7 @@ extern int setsid(void); + #endif + + #ifndef HAS_CLOSEFROM +-extern int closefrom(int); ++extern void closefrom(int); + + #endif + +@@ -1563,7 +1563,7 @@ typedef int pid_t; + + /* + * Clang-style attribute tests. +- * ++ * + * XXX Without the unconditional test below, gcc 4.6 will barf on ``elif + * defined(__clang__) && __has_attribute(__whatever__)'' with error message + * ``missing binary operator before token "("''. +@@ -1577,7 +1577,7 @@ typedef int pid_t; + * warn for missing initializations and other trouble. However, OPENSTEP4 + * gcc 2.7.x cannot handle this so we define this only if NORETURN isn't + * already defined above. +- * ++ * + * Data point: gcc 2.7.2 has __attribute__ (Wietse Venema) but gcc 2.6.3 does + * not (Clive Jones). So we'll set the threshold at 2.7. + */ +@@ -1653,12 +1653,12 @@ typedef int pid_t; + * write to output parameters (for example, stat- or scanf-like functions) + * or from functions that have other useful side effects (for example, + * fseek- or rename-like functions). +- * ++ * + * DO NOT use this for functions that write to a stream; it is entirely + * legitimate to detect write errors with fflush() or fclose() only. On the + * other hand most (but not all) functions that read from a stream must + * never ignore result values. +- * ++ * + * XXX Prepending "(void)" won't shut up GCC. Clang behaves as expected. + */ + #if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ > 3) +@@ -1739,7 +1739,7 @@ typedef const char *CONST_CHAR_STAR; + * Safety. On some systems, ctype.h misbehaves with non-ASCII or negative + * characters. More importantly, Postfix uses the ISXXX() macros to ensure + * protocol compliance, so we have to rule out non-ASCII characters. +- * ++ * + * XXX The (unsigned char) casts in isalnum() etc arguments are unnecessary + * because the ISASCII() guard already ensures that the values are + * non-negative; the casts are done anyway to shut up chatty compilers. + diff -r cfabeb5f6836 -r 6cbabf87b12b postfix/stuff/fix_gcc10_2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/postfix/stuff/fix_gcc10_2.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,77 @@ +--- a/src/util/sys_defs.h 2020-05-21 16:34:23.000000000 +0300 ++++ b/src/util/sys_defs.h 2021-08-07 19:14:20.000000000 +0300 +@@ -827,6 +827,9 @@ + #define HAVE_POSIX_GETPW_R + #endif + #endif ++#if HAVE_GLIBC_API_VERSION_SUPPORT(2, 34) ++#define HAS_CLOSEFROM ++#endif + + #endif + +--- a/src/global/mail_params.h 2020-01-21 10:52:36.025753878 +0300 ++++ b/src/global/mail_params.h 2020-01-21 10:53:11.173763126 +0300 +@@ -3983,23 +3983,23 @@ + + #define VAR_TLSP_CLNT_USE_TLS "tlsproxy_client_use_tls" + #define DEF_TLSP_CLNT_USE_TLS "$" VAR_SMTP_USE_TLS +-bool var_tlsp_clnt_use_tls; ++extern bool var_tlsp_clnt_use_tls; + + #define VAR_TLSP_CLNT_ENFORCE_TLS "tlsproxy_client_enforce_tls" + #define DEF_TLSP_CLNT_ENFORCE_TLS "$" VAR_SMTP_ENFORCE_TLS +-bool var_tlsp_clnt_enforce_tls; ++extern bool var_tlsp_clnt_enforce_tls; + + #define VAR_TLSP_CLNT_LEVEL "tlsproxy_client_level" + #define DEF_TLSP_CLNT_LEVEL "$" VAR_SMTP_TLS_LEVEL +-char *var_tlsp_clnt_level; ++extern char *var_tlsp_clnt_level; + + #define VAR_TLSP_CLNT_PER_SITE "tlsproxy_client_per_site" + #define DEF_TLSP_CLNT_PER_SITE "$" VAR_SMTP_TLS_PER_SITE +-char *var_tlsp_clnt_per_site; ++extern char *var_tlsp_clnt_per_site; + + #define VAR_TLSP_CLNT_POLICY "tlsproxy_client_policy" + #define DEF_TLSP_CLNT_POLICY "$" VAR_SMTP_TLS_POLICY +-char *var_tlsp_clnt_policy; ++extern char *var_tlsp_clnt_policy; + + /* + * SMTPD "reject" contact info. +--- a/src/smtpd/smtpd_expand.h 2014-12-07 03:35:34.000000000 +0200 ++++ b/src/smtpd/smtpd_expand.h 2020-01-21 11:30:10.270425259 +0300 +@@ -18,7 +18,7 @@ + /* + * External interface. + */ +-VSTRING *smtpd_expand_filter; ++extern VSTRING *smtpd_expand_filter; + void smtpd_expand_init(void); + const char *smtpd_expand_lookup(const char *, int, void *); + int smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int); +--- a/src/trivial-rewrite/trivial-rewrite.h 2014-10-06 18:02:16.000000000 +0300 ++++ b/src/trivial-rewrite/trivial-rewrite.h 2020-01-21 11:29:36.411409526 +0300 +@@ -23,7 +23,7 @@ + /* + * Connection management. + */ +-int server_flags; ++extern int server_flags; + + /* + * rewrite.c +--- a/src/postconf/postconf.h 2018-02-19 04:43:29.000000000 +0300 ++++ b/src/postconf/postconf.h 2020-01-21 11:29:07.851401023 +0300 +@@ -152,7 +152,7 @@ + * Lookup table for master.cf entries. The table is terminated with an entry + * that has a null argv member. + */ +-PCF_MASTER_ENT *pcf_master_table; ++extern PCF_MASTER_ENT *pcf_master_table; + + /* + * Line-wrapping support. + diff -r cfabeb5f6836 -r 6cbabf87b12b postfix/stuff/fix_glibc230.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/postfix/stuff/fix_glibc230.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,31 @@ +--- a/src/dns/dns_str_resflags.c 2016-05-15 18:20:14.000000000 +0300 ++++ b/src/dns/dns_str_resflags.c 2019-05-03 17:29:16.000000000 +0300 +@@ -52,18 +52,28 @@ + static const LONG_NAME_MASK resflag_table[] = { + "RES_INIT", RES_INIT, + "RES_DEBUG", RES_DEBUG, ++#ifdef RES_AAONLY + "RES_AAONLY", RES_AAONLY, ++#endif + "RES_USEVC", RES_USEVC, ++#ifdef RES_PRIMARY + "RES_PRIMARY", RES_PRIMARY, ++#endif + "RES_IGNTC", RES_IGNTC, + "RES_RECURSE", RES_RECURSE, + "RES_DEFNAMES", RES_DEFNAMES, + "RES_STAYOPEN", RES_STAYOPEN, + "RES_DNSRCH", RES_DNSRCH, ++#ifdef RES_INSECURE1 + "RES_INSECURE1", RES_INSECURE1, ++#endif ++#ifdef RES_INSECURE2 + "RES_INSECURE2", RES_INSECURE2, ++#endif + "RES_NOALIASES", RES_NOALIASES, ++#ifdef RES_USE_INET6 + "RES_USE_INET6", RES_USE_INET6, ++#endif + #ifdef RES_ROTATE + "RES_ROTATE", RES_ROTATE, + #endif diff -r cfabeb5f6836 -r 6cbabf87b12b qt4/receipt --- a/qt4/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/qt4/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -55,6 +55,10 @@ patch -p1 < $stuff/qt4-openssl-1.1-support.patch patch -p1 < $stuff/disable-sslv3.patch + # Patch for build with gcc >= 9 + # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925811 + patch -p1 < $stuff/gcc9_build_fix.patch + # Force std=gnu++98 to sanity built qt4 export CXXFLAGS="$CXXFLAGS -std=gnu++98" diff -r cfabeb5f6836 -r 6cbabf87b12b qt4/stuff/gcc9_build_fix.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/stuff/gcc9_build_fix.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,65 @@ +From c35a3f519007af44c3b364b9af86f6a336f6411b Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Tue, 11 Feb 2014 16:17:46 -0800 +Subject: [PATCH] Redo the Q_FOREACH loop control without GCC statement + expressions + +It's possible to do without them, which probably makes the number of +supported compilers a lot bigger: they just need to support decltype() +or __typeof__. + +That includes the Intel compiler. The old code was also apparently +working, but no one had realized the old workaround for some old version +was still in place. + +The loop overhead is more or less the same. I have not done benchmarks, +but inspection of the generated assembly shows more or less the same +number of instructions. + +Change-Id: I32d499c84a6ddd19d994b49f17a469acb5c3a3f1 +Reviewed-by: Olivier Goffart +Reviewed-by: Marc Mutz + +Backported to Qt 4 + +--- a/src/corelib/global/qglobal.h ++++ b/src/corelib/global/qglobal.h +@@ -2482,22 +2482,32 @@ typedef uint Flags; + + #endif /* Q_NO_TYPESAFE_FLAGS */ + +-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT) ++#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT)) + /* make use of typeof-extension */ + template + class QForeachContainer { + public: +- inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { } ++ inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { } + const T c; + int brk; + typename T::const_iterator i, e; ++ int control; + }; + ++// Explanation of the control word: ++// - it's initialized to 1 ++// - that means both the inner and outer loops start ++// - if there were no breaks, at the end of the inner loop, it's set to 0, which ++// causes it to exit (the inner loop is run exactly once) ++// - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing ++// the outer loop to continue executing ++// - if there was a break inside the inner loop, it will exit with control still ++// set to 1; in that case, the outer loop will invert it to 0 and will exit too + #define Q_FOREACH(variable, container) \ + for (QForeachContainer<__typeof__(container)> _container_(container); \ +- !_container_.brk && _container_.i != _container_.e; \ +- __extension__ ({ ++_container_.brk; ++_container_.i; })) \ +- for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;})) ++ _container_.control && _container_.i != _container_.e; \ ++ ++_container_.i, _container_.control ^= 1) \ ++ for (variable = *_container_.i; _container_.control; _container_.control = 0) + + #else + + diff -r cfabeb5f6836 -r 6cbabf87b12b qt5/receipt --- a/qt5/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/qt5/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -42,6 +42,10 @@ { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${src}/lib" + # Patch to be build with gcc 10 + # see https://bugs.gentoo.org/722102 + patch -p1 < $stuff/qtlocation-5.14.2-gcc-10.patch + ./configure \ -prefix /usr \ -confirm-license \ diff -r cfabeb5f6836 -r 6cbabf87b12b qt5/stuff/qtlocation-5.14.2-gcc-10.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt5/stuff/qtlocation-5.14.2-gcc-10.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,37 @@ +From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001 +From: Bruno de Oliveira Abinader +Date: Wed, 22 Apr 2020 19:54:53 +0300 +Subject: Fix compilation issues on GCC 9 + +--- + platform/default/bidi.cpp | 1 + + src/mbgl/util/convert.cpp | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +index d475c387b..c1710a6f1 100644 +--- a/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp ++++ b/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp +@@ -5,6 +5,7 @@ + #include + + #include ++#include + + namespace mbgl { + +diff --git a/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +index 97bfe9108..510ff2386 100644 +--- a/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp ++++ b/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp +@@ -1,5 +1,7 @@ + #include + ++#include ++ + namespace mbgl { + namespace util { + +-- +cgit v1.2.1 + diff -r cfabeb5f6836 -r 6cbabf87b12b rpcsvc-proto/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rpcsvc-proto/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,36 @@ +# SliTaz package receipt. + +PACKAGE="rpcsvc-proto" +VERSION="1.4.3" +CATEGORY="system-tools" +SHORT_DESC="rpcsvc protocol definitions from glibc." +MAINTAINER="maintainer@slitaz.org" +LICENSE="BSD" +WEB_SITE="https://github.com/thkukuk/rpcsvc-proto" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://github.com/thkukuk/rpcsvc-proto/archive/v$VERSION/$TARBALL" + +BUILD_DEPENDS="automake libtool" + +HOST_ARCH="i486 arm x86_64" + +# Rules to configure and make the package. +compile_rules() +{ + autoreconf -vif + + ./configure \ + --prefix=/usr \ + $CONFIGURE_ARGS && + make && + make install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir $fs/usr + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/include $fs/usr +} diff -r cfabeb5f6836 -r 6cbabf87b12b slitaz-configs/receipt --- a/slitaz-configs/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/slitaz-configs/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -85,7 +85,9 @@ pre_install() { # Save previous menu.xml symlink - cp -a /etc/xdg/openbox/menu.xml /etc/xdg/openbox/menu.xml.save + if [ -d $1/etc/xdg/openbox ]; then + cp -a /etc/xdg/openbox/menu.xml $1/etc/xdg/openbox/menu.xml.save + fi } post_install() @@ -102,5 +104,7 @@ esac # Restore previous menu.xml symlink + [ -s $1/etc/xdg/openbox/menu.xml.save ] && mv /etc/xdg/openbox/menu.xml.save /etc/xdg/openbox/menu.xml + true } diff -r cfabeb5f6836 -r 6cbabf87b12b sudo/receipt --- a/sudo/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/sudo/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="sudo" -VERSION="1.9.15p5" +VERSION="1.9.17p2" CATEGORY="security" SHORT_DESC="Allows command execution as root for specified users." MAINTAINER="erjo@slitaz.org" diff -r cfabeb5f6836 -r 6cbabf87b12b texinfo/receipt --- a/texinfo/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/texinfo/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -34,6 +34,10 @@ # Rules to configure and make the package. compile_rules() { + # Patch for build with glibc > 2.31 + # see https://bugs.gentoo.org/803485 + patch -p1 < $stuff/texinfo_glibc2.34.patch + export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -ltinfo" ./configure $CONFIGURE_ARGS && make && make install diff -r cfabeb5f6836 -r 6cbabf87b12b texinfo/stuff/texinfo_glibc2.34.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/texinfo/stuff/texinfo_glibc2.34.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,187 @@ + +Patch by Vitezslav Crhonek +Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide + +diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h +--- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200 +@@ -321,15 +321,15 @@ + + /* The nonnull function attribute marks pointer parameters that + must not be NULL. */ +-#ifndef __attribute_nonnull__ ++#ifndef __nonnull + # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) +-# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) ++# define __nonnull(params) __attribute__ ((__nonnull__ params)) + # else +-# define __attribute_nonnull__(params) ++# define __nonnull(params) + # endif +-#endif +-#ifndef __nonnull +-# define __nonnull(params) __attribute_nonnull__ (params) ++#elif !defined __GLIBC__ ++# undef __nonnull ++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) + #endif + + /* If fortification mode, we warn about unused results of certain +diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h +--- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200 +@@ -33,9 +33,9 @@ + #include + + /* On glibc this includes and and #defines +- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and +- DragonFlyBSD 5.9 it includes which defines __nonnull. +- Elsewhere it is harmless. */ ++ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it ++ includes which defines __nonnull. Elsewhere it ++ is harmless. */ + #include + + /* From glibc . */ +diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c +--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200 +@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY + + /* Initialize a dynamic array object. This must be called before any + use of the object. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list) + { +@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST + } + + /* Deallocate the dynamic array and its elements. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_FREE (struct DYNARRAY_STRUCT *list) + { +@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l + } + + /* Return true if the dynamic array is in an error state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline bool + DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list) + { +@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct + + /* Mark the dynamic array as failed. All elements are deallocated as + a side effect. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list) + { +@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA + + /* Return the number of elements which have been added to the dynamic + array. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline size_t + DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list) + { +@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR + + /* Return a pointer to the array element at INDEX. Terminate the + process if INDEX is out of bounds. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index) + { +@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU + /* Return a pointer to the first array element, if any. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list) + { +@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S + /* Return a pointer one element past the last array element. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list) + { +@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S + /* Add ITEM at the end of the array, enlarging it by one element. + Mark *LIST as failed if the dynamic array allocation size cannot be + increased. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline void + DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item) + { +@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR + /* Allocate a place for a new element in *LIST and return a pointer to + it. The pointer can be NULL if the dynamic array cannot be + enlarged due to a memory allocation failure. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static + /* Avoid inlining with the larger initialization code. */ + #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE)) +@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY + existing size, new elements are added (which can be initialized). + Otherwise, the list is truncated, and elements are freed. Return + false on memory allocation failure (and mark *LIST as failed). */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static bool + DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size) + { +@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_ + } + + /* Remove the last element of LIST if it is present. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list) + { +@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA + + /* Remove all elements from the list. The elements are freed, but the + list itself is not. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list) + { +@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S + stored in *RESULT if LIST refers to an empty list. On success, the + pointer in *RESULT is heap-allocated and must be deallocated using + free. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1, 2)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2)) + static bool + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, + DYNARRAY_FINAL_TYPE *result) +@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA + have a sentinel at the end). If LENGTHP is not NULL, the array + length is written to *LENGTHP. *LIST is re-initialized and can be + reused. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static DYNARRAY_ELEMENT * + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp) + { + diff -r cfabeb5f6836 -r 6cbabf87b12b veracrypt/receipt --- a/veracrypt/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/veracrypt/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -1,18 +1,20 @@ # SliTaz package receipt. PACKAGE="veracrypt" -VERSION="1.25.9" +VERSION="1.26.24" CATEGORY="security" SHORT_DESC="Disk encryption software based on TrueCrypt 7.1a." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="Apache" WEB_SITE="https://www.veracrypt.fr/en/" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="https://veracrypt.fr/code/VeraCrypt/snapshot/VeraCrypt_$VERSION.tar.gz" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="https://launchpad.net/veracrypt/trunk/$VERSION/+download/VeraCrypt_${VERSION}_Source.tar.bz2" -DEPENDS="fuse2 wxWidgets" -BUILD_DEPENDS="fuse2-dev pkg-config wxWidgets-dev yasm" +DEPENDS="fuse2 pcsc-lite wxWidgets sudo dmsetup libdevmapper linux64-md" +BUILD_DEPENDS="fuse2-dev pkg-config wxWidgets-dev yasm pcsc-lite-dev" + +HOST_ARCH="i486 x86_64" current_version() { @@ -23,18 +25,39 @@ # Rules to configure and make the package. compile_rules() { - cd src && - make ARCH=i686 && + barch=i686 + case $SLITAZ_ARCH in + x86_64) + barch=x86_64 ;; + esac + + cd src + # Remove warning about size on runtime + # see https://github.com/veracrypt/VeraCrypt/issues/952 + patch -p1 < $stuff/wx-3.2-size-warnings.patch + # Remove self installer + patch -Np1 < $stuff/no-makeself.patch + + make ARCH=$barch && make install DESTDIR=$DESTDIR } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin - mkdir -p $fs/usr/share + mkdir -p $fs/usr/bin $fs/usr/share $fs/etc/sudoers.d cp -a $install/usr/bin/veracrypt $fs/usr/bin cp -a $install/usr/share/applications $fs/usr/share cp -a $install/usr/share/pixmaps $fs/usr/share + cp -a $stuff/etc/sudoers.d/veracrypt $fs/etc/sudoers.d + chmod 640 $fs/etc/sudoers.d/veracrypt } + +post_install() +{ + grep -qs veracrypt "$1/etc/group" || chroot "$1/" addgroup -S veracrypt + echo '' + echo "add yourself to veracrypt group to use veracrypt software" + echo "su -c \"addgroup veracrypt\" or \"subox \$USER veracrypt\"" +} diff -r cfabeb5f6836 -r 6cbabf87b12b veracrypt/stuff/etc/sudoers.d/veracrypt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/veracrypt/stuff/etc/sudoers.d/veracrypt Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,1 @@ +%veracrypt ALL=(root) /usr/bin/veracrypt diff -r cfabeb5f6836 -r 6cbabf87b12b veracrypt/stuff/no-makeself.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/veracrypt/stuff/no-makeself.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,11 @@ +diff -aur clean/veracrypt/src/Main/Main.make src/veracrypt/src/Main/Main.make +--- clean/Main/Main.make 2014-10-14 19:12:32.000000000 +0300 ++++ src/Main/Main.make 2014-10-14 19:13:27.330705412 +0300 +@@ -206,7 +206,6 @@ + rm -fr $(BASE_DIR)/Setup/Linux/packaging + mkdir -p $(BASE_DIR)/Setup/Linux/packaging + cp $(INTERNAL_INSTALLER_NAME) $(BASE_DIR)/Setup/Linux/packaging/. +- makeself $(BASE_DIR)/Setup/Linux/packaging $(BASE_DIR)/Setup/Linux/$(INSTALLER_NAME) "VeraCrypt $(TC_VERSION) Installer" ./$(INTERNAL_INSTALLER_NAME) + + endif + diff -r cfabeb5f6836 -r 6cbabf87b12b veracrypt/stuff/wx-3.2-size-warnings.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/veracrypt/stuff/wx-3.2-size-warnings.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,12 @@ +diff --git a/Main/GraphicUserInterface.cpp b/Main/GraphicUserInterface.cpp +index 7d1cee7..f9db203 100644 +--- a/Main/GraphicUserInterface.cpp ++++ b/Main/GraphicUserInterface.cpp +@@ -60,6 +60,7 @@ namespace VeraCrypt + g_customIdCmdA = wxNewId(); + wxApp::s_macHelpMenuTitleName = LangString["MENU_HELP"]; + #endif ++ wxSizerFlags::DisableConsistencyChecks(); + } + + GraphicUserInterface::~GraphicUserInterface () diff -r cfabeb5f6836 -r 6cbabf87b12b xorg-xf86-video-amdgpu/receipt --- a/xorg-xf86-video-amdgpu/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/xorg-xf86-video-amdgpu/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -13,7 +13,8 @@ TAGS="xorg display" DEPENDS="xorg-server mesa-dri" -BUILD_DEPENDS="xorg-server-dev libpthread-stubs-dev xorg-xf86driproto" +BUILD_DEPENDS="xorg-server-dev xorg-xf86driproto" +# libpthread-stubs-dev MODS='/usr/lib/X11/modules' diff -r cfabeb5f6836 -r 6cbabf87b12b xorg-xf86-video-ati/receipt --- a/xorg-xf86-video-ati/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/xorg-xf86-video-ati/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -13,7 +13,8 @@ TAGS="xorg display" DEPENDS="xorg-server mesa-dri-ati" -BUILD_DEPENDS="xorg-server-dev libpthread-stubs-dev xorg-xf86driproto" +BUILD_DEPENDS="xorg-server-dev xorg-xf86driproto" +# libpthread-stubs-dev MODS='/usr/lib/X11/modules' @@ -28,6 +29,10 @@ # Rules to configure and make the package. compile_rules() { + # Patch to be build with gcc 10 + # see https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/patch/?id=f223035f + patch -p1 < $stuff/fix_gcc10.patch + ./configure \ --sysconfdir=/etc \ --mandir=/usr/share/man \ diff -r cfabeb5f6836 -r 6cbabf87b12b xorg-xf86-video-ati/stuff/fix_gcc10.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xorg-xf86-video-ati/stuff/fix_gcc10.patch Tue Sep 30 07:43:04 2025 +0000 @@ -0,0 +1,33 @@ +From f223035f4ffcff2a9296d1e907a5193f8e8845a3 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 4 Feb 2020 16:38:06 -0500 +Subject: Fix link failure with gcc 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without the 'extern' this looks like a definition not just a +declaration, in every file that includes the header. gcc 10 is stricter +about this kind of multiple definition. + +Reviewed-by: Michel Dänzer +--- + src/drmmode_display.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/drmmode_display.h b/src/drmmode_display.h +index 96eaef0a..8cd8a0a6 100644 +--- a/src/drmmode_display.h ++++ b/src/drmmode_display.h +@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, + uint64_t *ust, uint32_t *result_seq); + + +-miPointerSpriteFuncRec drmmode_sprite_funcs; ++extern miPointerSpriteFuncRec drmmode_sprite_funcs; + + + #endif +-- +cgit v1.2.3 + diff -r cfabeb5f6836 -r 6cbabf87b12b xorg-xf86-video-intel/receipt --- a/xorg-xf86-video-intel/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/xorg-xf86-video-intel/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -21,8 +21,9 @@ DEPENDS="libdrm libdrm-intel mesa-dri-intel xcb-util xorg-libXfont2 \ xorg-libXvMC xorg-server" -BUILD_DEPENDS="automake libtool git libdrm-dev libpthread-stubs-dev \ -xcb-util-dev xorg-libXfont2-dev xorg-libXvMC-dev xorg-server-dev" +BUILD_DEPENDS="automake libtool git libdrm-dev xcb-util-dev \ +xorg-libXfont2-dev xorg-libXvMC-dev xorg-server-dev" +# libpthread-stubs-dev MODS='/usr/lib/X11/modules' diff -r cfabeb5f6836 -r 6cbabf87b12b xorg-xf86-video-nouveau/receipt --- a/xorg-xf86-video-nouveau/receipt Tue Jul 29 18:07:04 2025 +0000 +++ b/xorg-xf86-video-nouveau/receipt Tue Sep 30 07:43:04 2025 +0000 @@ -12,9 +12,9 @@ WGET_URL="$XORG_MIRROR/driver/$TARBALL" TAGS="xorg display" -DEPENDS="xorg-server libdrm-nouveau libpthread-stubs \ - mesa-dri-nouveau" # opengl only -BUILD_DEPENDS="xorg-server-dev libpthread-stubs-dev libdrm-dev" +DEPENDS="xorg-server libdrm-nouveau mesa-dri-nouveau" # opengl only +BUILD_DEPENDS="xorg-server-dev libdrm-dev" +# libpthread-stubs-dev MODS='/usr/lib/X11/modules'