Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libfmos for openSUSE:Factory checked in at 2024-04-16 20:04:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfmos (Old) and /work/SRC/openSUSE:Factory/.libfmos.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfmos" Tue Apr 16 20:04:19 2024 rev:9 rq:1167891 version:20240415 Changes: -------- --- /work/SRC/openSUSE:Factory/libfmos/libfmos.changes 2024-02-07 18:49:23.564818761 +0100 +++ /work/SRC/openSUSE:Factory/.libfmos.new.26366/libfmos.changes 2024-04-16 20:07:28.980475486 +0200 @@ -1,0 +2,6 @@ +Mon Apr 15 19:18:06 UTC 2024 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 20240415 + * No changelog was provided + +------------------------------------------------------------------- Old: ---- libfmos-experimental-20240118.tar.gz libfmos-experimental-20240118.tar.gz.asc New: ---- libfmos-experimental-20240415.tar.gz libfmos-experimental-20240415.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfmos.spec ++++++ --- /var/tmp/diff_new_pack.fkETsL/_old 2024-04-16 20:07:30.688538271 +0200 +++ /var/tmp/diff_new_pack.fkETsL/_new 2024-04-16 20:07:30.692538419 +0200 @@ -18,7 +18,7 @@ Name: libfmos %define lname libfmos1 -Version: 20240118 +Version: 20240415 Release: 0 Summary: Library for MacOS data types License: LGPL-3.0-or-later @@ -27,13 +27,13 @@ Source: https://github.com/libyal/libfmos/releases/download/%version/libfmos-experimental-%version.tar.gz Source2: https://github.com/libyal/libfmos/releases/download/%version/libfmos-experimental-%version.tar.gz.asc Source3: %name.keyring -BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools} +BuildRequires: %python_module devel +BuildRequires: %python_module setuptools BuildRequires: c_compiler BuildRequires: pkg-config -BuildRequires: pkgconfig(libcerror) >= 20240101 -BuildRequires: pkgconfig(libcnotify) >= 20240108 -BuildRequires: pkgconfig(libcthreads) >= 20240102 +BuildRequires: pkgconfig(libcerror) >= 20240413 +BuildRequires: pkgconfig(libcnotify) >= 20240414 +BuildRequires: pkgconfig(libcthreads) >= 20240413 %python_subpackages # Various notes: https://en.opensuse.org/libyal @@ -76,8 +76,7 @@ mv %_builddir/rt/* %buildroot/ find %buildroot -type f -name "*.la" -delete -print -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%ldconfig_scriptlets -n %lname %files -n %lname %license COPYING* ++++++ libfmos-experimental-20240118.tar.gz -> libfmos-experimental-20240415.tar.gz ++++++ ++++ 2240 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/Makefile.am new/libfmos-20240415/Makefile.am --- old/libfmos-20240118/Makefile.am 2023-12-03 10:04:52.000000000 +0100 +++ new/libfmos-20240415/Makefile.am 2024-04-15 18:26:17.000000000 +0200 @@ -50,8 +50,15 @@ $(SETUP_PY_FILES) \ $(SPEC_FILES) -MAINTAINERCLEANFILES = \ - Makefile.in +DISTCLEANFILES = \ + config.status \ + config.cache \ + config.log \ + libfmos.pc \ + libfmos.spec \ + Makefile \ + Makefile.in \ + po/Makevars pkgconfigdir = $(libdir)/pkgconfig @@ -71,15 +78,3 @@ (cd $(srcdir)/libfmos && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -distclean: clean - -rm -f Makefile - -rm -f config.status - -rm -f config.cache - -rm -f config.log - -rm -f libfmos.pc - -rm -f libfmos.spec - @for dir in ${subdirs}; do \ - (cd $$dir && $(MAKE) distclean) \ - || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/common/Makefile.am new/libfmos-20240415/common/Makefile.am --- old/libfmos-20240118/common/Makefile.am 2024-01-18 05:50:44.000000000 +0100 +++ new/libfmos-20240415/common/Makefile.am 2024-04-15 18:25:05.000000000 +0200 @@ -1,4 +1,5 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = \ + -I../include -I$(top_srcdir)/include EXTRA_DIST = \ byte_stream.h \ @@ -15,11 +16,9 @@ types.h.in \ wide_string.h -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + config.h \ + types.h \ + Makefile \ Makefile.in -distclean: clean - -rm -f config.h - -rm -f types.h - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/common/config.h new/libfmos-20240415/common/config.h --- old/libfmos-20240118/common/config.h 2024-01-18 05:53:54.000000000 +0100 +++ new/libfmos-20240415/common/config.h 2024-04-15 18:39:52.000000000 +0200 @@ -323,7 +323,7 @@ #define PACKAGE_NAME "libfmos" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libfmos 20240118" +#define PACKAGE_STRING "libfmos 20240415" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libfmos" @@ -332,7 +332,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20240118" +#define PACKAGE_VERSION "20240415" /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -358,7 +358,7 @@ /* #undef STRERROR_R_CHAR_P */ /* Version number of package */ -#define VERSION "20240118" +#define VERSION "20240415" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/configure.ac new/libfmos-20240415/configure.ac --- old/libfmos-20240118/configure.ac 2024-01-18 05:50:44.000000000 +0100 +++ new/libfmos-20240415/configure.ac 2024-04-15 18:24:35.000000000 +0200 @@ -2,7 +2,7 @@ AC_INIT( [libfmos], - [20240118], + [20240415], [joachim.m...@gmail.com]) AC_CONFIG_SRCDIR( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/dpkg/changelog new/libfmos-20240415/dpkg/changelog --- old/libfmos-20240118/dpkg/changelog 2024-01-18 05:53:54.000000000 +0100 +++ new/libfmos-20240415/dpkg/changelog 2024-04-15 18:39:52.000000000 +0200 @@ -1,5 +1,5 @@ -libfmos (20240118-1) unstable; urgency=low +libfmos (20240415-1) unstable; urgency=low * Auto-generated - -- Joachim Metz <joachim.m...@gmail.com> Thu, 18 Jan 2024 05:53:53 +0100 + -- Joachim Metz <joachim.m...@gmail.com> Mon, 15 Apr 2024 18:39:49 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/include/Makefile.am new/libfmos-20240415/include/Makefile.am --- old/libfmos-20240118/include/Makefile.am 2024-01-18 05:50:44.000000000 +0100 +++ new/libfmos-20240415/include/Makefile.am 2024-04-15 18:25:05.000000000 +0200 @@ -14,13 +14,11 @@ libfmos/features.h.in \ libfmos/types.h.in -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + libfmos.h \ + libfmos/definitions.h \ + libfmos/features.h \ + libfmos/types.h \ + Makefile \ Makefile.in -distclean: clean - -rm -f libfmos.h - -rm -f libfmos/definitions.h - -rm -f libfmos/features.h - -rm -f libfmos/types.h - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/include/libfmos/definitions.h new/libfmos-20240415/include/libfmos/definitions.h --- old/libfmos-20240118/include/libfmos/definitions.h 2024-01-18 05:53:54.000000000 +0100 +++ new/libfmos-20240415/include/libfmos/definitions.h 2024-04-15 18:39:51.000000000 +0200 @@ -24,11 +24,11 @@ #include <libfmos/types.h> -#define LIBFMOS_VERSION 20240118 +#define LIBFMOS_VERSION 20240415 /* The version string */ -#define LIBFMOS_VERSION_STRING "20240118" +#define LIBFMOS_VERSION_STRING "20240415" #endif /* !defined( _LIBFMOS_DEFINITIONS_H ) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libcerror/Makefile.am new/libfmos-20240415/libcerror/Makefile.am --- old/libfmos-20240118/libcerror/Makefile.am 2024-01-18 05:53:40.000000000 +0100 +++ new/libfmos-20240415/libcerror/Makefile.am 2024-04-15 18:39:26.000000000 +0200 @@ -1,7 +1,7 @@ if HAVE_LOCAL_LIBCERROR AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common noinst_LTLIBRARIES = libcerror.la @@ -15,12 +15,10 @@ libcerror_unused.h endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - sources-local: $(BUILT_SOURCES) splint-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libcerror/libcerror_definitions.h new/libfmos-20240415/libcerror/libcerror_definitions.h --- old/libfmos-20240118/libcerror/libcerror_definitions.h 2024-01-18 05:53:40.000000000 +0100 +++ new/libfmos-20240415/libcerror/libcerror_definitions.h 2024-04-15 18:39:26.000000000 +0200 @@ -35,11 +35,11 @@ */ #else -#define LIBCERROR_VERSION 20240101 +#define LIBCERROR_VERSION 20240413 /* The libcerror version string */ -#define LIBCERROR_VERSION_STRING "20240101" +#define LIBCERROR_VERSION_STRING "20240413" /* The error domains */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libcnotify/Makefile.am new/libfmos-20240415/libcnotify/Makefile.am --- old/libfmos-20240118/libcnotify/Makefile.am 2024-01-18 05:53:41.000000000 +0100 +++ new/libfmos-20240415/libcnotify/Makefile.am 2024-04-15 18:39:28.000000000 +0200 @@ -1,7 +1,7 @@ if HAVE_LOCAL_LIBCNOTIFY AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ noinst_LTLIBRARIES = libcnotify.la @@ -17,12 +17,10 @@ libcnotify_verbose.c libcnotify_verbose.h endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - sources-local: $(BUILT_SOURCES) splint-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libcnotify/libcnotify_definitions.h new/libfmos-20240415/libcnotify/libcnotify_definitions.h --- old/libfmos-20240118/libcnotify/libcnotify_definitions.h 2024-01-18 05:53:41.000000000 +0100 +++ new/libfmos-20240415/libcnotify/libcnotify_definitions.h 2024-04-15 18:39:28.000000000 +0200 @@ -35,11 +35,11 @@ */ #else -#define LIBCNOTIFY_VERSION 20240108 +#define LIBCNOTIFY_VERSION 20240414 /* The libcnotify version string */ -#define LIBCNOTIFY_VERSION_STRING "20240108" +#define LIBCNOTIFY_VERSION_STRING "20240414" /* The print data flags */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libcthreads/Makefile.am new/libfmos-20240415/libcthreads/Makefile.am --- old/libfmos-20240118/libcthreads/Makefile.am 2024-01-18 05:53:42.000000000 +0100 +++ new/libfmos-20240415/libcthreads/Makefile.am 2024-04-15 18:39:30.000000000 +0200 @@ -1,7 +1,7 @@ if HAVE_LOCAL_LIBCTHREADS AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @PTHREAD_CPPFLAGS@ @@ -26,12 +26,10 @@ libcthreads_unused.h endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - sources-local: $(BUILT_SOURCES) splint-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libcthreads/libcthreads_definitions.h new/libfmos-20240415/libcthreads/libcthreads_definitions.h --- old/libfmos-20240118/libcthreads/libcthreads_definitions.h 2024-01-18 05:53:42.000000000 +0100 +++ new/libfmos-20240415/libcthreads/libcthreads_definitions.h 2024-04-15 18:39:30.000000000 +0200 @@ -35,11 +35,11 @@ */ #else -#define LIBCTHREADS_VERSION 20240102 +#define LIBCTHREADS_VERSION 20240413 /* The libcthreads version string */ -#define LIBCTHREADS_VERSION_STRING "20240102" +#define LIBCTHREADS_VERSION_STRING "20240413" /* The comparison function definitions */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libfmos/Makefile.am new/libfmos-20240415/libfmos/Makefile.am --- old/libfmos-20240118/libfmos/Makefile.am 2023-12-03 10:04:57.000000000 +0100 +++ new/libfmos-20240415/libfmos/Makefile.am 2024-04-15 18:26:34.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @LIBCTHREADS_CPPFLAGS@ \ @LIBCNOTIFY_CPPFLAGS@ \ @@ -39,14 +39,12 @@ libfmos.rc \ libfmos.rc.in -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + libfmos_definitions.h \ + libfmos.rc \ + Makefile \ Makefile.in -distclean: clean - -rm -f libfmos_definitions.h - -rm -f libfmos.rc - -rm -f Makefile - sources-local: $(BUILT_SOURCES) splint-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libfmos/libfmos.rc new/libfmos-20240415/libfmos/libfmos.rc --- old/libfmos-20240118/libfmos/libfmos.rc 2024-01-18 05:53:54.000000000 +0100 +++ new/libfmos-20240415/libfmos/libfmos.rc 2024-04-15 18:39:52.000000000 +0200 @@ -22,12 +22,12 @@ BLOCK "040904E4" BEGIN VALUE "FileDescription", "Library to support common Mac OS specific formats\0" - VALUE "FileVersion", "20240118" "\0" + VALUE "FileVersion", "20240415" "\0" VALUE "InternalName", "libfmos.dll\0" VALUE "LegalCopyright", "(C) 2019-2024, Joachim Metz <joachim.m...@gmail.com>\0" VALUE "OriginalFilename", "libfmos.dll\0" VALUE "ProductName", "libfmos\0" - VALUE "ProductVersion", "20240118" "\0" + VALUE "ProductVersion", "20240415" "\0" VALUE "Comments", "For more information visit https://github.com/libyal/libfmos/\0"; END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libfmos/libfmos_definitions.h new/libfmos-20240415/libfmos/libfmos_definitions.h --- old/libfmos-20240118/libfmos/libfmos_definitions.h 2024-01-18 05:53:54.000000000 +0100 +++ new/libfmos-20240415/libfmos/libfmos_definitions.h 2024-04-15 18:39:52.000000000 +0200 @@ -36,11 +36,11 @@ #else #include <byte_stream.h> -#define LIBFMOS_VERSION 20240118 +#define LIBFMOS_VERSION 20240415 /* The version string */ -#define LIBFMOS_VERSION_STRING "20240118" +#define LIBFMOS_VERSION_STRING "20240415" #endif /* !defined( HAVE_LOCAL_LIBFMOS ) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/libfmos.spec new/libfmos-20240415/libfmos.spec --- old/libfmos-20240118/libfmos.spec 2024-01-18 05:53:54.000000000 +0100 +++ new/libfmos-20240415/libfmos.spec 2024-04-15 18:39:52.000000000 +0200 @@ -1,5 +1,5 @@ Name: libfmos -Version: 20240118 +Version: 20240415 Release: 1 Summary: Library to support common Mac OS specific formats Group: System Environment/Libraries @@ -80,6 +80,6 @@ %{_libdir}/python3*/site-packages/*.so %changelog -* Thu Jan 18 2024 Joachim Metz <joachim.m...@gmail.com> 20240118-1 +* Mon Apr 15 2024 Joachim Metz <joachim.m...@gmail.com> 20240415-1 - Auto-generated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/m4/common.m4 new/libfmos-20240415/m4/common.m4 --- old/libfmos-20240118/m4/common.m4 2023-12-03 10:04:58.000000000 +0100 +++ new/libfmos-20240415/m4/common.m4 2024-04-04 06:21:25.000000000 +0200 @@ -1,6 +1,6 @@ dnl Checks for common headers and functions dnl -dnl Version: 20181117 +dnl Version: 20240308 dnl Function to test if a certain feature was disabled AC_DEFUN([AX_COMMON_ARG_DISABLE], @@ -26,7 +26,7 @@ [$1], [AS_HELP_STRING( [--enable-$1], - [$3 [default=$4]])], + [$3 @<:@default=$4@:>@])], [ac_cv_enable_$2=$enableval], [ac_cv_enable_$2=$4])dnl @@ -43,7 +43,7 @@ [$1], [AS_HELP_STRING( [--with-$1[[=$5]]], - [$3 [default=$4]])], + [$3 @<:@default=$4@:>@])], [ac_cv_with_$2=$withval], [ac_cv_with_$2=$4])dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/m4/libcerror.m4 new/libfmos-20240415/m4/libcerror.m4 --- old/libfmos-20240118/m4/libcerror.m4 2023-12-03 10:04:58.000000000 +0100 +++ new/libfmos-20240415/m4/libcerror.m4 2024-04-15 18:24:37.000000000 +0200 @@ -1,6 +1,6 @@ dnl Checks for libcerror required headers and functions dnl -dnl Version: 20190308 +dnl Version: 20240413 dnl Function to detect if libcerror is available dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments @@ -10,8 +10,10 @@ [ac_cv_libcerror=no], [ac_cv_libcerror=check dnl Check if the directory provided as parameter exists + dnl For both --with-libcerror which returns "yes" and --with-libcerror= which returns "" + dnl treat them as auto-detection. AS_IF( - [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect], + [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_with_libcerror" != xyes], [AS_IF( [test -d "$ac_cv_with_libcerror"], [CFLAGS="$CFLAGS -I${ac_cv_with_libcerror}/include" @@ -99,8 +101,9 @@ ac_cv_libcerror_LIBADD="-lcerror"]) ]) + AS_IF( - [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_libcerror" != xyes], + [test "x$ac_cv_libcerror" != xyes && test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_with_libcerror" != xyes], [AC_MSG_FAILURE( [unable to find supported libcerror in directory: $ac_cv_with_libcerror], [1]) @@ -166,7 +169,7 @@ ]) ]) - ac_cv_libcerror_CPPFLAGS="-I../libcerror"; + ac_cv_libcerror_CPPFLAGS="-I../libcerror -I\$(top_srcdir)/libcerror"; ac_cv_libcerror_LIBADD="../libcerror/libcerror.la"; ac_cv_libcerror=local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/m4/libcnotify.m4 new/libfmos-20240415/m4/libcnotify.m4 --- old/libfmos-20240118/m4/libcnotify.m4 2023-12-03 10:04:58.000000000 +0100 +++ new/libfmos-20240415/m4/libcnotify.m4 2024-04-15 18:24:37.000000000 +0200 @@ -1,6 +1,6 @@ dnl Checks for libcnotify required headers and functions dnl -dnl Version: 20190308 +dnl Version: 20240413 dnl Function to detect if libcnotify is available dnl ac_libcnotify_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments @@ -10,8 +10,10 @@ [ac_cv_libcnotify=no], [ac_cv_libcnotify=check dnl Check if the directory provided as parameter exists + dnl For both --with-libcnotify which returns "yes" and --with-libcnotify= which returns "" + dnl treat them as auto-detection. AS_IF( - [test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect], + [test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect && test "x$ac_cv_with_libcnotify" != xyes], [AS_IF( [test -d "$ac_cv_with_libcnotify"], [CFLAGS="$CFLAGS -I${ac_cv_with_libcnotify}/include" @@ -96,8 +98,9 @@ ac_cv_libcnotify_LIBADD="-lcnotify"]) ]) + AS_IF( - [test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect && test "x$ac_cv_libcnotify" != xyes], + [test "x$ac_with_libcnotify" != xyes && test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect && test "x$ac_cv_with_libcnotify" != xyes], [AC_MSG_FAILURE( [unable to find supported libcnotify in directory: $ac_cv_with_libcnotify], [1]) @@ -138,7 +141,7 @@ dnl Headers included in libcnotify/libcnotify_stream.c AC_CHECK_HEADERS([errno.h]) - ac_cv_libcnotify_CPPFLAGS="-I../libcnotify"; + ac_cv_libcnotify_CPPFLAGS="-I../libcnotify -I\$(top_srcdir)/libcnotify"; ac_cv_libcnotify_LIBADD="../libcnotify/libcnotify.la"; ac_cv_libcnotify=local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/m4/libcthreads.m4 new/libfmos-20240415/m4/libcthreads.m4 --- old/libfmos-20240118/m4/libcthreads.m4 2023-12-03 10:04:58.000000000 +0100 +++ new/libfmos-20240415/m4/libcthreads.m4 2024-04-15 18:24:37.000000000 +0200 @@ -1,6 +1,6 @@ dnl Checks for libcthreads required headers and functions dnl -dnl Version: 20190308 +dnl Version: 20240413 dnl Function to detect if libcthreads is available dnl ac_libcthreads_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments @@ -10,8 +10,10 @@ [ac_cv_libcthreads=no], [ac_cv_libcthreads=check dnl Check if the directory provided as parameter exists + dnl For both --with-libcthreads which returns "yes" and --with-libcthreads= which returns "" + dnl treat them as auto-detection. AS_IF( - [test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect], + [test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect && test "x$ac_cv_with_libcthreads" != xyes], [AS_IF( [test -d "$ac_cv_with_libcthreads"], [CFLAGS="$CFLAGS -I${ac_cv_with_libcthreads}/include" @@ -248,7 +250,7 @@ ]) AS_IF( - [test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect && test "x$ac_cv_libcthreads" != xyes], + [test "x$ac_cv_libcthreads" != xyes && test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect && test "x$ac_cv_with_libcthreads" != xyes], [AC_MSG_FAILURE( [unable to find supported libcthreads in directory: $ac_cv_with_libcthreads], [1]) @@ -290,7 +292,7 @@ AS_IF( [test "x$ac_cv_libcthreads_multi_threading" != xno], - [ac_cv_libcthreads_CPPFLAGS="-I../libcthreads"; + [ac_cv_libcthreads_CPPFLAGS="-I../libcthreads -I\$(top_srcdir)/libcthreads"; ac_cv_libcthreads_LIBADD="../libcthreads/libcthreads.la"; ac_cv_libcthreads=local], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/m4/pthread.m4 new/libfmos-20240415/m4/pthread.m4 --- old/libfmos-20240118/m4/pthread.m4 2023-12-03 10:04:58.000000000 +0100 +++ new/libfmos-20240415/m4/pthread.m4 2024-04-04 06:21:25.000000000 +0200 @@ -1,183 +1,196 @@ dnl Functions for pthread dnl -dnl Version: 20130509 +dnl Version: 20240308 dnl Function to detect if pthread is available AC_DEFUN([AX_PTHREAD_CHECK_LIB], - [dnl Check if parameters were provided - AS_IF( - [test "x$ac_cv_with_pthread" != x && test "x$ac_cv_with_pthread" != xno && test "x$ac_cv_with_pthread" != xauto-detect], [AS_IF( - [test -d "$ac_cv_with_pthread"], - [CFLAGS="$CFLAGS -I${ac_cv_with_pthread}/include" - LDFLAGS="$LDFLAGS -L${ac_cv_with_pthread}/lib"], - [AC_MSG_WARN([no such directory: $ac_cv_with_pthread]) - ]) - ]) - - AS_IF( - [test "x$ac_cv_with_pthread" = xno], - [ac_cv_pthread=no], - [dnl Check for headers - AC_CHECK_HEADERS([pthread.h]) + [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_pthread" = xno], + [ac_cv_pthread=no], + [ac_cv_pthread=check + dnl Check if parameters were provided + dnl For both --with-pthread which returns "yes" and --with-pthread= which returns "" + dnl treat them as auto-detection. + AS_IF( + [test "x$ac_cv_with_pthread" != x && test "x$ac_cv_with_pthread" != xauto-detect && test "x$ac_cv_with_pthread" != xyes], + [AS_IF( + [test -d "$ac_cv_with_pthread"], + [CFLAGS="$CFLAGS -I${ac_cv_with_pthread}/include" + LDFLAGS="$LDFLAGS -L${ac_cv_with_pthread}/lib"], + [AC_MSG_WARN([no such directory: $ac_cv_with_pthread]) + ]) + ]) + ]) + + AS_IF( + [test "x$ac_cv_pthread" = xcheck], + [dnl Check for headers + AC_CHECK_HEADERS([pthread.h]) + + AS_IF( + [test "x$ac_cv_header_pthread_h" = xno], + [ac_cv_pthread=no], + [dnl Check for the individual functions + ac_cv_pthread=pthread + + dnl Thread functions + AC_CHECK_LIB( + pthread, + pthread_create, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_exit, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_join, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + + dnl Condition functions + AC_CHECK_LIB( + pthread, + pthread_cond_init, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_cond_destroy, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_cond_broadcast, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_cond_signal, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_cond_wait, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + + dnl Mutex functions + AC_CHECK_LIB( + pthread, + pthread_mutex_init, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_mutex_destroy, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_mutex_lock, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_mutex_trylock, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_mutex_unlock, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + + dnl Read/Write lock functions + AC_CHECK_LIB( + pthread, + pthread_rwlock_init, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_rwlock_destroy, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_rwlock_rdlock, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_rwlock_wrlock, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + AC_CHECK_LIB( + pthread, + pthread_rwlock_unlock, + [ac_pthread_dummy=yes], + [ac_cv_pthread=no]) + + ac_cv_pthread_LIBADD="-lpthread"; + ]) + + AS_IF( + [test "x$ac_cv_with_pthread" != x && test "x$ac_cv_with_pthread" != xauto-detect && test "x$ac_cv_with_pthread" != xyes], + [AC_MSG_FAILURE( + [unable to find supported pthread in directory: $ac_cv_with_pthread], + [1]) + ]) + ]) AS_IF( - [test "x$ac_cv_header_pthread_h" = xno], - [ac_cv_pthread=no], - [dnl Check for the individual functions - ac_cv_pthread=pthread - - dnl Thread functions - AC_CHECK_LIB( - pthread, - pthread_create, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_exit, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_join, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - - dnl Condition functions - AC_CHECK_LIB( - pthread, - pthread_cond_init, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_cond_destroy, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_cond_broadcast, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_cond_signal, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_cond_wait, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - - dnl Mutex functions - AC_CHECK_LIB( - pthread, - pthread_mutex_init, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_mutex_destroy, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_mutex_lock, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_mutex_trylock, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_mutex_unlock, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - - dnl Read/Write lock functions - AC_CHECK_LIB( - pthread, - pthread_rwlock_init, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_rwlock_destroy, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_rwlock_rdlock, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_rwlock_wrlock, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - AC_CHECK_LIB( - pthread, - pthread_rwlock_unlock, - [ac_pthread_dummy=yes], - [ac_cv_pthread=no]) - - ac_cv_pthread_LIBADD="-lpthread"; - ]) - ]) + [test "x$ac_cv_pthread" = xpthread], + [AC_DEFINE( + [HAVE_PTHREAD], + [1], + [Define to 1 if you have the 'pthread' library (-lpthread).]) + ]) - AS_IF( - [test "x$ac_cv_pthread" = xpthread], - [AC_DEFINE( - [HAVE_PTHREAD], - [1], - [Define to 1 if you have the 'pthread' library (-lpthread).]) - ]) - - AS_IF( - [test "x$ac_cv_pthread" != xno], - [AC_SUBST( - [HAVE_PTHREAD], - [1]) ], - [AC_SUBST( - [HAVE_PTHREAD], - [0]) + AS_IF( + [test "x$ac_cv_pthread" != xno], + [AC_SUBST( + [HAVE_PTHREAD], + [1]) ], + [AC_SUBST( + [HAVE_PTHREAD], + [0]) + ]) ]) - ]) dnl Function to detect how to enable pthread AC_DEFUN([AX_PTHREAD_CHECK_ENABLE], - [AX_COMMON_ARG_WITH( - [pthread], - [pthread], - [search for pthread in includedir and libdir or in the specified DIR, or no if not to use pthread], - [auto-detect], - [DIR]) - - dnl Check for a shared library version - AX_PTHREAD_CHECK_LIB - - AS_IF( - [test "x$ac_cv_pthread_CPPFLAGS" != "x"], - [AC_SUBST( - [PTHREAD_CPPFLAGS], - [$ac_cv_pthread_CPPFLAGS]) - ]) - AS_IF( - [test "x$ac_cv_pthread_LIBADD" != "x"], - [AC_SUBST( - [PTHREAD_LIBADD], - [$ac_cv_pthread_LIBADD]) - ]) + [AX_COMMON_ARG_WITH( + [pthread], + [pthread], + [search for pthread in includedir and libdir or in the specified DIR, or no if not to use pthread], + [auto-detect], + [DIR]) - AS_IF( - [test "x$ac_cv_pthread" = xpthread], - [AC_SUBST( - [ax_pthread_pc_libs_private], - [-lpthread]) + dnl Check for a shared library version + AX_PTHREAD_CHECK_LIB + + AS_IF( + [test "x$ac_cv_pthread_CPPFLAGS" != "x"], + [AC_SUBST( + [PTHREAD_CPPFLAGS], + [$ac_cv_pthread_CPPFLAGS]) + ]) + AS_IF( + [test "x$ac_cv_pthread_LIBADD" != "x"], + [AC_SUBST( + [PTHREAD_LIBADD], + [$ac_cv_pthread_LIBADD]) + ]) + + AS_IF( + [test "x$ac_cv_pthread" = xpthread], + [AC_SUBST( + [ax_pthread_pc_libs_private], + [-lpthread]) + ]) ]) - ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/manuals/Makefile.am new/libfmos-20240415/manuals/Makefile.am --- old/libfmos-20240118/manuals/Makefile.am 2023-12-03 10:04:58.000000000 +0100 +++ new/libfmos-20240415/manuals/Makefile.am 2024-04-15 18:27:12.000000000 +0200 @@ -4,9 +4,7 @@ EXTRA_DIST = \ libfmos.3 -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/msvscpp/Makefile.am new/libfmos-20240415/msvscpp/Makefile.am --- old/libfmos-20240118/msvscpp/Makefile.am 2024-01-18 05:51:26.000000000 +0100 +++ new/libfmos-20240415/msvscpp/Makefile.am 2024-04-15 18:26:59.000000000 +0200 @@ -17,9 +17,7 @@ EXTRA_DIST = \ $(MSVSCPP_FILES) -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/ossfuzz/Makefile.am new/libfmos-20240415/ossfuzz/Makefile.am --- old/libfmos-20240118/ossfuzz/Makefile.am 2023-12-03 10:04:59.000000000 +0100 +++ new/libfmos-20240415/ossfuzz/Makefile.am 2024-04-15 18:27:37.000000000 +0200 @@ -1,7 +1,7 @@ if HAVE_LIB_FUZZING_ENGINE AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common bin_PROGRAMS = \ adc_fuzzer \ @@ -33,12 +33,10 @@ ../libfmos/libfmos.la endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - splint-local: @echo "Running splint on adc_fuzzer ..." -splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(adc_fuzzer_SOURCES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/pyfmos/Makefile.am new/libfmos-20240415/pyfmos/Makefile.am --- old/libfmos-20240118/pyfmos/Makefile.am 2023-12-03 10:04:58.000000000 +0100 +++ new/libfmos-20240415/pyfmos/Makefile.am 2024-04-15 18:26:44.000000000 +0200 @@ -1,7 +1,7 @@ if HAVE_PYTHON AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @LIBFMOS_DLL_IMPORT@ @@ -27,9 +27,7 @@ endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/setup.cfg new/libfmos-20240415/setup.cfg --- old/libfmos-20240118/setup.cfg 2024-01-18 05:53:54.000000000 +0100 +++ new/libfmos-20240415/setup.cfg 2024-04-15 18:39:52.000000000 +0200 @@ -1,6 +1,6 @@ [metadata] name = libfmos-python -version = 20240118 +version = 20240415 description = Python bindings module for libfmos long_description = Python bindings module for libfmos long_description_content_type = text/plain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/tests/Makefile.am new/libfmos-20240415/tests/Makefile.am --- old/libfmos-20240118/tests/Makefile.am 2024-01-18 05:51:26.000000000 +0100 +++ new/libfmos-20240415/tests/Makefile.am 2024-04-15 18:34:03.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @LIBCTHREADS_CPPFLAGS@ \ @LIBCNOTIFY_CPPFLAGS@ \ @@ -133,9 +133,8 @@ fmos_test_support_LDADD = \ ../libfmos/libfmos.la -MAINTAINERCLEANFILES = \ - Makefile.in - -distclean: clean - -rm -f Makefile +DISTCLEANFILES = \ + Makefile \ + Makefile.in \ + notify_stream.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/tests/test_library.sh new/libfmos-20240415/tests/test_library.sh --- old/libfmos-20240118/tests/test_library.sh 2024-01-18 05:51:38.000000000 +0100 +++ new/libfmos-20240415/tests/test_library.sh 2024-04-15 18:28:28.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tests library functions and types. # -# Version: 20231007 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -141,12 +141,9 @@ exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/tests/test_manpage.sh new/libfmos-20240415/tests/test_manpage.sh --- old/libfmos-20240118/tests/test_manpage.sh 2024-01-18 05:50:45.000000000 +0100 +++ new/libfmos-20240415/tests/test_manpage.sh 2024-04-15 18:24:37.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tests man pages. # -# Version: 20230410 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -45,12 +45,9 @@ exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfmos-20240118/tests/test_python_module.sh new/libfmos-20240415/tests/test_python_module.sh --- old/libfmos-20240118/tests/test_python_module.sh 2024-01-18 05:51:38.000000000 +0100 +++ new/libfmos-20240415/tests/test_python_module.sh 2024-04-15 18:30:24.000000000 +0200 @@ -1,10 +1,11 @@ #!/usr/bin/env bash # Tests Python module functions and types. # -# Version: 20231005 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; +EXIT_NO_TESTS_RAN=5; EXIT_IGNORE=77; TEST_FUNCTIONS="adc lzfse lzvn support"; @@ -124,12 +125,9 @@ exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then @@ -147,7 +145,11 @@ test_python_function "${TEST_FUNCTION}"; RESULT=$?; - if test ${RESULT} -ne ${EXIT_SUCCESS}; + if test ${RESULT} -eq ${EXIT_NO_TESTS_RAN}; + then + RESULT=${EXIT_IGNORE}; + fi + if test ${RESULT} -ne ${EXIT_SUCCESS} && test ${RESULT} -ne ${EXIT_IGNORE}; then break; fi @@ -168,8 +170,11 @@ test_python_function "${TEST_FUNCTION}"; RESULT=$?; fi - - if test ${RESULT} -ne ${EXIT_SUCCESS}; + if test ${RESULT} -eq ${EXIT_NO_TESTS_RAN}; + then + RESULT=${EXIT_IGNORE}; + fi + if test ${RESULT} -ne ${EXIT_SUCCESS} && test ${RESULT} -ne ${EXIT_IGNORE}; then break; fi
