diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
| commit | 8bb05ac73a5b448b339ce0bc8d396c82c459b47f (patch) | |
| tree | 1fdda006866bca20d41cb206767ea5241e36852f /tools | |
| parent | Adding debian version 2.39.3-11. (diff) | |
| download | util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.tar.xz util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.zip | |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | tools/Makemodule.am | 4 | ||||
| -rwxr-xr-x | tools/all_syscalls | 15 | ||||
| -rwxr-xr-x | tools/checkadoc-missing.sh | 2 | ||||
| -rwxr-xr-x | tools/oss-fuzz.sh | 11 |
4 files changed, 29 insertions, 3 deletions
diff --git a/tools/Makemodule.am b/tools/Makemodule.am index dbda625..ebee6c3 100644 --- a/tools/Makemodule.am +++ b/tools/Makemodule.am @@ -56,4 +56,6 @@ EXTRA_DIST += \ tools/config-gen.d/non-libmount.conf \ \ tools/asciidoctor-includetracker.rb \ - tools/asciidoctor-unicodeconverter.rb + tools/asciidoctor-unicodeconverter.rb \ + \ + tools/all_syscalls diff --git a/tools/all_syscalls b/tools/all_syscalls new file mode 100755 index 0000000..9c14778 --- /dev/null +++ b/tools/all_syscalls @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +OUTPUT=syscalls.h +SYSCALL_INCLUDES=" +#include <sys/syscall.h> +" + +trap 'rm $OUTPUT $OUTPUT.deps' ERR + +"$@" -MD -MF "$OUTPUT.deps" <<< "$SYSCALL_INCLUDES" -dM -E - \ + | gawk 'match($0, /^#define __NR_([^ ]+)/, res) { print "UL_SYSCALL(\"" res[1] "\", __NR_" res[1] ")" }' \ + | sort \ + > "$OUTPUT" diff --git a/tools/checkadoc-missing.sh b/tools/checkadoc-missing.sh index a1c3b38..bb0c046 100755 --- a/tools/checkadoc-missing.sh +++ b/tools/checkadoc-missing.sh @@ -46,7 +46,7 @@ remove_repeats() cd $(git rev-parse --show-toplevel) for I in $( - find . -type f -name '*[[:alpha:]].[1-8].adoc' |grep -v "autom4te.cache\|\.libs/\|\.git" + find . -type f -name '*[[:alnum:]].[1-8].adoc' |grep -v "autom4te.cache\|\.libs/\|\.git" ); do ADOCS_FILE=${I##*/} ADOCS_LIST[${ADOCS_FILE%%.[0-9].adoc}]=1 diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh index 4aa7f23..c94a5f9 100755 --- a/tools/oss-fuzz.sh +++ b/tools/oss-fuzz.sh @@ -24,8 +24,17 @@ if [[ "$SANITIZER" == undefined ]]; then CXXFLAGS+=" $UBSAN_FLAGS" fi +CONFIGURE_ARGS="--disable-all-programs --enable-libuuid --enable-libfdisk --enable-last --enable-fuzzing-engine --enable-libmount --enable-libblkid" + +LIBC_VERSION="$(dpkg -s libc6 | grep Version | cut -d' ' -f2)" + +# Ubuntu focal uses glibc 2.31 but 2.34 is necessary +if dpkg --compare-versions "$LIBC_VERSION" 'lt' '2.34'; then + CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-year2038" +fi + ./autogen.sh -./configure --disable-all-programs --enable-libuuid --enable-libfdisk --enable-last --enable-fuzzing-engine --enable-libmount --enable-libblkid +./configure $CONFIGURE_ARGS make -j$(nproc) V=1 check-programs for d in "$(dirname $0)"/../tests/ts/fuzzers/test_*_fuzz_files; do |