# HG changeset patch # User Stanislas Leduc # Date 1668006720 0 # Node ID 654ef6aa196224be68b9ff8bab4f120f0675cfdb # Parent e929c75430357e0d1f164f2f05e52b05cdee970d New toolchain GCC 4.9.2, Glibc 2.19, Binutils 2.23.1 diff -r e929c7543035 -r 654ef6aa1962 binutils/receipt --- a/binutils/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/binutils/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="binutils" -VERSION="2.21" +VERSION="2.23.1" CATEGORY="development" SHORT_DESC="GNU assembler, linker and binary utilities." MAINTAINER="pankso@slitaz.org" @@ -53,6 +53,7 @@ $src/configure \ --program-prefix=$TOOLPREFIX \ --enable-shared \ + --disable-werror \ $CONFIGURE_ARGS && make tooldir=/usr && make tooldir=/usr install && diff -r e929c7543035 -r 654ef6aa1962 bison/receipt --- a/bison/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/bison/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="bison" -VERSION="2.5" +VERSION="3.7.5" CATEGORY="development" SHORT_DESC="GNU parser generator." MAINTAINER="pankso@slitaz.org" @@ -18,7 +18,8 @@ { cd $src ./configure $CONFIGURE_ARGS && - echo '#define YYENABLE_NLS 1' >> config.h && + # 2.5 + #echo '#define YYENABLE_NLS 1' >> config.h && make && make install } diff -r e929c7543035 -r 654ef6aa1962 busybox/receipt --- a/busybox/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/busybox/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,25 +1,28 @@ # SliTaz package receipt. PACKAGE="busybox" -VERSION="1.18.4" +VERSION="1.23.2" CATEGORY="base-system" SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities." -MAINTAINER="pascal.bellard@slitaz.org" -DEPENDS="slitaz-base-files glibc-base ncurses-common" -BUILD_DEPENDS="bzip2 pam pam-dev uclibc-cross-compiler-i486" -AUFS_NOT_SUPPORTED="uclibc-cross-compiler-i486 is not compatible with aufs 8(" +MAINTAINER="shann@slitaz.org" +LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.busybox.net/" WGET_URL="http://www.busybox.net/downloads/$TARBALL" -CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf /etc/resolv.conf /etc/httpd.conf" +DEPENDS="slitaz-base-files glibc-base ncurses-common ncurses-extra" +BUILD_DEPENDS="bzip2 libtirpc-dev" + +CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf \ +/etc/resolv.conf /etc/httpd.conf" + +# Busybox patches apply_bb_patchs() { - cd $src while read file; do [ -f done.$file ] && continue echo "Apply $file..." - patch -p1 < $stuff/$PACKAGE-${VERSION%.*}-$file || return 1 + patch -p1 < $stuff/patches/$PACKAGE-${VERSION%.*}-$file || return 1 touch done.$file done <> $root/etc/daemons.conf echo '' >> $root/etc/daemons.conf fi - if ! grep -q ^HTTPD_OPTIONS $root/etc/daemons.conf; then - echo '# Busybox HTTP web server options.' >> $root/etc/daemons.conf - echo 'HTTPD_OPTIONS="-u www"' >> $root/etc/daemons.conf - echo '' >> $root/etc/daemons.conf - fi + sed -i "s/copy; 20../copy; $(date +%Y)/" $root/var/www/httpd/404.html } pre_remove() diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/applications/httpd.desktop --- a/busybox/stuff/applications/httpd.desktop Mon Mar 04 18:42:23 2019 +0100 +++ b/busybox/stuff/applications/httpd.desktop Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 +Type=Application Name=Local Web Server +Name[fr]=Serveur Web local +Name[pt]=Servidor Web local +Name[pt_BR]=Servidor Web local +Name[ru]=Локальный веб-сервер Exec=browser http://localhost/ -Icon=text-html -Type=Application +Icon=network-server Categories=Network; diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/applications/vi.desktop --- a/busybox/stuff/applications/vi.desktop Mon Mar 04 18:42:23 2019 +0100 +++ b/busybox/stuff/applications/vi.desktop Wed Nov 09 15:12:00 2022 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 +Type=Application Name=Vi Text Editor Name[fr]=Editeur de texte Vi -Exec=terminal vi -Icon=text-editor -Type=Application -Categories=Application;Development; +Name[pt]=Editor de textos Vi +Name[pt_BR]=Editor de textos Vi +Name[ru]=Текстовый редактор Vi +Exec=terminal -e vi +Icon=accessories-text-editor +Categories=Development;IDE; diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/busybox-1.23.config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/busybox-1.23.config Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,1056 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.23.2 +# Fri Apr 29 06:50:20 2022 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=11263 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/run" +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=255 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +CONFIG_FEATURE_REVERSE_SEARCH=y +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +CONFIG_FEATURE_HWIB=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_FEATURE_AR_CREATE=y +CONFIG_UNCOMPRESS=y +CONFIG_GUNZIP=y +CONFIG_BUNZIP2=y +CONFIG_UNLZMA=y +# CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +CONFIG_UNXZ=y +# CONFIG_XZ is not set +# CONFIG_BZIP2 is not set +CONFIG_CPIO=y +CONFIG_FEATURE_CPIO_O=y +# CONFIG_FEATURE_CPIO_P is not set +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y +CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y +CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_GZIP_FAST=0 +# CONFIG_LZOP is not set +# CONFIG_LZOP_COMPR_HIGH is not set +CONFIG_RPM=y +CONFIG_RPM2CPIO=y +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_GROUPS=y +# CONFIG_SHUF is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_UNLINK is not set +CONFIG_BASE64=y +CONFIG_WHO=y +CONFIG_USERS=y +CONFIG_CAL=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +# CONFIG_FGCONSOLE is not set +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +# CONFIG_LOADFONT is not set +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETFONT is not set +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +# CONFIG_SHOWKEY is not set +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +# CONFIG_FEATURE_FIND_EXEC_PLUS is not set +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=0 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +CONFIG_FEATURE_INITRD=y +CONFIG_INIT_TERMINAL_TYPE="" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=60000 +CONFIG_FIRST_SYSTEM_ID=100 +CONFIG_LAST_SYSTEM_ID=999 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_LOGIN_SESSION_AS_CHILD is not set +# CONFIG_LOGIN_SCRIPTS is not set +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +# CONFIG_FSCK is not set +CONFIG_LSATTR=y +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" + +# +# Linux System Utilities +# +CONFIG_BLOCKDEV=y +CONFIG_FATATTR=y +# CONFIG_FBVNC is not set +CONFIG_FSTRIM=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_REV=y +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +CONFIG_BLKID=y +CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +CONFIG_FEATURE_GPT_LABEL=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set +CONFIG_FINDFS=y +CONFIG_FLOCK=y +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +# CONFIG_GETOPT is not set +# CONFIG_FEATURE_GETOPT_LONG is not set +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +# CONFIG_HD is not set +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_DISCARD=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_BTRFS=y +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +# CONFIG_FEATURE_VOLUMEID_JFS is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_NILFS=y +CONFIG_FEATURE_VOLUMEID_NTFS=y +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y + +# +# Miscellaneous Utilities +# +CONFIG_CONSPY=y +CONFIG_CROND=y +# CONFIG_FEATURE_CROND_D is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_RFKILL is not set +CONFIG_SETSERIAL=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_UBIATTACH=y +CONFIG_UBIDETACH=y +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +CONFIG_WALL=y +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +CONFIG_CHRT=y +CONFIG_CRONTAB=y +# CONFIG_DC is not set +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_DEVMEM is not set +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set +CONFIG_IONICE=y +# CONFIG_INOTIFYD is not set +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MAN is not set +CONFIG_MICROCOM=y +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +# CONFIG_READAHEAD is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +CONFIG_NC_110_COMPAT=y +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_WHOIS=y +CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_UNIX_LOCAL is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +CONFIG_FEATURE_BRCTL_FANCY=y +CONFIG_FEATURE_BRCTL_SHOW=y +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTP_AUTHENTICATION=y +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +# CONFIG_IFPLUGD is not set +# CONFIG_IFUPDOWN is not set +CONFIG_IFUPDOWN_IFSTATE_PATH="" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +CONFIG_NTPD=y +CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_FEATURE_NTPD_CONF=y +CONFIG_PSCAN=y +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +CONFIG_TFTPD=y + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTPD_RIS=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +# CONFIG_TFTP_DEBUG is not set +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +CONFIG_UDHCPC6=y +CONFIG_UDHCPD=y +CONFIG_DHCPRELAY=y +CONFIG_DUMPLEASES=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y +CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +# CONFIG_UDPSVD is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +CONFIG_LPD=y +CONFIG_LPR=y +CONFIG_LPQ=y + +# +# Mail Utilities +# +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +CONFIG_SENDMAIL=y + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_LSOF=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_PSTREE=y +# CONFIG_PWDX is not set +CONFIG_SMEMCAP=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_UPTIME=y +CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +# CONFIG_ASH_EXPAND_PRMT is not set +# CONFIG_CTTYHACK is not set +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +# CONFIG_SH_MATH_SUPPORT_64 is not set +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_HISTFILESIZE=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_SYSLOGD_DUP=y +CONFIG_FEATURE_SYSLOGD_CFG=y +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=1024 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_FEATURE_KMSG_SYSLOG=y +CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# +CONFIG_FEATURE_KLOGD_KLOGCTL=y +CONFIG_LOGGER=y diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/httpd.conf --- a/busybox/stuff/httpd.conf Mon Mar 04 18:42:23 2019 +0100 +++ b/busybox/stuff/httpd.conf Wed Nov 09 15:12:00 2022 +0000 @@ -4,16 +4,16 @@ H:/var/www # Allow address. -A:0.0.0.0/0 +A:192.168. # File to open by default. -#I:index.html +#I:index.html # Path to the 404 error page. -#E404:/path/404.html +E404:/var/www/httpd/404.html -# Require user root, password root on urls starting with /adm/. -#/adm:root:root +# Require user root on urls starting with /adm/. use passwd system db +/adm:root:* # Reverse proxy. #P:/url:[http://]hostname[:port]/new/path @@ -21,6 +21,7 @@ # CGI interpreter path. *.sh:/bin/sh *.cgi:/bin/sh +#*.py:/usr/bin/python #*.php:/usr/bin/php-cgi # MIME type. diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/inetd.conf --- a/busybox/stuff/inetd.conf Mon Mar 04 18:42:23 2019 +0100 +++ b/busybox/stuff/inetd.conf Wed Nov 09 15:12:00 2022 +0000 @@ -26,6 +26,10 @@ # These are standard services. # -tftp dgram udp wait root /usr/bin/tftpd /usr/bin/tftpd -r /boot -#systat stream tcp nowait nobody /bin/ps -#netstat stream tcp nowait root /bin/netstat /bin/netstat -a +tftp dgram udp wait root /usr/sbin/tftpd tftpd -r /boot +#systat stream tcp nowait nobody /sbin/ps -auwwx +#netstat stream tcp nowait root /bin/netstat netstat -a +#http stream tcp nowait root /usr/sbin/httpd httpd -i -u 80:80 +#ftp stream tcp nowait root /usr/sbin/ftpd ftpd -w /home/ftp +#printer stream tcp nowait root /usr/bin/lpd lpd /var/spool/lpd +#telnet stream tcp nowait root /usr/sbin/telnetd telnetd -i diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-cmdline.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-cmdline.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,37 @@ +Display command line in usage output. Useful to debug scripts with variables. +--- busybox-1.23.0/libbb/appletlib.c ++++ busybox-1.23.0/libbb/appletlib.c +@@ -93,9 +93,16 @@ + + #endif /* FEATURE_COMPRESS_USAGE */ + +- ++static char **bb_argv; + void FAST_FUNC bb_show_usage(void) + { ++ full_write2_str("\nCommand line: "); ++ while (*bb_argv) { ++ full_write2_str(*bb_argv++); ++ full_write2_str(" "); ++ } ++ full_write2_str("\n\n"); ++ + if (ENABLE_SHOW_USAGE) { + #ifdef SINGLE_APPLET_STR + /* Imagine that this applet is "true". Dont suck in printf! */ +@@ -615,6 +622,7 @@ + /* If we were called as "busybox..." */ + static int busybox_main(char **argv) + { ++ bb_argv = argv; + if (!argv[1]) { + /* Called without arguments */ + const char *a; +@@ -792,6 +800,7 @@ + int main(int argc UNUSED_PARAM, char **argv) + #endif + { ++ bb_argv = argv; + /* Tweak malloc for reduced memory consumption */ + #ifdef M_TRIM_THRESHOLD + /* M_TRIM_THRESHOLD is the maximum amount of freed top-most memory diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-cpio.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-cpio.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,12 @@ +--- busybox-1.23.0/archival/cpio.c ++++ busybox-1.23.0/archival/cpio.c +@@ -226,6 +226,9 @@ + if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode))) + st.st_size = 0; /* paranoia */ + ++ if (S_ISLNK(st.st_mode)) ++ st.st_nlink = 1; /* like GNU cpio */ ++ + /* Store hardlinks for later processing, dont output them */ + if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) { + struct name_s *n; diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-diet.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-diet.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,110 @@ +--- busybox-1.23.0/include/platform.h ++++ busybox-1.23.0/include/platform.h +@@ -483,6 +483,20 @@ + # undef HAVE_NET_ETHERNET_H + #endif + ++#if defined(__dietlibc__) ++# define __aligned_u64 __u64 __attribute__((aligned(8))) ++# define LOOP_SET_STATUS64 0x4C04 ++# define LOOP_GET_STATUS64 0x4C05 ++# define MAXSYMLINKS 20 ++# define S_TYPEISMQ(x) 0 ++# define S_TYPEISSEM(x) 0 ++# define S_TYPEISSHM(x) 0 ++# undef HAVE_STRVERSCMP ++# undef HAVE_DPRINTF ++# undef HAVE_STRCASESTR ++# define ttyname_r(a,b,c) (strlcpy(b, ttyname(a), c) == 0) ++#endif ++ + /* + * Now, define prototypes for all the functions defined in platform.c + * These must come after all the HAVE_* macros are defined (or not) +--- busybox-1.23.0/networking/ping.c ++++ busybox-1.23.0/networking/ping.c +@@ -29,6 +29,84 @@ + #include + #include "libbb.h" + ++#ifdef __dietlibc__ ++/* Dietlibc is missing the BSD definition 'struct icmp' */ ++/* ++ * Internal of an ICMP Router Advertisement ++ */ ++struct icmp_ra_addr ++{ ++ uint32_t ira_addr; ++ uint32_t ira_preference; ++}; ++ ++struct icmp ++{ ++ uint8_t icmp_type; /* type of message, see below */ ++ uint8_t icmp_code; /* type sub code */ ++ uint16_t icmp_cksum; /* ones complement checksum of struct */ ++ union ++ { ++ uint8_t ih_pptr; /* ICMP_PARAMPROB */ ++ struct in_addr ih_gwaddr; /* gateway address */ ++ struct ih_idseq /* echo datagram */ ++ { ++ uint16_t icd_id; ++ uint16_t icd_seq; ++ } ih_idseq; ++ uint32_t ih_void; ++ ++ /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */ ++ struct ih_pmtu ++ { ++ uint16_t ipm_void; ++ uint16_t ipm_nextmtu; ++ } ih_pmtu; ++ ++ struct ih_rtradv ++ { ++ uint8_t irt_num_addrs; ++ uint8_t irt_wpa; ++ uint16_t irt_lifetime; ++ } ih_rtradv; ++ } icmp_hun; ++#define icmp_pptr icmp_hun.ih_pptr ++#define icmp_gwaddr icmp_hun.ih_gwaddr ++#define icmp_id icmp_hun.ih_idseq.icd_id ++#define icmp_seq icmp_hun.ih_idseq.icd_seq ++#define icmp_void icmp_hun.ih_void ++#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void ++#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu ++#define icmp_num_addrs icmp_hun.ih_rtradv.irt_num_addrs ++#define icmp_wpa icmp_hun.ih_rtradv.irt_wpa ++#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime ++ union ++ { ++ struct ++ { ++ uint32_t its_otime; ++ uint32_t its_rtime; ++ uint32_t its_ttime; ++ } id_ts; ++ struct ++ { ++ struct ip idi_ip; ++ /* options and then 64 bits of data */ ++ } id_ip; ++ struct icmp_ra_addr id_radv; ++ uint32_t id_mask; ++ uint8_t id_data[1]; ++ } icmp_dun; ++#define icmp_otime icmp_dun.id_ts.its_otime ++#define icmp_rtime icmp_dun.id_ts.its_rtime ++#define icmp_ttime icmp_dun.id_ts.its_ttime ++#define icmp_ip icmp_dun.id_ip.idi_ip ++#define icmp_radv icmp_dun.id_radv ++#define icmp_mask icmp_dun.id_mask ++#define icmp_data icmp_dun.id_data ++}; ++#endif /* __dietlibc__ */ ++ + #ifdef __BIONIC__ + /* should be in netinet/ip_icmp.h */ + # define ICMP_DEST_UNREACH 3 /* Destination Unreachable */ diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-diff.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-diff.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,53 @@ +--- busybox-1.23.0/editors/diff.c ++++ busybox-1.23.0/editors/diff.c +@@ -113,6 +113,7 @@ + //usage: "\n -B Ignore changes whose lines are all blank" + //usage: "\n -d Try hard to find a smaller set of changes" + //usage: "\n -i Ignore case differences" ++//usage: "\n -l Ignore symbolic links" + //usage: "\n -L Use LABEL instead of the filename in the unified header" + //usage: "\n -N Treat absent files as empty" + //usage: "\n -q Output only whether files differ" +@@ -143,6 +144,7 @@ + FLAG_b, + FLAG_d, + FLAG_i, ++ FLAG_l, + FLAG_L, /* never used, handled by getopt32 */ + FLAG_N, + FLAG_q, +@@ -756,6 +756,14 @@ + j = fread(buf1, 1, sz, fp[1]); + if (i != j) { + differ = true; ++ /* Ensure we detect binary file even if a file is empty or very ++ short. */ ++ for (k = 0; k < i; k++) ++ if (!buf0[k]) ++ binary = true; ++ for (k = 0; k < j; k++) ++ if (!buf1[k]) ++ binary = true; + i = MIN(i, j); + } + if (i == 0) +@@ -869,7 +879,9 @@ + * Using list.len to specify its length, + * add_to_dirlist will remove it. */ + list[i].len = strlen(p[i]); +- recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS, ++ recursive_action(p[i], ++ (option_mask32 & FLAG(l)) ? ACTION_RECURSE : ++ ACTION_RECURSE | ACTION_FOLLOWLINKS, + add_to_dirlist, skip_dir, &list[i], 0); + /* Sort dl alphabetically. + * GNU diff does this ignoring any number of trailing dots. +@@ -983,7 +995,7 @@ + #if ENABLE_FEATURE_DIFF_LONG_OPTIONS + applet_long_options = diff_longopts; + #endif +- getopt32(argv, "abdiL:NqrsS:tTU:wupBE", ++ getopt32(argv, "abdilL:NqrsS:tTU:wupBE", + &L_arg, &s_start, &opt_U_context); + argv += optind; + while (L_arg) diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-dpkgxz.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-dpkgxz.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,163 @@ +Description: Add support for latest .deb format members + This adds support for control.tar, control.tar.xz, data.tar, data.tar.xz + and data.tar.lzma in the dpkg and dpkg-deb applet. It also removes support + for control.tar.bz2 which has never been supported. + . + This should make these applets conform to deb(5). +Author: Guillem Jover +Origin: vendor +Forwarded: no +Last-Update: 2014-07-30 +Bug-Debian: http://bugs.debian.org/756462 +--- + archival/dpkg.c | 12 ++++++++++-- + archival/dpkg_deb.c | 6 ++++++ + archival/libarchive/Kbuild.src | 1 + + archival/libarchive/filter_accept_list_reassign.c | 11 +++++++++++ + archival/libarchive/get_header_tar_xz.c | 21 +++++++++++++++++++++ + include/bb_archive.h | 1 + + 6 files changed, 50 insertions(+), 2 deletions(-) + create mode 100644 archival/libarchive/get_header_tar_xz.c + +diff --git a/archival/dpkg.c b/archival/dpkg.c +index 2893cfc..71eae66 100644 +--- a/archival/dpkg.c ++++ b/archival/dpkg.c +@@ -1472,11 +1472,12 @@ static void init_archive_deb_control(archive_handle_t *ar_handle) + tar_handle->src_fd = ar_handle->src_fd; + + /* We don't care about data.tar.* or debian-binary, just control.tar.* */ ++ llist_add_to(&(ar_handle->accept), (char*)"control.tar"); + #if ENABLE_FEATURE_SEAMLESS_GZ + llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz"); + #endif +-#if ENABLE_FEATURE_SEAMLESS_BZ2 +- llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2"); ++#if ENABLE_FEATURE_SEAMLESS_XZ ++ llist_add_to(&(ar_handle->accept), (char*)"control.tar.xz"); + #endif + + /* Assign the tar handle as a subarchive of the ar handle */ +@@ -1492,12 +1493,19 @@ static void init_archive_deb_data(archive_handle_t *ar_handle) + tar_handle->src_fd = ar_handle->src_fd; + + /* We don't care about control.tar.* or debian-binary, just data.tar.* */ ++ llist_add_to(&(ar_handle->accept), (char*)"data.tar"); + #if ENABLE_FEATURE_SEAMLESS_GZ + llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz"); + #endif ++#if ENABLE_FEATURE_SEAMLESS_XZ ++ llist_add_to(&(ar_handle->accept), (char*)"data.tar.xz"); ++#endif + #if ENABLE_FEATURE_SEAMLESS_BZ2 + llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2"); + #endif ++#if ENABLE_FEATURE_SEAMLESS_LZMA ++ llist_add_to(&(ar_handle->accept), (char*)"data.tar.lzma"); ++#endif + + /* Assign the tar handle as a subarchive of the ar handle */ + ar_handle->dpkg__sub_archive = tar_handle; +diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c +index 13f9db9..48920f6 100644 +--- a/archival/dpkg_deb.c ++++ b/archival/dpkg_deb.c +@@ -70,10 +70,16 @@ int dpkg_deb_main(int argc, char **argv) + ar_archive->dpkg__sub_archive = tar_archive; + ar_archive->filter = filter_accept_list_reassign; + ++ llist_add_to(&ar_archive->accept, (char*)"data.tar"); ++ llist_add_to(&control_tar_llist, (char*)"control.tar"); + #if ENABLE_FEATURE_SEAMLESS_GZ + llist_add_to(&ar_archive->accept, (char*)"data.tar.gz"); + llist_add_to(&control_tar_llist, (char*)"control.tar.gz"); + #endif ++#if ENABLE_FEATURE_SEAMLESS_XZ ++ llist_add_to(&ar_archive->accept, (char*)"data.tar.xz"); ++ llist_add_to(&control_tar_llist, (char*)"control.tar.xz"); ++#endif + #if ENABLE_FEATURE_SEAMLESS_BZ2 + llist_add_to(&ar_archive->accept, (char*)"data.tar.bz2"); + llist_add_to(&control_tar_llist, (char*)"control.tar.bz2"); +diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src +index 968fdf8..fda05d8 100644 +--- a/archival/libarchive/Kbuild.src ++++ b/archival/libarchive/Kbuild.src +@@ -33,6 +33,7 @@ DPKG_FILES:= \ + get_header_ar.o \ + get_header_tar.o \ + get_header_tar_gz.o \ ++ get_header_tar_xz.o \ + get_header_tar_bz2.o \ + get_header_tar_lzma.o \ + +diff --git a/archival/libarchive/filter_accept_list_reassign.c b/archival/libarchive/filter_accept_list_reassign.c +index 3d19abe..bcfeb96 100644 +--- a/archival/libarchive/filter_accept_list_reassign.c ++++ b/archival/libarchive/filter_accept_list_reassign.c +@@ -28,12 +28,23 @@ char FAST_FUNC filter_accept_list_reassign(archive_handle_t *archive_handle) + name_ptr++; + + /* Modify the subarchive handler based on the extension */ ++ if (strcmp(name_ptr, "tar") == 0 ++ ) { ++ archive_handle->dpkg__action_data_subarchive = get_header_tar; ++ return EXIT_SUCCESS; ++ } + if (ENABLE_FEATURE_SEAMLESS_GZ + && strcmp(name_ptr, "gz") == 0 + ) { + archive_handle->dpkg__action_data_subarchive = get_header_tar_gz; + return EXIT_SUCCESS; + } ++ if (ENABLE_FEATURE_SEAMLESS_XZ ++ && strcmp(name_ptr, "xz") == 0 ++ ) { ++ archive_handle->dpkg__action_data_subarchive = get_header_tar_xz; ++ return EXIT_SUCCESS; ++ } + if (ENABLE_FEATURE_SEAMLESS_BZ2 + && strcmp(name_ptr, "bz2") == 0 + ) { +diff --git a/archival/libarchive/get_header_tar_xz.c b/archival/libarchive/get_header_tar_xz.c +new file mode 100644 +index 0000000..30ac522 +--- /dev/null ++++ b/archival/libarchive/get_header_tar_xz.c +@@ -0,0 +1,21 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * Licensed under GPLv2 or later, see file LICENSE in this source tree. ++ */ ++ ++#include "libbb.h" ++#include "bb_archive.h" ++ ++char FAST_FUNC get_header_tar_xz(archive_handle_t *archive_handle) ++{ ++ /* Can't lseek over pipes */ ++ archive_handle->seek = seek_by_read; ++ ++ fork_transformer_with_sig(archive_handle->src_fd, unpack_xz_stream, "unxz"); ++ archive_handle->offset = 0; ++ while (get_header_tar(archive_handle) == EXIT_SUCCESS) ++ continue; ++ ++ /* Can only do one file at a time */ ++ return EXIT_FAILURE; ++} +diff --git a/include/bb_archive.h b/include/bb_archive.h +index b82cfd8..a356f70 100644 +--- a/include/bb_archive.h ++++ b/include/bb_archive.h +@@ -182,6 +182,7 @@ char get_header_ar(archive_handle_t *archive_handle) FAST_FUNC; + char get_header_cpio(archive_handle_t *archive_handle) FAST_FUNC; + char get_header_tar(archive_handle_t *archive_handle) FAST_FUNC; + char get_header_tar_gz(archive_handle_t *archive_handle) FAST_FUNC; ++char get_header_tar_xz(archive_handle_t *archive_handle) FAST_FUNC; + char get_header_tar_bz2(archive_handle_t *archive_handle) FAST_FUNC; + char get_header_tar_lzma(archive_handle_t *archive_handle) FAST_FUNC; + +-- +1.7.10.4 + diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-fbvnc.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-fbvnc.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,683 @@ + text data bss dec hex filename + 3122 0 0 3122 c32 util-linux/fbvnc.o +--- /dev/null ++++ busybox/util-linux/fbvnc.c +@@ -0,0 +1,551 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * A small linux framebuffer VNC viewer ++ * ++ * pascal.bellard@ads-lu.com ++ * ++ * Based on Ali Gholami Rudi's fbvnc.c ++ * http://repo.or.cz/w/fbvnc.git ++ * ++ * Licensed under GPLv2 or later, see file LICENSE in this source tree. ++ */ ++ ++//applet:IF_FBVNC(APPLET(fbvnc, BB_DIR_BIN, BB_SUID_DROP)) ++ ++//kbuild:lib-$(CONFIG_FBVNC) += fbvnc.o ++ ++//config:config FBVNC ++//config: bool "fbvnc" ++//config: default n ++//config: depends on PLATFORM_LINUX ++//config: help ++//config: A linux framebuffer VNC viewer. ++ ++//usage:#define fbvnc_trivial_usage ++//usage: "[VNC_SERVER] [PORT]" ++//usage:#define fbvnc_full_usage "\n\n" ++//usage: "A linux framebuffer VNC viewer." ++//usage: "\nTo exit, press any mouse button and press ESC." ++ ++#include "libbb.h" ++#include "vnc.h" ++ ++/* Stuff stolen from the kernel's fb.h */ ++#define FB_ACTIVATE_ALL 64 ++enum { ++ FBIOGET_VSCREENINFO = 0x4600, ++ FBIOPUT_VSCREENINFO = 0x4601, ++ FBIOGET_FSCREENINFO = 0x4602, ++ FBIOGETCMAP = 0x4604, ++ FBIOPUTCMAP = 0x4605 ++}; ++ ++struct fb_bitfield { ++ uint32_t offset; /* beginning of bitfield */ ++ uint32_t length; /* length of bitfield */ ++ uint32_t msb_right; /* !=0: Most significant bit is right */ ++}; ++struct fb_var_screeninfo { ++ uint32_t xres; /* visible resolution */ ++ uint32_t yres; ++ uint32_t xres_virtual; /* virtual resolution */ ++ uint32_t yres_virtual; ++ uint32_t xoffset; /* offset from virtual to visible */ ++ uint32_t yoffset; /* resolution */ ++ ++ uint32_t bits_per_pixel; ++ uint32_t grayscale; /* !=0 Graylevels instead of colors */ ++ ++ struct fb_bitfield red; /* bitfield in fb mem if true color, */ ++ struct fb_bitfield green; /* else only length is significant */ ++ struct fb_bitfield blue; ++ struct fb_bitfield transp; /* transparency */ ++ ++ uint32_t nonstd; /* !=0 Non standard pixel format */ ++ ++ uint32_t activate; /* see FB_ACTIVATE_x */ ++ ++ uint32_t height; /* height of picture in mm */ ++ uint32_t width; /* width of picture in mm */ ++ ++ uint32_t accel_flags; /* acceleration flags (hints) */ ++ ++ /* Timing: All values in pixclocks, except pixclock (of course) */ ++ uint32_t pixclock; /* pixel clock in ps (pico seconds) */ ++ uint32_t left_margin; /* time from sync to picture */ ++ uint32_t right_margin; /* time from picture to sync */ ++ uint32_t upper_margin; /* time from sync to picture */ ++ uint32_t lower_margin; ++ uint32_t hsync_len; /* length of horizontal sync */ ++ uint32_t vsync_len; /* length of vertical sync */ ++ uint32_t sync; /* see FB_SYNC_x */ ++ uint32_t vmode; /* see FB_VMODE_x */ ++ uint32_t reserved[6]; /* Reserved for future compatibility */ ++}; ++ ++#define DEFAULTFBDEV FB_0 ++ ++struct fb_fix_screeninfo { ++ char id[16]; /* identification string eg "TT Builtin" */ ++ unsigned long smem_start; /* Start of frame buffer mem */ ++ /* (physical address) */ ++ uint32_t smem_len; /* Length of frame buffer mem */ ++ uint32_t type; /* see FB_TYPE_* */ ++ uint32_t type_aux; /* Interleave for interleaved Planes */ ++ uint32_t visual; /* see FB_VISUAL_* */ ++ uint16_t xpanstep; /* zero if no hardware panning */ ++ uint16_t ypanstep; /* zero if no hardware panning */ ++ uint16_t ywrapstep; /* zero if no hardware ywrap */ ++ uint32_t line_length; /* length of a line in bytes */ ++ unsigned long mmio_start; /* Start of Memory Mapped I/O */ ++ /* (physical address) */ ++ uint32_t mmio_len; /* Length of Memory Mapped I/O */ ++ uint32_t accel; /* Indicate to driver which */ ++ /* specific chip/card we have */ ++ uint16_t reserved[3]; /* Reserved for future compatibility */ ++}; ++ ++struct fb_cmap { ++ uint32_t start; /* First entry */ ++ uint32_t len; /* Number of entries */ ++ uint16_t *red; /* Red values */ ++ uint16_t *green; ++ uint16_t *blue; ++ uint16_t *transp; /* transparency, can be NULL */ ++}; ++ ++#define FB_VISUAL_TRUECOLOR 2 /* True color */ ++ ++#define COLORLEVELS (1 << 8) ++ ++struct scroll_data { ++ int size; ++ int srv_size; ++ int offset; ++ int pos; ++}; ++ ++struct globals { ++ struct termios term_orig; ++ struct pollfd ufds[3]; ++#define kbd_fd ufds[0].fd ++#define vnc_fd ufds[1].fd ++#define rat_fd ufds[2].fd ++ struct scroll_data scroll[2]; ++#define cols scroll[0].size ++#define srv_cols scroll[0].srv_size ++#define oc scroll[0].offset ++#define mc scroll[0].pos ++#define rows scroll[1].size ++#define srv_rows scroll[1].srv_size ++#define or scroll[1].offset ++#define mr scroll[1].pos ++ char rat_buttons; ++ int fb_fd; ++ void *fb_ptr; ++ int bpp; ++ int nr, ng, nb; ++ struct fb_var_screeninfo vinfo; ++ struct fb_fix_screeninfo finfo; ++ unsigned short red[COLORLEVELS], green[COLORLEVELS], blue[COLORLEVELS]; ++}; ++ ++#define G (*ptr_to_globals) ++#define INIT_G() do { \ ++ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ ++} while (0) ++ ++static int fb_len(void) ++{ ++ return G.finfo.line_length * G.vinfo.yres_virtual; ++} ++ ++static void fb_ioctl_cmap(int fct, struct fb_cmap *cmap) ++{ ++ if (G.finfo.visual == FB_VISUAL_TRUECOLOR) ++ return; ++ cmap->start = 0; ++ cmap->len = MAX(G.nr, MAX(G.ng, G.nb)); ++ cmap->transp = NULL; ++ xioctl(G.fb_fd, fct, cmap); ++} ++ ++static void fb_cmap_save(int save) ++{ ++ struct fb_cmap cmap; ++ ++ cmap.red = G.red; ++ cmap.green = G.green; ++ cmap.blue = G.blue; ++ fb_ioctl_cmap(save ? FBIOGETCMAP : FBIOPUTCMAP, &cmap); ++} ++ ++static void fb_build_cmap(unsigned short *color, int n) ++{ ++ int i, inc = 65535 / (n - 1); ++ ++ for (i = 0; n--; i += inc) ++ *color++ = i; ++} ++ ++static void fb_cmap(void) ++{ ++ unsigned short red[COLORLEVELS], green[COLORLEVELS], blue[COLORLEVELS]; ++ struct fb_cmap cmap; ++ ++ fb_build_cmap(cmap.red = red, G.nr); ++ fb_build_cmap(cmap.green = green, G.ng); ++ fb_build_cmap(cmap.blue = blue, G.nb); ++ fb_ioctl_cmap(FBIOPUTCMAP, &cmap); ++} ++ ++static void fb_init(void) ++{ ++ G.fb_fd = xopen(DEFAULTFBDEV, O_RDWR); ++ xioctl(G.fb_fd, FBIOGET_VSCREENINFO, &G.vinfo); ++ xioctl(G.fb_fd, FBIOGET_FSCREENINFO, &G.finfo); ++ close_on_exec_on(G.fb_fd); ++ G.fb_ptr = mmap(NULL, fb_len(), PROT_READ | PROT_WRITE, MAP_SHARED, G.fb_fd, 0); ++ if (G.fb_ptr == MAP_FAILED) ++ bb_perror_msg_and_die("mmap"); ++ G.bpp = (G.vinfo.bits_per_pixel + 7) >> 3; ++ G.nr = 1 << G.vinfo.red.length; ++ G.nb = 1 << G.vinfo.blue.length; ++ G.ng = 1 << G.vinfo.green.length; ++ fb_cmap_save(1); ++ fb_cmap(); ++} ++ ++static void fb_free(void) ++{ ++ fb_cmap_save(0); ++ munmap(G.fb_ptr, fb_len()); ++ close(G.fb_fd); ++} ++ ++#define fb_rows vinfo.yres ++#define fb_cols vinfo.xres ++ ++static void fb_set(int r, int c, void *mem, int len) ++{ ++ memcpy(G.fb_ptr + (r + G.vinfo.yoffset) * G.finfo.line_length + ++ (c + G.vinfo.xoffset) * G.bpp, mem, len * G.bpp); ++} ++ ++#define line_buffer bb_common_bufsiz1 ++#define MAXPIX (sizeof(line_buffer)/sizeof(uint32_t)) ++ ++static void skip(int len) ++{ ++ int n; ++ while (len > 0 && (n = read(G.vnc_fd, line_buffer, ++ MIN(len, sizeof(line_buffer)))) > 0) ++ len -= n; ++} ++ ++static void vnc_init(void) ++{ ++ struct vnc_client_init clientinit; ++ struct vnc_server_init serverinit; ++ struct vnc_client_pixelfmt pixfmt_cmd; ++ int connstat = VNC_CONN_FAILED; ++ ++ write(G.vnc_fd, "RFB 003.003\n", 12); ++ skip(12); ++ ++ xread(G.vnc_fd, &connstat, sizeof(connstat)); ++ ++ if (ntohl(connstat) != VNC_CONN_NOAUTH) ++ bb_perror_msg_and_die("vnc auth"); ++ ++ clientinit.shared = 1; ++ write(G.vnc_fd, &clientinit, sizeof(clientinit)); ++ read(G.vnc_fd, &serverinit, sizeof(serverinit)); ++ ++ fb_init(); ++ G.srv_cols = ntohs(serverinit.w); ++ G.srv_rows = ntohs(serverinit.h); ++ G.cols = MIN(G.srv_cols, G.fb_cols); ++ G.rows = MIN(G.srv_rows, G.fb_rows); ++ G.mr = G.rows / 2; ++ G.mc = G.cols / 2; ++ ++ skip(ntohl(serverinit.len)); ++ pixfmt_cmd.type = VNC_CLIENT_PIXFMT; ++ pixfmt_cmd.format.bigendian = 0; ++ pixfmt_cmd.format.truecolor = 1; ++ pixfmt_cmd.format.bpp = ++ pixfmt_cmd.format.depth = G.bpp << 3; ++ pixfmt_cmd.format.rmax = htons(G.nr - 1); ++ pixfmt_cmd.format.gmax = htons(G.ng - 1); ++ pixfmt_cmd.format.bmax = htons(G.nb - 1); ++ pixfmt_cmd.format.rshl = G.vinfo.red.offset; ++ pixfmt_cmd.format.gshl = G.vinfo.green.offset; ++ pixfmt_cmd.format.bshl = G.vinfo.blue.offset; ++ write(G.vnc_fd, &pixfmt_cmd, sizeof(pixfmt_cmd)); ++} ++ ++static void vnc_refresh(int inc) ++{ ++ struct vnc_client_fbup fbup_req; ++ fbup_req.type = VNC_CLIENT_FBUP; ++ fbup_req.inc = inc; ++ fbup_req.x = htons(G.oc); ++ fbup_req.y = htons(G.or); ++ fbup_req.w = htons(G.oc + G.cols); ++ fbup_req.h = htons(G.or + G.rows); ++ write(G.vnc_fd, &fbup_req, sizeof(fbup_req)); ++} ++ ++static void cleanup(void) ++{ ++#define RESETSTR "\x1b[?25h\x1b[2J\x1b[H" ++ fb_free(); ++ tcsetattr_stdin_TCSANOW(&G.term_orig); ++ write(STDOUT_FILENO, RESETSTR, sizeof(RESETSTR)); ++ if (ENABLE_FEATURE_CLEAN_UP) { ++ close(G.vnc_fd); ++ close(G.rat_fd); ++ } ++} ++ ++static void killed(int code) NORETURN; ++static void killed(int code) ++{ ++ cleanup(); ++ if (code > EXIT_FAILURE) ++ kill_myself_with_sig(code); ++ exit(code); ++} ++ ++static void vnc_event(void) ++{ ++ struct vnc_rect uprect; ++ union { ++ struct vnc_server_fbup fbup; ++ struct vnc_server_cuttext cuttext; ++ struct vnc_server_colormap colormap; ++ } msg; ++ int n; ++ ++ switch (xread_char(G.vnc_fd)) { ++ case VNC_SERVER_FBUP: ++ xread(G.vnc_fd, &msg.fbup.pad, sizeof(msg.fbup) - 1); ++ n = ntohs(msg.fbup.n); ++ while (n--) { ++ int x, y, w, h, l, i; ++ xread(G.vnc_fd, &uprect, sizeof(uprect)); ++ if (uprect.enc != 0) ++ killed(1); ++ i = 0; ++ x = ntohs(uprect.x) - G.oc; ++ y = ntohs(uprect.y) - G.or; ++ w = ntohs(uprect.w); ++ h = ntohs(uprect.h); ++ l = MIN(w, G.cols - x); ++ if (x < 0) { ++ l = MIN(w + x, G.cols); ++ i = -x; ++ x = 0; ++ } ++ for (; h--; y++) { ++ int a, b, c = i; ++ for (a = b = 0; w > b; b += a, c = 0) { ++ int len; ++ a = MIN(w - b, MAXPIX); ++ len = MIN(a, l - b) - c; ++ xread(G.vnc_fd, line_buffer, a * G.bpp); ++ if (y >= 0 && y < G.rows && len > 0) ++ fb_set(y, x + b, ++ line_buffer + (c * G.bpp), ++ len); ++ } ++ } ++ } ++ break; ++ case VNC_SERVER_BELL: ++ break; ++ case VNC_SERVER_CUTTEXT: ++ xread(G.vnc_fd, &msg.cuttext.pad1, sizeof(msg.cuttext) - 1); ++ skip(ntohl(msg.cuttext.len)); ++ break; ++ case VNC_SERVER_COLORMAP: ++ xread(G.vnc_fd, &msg.colormap.pad, sizeof(msg.colormap) - 1); ++ skip(ntohs(msg.colormap.n) * 3 * 2); ++ break; ++ default: ++ killed(1); ++ } ++} ++ ++static int update_scroll(struct scroll_data *s) ++{ ++ int shift = s->size / 5; ++ int max = s->srv_size - s->size; ++ int status = 0; ++ if (s->pos < s->offset) { ++ if ((s->offset -= shift) < 0) ++ s->offset = 0; ++ } ++ else if (s->pos >= s->offset + s->size && s->offset < max) { ++ if ((s->offset += shift) > max) ++ s->offset = max; ++ } ++ else status++; ++ s->pos = MAX(s->offset, MIN(s->offset + s->size - 1, s->pos)); ++ return status; ++} ++ ++static void rat_event(void) ++{ ++ static u8 btn2vnc[8] = { ++ 0, VNC_BUTTON1_MASK, VNC_BUTTON3_MASK, ++ VNC_BUTTON1_MASK + VNC_BUTTON3_MASK, VNC_BUTTON2_MASK, ++ VNC_BUTTON1_MASK + VNC_BUTTON2_MASK, ++ VNC_BUTTON2_MASK + VNC_BUTTON3_MASK, ++ VNC_BUTTON1_MASK + VNC_BUTTON2_MASK + VNC_BUTTON3_MASK ++ }; ++ signed char ie[4]; ++ struct vnc_client_ratevent me = {VNC_CLIENT_RATEVENT}; ++ int refresh; ++ ++ xread(G.rat_fd, &ie, sizeof(ie)); ++ G.mc += ie[1]; ++ G.mr -= ie[2]; ++ refresh = 2 - update_scroll(&G.scroll[0]) - update_scroll(&G.scroll[1]); ++ me.mask = btn2vnc[G.rat_buttons = ie[0] & 7]; ++ if (ie[3] > 0) /* wheel up */ ++ me.mask |= VNC_BUTTON4_MASK; ++ if (ie[3] < 0) /* wheel down */ ++ me.mask |= VNC_BUTTON5_MASK; ++ me.y = htons(G.mr); ++ me.x = htons(G.mc); ++ write(G.vnc_fd, &me, sizeof(me)); ++ if (refresh) ++ vnc_refresh(0); ++} ++ ++static int press(int key, int down) ++{ ++ struct vnc_client_keyevent ke = {VNC_CLIENT_KEYEVENT}; ++ ke.key = htonl(key); ++ ke.down = down; ++ return write(G.vnc_fd, &ke, sizeof(ke)); ++} ++ ++static void kbd_event(void) ++{ ++ char key[1024]; ++ int i, nr; ++ ++ if ((nr = read(0, key, sizeof(key))) <= 0 ) ++ killed(1); ++ for (i = 0; i < nr; i++) { ++ int j, k; ++ int mod[4]; ++ int nmod; ++ ++ k = nmod = 0; ++ switch (key[i]) { ++ case 0x08: ++ case 0x7f: ++ k = 0xff08; ++ break; ++ case 0x1b: ++ if (G.rat_buttons) ++ killed(0); ++ if (i + 2 < nr && key[i + 1] == '[') { ++ static const char arr2vnc[] = "HDACB"; ++ char *p = strchr(arr2vnc, key[i + 2]); ++ ++ if (p) { ++ k = p - arr2vnc + 0xff50; ++ i += 2; ++ break; ++ } ++ } ++ if (i + 1 < nr) { ++ mod[nmod++] = 0xffe9; ++ i++; ++ } ++ case 0x09: ++ case 0x0d: ++ k = 0xff00; ++ goto getkey; ++ case 0x0c: /* Mouse button + ^L: redraw */ ++ if (G.rat_buttons) { ++ vnc_refresh(0); ++ continue; ++ } ++ default: ++ getkey: ++ k += (unsigned char) key[i]; ++ } ++ if ((k >= 'A' && k <= 'Z') || strchr(":\"<>?{}|+_()*&^%$#@!~", k)) ++ mod[nmod++] = 0xffe1; ++ if (k >= 1 && k <= 26) { ++ k += 'a' - 1; ++ mod[nmod++] = 0xffe3; ++ } ++ mod[nmod] = k; ++ for (j = 0; j <= nmod; j++) ++ press(mod[j], 1); ++ press(k, 0); ++ for (j = 0; j < nmod; j++) ++ press(mod[j], 0); ++ } ++} ++ ++static void term_setup(void) ++{ ++ struct termios termios; ++#define INITSTR "\x1b[?25l\x1b[2J\x1b[H** fbvnc **" ++ ++ write(STDOUT_FILENO, INITSTR, sizeof(INITSTR)); ++ tcgetattr (STDIN_FILENO, &termios); ++ G.term_orig = termios; ++ cfmakeraw(&termios); ++ tcsetattr_stdin_TCSANOW(&termios); ++} ++ ++int fbvnc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; ++int fbvnc_main(int argc, char **argv) ++{ ++ char *host = (char *) "127.0.0.1"; ++ int port, pending = 0; ++ ++ INIT_G(); ++ if (argc >= 2) ++ host = argv[1]; ++ port = bb_lookup_port((argc >= 3) ? argv[2] : "vnc", "tcp", 5900); ++ G.vnc_fd = create_and_connect_stream_or_die(host, port); ++ vnc_init(); ++ G.rat_fd = open("/dev/input/mice", O_RDWR); ++ write(G.rat_fd, "\xf3\xc8\xf3\x64\xf3\x50", 6); /* for using mouse wheel */ ++ read(G.rat_fd, line_buffer, 1); ++ term_setup(); ++ atexit(cleanup); ++ bb_signals(BB_FATAL_SIGS, killed); ++ ++ G.ufds[0].events = ++ G.ufds[1].events = ++ G.ufds[2].events = POLLIN; ++ vnc_refresh(0); ++ while (1) { ++ int status = poll(G.ufds, 3, 500); ++ if (status == -1 && errno != EINTR) ++ killed(1); ++ if (!status) ++ continue; ++ if (G.ufds[0].revents & POLLIN) ++ kbd_event(); ++ if (G.ufds[1].revents & POLLIN) { ++ vnc_event(); ++ pending = 0; ++ } ++ if (G.ufds[2].revents & POLLIN) ++ rat_event(); ++ if (!pending++) ++ vnc_refresh(1); ++ } ++} +--- /dev/null ++++ busybox/util-linux/vnc.h +@@ -0,0 +1,124 @@ ++#define VNC_CONN_FAILED 0 ++#define VNC_CONN_NOAUTH 1 ++#define VNC_CONN_AUTH 2 ++ ++#define VNC_AUTH_OK 0 ++#define VNC_AUTH_FAILED 1 ++#define VNC_AUTH_TOOMANY 2 ++ ++#define VNC_SERVER_FBUP 0 ++#define VNC_SERVER_COLORMAP 1 ++#define VNC_SERVER_BELL 2 ++#define VNC_SERVER_CUTTEXT 3 ++ ++#define VNC_CLIENT_PIXFMT 0 ++#define VNC_CLIENT_COLORMAP 1 ++#define VNC_CLIENT_SETENC 2 ++#define VNC_CLIENT_FBUP 3 ++#define VNC_CLIENT_KEYEVENT 4 ++#define VNC_CLIENT_RATEVENT 5 ++#define VNC_CLIENT_CUTTEXT 6 ++ ++#define VNC_ENC_RAW 0 ++#define VNC_ENC_COPYRECT 1 ++#define VNC_ENC_RRE 2 ++#define VNC_ENC_CORRE 4 ++#define VNC_ENC_HEXTILE 5 ++ ++#define VNC_BUTTON1_MASK 0x01 ++#define VNC_BUTTON2_MASK 0x02 ++#define VNC_BUTTON3_MASK 0x04 ++#define VNC_BUTTON4_MASK 0x10 ++#define VNC_BUTTON5_MASK 0x08 ++ ++typedef unsigned char u8; ++typedef unsigned short u16; ++typedef unsigned int u32; ++ ++struct vnc_pixelfmt { ++ u8 bpp; ++ u8 depth; ++ u8 bigendian; ++ u8 truecolor; ++ u16 rmax; ++ u16 gmax; ++ u16 bmax; ++ u8 rshl; ++ u8 gshl; ++ u8 bshl; ++ ++ u8 pad1; ++ u16 pad2; ++}; ++ ++struct vnc_client_init { ++ u8 shared; ++}; ++ ++struct vnc_server_init { ++ u16 w; ++ u16 h; ++ struct vnc_pixelfmt fmt; ++ u32 len; ++ /* char name[len]; */ ++}; ++ ++struct vnc_rect { ++ u16 x, y; ++ u16 w, h; ++ u32 enc; ++ /* rect bytes */ ++}; ++ ++struct vnc_server_fbup { ++ u8 type; ++ u8 pad; ++ u16 n; ++ /* struct vnc_rect rects[n]; */ ++}; ++ ++struct vnc_server_cuttext { ++ u8 type; ++ u8 pad1; ++ u16 pad2; ++ u32 len; ++ /* char text[length] */ ++}; ++ ++struct vnc_server_colormap { ++ u8 type; ++ u8 pad; ++ u16 first; ++ u16 n; ++ /* u8 colors[n * 3 * 2]; */ ++}; ++ ++struct vnc_client_pixelfmt { ++ u8 type; ++ u8 pad1; ++ u16 pad2; ++ struct vnc_pixelfmt format; ++}; ++ ++struct vnc_client_fbup { ++ u8 type; ++ u8 inc; ++ u16 x; ++ u16 y; ++ u16 w; ++ u16 h; ++}; ++ ++struct vnc_client_keyevent { ++ u8 type; ++ u8 down; ++ u16 pad; ++ u32 key; ++}; ++ ++struct vnc_client_ratevent { ++ u8 type; ++ u8 mask; ++ u16 x; ++ u16 y; ++}; diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-ftpd.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-ftpd.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,63 @@ +Keep anonynous default usage, need -a for authentication check +--- busybox-1.23.0/networking/ftpd.c ++++ busybox-1.23.0/networking/ftpd.c +@@ -13,7 +13,7 @@ + */ + + //usage:#define ftpd_trivial_usage +-//usage: "[-wvS] [-t N] [-T N] [DIR]" ++//usage: "[-wvSa] [-t N] [-T N] [DIR]" + //usage:#define ftpd_full_usage "\n\n" + //usage: "Anonymous FTP server\n" + //usage: "\n" +@@ -25,6 +25,7 @@ + //usage: "\n -w Allow upload" + //usage: "\n -v Log errors to stderr. -vv: verbose log" + //usage: "\n -S Log errors to syslog. -SS: verbose log" ++//usage: "\n -a Authentication check" + //usage: "\n -t,-T Idle and absolute timeouts" + //usage: "\n DIR Change root to this directory" + +@@ -1106,7 +1107,8 @@ + #endif + OPT_v = (1 << ((!BB_MMU) * 3 + 0)), + OPT_S = (1 << ((!BB_MMU) * 3 + 1)), +- OPT_w = (1 << ((!BB_MMU) * 3 + 2)) * ENABLE_FEATURE_FTP_WRITE, ++ OPT_a = (1 << ((!BB_MMU) * 3 + 2)), ++ OPT_w = (1 << ((!BB_MMU) * 3 + 3)) * ENABLE_FEATURE_FTP_WRITE, + }; + + int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +@@ -1127,9 +1129,9 @@ + G.timeout = 2 * 60; + opt_complementary = "t+:T+:vv:SS"; + #if BB_MMU +- opts = getopt32(argv, "vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S); ++ opts = getopt32(argv, "vSa" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S); + #else +- opts = getopt32(argv, "l1AvS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S); ++ opts = getopt32(argv, "l1AvSa" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S); + if (opts & (OPT_l|OPT_1)) { + /* Our secret backdoor to ls */ + /* TODO: pass --group-directories-first? would be nice, but ls doesn't do that yet */ +@@ -1193,7 +1195,8 @@ + signal(SIGALRM, timeout_handler); + + #if ENABLE_FEATURE_FTP_AUTHENTICATION +- { ++ if (opts & OPT_a) { ++ { + struct passwd *pw = NULL; + + while (1) { +@@ -1216,8 +1219,9 @@ + } + } + change_identity(pw); ++ } ++ WRITE_OK(FTP_LOGINOK); + } +- WRITE_OK(FTP_LOGINOK); + #endif + + /* Do this after auth, else /etc/passwd is not accessible */ diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-losetup.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-losetup.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,27 @@ +keep previous default behaviour and display cloop devices +--- busybox-1.23.0/util-linux/losetup.c ++++ busybox-1.23.0/util-linux/losetup.c +@@ -71,16 +71,20 @@ + + /* -a */ +- if (opt == OPT_a) { ++ if (opt == OPT_a || (!opt && !argv[0])) { +- int n; ++ int i, n; ++ static char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; ++ ++ for (i = 0; i < 3; i++) + for (n = 0; n < MAX_LOOP_NUM; n++) { + char *s; + +- sprintf(dev, LOOP_FORMAT, n); ++ sprintf(dev, fmt[i], n); + s = query_loop(dev); + if (s) { + printf("%s: %s\n", dev, s); + free(s); + } ++ if (i == 1) break; /* /dev/cloop */ + } + return EXIT_SUCCESS; + } diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-printable.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-printable.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,24 @@ +fix the bug of 'ls cannot display utf-8 filenames' +--- busybox-1.17.3/libbb/printable_string.c ++++ busybox-printable/libbb/printable_string.c +@@ -31,8 +31,8 @@ + } + if (c < ' ') + break; +- if (c >= 0x7f) +- break; ++ /* if (c >= 0x7f) */ ++ /* break; */ + s++; + } + +@@ -45,7 +45,8 @@ + unsigned char c = *d; + if (c == '\0') + break; +- if (c < ' ' || c >= 0x7f) ++ /* if (c < ' ' || c >= 0x7f) */ ++ if (c < ' ') + *d = '?'; + d++; + } diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-ris.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-ris.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,92 @@ +Add support for the Windows Remote Installation Service +--- busybox-1.23.0/networking/Config.src ++++ busybox-1.23.0/networking/Config.src +@@ -827,6 +827,15 @@ + comment "Common options for tftp/tftpd" + depends on TFTP || TFTPD + ++config FEATURE_TFTPD_RIS ++ bool "Enable \"RIS\" support" ++ default y ++ depends on TFTPD ++ help ++ Add support for the Windows Remote Installation Service. This allows ++ a client to get files starting with \ without respecting case. ++ Each \ will be replaced by a /. ++ + config FEATURE_TFTP_GET + bool "Enable 'tftp get' and/or tftpd upload code" + default y +--- busybox-1.23.0/networking/tftp.c ++++ busybox-1.23.0/networking/tftp.c +@@ -673,6 +673,59 @@ + #undef remote_file + } + ++#if ENABLE_FEATURE_TFTPD_RIS ++#include ++ ++static int lookup_entry(const char *search, char *unixpath); ++static void unixfilename(char *filename); ++ ++// lookup search and concat real filename to unixpath ++static int lookup_entry(const char *search, char *unixpath) ++{ ++ int status = 0; ++ DIR *dirp = opendir(unixpath[0] ? unixpath : "."); ++ ++ if (dirp != NULL) { ++ struct dirent *entry; ++ ++ while ((entry = readdir(dirp))) { ++ if (!strcasecmp(entry->d_name, search)) { ++ if (unixpath[0]) strcat(unixpath, "/"); ++ strcat(unixpath, entry->d_name); ++ status++; ++ break; ++ } ++ } ++ closedir(dirp); ++ } ++ return status; ++} ++ ++// update filename with real file path found ++static void unixfilename(char *filename) ++{ ++ char unixpath[PATH_MAX]; ++ char *s = unixpath + 1; ++ char *check = filename + 1; ++ int len; ++ ++ for (unixpath[0] = 0; *check; len++, s += len, check += len) { ++ char *seek = strchr(check, '\\'); ++ ++ if (!seek) { // basename of filename ++ if (lookup_entry(check, unixpath)) ++ strcpy(filename, unixpath); // found ++ break; ++ } ++ len = seek - check; ++ memcpy(s, check, len); ++ s[len] = '\0'; ++ if (!lookup_entry(s, unixpath)) ++ break; // path mismatch ++ } ++} ++#endif ++ + #if ENABLE_TFTP + + int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +@@ -820,6 +873,10 @@ + G.block_buf_tail[0] = '\0'; + + local_file = G.block_buf + 2; ++#if ENABLE_FEATURE_TFTPD_RIS ++ if (local_file[0] == '\\') ++ unixfilename(local_file); ++#endif + if (local_file[0] == '.' || strstr(local_file, "/.")) { + error_msg = "dot in file name"; + goto err; diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-shutdown.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-shutdown.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,63 @@ +--- busybox-1.23/init/halt.c ++++ busybox-1.23/init/halt.c +@@ -10,6 +10,7 @@ + //applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP)) + //applet:IF_HALT(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff)) + //applet:IF_HALT(APPLET_ODDNAME(reboot, halt, BB_DIR_SBIN, BB_SUID_DROP, reboot)) ++//applet:IF_HALT(APPLET_ODDNAME(shutdown, halt, BB_DIR_SBIN, BB_SUID_DROP, shutdown)) + + //kbuild:lib-$(CONFIG_HALT) += halt.o + +@@ -65,6 +66,15 @@ + //usage: "\n -d SEC Delay interval" + //usage: "\n -n Do not sync" + //usage: "\n -f Force (don't go through init)" ++//usage: ++//usage:#define shutdown_trivial_usage ++//usage: "[-rhHP]" ++//usage:#define shutdown_full_usage "\n\n" ++//usage: "Bring the system down\n" ++//usage: "\n -r Do reboot" ++//usage: "\n -h Do poweroff" ++//usage: "\n -H Do halt" ++//usage: "\n -P Do poweroff" + + #include "libbb.h" + #include "reboot.h" +@@ -98,6 +108,7 @@ + int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int halt_main(int argc UNUSED_PARAM, char **argv) + { ++ enum { HALT=0, POWEROFF=1, REBOOT=2, SHUTDOWN=3 }; + static const int magic[] = { + RB_HALT_SYSTEM, + RB_POWER_OFF, +@@ -109,9 +120,19 @@ + int which, flags, rc; + + /* Figure out which applet we're running */ +- for (which = 0; "hpr"[which] != applet_name[0]; which++) ++ for (which = 0; "hprs"[which] != applet_name[0]; which++) + continue; + ++ if (which == SHUTDOWN) { ++ which = REBOOT; ++ switch (getopt32(argv, "rhPH")) { ++ case 2: ++ case 4: which = POWEROFF; break; ++ case 8: which = HALT; ++ } ++ flags = 0; ++ } ++ else { + /* Parse and handle arguments */ + opt_complementary = "d+"; /* -d N */ + /* We support -w even if !ENABLE_FEATURE_WTMP, +@@ -119,6 +140,7 @@ + * -i (shut down network interfaces) is ignored. + */ + flags = getopt32(argv, "d:nfwi", &delay); ++ } + + sleep(delay); + diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-stat.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-stat.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,74 @@ +Add non standard stat -m support to display file block list +Useful to patch read-only filesystems such as ISO9660, for defragmentation +tools or boot loaders +--- busybox-1.23.0/coreutils/stat.c ++++ busybox-1.23.0/coreutils/stat.c +@@ -23,6 +23,7 @@ + //usage: "\n -f Display filesystem status" + //usage: "\n -L Follow links" + //usage: "\n -t Display info in terse form" ++//usage: "\n -m Display block list" + //usage: IF_SELINUX( + //usage: "\n -Z Print security context" + //usage: ) +@@ -73,11 +74,13 @@ + //usage: ) + + #include "libbb.h" ++#include + + #define OPT_FILESYS (1 << 0) + #define OPT_TERSE (1 << 1) + #define OPT_DEREFERENCE (1 << 2) +-#define OPT_SELINUX (1 << 3) ++#define OPT_MAP (1 << 3) ++#define OPT_SELINUX (1 << 4) + + #if ENABLE_FEATURE_STAT_FORMAT + typedef bool (*statfunc_ptr)(const char *, const char *); +@@ -425,6 +428,26 @@ + + /* Stat the file system and print what we find. */ + #if !ENABLE_FEATURE_STAT_FORMAT ++#define do_mapfile(filename, format) do_mapfile(filename) ++#endif ++static bool do_mapfile(const char *filename, const char *format) ++{ ++ int i = 0; ++ int fd = xopen(filename, O_RDONLY); ++ ++#if ENABLE_FEATURE_STAT_FORMAT ++ (void) format; ++#endif ++ while (1) { ++ int blk = i++; ++ if (ioctl(fd,FIBMAP,&blk) < 0 || blk == 0) break; ++ printf("%u\n",blk); ++ } ++ return 1; ++} ++ ++/* Stat the file system and print what we find. */ ++#if !ENABLE_FEATURE_STAT_FORMAT + #define do_statfs(filename, format) do_statfs(filename) + #endif + static bool do_statfs(const char *filename, const char *format) +@@ -721,7 +744,7 @@ + statfunc_ptr statfunc = do_stat; + + opt_complementary = "-1"; /* min one arg */ +- opts = getopt32(argv, "ftL" ++ opts = getopt32(argv, "ftLm" + IF_SELINUX("Z") + IF_FEATURE_STAT_FORMAT("c:", &format) + ); +@@ -732,6 +755,9 @@ + selinux_or_die(); + } + #endif ++ if (opts & OPT_MAP) { /* -m */ ++ statfunc = do_mapfile; ++ } + ok = 1; + argv += optind; + for (i = 0; argv[i]; ++i) diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-tar.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-tar.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,18 @@ +Accept and ignore --wildcards argument +--- busybox-1.23.0/archival/tar.c ++++ busybox-1.23.0/archival/tar.c +@@ -928,10 +928,12 @@ + # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME + "touch\0" No_argument "m" + # endif +- "no-recursion\0" No_argument "\xfa" ++ "no-recursion\0" No_argument "\xf9" + # if ENABLE_FEATURE_TAR_TO_COMMAND +- "to-command\0" Required_argument "\xfb" ++ "to-command\0" Required_argument "\xfa" + # endif ++ /* ignore --wildcards */ ++ "wildcards\0" No_argument "\xfb" + /* use numeric uid/gid from tar header, not textual */ + "numeric-owner\0" No_argument "\xfc" + /* do not restore mode */ diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/patches/busybox-1.23-zmodules.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/patches/busybox-1.23-zmodules.u Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,26 @@ +Add LZMA_DEFAULT_MAGIC support +--- busybox-1.23/archival/libarchive/open_transformer.c ++++ busybox-1.23/archival/libarchive/open_transformer.c +@@ -178,6 +178,22 @@ + /* .gz and .bz2 both have 2-byte signature, and their + * unpack_XXX_stream wants this header skipped. */ + xread(fd, magic.b16, sizeof(magic.b16[0])); ++#if 1 ++// SliTaz uses .gz suffix for lzma'd kernel modules ++#if BB_BIG_ENDIAN ++#define LZMA_DEFAULT_MAGIC 0x5d00 ++#else ++#define LZMA_DEFAULT_MAGIC 0x5d ++#endif ++ if (ENABLE_FEATURE_SEAMLESS_LZMA ++ && magic.b16[0] == LZMA_DEFAULT_MAGIC ++ ) { ++ xlseek(fd, offset, SEEK_CUR); ++ xstate->xformer = unpack_lzma_stream; ++ USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";) ++ goto found_magic; ++ } ++#endif + if (ENABLE_FEATURE_SEAMLESS_GZ + && magic.b16[0] == GZIP_MAGIC + ) { diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/syslog.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/syslog.conf Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,8 @@ +# /etc/syslog.conf Configuration file for syslogd. + +*.*;auth,authpriv.none /var/log/messages +auth,authpriv.* /var/log/auth.log +cron.* /var/log/cron.log +daemon.* /var/log/daemon.log +mail.* /var/log/mail.log +lpr.* /var/log/lpr.log diff -r e929c7543035 -r 654ef6aa1962 busybox/stuff/udhcp.script --- a/busybox/stuff/udhcp.script Mon Mar 04 18:42:23 2019 +0100 +++ b/busybox/stuff/udhcp.script Wed Nov 09 15:12:00 2022 +0000 @@ -16,6 +16,9 @@ logger "$0 interface=$interface ip=$ip broadcast=$broadcast subnet=$subnet router=$router domain=$domain dns=$dns $@" +skip=$(sed "/skipdhcpip=/!d;s/.*skipdhcpip=\([^ ]*\).*/\1/" + + + + 404 Not Found + + + + +
+

SliTaz Web Server

+
+ + +
+

Not Found

+ +

The requested URL was not found on this server.

+ + +
+ + + + + + + diff -r e929c7543035 -r 654ef6aa1962 bzip2-dev/receipt --- a/bzip2-dev/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/bzip2-dev/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="bzip2-dev" -VERSION="1.0.6" +VERSION="1.0.8" CATEGORY="development" SHORT_DESC="High-quality data compressor dev files." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 bzip2/receipt --- a/bzip2/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/bzip2/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,13 +1,13 @@ # SliTaz package receipt. PACKAGE="bzip2" -VERSION="1.0.6" +VERSION="1.0.8" CATEGORY="utilities" SHORT_DESC="High-quality data compressor." MAINTAINER="pankso@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.bzip.org/" -WGET_URL="http://www.bzip.org/$VERSION/$TARBALL" +WGET_URL="http://sourceware.org/pub//$PACKAGE/$TARBALL" DEPENDS="bzlib" BUILD_DEPENDS="gcc" TAGS="compression archive" diff -r e929c7543035 -r 654ef6aa1962 bzlib/receipt --- a/bzlib/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/bzlib/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="bzlib" -VERSION="1.0.6" +VERSION="1.0.8" CATEGORY="utilities" SHORT_DESC="High-quality data compressor libraries." DEPENDS="glibc-base" diff -r e929c7543035 -r 654ef6aa1962 gcc-lib-base/receipt --- a/gcc-lib-base/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gcc-lib-base/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gcc-lib-base" -VERSION="4.5.2" +VERSION="4.9.2" CATEGORY="development" SHORT_DESC="GCC base libraries, libgcc_s and libstdc++." WEB_SITE="http://gcc.gnu.org/" diff -r e929c7543035 -r 654ef6aa1962 gcc/receipt --- a/gcc/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gcc/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gcc" -VERSION="4.5.2" +VERSION="4.9.2" CATEGORY="development" SHORT_DESC="The the GNU Compiler Collection." MAINTAINER="pankso@slitaz.org" @@ -119,6 +119,10 @@ { cd $src + # Patch for compile with kernel 2.6 branch (thanks TimeSys) + # see http://repository.timesys.com/buildsources/ + patch -Np1 < $stuff/gcc-$VERSION-EVIOCGPROP_fix-1.patch + patch -Np1 < $stuff/gcc-$VERSION-libsanitizer_fix-1.patch # SliTaz is a Busybox based OS, why we so small and fast. Using gawk by # default to build package will not ensure package work with Busybox awk diff -r e929c7543035 -r 654ef6aa1962 gcc/stuff/gcc-4.9.2-EVIOCGPROP_fix-1.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gcc/stuff/gcc-4.9.2-EVIOCGPROP_fix-1.patch Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,22 @@ +Author: Jaret Cantu +Date: Thu Nov 20 13:10:47 EST 2014 + + Check for the existence of EVIOCGPROP() + + The EV_VERSION in 2.6.37 falls within the check, but EVIOCGPROP was not + introduced until 2.6.38. + +--- gcc-4.9.2/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2014-11-20 13:07:38.462155257 -0500 ++++ gcc-4.9.2/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2014-11-20 13:08:29.098945193 -0500 +@@ -672,7 +672,11 @@ namespace __sanitizer { + unsigned IOCTL_EQL_SETSLAVECFG = EQL_SETSLAVECFG; + #if EV_VERSION > (0x010000) + unsigned IOCTL_EVIOCGKEYCODE_V2 = EVIOCGKEYCODE_V2; ++#ifdef EVIOCGPROP + unsigned IOCTL_EVIOCGPROP = EVIOCGPROP(0); ++#else ++ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; ++#endif + unsigned IOCTL_EVIOCSKEYCODE_V2 = EVIOCSKEYCODE_V2; + #else + unsigned IOCTL_EVIOCGKEYCODE_V2 = IOCTL_NOT_PRESENT; diff -r e929c7543035 -r 654ef6aa1962 gcc/stuff/gcc-4.9.2-libsanitizer_fix-1.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gcc/stuff/gcc-4.9.2-libsanitizer_fix-1.patch Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,86 @@ +2013-12-10 Jakub Jelinek + + * sanitizer_common/Makefile.am (AM_CPPFLAGS): Add + -isystem $(top_srcdir)/include/system. + * sanitizer_common/Makefile.in: Regenerated. + * include/system/linux/aio_abi.h: New header. + * include/system/linux/mroute.h: New header. + * include/system/linux/mroute6.h: New header. + * include/system/linux/perf_event.h: New header. + * include/system/linux/types.h: New header. + +--- a/libsanitizer/sanitizer_common/Makefile.am 2013-12-10 09:55:19.000000000 +0100 ++++ b/libsanitizer/sanitizer_common/Makefile.am 2013-12-10 09:56:36.748472017 +0100 +@@ -1,5 +1,5 @@ +-AM_CPPFLAGS = -I $(top_srcdir)/include +- ++AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system ++ + # May be used by toolexeclibdir. + gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + +--- a/libsanitizer/include/system/linux/mroute.h 2013-12-10 09:56:03.888640325 +0100 ++++ b/libsanitizer/include/system/linux/mroute.h 2013-12-10 09:56:03.888640325 +0100 +@@ -0,0 +1,8 @@ ++#include ++/* before 2.6.26 included ++ which clashes with userspace headers. */ ++#if LINUX_VERSION_CODE < 132634 ++#define _LINUX_IN_H ++#include ++#endif ++#include_next +--- a/libsanitizer/include/system/linux/aio_abi.h 2013-12-10 09:56:03.887640312 +0100 ++++ b/libsanitizer/include/system/linux/aio_abi.h 2013-12-10 09:56:03.887640312 +0100 +@@ -0,0 +1,7 @@ ++#include ++#include_next ++/* IOCB_CMD_PREADV/PWRITEV has been added in 2.6.19 */ ++#if LINUX_VERSION_CODE < 132627 ++#define IOCB_CMD_PREADV 7 ++#define IOCB_CMD_PWRITEV 8 ++#endif +--- a/libsanitizer/include/system/linux/types.h 2013-12-10 09:56:03.888640325 +0100 ++++ b/libsanitizer/include/system/linux/types.h 2013-12-10 09:56:03.888640325 +0100 +@@ -0,0 +1,12 @@ ++#ifndef LINUX_TYPES_WRAPPER_H ++#define LINUX_TYPES_WRAPPER_H ++ ++/* Before ++ https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/include/linux/types.h?id=6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8 ++ linux/types.h conflicted with sys/ustat.h. Work around it. */ ++ ++#define ustat __asan_bad_ustat ++#include_next ++#undef ustat ++ ++#endif +--- a/libsanitizer/include/system/linux/perf_event.h 2013-12-10 09:56:03.888640325 +0100 ++++ b/libsanitizer/include/system/linux/perf_event.h 2013-12-10 09:56:03.888640325 +0100 +@@ -0,0 +1,7 @@ ++#include ++/* has been added in 2.6.32 */ ++#if LINUX_VERSION_CODE >= 132640 ++#include_next ++#else ++#define perf_event_attr __sanitizer_perf_event_attr ++#endif +--- a/libsanitizer/include/system/linux/mroute6.h 2013-12-10 09:56:03.888640325 +0100 ++++ b/libsanitizer/include/system/linux/mroute6.h 2013-12-10 09:56:03.888640325 +0100 +@@ -0,0 +1,5 @@ ++#include ++/* has been added in 2.6.26 */ ++#if LINUX_VERSION_CODE >= 132634 ++#include_next ++#endif +--- a/libsanitizer/sanitizer_common/Makefile.in 2013-12-10 09:55:19.000000000 +0100 ++++ b/libsanitizer/sanitizer_common/Makefile.in 2013-12-10 09:57:05.079324403 +0100 +@@ -235,7 +235,7 @@ toolexeclibdir = @toolexeclibdir@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CPPFLAGS = -I $(top_srcdir)/include ++AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system + + # May be used by toolexeclibdir. + gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) diff -r e929c7543035 -r 654ef6aa1962 gdbm-dev/receipt --- a/gdbm-dev/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gdbm-dev/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gdbm-dev" -VERSION="1.10" +VERSION="1.19" CATEGORY="development" SHORT_DESC="GNU database indexing library development files." MAINTAINER="pascal.bellard@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 gdbm/receipt --- a/gdbm/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gdbm/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gdbm" -VERSION="1.10" +VERSION="1.19" CATEGORY="misc" SHORT_DESC="GNU database indexing library." MAINTAINER="pascal.bellard@slitaz.org" @@ -9,8 +9,8 @@ WEB_SITE="http://www.gnu.org/software/gdbm" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -DEPENDS="glibc-base" -BUILD_DEPENDS="gcc" +DEPENDS="" +BUILD_DEPENDS="readline-dev" # Rules to configure and make the package. compile_rules() diff -r e929c7543035 -r 654ef6aa1962 gettext-base/receipt --- a/gettext-base/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gettext-base/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gettext-base" -VERSION="0.18.1.1" +VERSION="0.18.2" CATEGORY="base-system" SHORT_DESC="Base tools from the GNU Translation Project." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 gettext/receipt --- a/gettext/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gettext/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gettext" -VERSION="0.18.1.1" +VERSION="0.18.2" CATEGORY="development" SHORT_DESC="Utilities for the GNU Translation Project." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 gfortran/receipt --- a/gfortran/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gfortran/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gfortran" -VERSION="4.5.2" +VERSION="4.9.2" CATEGORY="development" SHORT_DESC="GCC fortran extension." WEB_SITE="http://gcc.gnu.org/" diff -r e929c7543035 -r 654ef6aa1962 glibc-base/receipt --- a/glibc-base/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/glibc-base/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc-base" -VERSION="2.13" +VERSION="2.19" 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 e929c7543035 -r 654ef6aa1962 glibc-base/stuff/wanted-files.list --- a/glibc-base/stuff/wanted-files.list Mon Mar 04 18:42:23 2019 +0100 +++ b/glibc-base/stuff/wanted-files.list Wed Nov 09 15:12:00 2022 +0000 @@ -1,18 +1,18 @@ -/lib/libutil-2.13.so -/lib/libnss_dns-2.13.so -/lib/libnsl-2.13.so -/lib/libanl-2.13.so -/lib/libm-2.13.so -/lib/libpthread-2.13.so +/lib/libutil-2.19.so +/lib/libnss_dns-2.19.so +/lib/libnsl-2.19.so +/lib/libanl-2.19.so +/lib/libm-2.19.so +/lib/libpthread-2.19.so /lib/libthread_db-1.0.so -/lib/libnss_compat-2.13.so -/lib/libc-2.13.so -/lib/librt-2.13.so -/lib/libcrypt-2.13.so -/lib/ld-2.13.so -/lib/libresolv-2.13.so -/lib/libnss_files-2.13.so -/lib/libdl-2.13.so +/lib/libnss_compat-2.19.so +/lib/libc-2.19.so +/lib/librt-2.19.so +/lib/libcrypt-2.19.so +/lib/ld-2.19.so +/lib/libresolv-2.19.so +/lib/libnss_files-2.19.so +/lib/libdl-2.19.so /usr/lib/gconv/UNICODE.so /usr/lib/gconv/gconv-modules @@ -41,19 +41,6 @@ /usr/share/i18n/locales/translit_small /usr/share/i18n/locales/translit_wide -/usr/share/zoneinfo/Europe/Madrid -/usr/share/zoneinfo/Europe/Moscow -/usr/share/zoneinfo/Europe/London -/usr/share/zoneinfo/Europe/Zurich -/usr/share/zoneinfo/Europe/Paris -/usr/share/zoneinfo/UTC -/usr/share/zoneinfo/CET -/usr/share/zoneinfo/America/Montreal -/usr/share/zoneinfo/America/New_York -/usr/share/zoneinfo/America/Los_Angeles -/usr/share/zoneinfo/America/Sao_Paulo -/usr/share/zoneinfo/America/Mexico_City - /etc/rpc /etc/ld.so.conf /etc/ld.so.cache diff -r e929c7543035 -r 654ef6aa1962 glibc-dev/receipt --- a/glibc-dev/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/glibc-dev/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc-dev" -VERSION="2.13" +VERSION="2.19" CATEGORY="development" SHORT_DESC="The GNU C libraries devel files (Part of SliTaz toolchain)." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 glibc-extra-samba/receipt --- a/glibc-extra-samba/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/glibc-extra-samba/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc-extra-samba" -VERSION="2.13" +VERSION="2.19" CATEGORY="base-system" SHORT_DESC="GNU libc extra gconv modules for samba." WEB_SITE="http://gcc.gnu.org/" diff -r e929c7543035 -r 654ef6aa1962 glibc-locale/receipt --- a/glibc-locale/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/glibc-locale/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc-locale" -VERSION="2.13" +VERSION="2.19" CATEGORY="system-tools" SHORT_DESC="The GNU C libraries locale files and utilities (see also locale-*)." MAINTAINER="pankso@slitaz.org" @@ -19,7 +19,7 @@ cp -a $_pkg/usr/lib/gconv $fs/usr/lib cp -a $_pkg/usr/share/locale $fs/usr/share cp -a $_pkg/usr/share/i18n $fs/usr/share - cp -a $_pkg/usr/share/zoneinfo $fs/usr/share + #cp -a $_pkg/usr/share/zoneinfo $fs/usr/share # Utilities and tools cp -a $_pkg/usr/bin/iconv $fs/usr/bin diff -r e929c7543035 -r 654ef6aa1962 glibc/receipt --- a/glibc/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/glibc/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glibc" -VERSION="2.13" +VERSION="2.19" CATEGORY="meta" SHORT_DESC="The GNU C libraries. This package is used to compile the libc." MAINTAINER="pankso@slitaz.org" @@ -10,7 +10,7 @@ WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" DEPENDS="glibc-base glibc-locale glibc-dev" -BUILD_DEPENDS="linux-api-headers" +BUILD_DEPENDS="linux-api-headers autoconf bash advancecomp" # Genpkg order for tazwok. COOK_OPT="genpkg=glibc-base:glibc-extra-samba:glib-locale:glibc-dev" @@ -19,11 +19,6 @@ cook_tmp_toolchain() { cd $src - - # Fix a bug that prevents Glibc from building with GCC-4.5.2: - patch -Np1 -i $stuff/glibc-2.13-gcc_fix-1.patch - - patch -Np1 -i $stuff/glibc-2.13-CVE-2015-0235.patch # Build in a separate directory. mkdir ../glibc-build && cd ../glibc-build @@ -68,19 +63,22 @@ [ -d "/var/lib/tazpkg/installed/gawk" ] || tazpkg get-install gawk fi - # Following patches and sed fixes comes from LFS development book: - # http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html - DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') - sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \ - scripts/test-installation.pl - unset DL + # 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-4.5.2: - patch -Np1 -i $stuff/glibc-2.13-gcc_fix-1.patch + # Glibc misc Bug Fixes + # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae + patch -p1 -i $stuff/glibc-2.19-xattr_header.patch - patch -Np1 -i $stuff/glibc-2.13-CVE-2015-0235.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 + + # Revert commit causing issues with crappy DNS servers + patch -Np1 -i $stuff/glibc-2.14-revert-4768ae77.patch # Fix a stack imbalance that occurs under some conditions: sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \ @@ -107,6 +105,7 @@ --disable-profile \ --enable-add-ons \ --enable-kernel=2.6.30 \ + --enable-obsolete-rpc \ --libexecdir=/usr/lib/glibc \ --build=$HOST_SYSTEM \ --host=$HOST_SYSTEM && diff -r e929c7543035 -r 654ef6aa1962 glibc/stuff/glibc-2.19-fix-sign-in-bsloww1-input.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glibc/stuff/glibc-2.19-fix-sign-in-bsloww1-input.patch Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,71 @@ + +From ffe768a90912f9bce43b70a82576b3dc99e3121c Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar +Date: Thu, 27 Feb 2014 21:29:16 +0530 +Subject: [PATCH] Fix sign of input to bsloww1 (BZ #16623) + +In 84ba214c, I removed some redundant sign computations and in the +process, I incorrectly got rid of a temporary variable, thus passing +the absolute value of the input to bsloww1. This caused #16623. + +This fix undoes the incorrect change. +--- + sysdeps/ieee754/dbl-64/s_sin.c | 16 ++++++++++------ + 3 files changed, 18 insertions(+), 7 deletions(-) + +diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c +index 6105e9f..50109b8 100644 +--- a/sysdeps/ieee754/dbl-64/s_sin.c ++++ b/sysdeps/ieee754/dbl-64/s_sin.c +@@ -447,19 +447,21 @@ __sin (double x) + } + else + { ++ double t; + if (a > 0) + { + m = 1; ++ t = a; + db = da; + } + else + { + m = 0; +- a = -a; ++ t = -a; + db = -da; + } +- u.x = big + a; +- y = a - (u.x - big); ++ u.x = big + t; ++ y = t - (u.x - big); + res = do_sin (u, y, db, &cor); + cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; + retval = ((res == res + cor) ? ((m) ? res : -res) +@@ -671,19 +673,21 @@ __cos (double x) + } + else + { ++ double t; + if (a > 0) + { + m = 1; ++ t = a; + db = da; + } + else + { + m = 0; +- a = -a; ++ t = -a; + db = -da; + } +- u.x = big + a; +- y = a - (u.x - big); ++ u.x = big + t; ++ y = t - (u.x - big); + res = do_sin (u, y, db, &cor); + cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; + retval = ((res == res + cor) ? ((m) ? res : -res) +-- +1.9.0 diff -r e929c7543035 -r 654ef6aa1962 glibc/stuff/glibc-2.19-tzselect-default.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glibc/stuff/glibc-2.19-tzselect-default.patch Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,13 @@ +diff --git a/timezone/Makefile b/timezone/Makefile +index 998cd14..d5f647c 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) + + $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make + sed -e 's|/bin/bash|$(KSH)|g' \ +- -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ ++ -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ + -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ + -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ + -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ diff -r e929c7543035 -r 654ef6aa1962 glibc/stuff/glibc-2.19-xattr_header.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glibc/stuff/glibc-2.19-xattr_header.patch Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,43 @@ +From: Serge Hallyn +Date: Tue, 11 Mar 2014 04:17:07 +0000 (-0500) +Subject: misc/sys/xattr.h: guard against linux uapi header inclusion +X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=fdbe8eae;hp=fede7a5ffa188c22c3789135bd5cf82e487dd3d0 + +misc/sys/xattr.h: guard against linux uapi header inclusion + +If the glibc xattr.h header is included after the uapi header, +compilation fails due to an enum re-using a #define from the +uapi header. Protect against this by guarding the define and +enum inclusions against each other. + +(A corresponding kernel patch has been sent here: +http://lkml.org/lkml/2014/3/7/331 ) + +(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html +and https://sourceware.org/glibc/wiki/Synchronizing_Headers +for more information.) + +Signed-off-by: Serge Hallyn +--- + +diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h +index 929cd87..796df90 100644 +--- a/misc/sys/xattr.h ++++ b/misc/sys/xattr.h +@@ -26,6 +26,7 @@ __BEGIN_DECLS + + /* The following constants should be used for the fifth parameter of + `*setxattr'. */ ++#ifndef __USE_KERNEL_XATTR_DEFS + enum + { + XATTR_CREATE = 1, /* set value, fail if attr already exists. */ +@@ -33,6 +34,7 @@ enum + XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */ + #define XATTR_REPLACE XATTR_REPLACE + }; ++#endif + + /* Set the attribute NAME of the file pointed to by PATH to VALUE (which + is SIZE bytes long). Return 0 on success, -1 for errors. */ + diff -r e929c7543035 -r 654ef6aa1962 gmp-dev/receipt --- a/gmp-dev/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gmp-dev/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="gmp-dev" -VERSION="5.0.1" +VERSION="6.0.0a" CATEGORY="development" SHORT_DESC="GNU Multiple Precision Arithmetic devel files." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 gmp/receipt --- a/gmp/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/gmp/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="gmp" -VERSION="5.0.1" +VERSION="6.0.0a" CATEGORY="development" SHORT_DESC="GNU Multiple Precision Arithmetic Library." MAINTAINER="pankso@slitaz.org" @@ -10,7 +10,7 @@ WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" DEPENDS="glibc-base" -BUILD_DEPENDS="binutils" +BUILD_DEPENDS="binutils m4" # Rules to configure and make the package. compile_rules() diff -r e929c7543035 -r 654ef6aa1962 libgfortran/receipt --- a/libgfortran/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/libgfortran/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgfortran" -VERSION="4.5.2" +VERSION="4.9.2" CATEGORY="misc" SHORT_DESC="GCC fortran runtime." WEB_SITE="http://gcc.gnu.org/" diff -r e929c7543035 -r 654ef6aa1962 libgomp/receipt --- a/libgomp/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/libgomp/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgomp" -VERSION="4.5.2" +VERSION="4.9.2" CATEGORY="development" SHORT_DESC="API specification for parallel programming." MAINTAINER="pascal.bellard@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 libobjc/receipt --- a/libobjc/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/libobjc/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libobjc" -VERSION="4.5.2" +VERSION="4.9.2" CATEGORY="development" SHORT_DESC="API for gcc object" MAINTAINER="slaxemulator@gmail.com" diff -r e929c7543035 -r 654ef6aa1962 linux-api-headers/receipt --- a/linux-api-headers/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/linux-api-headers/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -24,6 +24,9 @@ compile_rules() { cd $src + + patch -p1 < $stuff/header-type-missing.patch + make mrproper && make headers_check && make INSTALL_HDR_PATH=$DESTDIR/usr headers_install diff -r e929c7543035 -r 654ef6aa1962 linux-api-headers/stuff/header-type-missing.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linux-api-headers/stuff/header-type-missing.patch Wed Nov 09 15:12:00 2022 +0000 @@ -0,0 +1,71 @@ +diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h +index c4961ea..fe8005f 100644 +--- a/include/drm/drm_mode.h ++++ b/include/drm/drm_mode.h +@@ -81,6 +81,8 @@ + #define DRM_MODE_DIRTY_ON 1 + #define DRM_MODE_DIRTY_ANNOTATE 2 + ++#include ++ + struct drm_mode_modeinfo { + __u32 clock; + __u16 hdisplay, hsync_start, hsync_end, htotal, hskew; +diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h +index 28c0d11..d7ddd33 100644 +--- a/include/drm/i915_drm.h ++++ b/include/drm/i915_drm.h +@@ -27,6 +27,7 @@ + #ifndef _I915_DRM_H_ + #define _I915_DRM_H_ + ++#include + #include "drm.h" + + /* Please note that modifications to all structs defined here are +diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h +index fca8170..8058ce0 100644 +--- a/include/drm/mga_drm.h ++++ b/include/drm/mga_drm.h +@@ -35,6 +35,7 @@ + #ifndef __MGA_DRM_H__ + #define __MGA_DRM_H__ + ++#include + #include "drm.h" + + /* WARNING: If you change any of these defines, make sure to change the +diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h +index b65be60..f0be4c7 100644 +--- a/include/drm/radeon_drm.h ++++ b/include/drm/radeon_drm.h +@@ -33,6 +33,7 @@ + #ifndef __RADEON_DRM_H__ + #define __RADEON_DRM_H__ + ++#include + #include "drm.h" + + /* WARNING: If you change any of these defines, make sure to change the +diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h +index fd11a5b..23880b0 100644 +--- a/include/drm/via_drm.h ++++ b/include/drm/via_drm.h +@@ -24,6 +24,7 @@ + #ifndef _VIA_DRM_H_ + #define _VIA_DRM_H_ + ++#include + #include "drm.h" + + /* WARNING: These defines must be the same as what the Xserver uses. +diff a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h +--- a/include/scsi/scsi_netlink.h ++++ b/include/scsi/scsi_netlink.h +@@ -22,6 +22,7 @@ + #ifndef SCSI_NETLINK_H + #define SCSI_NETLINK_H + ++#include + #include + diff -r e929c7543035 -r 654ef6aa1962 m4/receipt --- a/m4/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/m4/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="m4" -VERSION="1.4.16" +VERSION="1.4.18" CATEGORY="development" SHORT_DESC="GNU traditional Unix macro processor." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 mpc-library/receipt --- a/mpc-library/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/mpc-library/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mpc-library" -VERSION="0.8.2" +VERSION="1.0.2" CATEGORY="development" SHORT_DESC="MPC is a C library for the arithmetic of complex numbers." MAINTAINER="pankso@slitaz.org" @@ -25,5 +25,9 @@ mkdir -p $fs/usr cp -a $_pkg/usr/lib $fs/usr cp -a $_pkg/usr/include $fs/usr + + # Workaround soname transition (mpc 0.8.2 > 1.0.2) + # libmpc.so.2 > libmpc.so.3 for cc1 + cd $fs/usr/lib + ln -sf libmpc.so.3 libmpc.so.2 } - diff -r e929c7543035 -r 654ef6aa1962 mpfr-dev/receipt --- a/mpfr-dev/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/mpfr-dev/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,9 +1,9 @@ # SliTaz package receipt PACKAGE="mpfr-dev" -VERSION="3.0.1" +VERSION="3.1.2" CATEGORY="development" -SHORT_DESC="GNU Multiple Precision Arithmetic devel files." +SHORT_DESC="MPFR library devel files." MAINTAINER="pankso@slitaz.org" DEPENDS="mpfr" WANTED="mpfr" diff -r e929c7543035 -r 654ef6aa1962 mpfr/receipt --- a/mpfr/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/mpfr/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="mpfr" -VERSION="3.0.1" +VERSION="3.1.2" CATEGORY="development" SHORT_DESC="C library for multiple-precision floating-point computations." MAINTAINER="pankso@slitaz.org" @@ -16,8 +16,9 @@ compile_rules() { cd $src - patch -Np1 -i $stuff/$PACKAGE-$VERSION.patch - ./configure $CONFIGURE_ARGS && + ./configure \ + --enable-thread-safe \ + $CONFIGURE_ARGS && make && make install } diff -r e929c7543035 -r 654ef6aa1962 patch/receipt --- a/patch/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/patch/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="patch" -VERSION="2.6.1" +VERSION="2.7.6" CATEGORY="utilities" SHORT_DESC="Utilitie to patch file with diff file." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 perl/receipt --- a/perl/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/perl/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pankso@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.bz2" DEPENDS="libdb gdbm zlib" -BUILD_DEPENDS="db gdbm zlib" +BUILD_DEPENDS="db gdbm zlib less" WEB_SITE="http://www.perl.org/" WGET_URL="http://ftp.funet.fi/pub/CPAN/src/$TARBALL" PROVIDE="microperl" diff -r e929c7543035 -r 654ef6aa1962 slitaz-toolchain/receipt --- a/slitaz-toolchain/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/slitaz-toolchain/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="slitaz-toolchain" -VERSION="4.0" +VERSION="4.1" CATEGORY="meta" SHORT_DESC="SliTaz meta package to rebuild or install current toolchain." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 wget/receipt --- a/wget/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/wget/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="wget" -VERSION="1.13.4" +VERSION="1.17.1" CATEGORY="utilities" SHORT_DESC="retrieve files from the web" MAINTAINER="sygne@ombres.eu" diff -r e929c7543035 -r 654ef6aa1962 zlib-dev/receipt --- a/zlib-dev/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/zlib-dev/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="zlib-dev" -VERSION="1.2.6" +VERSION="1.2.12" CATEGORY="development" SHORT_DESC="Zlib compression library devel files." MAINTAINER="pankso@slitaz.org" diff -r e929c7543035 -r 654ef6aa1962 zlib/receipt --- a/zlib/receipt Mon Mar 04 18:42:23 2019 +0100 +++ b/zlib/receipt Wed Nov 09 15:12:00 2022 +0000 @@ -1,11 +1,11 @@ # SliTaz package receipt. PACKAGE="zlib" -VERSION="1.2.6" +VERSION="1.2.12" CATEGORY="base-system" SHORT_DESC="Compression library." MAINTAINER="pankso@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tar.bz2" +TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="http://zlib.net/" WGET_URL="$WEB_SITE/$TARBALL"