Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nilfs-utils for openSUSE:Factory checked in at 2022-08-19 17:56:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nilfs-utils (Old) and /work/SRC/openSUSE:Factory/.nilfs-utils.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nilfs-utils" Fri Aug 19 17:56:33 2022 rev:23 rq:998109 version:2.2.9 Changes: -------- --- /work/SRC/openSUSE:Factory/nilfs-utils/nilfs-utils.changes 2021-09-30 23:44:58.140577486 +0200 +++ /work/SRC/openSUSE:Factory/.nilfs-utils.new.2083/nilfs-utils.changes 2022-08-19 17:59:12.848444373 +0200 @@ -1,0 +2,21 @@ +Wed Aug 17 19:24:45 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 2.2.9: + * {mount,umount}.nilfs2: use libmount by default + * fix build warnings in Autoconf 2.70 or later: + - configure.ac: use AC_CONFIG_HEADERS instead of AC_CONFIG_HEADER + - configure.ac: remove AC_PROG_CC_C99 macro + - configure.ac: use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE + - configure.ac: use LT_INIT instead of AC_PROG_LIBTOOL + - configure.ac: remove obsolete AC_HEADER_STDC marco + - configure.ac: remove obsolete AC_HEADER_TIME marco + - do not use AC_TYPE_SIGNAL and RETSIGTYPE + * fix gcc8 -Wstringop-truncation warnings: + - mkfs, nilfs-tune: fix gcc8 warnings for volume name buffers + - nilfs-tune: fix gcc8 warnings at user_string() and group_string() + * update documents: + - README: update git repository url + - README: alter URLs referenced in the developer notes + - README: remedy a note about dependency on the selinux library + +------------------------------------------------------------------- Old: ---- nilfs-utils-2.2.8.tar.bz2 New: ---- nilfs-utils-2.2.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nilfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.lsZjTk/_old 2022-08-19 17:59:13.276445270 +0200 +++ /var/tmp/diff_new_pack.lsZjTk/_new 2022-08-19 17:59:13.276445270 +0200 @@ -1,7 +1,7 @@ # # spec file for package nilfs-utils # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %endif Name: nilfs-utils -Version: 2.2.8 +Version: 2.2.9 Release: 0 Summary: Utilities for NILFS License: GPL-2.0-only ++++++ nilfs-utils-2.2.8.tar.bz2 -> nilfs-utils-2.2.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/ChangeLog new/nilfs-utils-2.2.9/ChangeLog --- old/nilfs-utils-2.2.8/ChangeLog 2019-08-20 16:26:10.000000000 +0200 +++ new/nilfs-utils-2.2.9/ChangeLog 2022-06-20 11:01:42.000000000 +0200 @@ -1,3 +1,22 @@ +nilfs-utils-2.2.9 Mon Jun 20, 2022 JST + + * {mount,umount}.nilfs2: use libmount by default + * fix build warnings in Autoconf 2.70 or later: + - configure.ac: use AC_CONFIG_HEADERS instead of AC_CONFIG_HEADER + - configure.ac: remove AC_PROG_CC_C99 macro + - configure.ac: use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE + - configure.ac: use LT_INIT instead of AC_PROG_LIBTOOL + - configure.ac: remove obsolete AC_HEADER_STDC marco + - configure.ac: remove obsolete AC_HEADER_TIME marco + - do not use AC_TYPE_SIGNAL and RETSIGTYPE + * fix gcc8 -Wstringop-truncation warnings: + - mkfs, nilfs-tune: fix gcc8 warnings for volume name buffers + - nilfs-tune: fix gcc8 warnings at user_string() and group_string() + * update documents: + - README: update git repository url + - README: alter URLs referenced in the developer notes + - README: remedy a note about dependency on the selinux library + nilfs-utils-2.2.8 Tue Aug 20, 2019 JST * fix some build issues: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/README new/nilfs-utils-2.2.9/README --- old/nilfs-utils-2.2.8/README 2019-08-20 16:26:10.000000000 +0200 +++ new/nilfs-utils-2.2.9/README 2022-06-20 11:01:42.000000000 +0200 @@ -1,30 +1,35 @@ * Required packages - libuuid-devel or uuid-dev - - libmount-devel (fedora 14 and later) - - libselinux-devel (unless you specify --without-selinux or --with-libmount) - - libblkid-devel (unless you specify --without-blkid) + - libmount-devel or libmount-dev + - libblkid-devel or libblkid-dev + - libselinux-devel or libselinux1-dev (*1) + + *1: required only if supporting selinux context mount options without + using libmount. By default, libmount is used and support of the + context mount depends on the libmount that distro provides. * How to compile $ ./configure $ make -To link mount.nilfs2 and umount.nilfs2 helper programs with libmount -library, install libmount-devel package and run the configure script -with --with-libmount option: - - $ ./configure --with-libmount - -This option is set by default if /etc/mtab is a symlink to -/proc/mounts in your system. - If your system is a 64-bit architecture and libraries are installed into /usr/lib64 instead of /usr/lib, change the library directory with --libdir option: $ ./configure --libdir=/usr/lib64 +If /etc/mtab is not a symlink to /proc/self/mounts but a regular file +in the target system, run the configure script with --without-libmount +option: + + $ ./configure --without-libmount + +This configures the build environment so as to make legacy +mount/umount helpers (mount.nilfs2 and umount.nilfs2), in which the +legacy mtab file is handled properly. For CentOS 6 (and other RHEL 6 +clones), for instance, this options is needed. * Trouble shooting @@ -40,16 +45,16 @@ You can compile legacy mount.nilfs2 and umount.nilfs2 without support of selinux context mount options (-o context=<context>, etc): - $ ./configure --without-selinux + $ ./configure --without-libmount --without-selinux -For mount.nilfs2 built with the --with-libmount option, support of -the context mount depends on the libmount library. +For helpers built with mount library (libmount), support of the +context mount depends on the libmount that distro provides. * How to get development sources $ cd your-work-directory - $ git clone git://github.com/nilfs-dev/nilfs-utils.git + $ git clone https://github.com/nilfs-dev/nilfs-utils.git Before compiling the development sources, you need to run autogen.sh script. This is not required for packaged sources unless you changed @@ -66,8 +71,8 @@ First, please read the following documents (in short, follow Linux kernel development rules): -http://lxr.linux.no/source/Documentation/CodingStyle -http://lxr.linux.no/source/Documentation/SubmittingPatches +https://docs.kernel.org/process/coding-style.html +https://docs.kernel.org/process/submitting-patches.html Then, check your patches with the patch style checker prior to submission (scripts/checkpatch.pl) like the following example: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/config.h.in new/nilfs-utils-2.2.9/config.h.in --- old/nilfs-utils-2.2.8/config.h.in 2019-08-20 17:42:50.000000000 +0200 +++ new/nilfs-utils-2.2.9/config.h.in 2022-06-20 12:08:08.000000000 +0200 @@ -270,9 +270,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -284,9 +281,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -#undef TIME_WITH_SYS_TIME - /* Define to 1 if your <sys/time.h> declares `struct tm'. */ #undef TM_IN_SYS_TIME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/configure new/nilfs-utils-2.2.9/configure --- old/nilfs-utils-2.2.8/configure 2019-08-20 17:42:52.000000000 +0200 +++ new/nilfs-utils-2.2.9/configure 2022-06-20 12:08:01.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NILFS utils 2.2.8. +# Generated by GNU Autoconf 2.69 for NILFS utils 2.2.9. # # Report bugs to <linux-ni...@vger.kernel.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='NILFS utils' PACKAGE_TARNAME='nilfs-utils' -PACKAGE_VERSION='2.2.8' -PACKAGE_STRING='NILFS utils 2.2.8' +PACKAGE_VERSION='2.2.9' +PACKAGE_STRING='NILFS utils 2.2.9' PACKAGE_BUGREPORT='linux-ni...@vger.kernel.org' PACKAGE_URL='' @@ -774,7 +774,6 @@ with_sysroot enable_libtool_lock with_libmount -enable_libmount with_selinux with_blkid enable_largefile @@ -1328,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NILFS utils 2.2.8 to adapt to many kinds of systems. +\`configure' configures NILFS utils 2.2.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1398,7 +1397,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NILFS utils 2.2.8:";; + short | recursive ) echo "Configuration of NILFS utils 2.2.9:";; esac cat <<\_ACEOF @@ -1417,8 +1416,6 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-libmount (obsolete) - same as --with-libmount --disable-largefile omit support for large files Optional Packages: @@ -1429,7 +1426,7 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-libmount compile mount.nilfs2 with libmount support + --without-libmount compile mount.nilfs2 without libmount support --without-selinux compile without SELinux support --without-blkid compile without blkid support @@ -1509,7 +1506,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NILFS utils configure 2.2.8 +NILFS utils configure 2.2.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1932,7 +1929,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NILFS utils $as_me 2.2.8, which was +It was created by NILFS utils $as_me 2.2.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2798,7 +2795,7 @@ # Define the identity of the package. PACKAGE='nilfs-utils' - VERSION='2.2.8' + VERSION='2.2.9' cat >>confdefs.h <<_ACEOF @@ -3835,183 +3832,6 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdbool.h> -#include <stdlib.h> -#include <wchar.h> -#include <stdio.h> - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} - -int -main () -{ - - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); - - ; - return 0; -} -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then : - -fi - - if test "x$CC" != xcc; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } @@ -11863,18 +11683,9 @@ # Check whether --with-libmount was given. if test "${with_libmount+set}" = set; then : - withval=$with_libmount; with_libmount=$withval + withval=$with_libmount; else - with_libmount=no; \ - if test -L /etc/mtab; then with_libmount=yes; fi -fi - - -# Leave --enable-libmount[=ARG] and --disable-libmount options for -# compatibility reason. -# Check whether --enable-libmount was given. -if test "${enable_libmount+set}" = set; then : - enableval=$enable_libmount; with_libmount=$enableval + with_libmount=yes fi @@ -12219,118 +12030,6 @@ # Checks for header files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } if ${ac_cv_header_sys_wait_h+:} false; then : @@ -12390,6 +12089,20 @@ done +# Check /etc/mtab +mtab_type='' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mtab" >&5 +$as_echo_n "checking for /etc/mtab... " >&6; } +if test -L /etc/mtab; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: symlink" >&5 +$as_echo "symlink" >&6; } + mtab_type=symlink +elif test -f /etc/mtab; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: regular file" >&5 +$as_echo "regular file" >&6; } + mtab_type=file +fi + # Check for conditional libraries and headers. if test "${with_blkid}" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blkid_new_probe_from_filename in -lblkid" >&5 @@ -12454,6 +12167,10 @@ if test "${with_libmount}" = "yes"; then + if test "$mtab_type" = file; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Use --without-libmount option to generate mount helpers that work with the legacy mtab file." >&5 +$as_echo "$as_me: WARNING: Use --without-libmount option to generate mount helpers that work with the legacy mtab file." >&2;} + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mnt_context_do_mount in -lmount" >&5 $as_echo_n "checking for mnt_context_do_mount in -lmount... " >&6; } if ${ac_cv_lib_mount_mnt_context_do_mount+:} false; then : @@ -12761,41 +12478,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#include <sys/time.h> -#include <time.h> - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } if ${ac_cv_struct_tm+:} false; then : @@ -13943,39 +13625,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if ${ac_cv_type_signal+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#include <signal.h> - -int -main () -{ -return *(signal (0, 0)) (0) == 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int -else - ac_cv_type_signal=void -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 $as_echo_n "checking whether stat accepts an empty string... " >&6; } if ${ac_cv_func_stat_empty_string_bug+:} false; then : @@ -14869,7 +14518,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NILFS utils $as_me 2.2.8, which was +This file was extended by NILFS utils $as_me 2.2.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14935,7 +14584,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NILFS utils config.status 2.2.8 +NILFS utils config.status 2.2.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/configure.ac new/nilfs-utils-2.2.9/configure.ac --- old/nilfs-utils-2.2.8/configure.ac 2019-08-20 16:26:10.000000000 +0200 +++ new/nilfs-utils-2.2.9/configure.ac 2022-06-20 11:01:42.000000000 +0200 @@ -6,22 +6,22 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT(NILFS utils, 2.2.8, linux-ni...@vger.kernel.org) +AC_INIT([NILFS utils],[2.2.9],[linux-ni...@vger.kernel.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([config.h.in]) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) # Checks for programs. AC_PROG_CC -AC_PROG_CC_C99 AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_GNU_SOURCE -AC_PROG_LIBTOOL +AC_USE_SYSTEM_EXTENSIONS +LT_PREREQ([2.4]) +LT_INIT AC_PATH_PROG([LDCONFIG], [ldconfig], [AC_MSG_ERROR([ldconfig not found])], [$PATH:/sbin]) @@ -45,18 +45,9 @@ # Check for options. AC_ARG_WITH([libmount], - AS_HELP_STRING([--with-libmount], - [compile mount.nilfs2 with libmount support]), - [with_libmount=$withval], - [with_libmount=no; \ - if test -L /etc/mtab; then with_libmount=yes; fi]) - -# Leave --enable-libmount[=ARG] and --disable-libmount options for -# compatibility reason. -AC_ARG_ENABLE(libmount, - AS_HELP_STRING([--enable-libmount (obsolete)], - [same as --with-libmount]), - [with_libmount=$enableval], []) + AS_HELP_STRING([--without-libmount], + [compile mount.nilfs2 without libmount support]), + [], with_libmount=yes) AC_ARG_WITH([selinux], AS_HELP_STRING([--without-selinux], [compile without SELinux support]), @@ -94,7 +85,6 @@ AC_SUBST(LIB_POSIX_TIMER) # Checks for header files. -AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([ctype.h err.h fcntl.h grp.h libintl.h limits.h \ linux/magic.h linux/types.h locale.h mntent.h mqueue.h \ @@ -102,6 +92,17 @@ strings.h sys/ioctl.h sys/mount.h sys/time.h syslog.h \ time.h unistd.h]) +# Check /etc/mtab +mtab_type='' +AC_MSG_CHECKING([for /etc/mtab]) +if test -L /etc/mtab; then + AC_MSG_RESULT([symlink]) + mtab_type=symlink +elif test -f /etc/mtab; then + AC_MSG_RESULT([regular file]) + mtab_type=file +fi + # Check for conditional libraries and headers. if test "${with_blkid}" = "yes"; then AC_CHECK_LIB(blkid, blkid_new_probe_from_filename, @@ -115,6 +116,9 @@ AC_SUBST(LIB_BLKID) if test "${with_libmount}" = "yes"; then + if test "$mtab_type" = file; then + AC_MSG_WARN([Use --without-libmount option to generate mount helpers that work with the legacy mtab file.]) + fi AC_CHECK_LIB(mount, mnt_context_do_mount, [LIB_MOUNT="-lmount $LIB_BLKID"], AC_MSG_ERROR([Mount library is enabled but libmount not found]), [$LIB_BLKID]) AC_CHECK_HEADERS([libmount/libmount.h]) @@ -143,7 +147,6 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_TYPE_SSIZE_T -AC_HEADER_TIME AC_STRUCT_TM AC_C_VOLATILE @@ -158,7 +161,6 @@ AC_FUNC_MALLOC AC_FUNC_MMAP AC_FUNC_REALLOC -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME AC_FUNC_VPRINTF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/sbin/cleanerd/cleanerd.c new/nilfs-utils-2.2.9/sbin/cleanerd/cleanerd.c --- old/nilfs-utils-2.2.8/sbin/cleanerd/cleanerd.c 2019-08-20 16:26:10.000000000 +0200 +++ new/nilfs-utils-2.2.9/sbin/cleanerd/cleanerd.c 2022-06-20 11:01:42.000000000 +0200 @@ -771,12 +771,12 @@ return 0; } -static RETSIGTYPE handle_sigterm(int signum) +static void handle_sigterm(int signum) { siglongjmp(nilfs_cleanerd_env, 1); } -static RETSIGTYPE handle_sighup(int signum) +static void handle_sighup(int signum) { nilfs_cleanerd_reload_config = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/sbin/mkfs/mkfs.c new/nilfs-utils-2.2.9/sbin/mkfs/mkfs.c --- old/nilfs-utils-2.2.8/sbin/mkfs/mkfs.c 2019-08-20 16:26:10.000000000 +0200 +++ new/nilfs-utils-2.2.9/sbin/mkfs/mkfs.c 2022-06-20 11:01:42.000000000 +0200 @@ -1091,7 +1091,18 @@ discard = 0; break; case 'L': + /* + * For the 'volume_label' buffer, truncation is + * explicitly OK without a terminating '\0'. + */ +#if defined(__GNUC__) && __GNUC__ >= 8 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif strncpy(volume_label, optarg, sizeof(volume_label)); +#if defined(__GNUC__) && __GNUC__ >= 8 +#pragma GCC diagnostic pop +#endif break; case 'm': r_segments_percentage = atol(optarg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/sbin/nilfs-clean/nilfs-clean.c new/nilfs-utils-2.2.9/sbin/nilfs-clean/nilfs-clean.c --- old/nilfs-utils-2.2.8/sbin/nilfs-clean/nilfs-clean.c 2019-08-20 16:26:10.000000000 +0200 +++ new/nilfs-utils-2.2.9/sbin/nilfs-clean/nilfs-clean.c 2022-06-20 11:01:42.000000000 +0200 @@ -159,7 +159,7 @@ va_end(args); } -static RETSIGTYPE nilfs_clean_escape(int signum) +static void nilfs_clean_escape(int signum) { siglongjmp(nilfs_clean_env, 1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nilfs-utils-2.2.8/sbin/nilfs-tune/nilfs-tune.c new/nilfs-utils-2.2.9/sbin/nilfs-tune/nilfs-tune.c --- old/nilfs-utils-2.2.8/sbin/nilfs-tune/nilfs-tune.c 2019-08-20 16:26:10.000000000 +0200 +++ new/nilfs-utils-2.2.9/sbin/nilfs-tune/nilfs-tune.c 2022-06-20 11:01:42.000000000 +0200 @@ -151,7 +151,18 @@ opts->flags = O_RDWR; break; case 'L': + /* + * For the 'label' buffer, truncation is + * explicitly OK without a terminating '\0'. + */ +#if defined(__GNUC__) && __GNUC__ >= 8 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif strncpy(opts->label, optarg, sizeof(opts->label)); +#if defined(__GNUC__) && __GNUC__ >= 8 +#pragma GCC diagnostic pop +#endif opts->mask |= NILFS_SB_LABEL; opts->flags = O_RDWR; break; @@ -249,14 +260,12 @@ static char buf[LOGIN_NAME_MAX + 8]; struct passwd *pwd; - strcpy(buf, "user "); - pwd = getpwuid(uid); - if (pwd) - strncpy(tmp, pwd->pw_name, sizeof(tmp)); - else - strcpy(tmp, "unknown"); - strcat(buf, tmp); + strncpy(tmp, pwd ? pwd->pw_name : "unknown", sizeof(tmp)); + tmp[sizeof(tmp) - 1] = '\0'; + + snprintf(buf, sizeof(buf), "user %s", tmp); + buf[sizeof(buf) - 1] = '\0'; return buf; } @@ -266,14 +275,12 @@ static char buf[LOGIN_NAME_MAX + 8]; struct group *grp; - strcpy(buf, "group "); - grp = getgrgid(gid); - if (grp) - strncpy(tmp, grp->gr_name, sizeof(tmp)); - else - strcpy(tmp, "unknown"); - strcat(buf, tmp); + strncpy(tmp, grp ? grp->gr_name : "unknown", sizeof(tmp)); + tmp[sizeof(tmp) - 1] = '\0'; + + snprintf(buf, sizeof(buf), "group %s", tmp); + buf[sizeof(buf) - 1] = '\0'; return buf; }