Hello community, here is the log from the commit of package pkgconf for openSUSE:Factory checked in at 2019-08-19 20:46:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pkgconf (Old) and /work/SRC/openSUSE:Factory/.pkgconf.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pkgconf" Mon Aug 19 20:46:38 2019 rev:7 rq:722625 version:1.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/pkgconf/pkgconf.changes 2019-08-06 15:11:50.779741454 +0200 +++ /work/SRC/openSUSE:Factory/.pkgconf.new.22127/pkgconf.changes 2019-08-19 20:46:40.397107669 +0200 @@ -1,0 +2,17 @@ +Mon Aug 12 09:35:34 UTC 2019 - Neal Gompa <[email protected]> + +- Update to 1.6.3 + + Fixed a memory leak when deduplicating paths. + + Fixed strndup-related build regression on Windows. + + Added --modversion description to pkgconf(1) man page. + + Properly tokenize versions. Versions cannot logically contain + whitespace, as dependency-lists would not properly tokenize if + they could. A diagnostic is generated for malformed version + strings containing whitespace when --validate is used. + +------------------------------------------------------------------- +Fri Aug 9 00:19:43 UTC 2019 - Neal Gompa <[email protected]> + +- Co-own aclocal directory to avoid requiring autoconf-archive + +------------------------------------------------------------------- Old: ---- pkgconf-1.6.1.tar.xz New: ---- pkgconf-1.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pkgconf.spec ++++++ --- /var/tmp/diff_new_pack.twt6Zf/_old 2019-08-19 20:46:41.725107384 +0200 +++ /var/tmp/diff_new_pack.twt6Zf/_new 2019-08-19 20:46:41.745107380 +0200 @@ -45,7 +45,7 @@ %global devname lib%{name}-devel Name: pkgconf -Version: 1.6.1 +Version: 1.6.3 Release: 0 Summary: Package compiler and linker metadata toolkit License: ISC @@ -216,6 +216,7 @@ %if %{with pkgconfig_compat} %files m4 +%dir %{_datadir}/aclocal %{_datadir}/aclocal/pkg.m4 %{_mandir}/man7/pkg.m4.7* ++++++ pkgconf-1.6.1.tar.xz -> pkgconf-1.6.3.tar.xz ++++++ ++++ 4911 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/pkgconf-1.6.1/AUTHORS new/pkgconf-1.6.3/AUTHORS --- old/pkgconf-1.6.1/AUTHORS 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/AUTHORS 2019-07-12 13:10:54.000000000 +0200 @@ -1,4 +1,41 @@ +A. Wilcox <[email protected]> +Alexander Tsoy <[email protected]> +Alexpux <[email protected]> +Alon Bar-Lev <[email protected]> +Alyx <[email protected]> +Ariadne Conill <[email protected]> Baptiste Daroussin <[email protected]> -Jeff Horelick <[email protected]> -Michał Górny <[email protected] -William Pitcock <[email protected]> +Baptiste Daroussin <[email protected]> +Bryan Drewery <[email protected]> +Dag-Erling Smørgrav <[email protected]> +Dan Kegel <[email protected]> +Dan Kegel <[email protected]> +Dan Nicholson <[email protected]> +David Michael <[email protected]> +Emil Renner Berthing <[email protected]> +Fabian Groffen <[email protected]> +Graham Ollis <[email protected]> +Gregor Richards <[email protected]> +Ignacio Casal Quinteiro <[email protected]> +Igor Gnatenko <[email protected]> +Issam Maghni <[email protected]> +JD Horelick <[email protected]> +Jason Dusek <[email protected]> +Javier Viguera <[email protected]> +Jean-Sébastien Pédron <[email protected]> +John Hein <[email protected]> +Jussi Pakkanen <[email protected]> +Leorize <[email protected]> +Luca Barbato <[email protected]> +Marcin Wojdyr <[email protected]> +Maxin B. John <[email protected]> +Michał Górny <[email protected]> +Mike Frysinger <[email protected]> +Seungha Yang <[email protected]> +TingPing <[email protected]> +Tobias Kortkamp <[email protected]> +Tony Theodore <[email protected]> +Volker Braun <[email protected]> +Yu Kobayashi <[email protected]> +orbea <[email protected]> +✈ Graham ✈ <[email protected]> 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/pkgconf-1.6.1/CMakeLists.txt new/pkgconf-1.6.3/CMakeLists.txt --- old/pkgconf-1.6.1/CMakeLists.txt 2019-03-24 03:50:13.000000000 +0100 +++ new/pkgconf-1.6.3/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,135 +0,0 @@ -# CMake configuration for pkgconf -# -# Caution: this assumes you don't set CMAKE_BUILD_TYPE -# -# FIXME: this isn't a native cmake approach, it's just a straight translation -# of configure.ac + Makefile.am, barely good enough to work on Linux, Mac, and Windows. - -# Require recent cmake, but not so recent that Ubuntu 16.04 users have to upgrade. -CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1 FATAL_ERROR) - -PROJECT(pkgconf C) - -SET(PACKAGE_BUGREPORT http://github.com/pkgconf/pkgconf/issues) -SET(PACKAGE_NAME pkgconf) -SET(PACKAGE_VERSION 1.6.0) -SET(LIBPKGCONF_VERSION "3.0.0") -SET(LIBPKGCONF_SOVERSION 3) - -#-------- GNU directory variables --------- - -SET(abs_top_srcdir ${pkgconf_SOURCE_DIR}) -SET(prefix ${CMAKE_INSTALL_PREFIX}) -SET(exec_prefix ${prefix}) -SET(datarootdir ${prefix}/share) -SET(datadir ${datarootdir}) -SET(libdir ${prefix}/lib) -SET(includedir ${prefix}/include) - -#-------- User-settable options --------- - -# FIXME: this is overridden in get_default_pkgconfig_path() on windows, but not in test_env.sh.in?! -SET(pkg_config_dir "${libdir}/pkgconfig:${datadir}/pkgconfig" CACHE STRING "specify the places where pc files will be found") -SET(PKGCONFIGDIR "${pkg_config_dir}") -SET(pkg_default_dir "${PKGCONFIGDIR}") # c'mon, make up your mind - -SET(personality_dir "${libdir}/pkgconfig/personality.d:${datadir}/pkgconfig/personality.d" CACHE STRING "specify the places where personality files will be found") - -SET(system_libdir "${libdir}" CACHE STRING "specify the system library directory (default LIBDIR)") -SET(SYSTEM_LIBDIR "${system_libdir}") - -SET(system_includedir "${includedir}" CACHE STRING "specify the system include directory (default INCLUDEDIR)") -SET(SYSTEM_INCLUDEDIR "${system_includedir}") - -#-------- Probe system --------- - -INCLUDE (CheckIncludeFiles) -CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) -INCLUDE (CheckFunctionExists) -CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY) -CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT) -CHECK_FUNCTION_EXISTS(strndup HAVE_STRNDUP) -CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH) - -#-------- Generate source files --------- - -CONFIGURE_FILE(libpkgconf/config.h.cmake.in libpkgconf/config.h @ONLY) - -#-------- Configure common compiler options -------- - -IF (MSVC) - # Make warnings fatal... but ignore C4996: 'strdup' two different ways - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4996") - # Ignore warning C4996: 'strncpy' - ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS=1") -ELSE() - INCLUDE(CheckCCompilerFlag) - CHECK_C_COMPILER_FLAG("-Wall" COMPILER_HAS_WALL) - IF (COMPILER_HAS_WALL) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") - ENDIF() - CHECK_C_COMPILER_FLAG("-Wextra" COMPILER_HAS_WEXTRA) - IF (COMPILER_HAS_WEXTRA) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") - ENDIF() - CHECK_C_COMPILER_FLAG("-Wformat=2" COMPILER_HAS_WFORMAT) - IF (COMPILER_HAS_WFORMAT) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat=2") - ENDIF() - CHECK_C_COMPILER_FLAG("-std=gnu99" COMPILER_HAS_STD_GNU99) - CHECK_C_COMPILER_FLAG("-std=c99" COMPILER_HAS_STD_C99) - IF (COMPILER_HAS_STD_GNU99) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") - ELSEIF (COMPILER_HAS_STD_C99) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - ENDIF() - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g") -ENDIF() - -INCLUDE_DIRECTORIES(${pkgconf_SOURCE_DIR} ${pkgconf_BINARY_DIR}) -ADD_DEFINITIONS(-DPERSONALITY_PATH=\"${personality_dir}\") -ADD_DEFINITIONS(-DPKG_DEFAULT_PATH=\"${pkg_default_dir}\") -ADD_DEFINITIONS(-DSYSTEM_INCLUDEDIR=\"${system_includedir}\") -ADD_DEFINITIONS(-DSYSTEM_LIBDIR=\"${system_libdir}\") - -#-------- Build and install library -------- - -# Place shared libraries in same place as binary, for ease of setting PATH in test_env.sh -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${pkgconf_BINARY_DIR}) -ADD_SUBDIRECTORY(libpkgconf) - -#-------- Build and install executable -------- - -INCLUDE_DIRECTORIES(${libpkgconf_BINARY_DIR}) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Icli") -ADD_EXECUTABLE(pkgconf cli/main.c cli/getopt_long.c cli/renderer-msvc.c) -TARGET_LINK_LIBRARIES(pkgconf libpkgconf) -INSTALL(TARGETS pkgconf DESTINATION bin) - -#-------- Tests --------- - -ENABLE_TESTING() - -# Handy that these files need configuring; cygwin atf doesn't like windows line endings, and NEWLINE_STYLE helps. -FOREACH(file Kyuafile tests/Kyuafile tests/test_env.sh) - CONFIGURE_FILE(${file}.in ${file} @ONLY NEWLINE_STYLE UNIX) -ENDFOREACH() - -SET(test_scripts - tests/basic - tests/builtins - tests/conflicts - tests/framework - tests/parser - tests/provides - tests/regress - tests/requires - tests/sysroot - tests/version - ) -# Handy that these files need configuring; cygwin atf doesn't like windows line endings, and NEWLINE_STYLE helps. -FOREACH(file ${test_scripts}) - CONFIGURE_FILE(${file}.sh ${file} @ONLY NEWLINE_STYLE UNIX) -ENDFOREACH() - -ADD_TEST(kyua kyua --config=none test) 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/pkgconf-1.6.1/Makefile.am new/pkgconf-1.6.3/Makefile.am --- old/pkgconf-1.6.1/Makefile.am 2019-03-24 03:50:13.000000000 +0100 +++ new/pkgconf-1.6.3/Makefile.am 2019-07-12 13:15:24.000000000 +0200 @@ -15,8 +15,6 @@ lib_LTLIBRARIES = libpkgconf.la EXTRA_DIST = pkg.m4 \ - CMakeLists.txt \ - libpkgconf/CMakeLists.txt \ libpkgconf/win-dirent.h \ tests/lib-relocatable/lib/pkgconfig/foo.pc \ tests/lib1/argv-parse-2.pc \ @@ -84,6 +82,7 @@ tests/lib1/fragment-quoting-7.pc \ tests/lib1/malformed-1.pc \ tests/lib1/malformed-quoting.pc \ + tests/lib1/malformed-version.pc \ tests/lib1/explicit-sysroot.pc \ tests/lib1/escaped-backslash.pc \ tests/lib1/cflags-internal.pc \ 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/pkgconf-1.6.1/NEWS new/pkgconf-1.6.3/NEWS --- old/pkgconf-1.6.1/NEWS 2019-03-24 04:33:52.000000000 +0100 +++ new/pkgconf-1.6.3/NEWS 2019-07-12 13:46:22.000000000 +0200 @@ -1,6 +1,30 @@ Changes from previous version of pkgconf ======================================== +Changes from 1.6.2 to 1.6.3: +---------------------------- + +* Bug fixes: + - Properly tokenize versions. Versions cannot logically contain + whitespace, as dependency-lists would not properly tokenize if + they could. A diagnostic is generated for malformed version + strings containing whitespace when --validate is used. + +* Enhancements: + - CMake support has been dropped. Use Meson to build on Windows. + +Changes from 1.6.1 to 1.6.2: +---------------------------- + +* Bug fixes: + - Fixed a memory leak when deduplicating paths. + - Fixed strndup-related build regression on Windows. + +* Enhancements: + - Added pkgconf-lite variant. pkgconf-lite is a stripped down + variant of pkgconf that only includes pkg-config features. + - Added --modversion description to pkgconf(1) man page. + Changes from 1.6.0 to 1.6.1: ---------------------------- 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/pkgconf-1.6.1/README.md new/pkgconf-1.6.3/README.md --- old/pkgconf-1.6.1/README.md 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/README.md 2019-07-12 13:10:54.000000000 +0200 @@ -1,4 +1,4 @@ -# pkgconf +# pkgconf [](https://builds.sr.ht/~kaniini/pkgconf?) `pkgconf` is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org. @@ -7,11 +7,6 @@ other tooling such as compilers and IDEs to discover and use libraries configured by pkgconf. -## git repository has moved - -Note: due to the recent acquisition of GitHub by Microsoft, we have moved our git -repository to <https://git.dereferenced.org/pkgconf/pkgconf>. - ## using `pkgconf` with autotools Implementations of pkg-config, such as pkgconf, are typically used with the @@ -122,8 +117,10 @@ Release tarballs are available at <https://distfiles.dereferenced.org/pkgconf/>. Please only use the tarballs from distfiles.dereferenced.org. -## reporting bugs +## contacts + +You can report bugs at <https://todo.sr.ht/~kaniini/pkgconf>. -See <https://git.dereferenced.org/pkgconf/pkgconf/issues>. +There is a mailing list at <https://lists.sr.ht/~kaniini/pkgconf>. -Also you can contact us at `#pkgconf` at `irc.freenode.net`. +You can contact us via IRC at `#pkgconf` at `irc.freenode.net`. 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/pkgconf-1.6.1/cli/main.c new/pkgconf-1.6.3/cli/main.c --- old/pkgconf-1.6.1/cli/main.c 2019-03-24 03:50:13.000000000 +0100 +++ new/pkgconf-1.6.3/cli/main.c 2019-07-12 13:53:12.000000000 +0200 @@ -2,7 +2,7 @@ * main.c * main() routine, printer functions * - * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 + * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 * pkgconf authors (see AUTHORS). * * Permission to use, copy, modify, and/or distribute this software for any @@ -14,11 +14,13 @@ * from the use of this software. */ +#include "libpkgconf/config.h" #include <libpkgconf/stdinc.h> #include <libpkgconf/libpkgconf.h> -#include "libpkgconf/config.h" #include "getopt_long.h" +#ifndef PKGCONF_LITE #include "renderer-msvc.h" +#endif #ifdef _WIN32 #include <io.h> /* for _setmode() */ #include <fcntl.h> @@ -246,6 +248,7 @@ return true; } +#ifndef PKGCONF_LITE static void print_digraph_node(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *unused) { @@ -280,6 +283,7 @@ printf("}\n"); return true; } +#endif static bool apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth) @@ -542,6 +546,7 @@ return true; } +#ifndef PKGCONF_LITE static void print_graph_node(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data) { @@ -585,6 +590,7 @@ return true; } +#endif static void version(void) @@ -596,7 +602,7 @@ about(void) { printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION); - printf("Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018\n"); + printf("Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019\n"); printf(" pkgconf authors (see AUTHORS in documentation directory).\n\n"); printf("Permission to use, copy, modify, and/or distribute this software for any\n"); printf("purpose with or without fee is hereby granted, provided that the above\n"); @@ -625,7 +631,9 @@ printf(" --silence-errors explicitly be silent about errors\n"); printf(" --list-all list all known packages\n"); printf(" --list-package-names list all known package names\n"); +#ifndef PKGCONF_LITE printf(" --simulate simulate walking the calculated dependency graph\n"); +#endif printf(" --no-cache do not cache already seen packages when\n"); printf(" walking the dependency graph\n"); printf(" --log-file=filename write an audit log to a specified file\n"); @@ -638,9 +646,11 @@ printf(" --relocate=path relocates a path and exits (mostly for testsuite)\n"); printf(" --dont-relocate-paths disables path relocation support\n"); +#ifndef PKGCONF_LITE printf("\ncross-compilation personality support:\n\n"); printf(" --personality=triplet|filename sets the personality to 'triplet' or a file named 'filename'\n"); printf(" --dump-personality dumps details concerning selected personality\n"); +#endif printf("\nchecking specific pkg-config database entries:\n\n"); @@ -676,7 +686,9 @@ printf(" linking to stdout\n"); printf(" --print-provides print provided dependencies to stdout\n"); printf(" --print-variables print all known variables in module to stdout\n"); +#ifndef PKGCONF_LITE printf(" --digraph print entire dependency graph in graphviz 'dot' format\n"); +#endif printf(" --keep-system-cflags keep -I%s entries in cflags output\n", SYSTEM_INCLUDEDIR); printf(" --keep-system-libs keep -L%s entries in libs output\n", SYSTEM_LIBDIR); printf(" --path show the exact filenames for any matching .pc files\n"); @@ -684,7 +696,9 @@ printf(" --internal-cflags do not filter 'internal' cflags from output\n"); printf("\nfiltering output:\n\n"); +#ifndef PKGCONF_LITE printf(" --msvc-syntax print translatable fragments in MSVC syntax\n"); +#endif printf(" --fragment-filter=types filter output fragments to the specified types\n"); printf("\nreport bugs to <%s>.\n", PACKAGE_BUGREPORT); @@ -701,6 +715,7 @@ printf("%s\n", buf); } +#ifndef PKGCONF_LITE static void dump_personality(const pkgconf_cross_personality_t *p) { @@ -758,7 +773,7 @@ if (i == NULL) return pkgconf_cross_personality_default(); - prefix = strndup(argv0, i - argv0); + prefix = pkgconf_strndup(argv0, i - argv0); out = pkgconf_cross_personality_find(prefix); free(prefix); if (out == NULL) @@ -766,6 +781,7 @@ return out; } +#endif int main(int argc, char *argv[]) @@ -814,7 +830,9 @@ { "pure", no_argument, &want_flags, PKG_PURE, }, { "print-requires", no_argument, &want_flags, PKG_REQUIRES, }, { "print-variables", no_argument, &want_flags, PKG_VARIABLES|PKG_PRINT_ERRORS, }, +#ifndef PKGCONF_LITE { "digraph", no_argument, &want_flags, PKG_DIGRAPH, }, +#endif { "help", no_argument, &want_flags, PKG_HELP, }, { "env-only", no_argument, &want_flags, PKG_ENV_ONLY, }, { "print-requires-private", no_argument, &want_flags, PKG_REQUIRES_PRIVATE, }, @@ -835,7 +853,9 @@ { "silence-errors", no_argument, &want_flags, PKG_SILENCE_ERRORS, }, { "list-all", no_argument, &want_flags, PKG_LIST|PKG_PRINT_ERRORS, }, { "list-package-names", no_argument, &want_flags, PKG_LIST_PACKAGE_NAMES|PKG_PRINT_ERRORS, }, +#ifndef PKGCONF_LITE { "simulate", no_argument, &want_flags, PKG_SIMULATE, }, +#endif { "no-cache", no_argument, &want_flags, PKG_NO_CACHE, }, { "print-provides", no_argument, &want_flags, PKG_PROVIDES, }, { "no-provides", no_argument, &want_flags, PKG_NO_PROVIDES, }, @@ -850,21 +870,31 @@ { "dont-define-prefix", no_argument, &want_flags, PKG_DONT_DEFINE_PREFIX }, { "dont-relocate-paths", no_argument, &want_flags, PKG_DONT_RELOCATE_PATHS }, { "env", required_argument, NULL, 48 }, +#ifndef PKGCONF_LITE { "msvc-syntax", no_argument, &want_flags, PKG_MSVC_SYNTAX }, +#endif { "fragment-filter", required_argument, NULL, 50 }, { "internal-cflags", no_argument, &want_flags, PKG_INTERNAL_CFLAGS }, +#ifndef PKGCONF_LITE { "dump-personality", no_argument, &want_flags, PKG_DUMP_PERSONALITY }, { "personality", required_argument, NULL, 53 }, +#endif { NULL, 0, NULL, 0 } }; +#ifndef PKGCONF_LITE if (getenv("PKG_CONFIG_EARLY_TRACE")) { error_msgout = stderr; pkgconf_client_set_trace_handler(&pkg_client, error_handler, NULL); } +#endif +#ifndef PKGCONF_LITE personality = deduce_personality(argv); +#else + personality = pkgconf_cross_personality_default(); +#endif while ((ret = pkg_getopt_long_only(argc, argv, "", options, NULL)) != -1) { @@ -909,9 +939,11 @@ case 50: want_fragment_filter = pkg_optarg; break; +#ifndef PKGCONF_LITE case 53: personality = pkgconf_cross_personality_find(pkg_optarg); break; +#endif case '?': case ':': return EXIT_FAILURE; @@ -924,17 +956,21 @@ pkgconf_path_copy_list(&personality->dir_list, &dir_list); pkgconf_path_free(&dir_list); +#ifndef PKGCONF_LITE if ((want_flags & PKG_DUMP_PERSONALITY) == PKG_DUMP_PERSONALITY) { dump_personality(personality); return EXIT_SUCCESS; } +#endif /* now, bring up the client. settings are preserved since the client is prealloced */ pkgconf_client_init(&pkg_client, error_handler, NULL, personality); +#ifndef PKGCONF_LITE if ((want_flags & PKG_MSVC_SYNTAX) == PKG_MSVC_SYNTAX) want_render_ops = msvc_renderer_get(); +#endif if ((env_traverse_depth = getenv("PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH")) != NULL) maximum_traverse_depth = atoi(env_traverse_depth); @@ -953,8 +989,10 @@ if ((want_flags & PKG_VALIDATE) == PKG_VALIDATE || (want_flags & PKG_DEBUG) == PKG_DEBUG) pkgconf_client_set_warn_handler(&pkg_client, error_handler, NULL); +#ifndef PKGCONF_LITE if ((want_flags & PKG_DEBUG) == PKG_DEBUG) pkgconf_client_set_trace_handler(&pkg_client, error_handler, NULL); +#endif if ((want_flags & PKG_ABOUT) == PKG_ABOUT) { @@ -1241,6 +1279,7 @@ ret = EXIT_SUCCESS; +#ifndef PKGCONF_LITE if ((want_flags & PKG_SIMULATE) == PKG_SIMULATE) { want_flags &= ~(PKG_CFLAGS|PKG_LIBS); @@ -1252,6 +1291,7 @@ goto out; } } +#endif if (!pkgconf_queue_validate(&pkg_client, &pkgq, maximum_traverse_depth)) { @@ -1291,6 +1331,7 @@ } } +#ifndef PKGCONF_LITE if ((want_flags & PKG_DIGRAPH) == PKG_DIGRAPH) { want_flags &= ~(PKG_CFLAGS|PKG_LIBS); @@ -1301,6 +1342,7 @@ goto out; } } +#endif if ((want_flags & PKG_MODVERSION) == PKG_MODVERSION) { 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/pkgconf-1.6.1/compile new/pkgconf-1.6.3/compile --- old/pkgconf-1.6.1/compile 2018-04-09 12:12:32.000000000 +0200 +++ new/pkgconf-1.6.3/compile 2018-03-26 01:44:27.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # 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/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,8 +255,7 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -340,9 +339,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # 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/pkgconf-1.6.1/configure.ac new/pkgconf-1.6.3/configure.ac --- old/pkgconf-1.6.1/configure.ac 2019-03-24 04:38:47.000000000 +0100 +++ new/pkgconf-1.6.3/configure.ac 2019-07-12 13:53:33.000000000 +0200 @@ -12,7 +12,7 @@ dnl from the use of this software. AC_PREREQ([2.68]) -AC_INIT([pkgconf], [1.6.1], [http://github.com/pkgconf/pkgconf/issues]) +AC_INIT([pkgconf], [1.6.3], [https://todo.sr.ht/~kaniini/pkgconf]) AC_CONFIG_SRCDIR([cli/main.c]) AC_CONFIG_MACRO_DIRS([m4]) AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"]) 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/pkgconf-1.6.1/libpkgconf/CMakeLists.txt new/pkgconf-1.6.3/libpkgconf/CMakeLists.txt --- old/pkgconf-1.6.1/libpkgconf/CMakeLists.txt 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/libpkgconf/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -PROJECT(libpkgconf C) - -# Enforce visibiliity restrictions when building shared libraries on Unix. -SET(CMAKE_CXX_VISIBILITY_PRESET hidden) -ADD_DEFINITIONS(-DLIBPKGCONF_EXPORT) - -ADD_LIBRARY(libpkgconf SHARED - argvsplit.c - audit.c - bsdstubs.c - cache.c - client.c - dependency.c - fileio.c - fragment.c - parser.c - path.c - personality.c - pkg.c - queue.c - tuple.c -) -SET_TARGET_PROPERTIES(libpkgconf PROPERTIES VERSION ${LIBPKGCONF_VERSION} SOVERSION ${LIBPKGCONF_SOVERSION}) -INSTALL(TARGETS libpkgconf - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) -INSTALL( - FILES bsdstubs.h iter.h libpkgconf.h libpkgconf-api.h stdinc.h - DESTINATION include/libpkgconf -) - -# Hypothesis: .pc files are a Unix thing, should always have unix line endings. -CONFIGURE_FILE(${pkgconf_SOURCE_DIR}/libpkgconf.pc.in libpkgconf.pc @ONLY NEWLINE_STYLE UNIX) -INSTALL(FILES ${libpkgconf_BINARY_DIR}/libpkgconf.pc DESTINATION lib/pkgconfig) 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/pkgconf-1.6.1/libpkgconf/bsdstubs.h new/pkgconf-1.6.3/libpkgconf/bsdstubs.h --- old/pkgconf-1.6.1/libpkgconf/bsdstubs.h 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/libpkgconf/bsdstubs.h 2019-07-12 13:10:54.000000000 +0200 @@ -13,8 +13,8 @@ * from the use of this software. */ -#ifndef __BSDSTUBS_H__ -#define __BSDSTUBS_H__ +#ifndef LIBPKGCONF_BSDSTUBS_H +#define LIBPKGCONF_BSDSTUBS_H #include <libpkgconf/libpkgconf-api.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/pkgconf-1.6.1/libpkgconf/client.c new/pkgconf-1.6.3/libpkgconf/client.c --- old/pkgconf-1.6.1/libpkgconf/client.c 2019-03-24 04:16:17.000000000 +0100 +++ new/pkgconf-1.6.3/libpkgconf/client.c 2019-07-12 13:10:54.000000000 +0200 @@ -13,9 +13,9 @@ * from the use of this software. */ +#include <libpkgconf/config.h> #include <libpkgconf/stdinc.h> #include <libpkgconf/libpkgconf.h> -#include <libpkgconf/config.h> /* * !doc @@ -99,8 +99,10 @@ client->error_handler = error_handler; client->auditf = NULL; +#ifndef PKGCONF_LITE if (client->trace_handler == NULL) pkgconf_client_set_trace_handler(client, NULL, NULL); +#endif pkgconf_client_set_error_handler(client, error_handler, error_handler_data); pkgconf_client_set_warn_handler(client, NULL, NULL); @@ -567,6 +569,7 @@ } } +#ifndef PKGCONF_LITE /* * !doc * @@ -607,3 +610,4 @@ PKGCONF_TRACE(client, "installing default trace handler"); } } +#endif 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/pkgconf-1.6.1/libpkgconf/iter.h new/pkgconf-1.6.3/libpkgconf/iter.h --- old/pkgconf-1.6.1/libpkgconf/iter.h 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/libpkgconf/iter.h 2019-07-12 13:10:54.000000000 +0200 @@ -13,8 +13,8 @@ * from the use of this software. */ -#ifndef PKGCONF__ITER_H -#define PKGCONF__ITER_H +#ifndef LIBPKGCONF_ITER_H +#define LIBPKGCONF_ITER_H #ifdef __cplusplus extern "C" { 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/pkgconf-1.6.1/libpkgconf/libpkgconf-api.h new/pkgconf-1.6.3/libpkgconf/libpkgconf-api.h --- old/pkgconf-1.6.1/libpkgconf/libpkgconf-api.h 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/libpkgconf/libpkgconf-api.h 2019-07-12 13:10:54.000000000 +0200 @@ -1,5 +1,5 @@ -#ifndef PKGCONFG_API -#define PKGCONFG_API +#ifndef LIBPKGCONF_LIBPKGCONF_API_H +#define LIBPKGCONF_LIBPKGCONF_API_H /* Makefile.am specifies visibility using the libtool option -export-symbols-regex '^pkgconf_' * Unfortunately, that is not available when building with cmake, so use attributes instead, 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/pkgconf-1.6.1/libpkgconf/libpkgconf.h new/pkgconf-1.6.3/libpkgconf/libpkgconf.h --- old/pkgconf-1.6.1/libpkgconf/libpkgconf.h 2019-03-24 04:22:42.000000000 +0100 +++ new/pkgconf-1.6.3/libpkgconf/libpkgconf.h 2019-07-12 13:53:33.000000000 +0200 @@ -78,8 +78,8 @@ #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \ for ((value) = (tail); (value) != NULL; (value) = (value)->prev) -#define LIBPKGCONF_VERSION 10600 -#define LIBPKGCONF_VERSION_STR "1.6.0" +#define LIBPKGCONF_VERSION 10603 +#define LIBPKGCONF_VERSION_STR "1.6.3" struct pkgconf_fragment_ { pkgconf_node_t iter; @@ -278,6 +278,7 @@ PKGCONF_API bool pkgconf_trace(const pkgconf_client_t *client, const char *filename, size_t lineno, const char *funcname, const char *format, ...) PRINTFLIKE(5, 6); PKGCONF_API bool pkgconf_default_error_handler(const char *msg, const pkgconf_client_t *client, const void *data); +#ifndef PKGCONF_LITE #if defined(__GNUC__) || defined(__INTEL_COMPILER) #define PKGCONF_TRACE(client, ...) do { \ pkgconf_trace(client, __FILE__, __LINE__, __PRETTY_FUNCTION__, __VA_ARGS__); \ @@ -287,6 +288,9 @@ pkgconf_trace(client, __FILE__, __LINE__, __func__, __VA_ARGS__); \ } while (0); #endif +#else +#define PKGCONF_TRACE(client, ...) +#endif PKGCONF_API pkgconf_pkg_t *pkgconf_pkg_ref(pkgconf_client_t *client, pkgconf_pkg_t *pkg); PKGCONF_API void pkgconf_pkg_unref(pkgconf_client_t *client, pkgconf_pkg_t *pkg); 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/pkgconf-1.6.1/libpkgconf/parser.c new/pkgconf-1.6.3/libpkgconf/parser.c --- old/pkgconf-1.6.1/libpkgconf/parser.c 2018-06-16 23:29:35.000000000 +0200 +++ new/pkgconf-1.6.3/libpkgconf/parser.c 2019-07-12 13:10:54.000000000 +0200 @@ -13,8 +13,8 @@ * from the use of this software. */ -#include <libpkgconf/stdinc.h> #include <libpkgconf/config.h> +#include <libpkgconf/stdinc.h> #include <libpkgconf/libpkgconf.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/pkgconf-1.6.1/libpkgconf/path.c new/pkgconf-1.6.3/libpkgconf/path.c --- old/pkgconf-1.6.1/libpkgconf/path.c 2019-03-24 04:25:53.000000000 +0100 +++ new/pkgconf-1.6.3/libpkgconf/path.c 2019-07-12 13:10:54.000000000 +0200 @@ -13,9 +13,9 @@ * from the use of this software. */ +#include <libpkgconf/config.h> #include <libpkgconf/stdinc.h> #include <libpkgconf/libpkgconf.h> -#include <libpkgconf/config.h> #if defined(HAVE_CYGWIN_CONV_PATH) && defined(__MSYS__) # include <sys/cygwin.h> @@ -95,7 +95,12 @@ char *linkdest = realpath(path, NULL); if (linkdest != NULL && stat(linkdest, &st) == -1) + { + free(linkdest); return; + } + + free(linkdest); } if (path_list_contains_entry(path, dirlist, &st)) return; 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/pkgconf-1.6.1/libpkgconf/personality.c new/pkgconf-1.6.3/libpkgconf/personality.c --- old/pkgconf-1.6.1/libpkgconf/personality.c 2019-03-24 03:50:13.000000000 +0100 +++ new/pkgconf-1.6.3/libpkgconf/personality.c 2019-07-12 13:10:54.000000000 +0200 @@ -13,9 +13,9 @@ * from the use of this software. */ +#include <libpkgconf/config.h> #include <libpkgconf/stdinc.h> #include <libpkgconf/libpkgconf.h> -#include <libpkgconf/config.h> #ifdef _WIN32 # define strcasecmp _stricmp @@ -99,6 +99,7 @@ return &default_personality; } +#ifndef PKGCONF_LITE static bool valid_triplet(const char *triplet) { @@ -249,3 +250,4 @@ pkgconf_path_free(&plist); return out; } +#endif 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/pkgconf-1.6.1/libpkgconf/pkg.c new/pkgconf-1.6.3/libpkgconf/pkg.c --- old/pkgconf-1.6.1/libpkgconf/pkg.c 2019-03-24 03:50:13.000000000 +0100 +++ new/pkgconf-1.6.3/libpkgconf/pkg.c 2019-07-12 13:31:22.000000000 +0200 @@ -13,8 +13,8 @@ * from the use of this software. */ -#include <libpkgconf/stdinc.h> #include <libpkgconf/config.h> +#include <libpkgconf/stdinc.h> #include <libpkgconf/libpkgconf.h> /* @@ -88,6 +88,31 @@ } static void +pkgconf_pkg_parser_version_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value) +{ + (void) keyword; + (void) lineno; + char *p, *i; + size_t len; + char **dest = (char **)((char *) pkg + offset); + + /* cut at any detected whitespace */ + p = pkgconf_tuple_parse(client, &pkg->vars, value); + + len = strcspn(p, " \t\r\n"); + if (len) + { + i = p + (ptrdiff_t) len; + *i = '\0'; + + pkgconf_warn(client, "%s:" SIZE_FMT_SPECIFIER ": warning: malformed version field with whitespace, trimming to [%s]\n", pkg->filename, + lineno, p); + } + + *dest = p; +} + +static void pkgconf_pkg_parser_fragment_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, const char *value) { pkgconf_list_t *dest = (pkgconf_list_t *)((char *) pkg + offset); @@ -134,7 +159,7 @@ {"Requires", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, required)}, {"Requires.internal", pkgconf_pkg_parser_internal_dependency_func, offsetof(pkgconf_pkg_t, requires_private)}, {"Requires.private", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_private)}, - {"Version", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, version)}, + {"Version", pkgconf_pkg_parser_version_func, offsetof(pkgconf_pkg_t, version)}, }; static void 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/pkgconf-1.6.1/libpkgconf/stdinc.h new/pkgconf-1.6.3/libpkgconf/stdinc.h --- old/pkgconf-1.6.1/libpkgconf/stdinc.h 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/libpkgconf/stdinc.h 2019-07-12 13:10:54.000000000 +0200 @@ -13,8 +13,8 @@ * from the use of this software. */ -#ifndef __STDINC_H -#define __STDINC_H +#ifndef LIBPKGCONF_STDINC_H +#define LIBPKGCONF_STDINC_H #include <ctype.h> #include <stdio.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/pkgconf-1.6.1/libpkgconf/win-dirent.h new/pkgconf-1.6.3/libpkgconf/win-dirent.h --- old/pkgconf-1.6.1/libpkgconf/win-dirent.h 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/libpkgconf/win-dirent.h 2019-07-12 13:10:54.000000000 +0200 @@ -7,8 +7,8 @@ * under the MIT license. For all details and documentation, see * https://github.com/tronkko/dirent */ -#ifndef DIRENT_H -#define DIRENT_H +#ifndef LIBPKGCONF_DIRENT_H +#define LIBPKGCONF_DIRENT_H /* * Include windows.h without Windows Sockets 1.1 to prevent conflicts with 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/pkgconf-1.6.1/m4/libtool.m4 new/pkgconf-1.6.3/m4/libtool.m4 --- old/pkgconf-1.6.1/m4/libtool.m4 2018-02-17 14:57:28.000000000 +0100 +++ new/pkgconf-1.6.3/m4/libtool.m4 2016-08-20 14:34:31.000000000 +0200 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2887,6 +2886,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3546,7 +3557,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4424,7 +4435,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4936,6 +4947,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4998,6 +5012,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5252,7 +5269,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5773,6 +5790,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5794,7 +5812,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else 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/pkgconf-1.6.1/man/pkgconf.1 new/pkgconf-1.6.3/man/pkgconf.1 --- old/pkgconf-1.6.1/man/pkgconf.1 2018-06-16 08:43:55.000000000 +0200 +++ new/pkgconf-1.6.3/man/pkgconf.1 2019-07-12 13:10:54.000000000 +0200 @@ -165,6 +165,8 @@ command. .It Fl -fragment-filter Ns = Ns Ar TYPES Filter the fragment lists for the specified types. +.It Fl -modversion +Print the version of the queried module. .El .Sh ENVIRONMENT .Bl -tag -width indent 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/pkgconf-1.6.1/missing new/pkgconf-1.6.3/missing --- old/pkgconf-1.6.1/missing 2018-04-09 12:12:32.000000000 +0200 +++ new/pkgconf-1.6.3/missing 2018-03-26 01:44:27.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # 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/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=https://www.perl.org/ -flex_URL=https://github.com/westes/flex -gnu_software_URL=https://www.gnu.org/software +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # 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/pkgconf-1.6.1/tests/lib1/malformed-version.pc new/pkgconf-1.6.3/tests/lib1/malformed-version.pc --- old/pkgconf-1.6.1/tests/lib1/malformed-version.pc 1970-01-01 01:00:00.000000000 +0100 +++ new/pkgconf-1.6.3/tests/lib1/malformed-version.pc 2019-07-12 13:13:52.000000000 +0200 @@ -0,0 +1,5 @@ +Name: malformed-version +Version: 3.922 2018-03-17 +Description: None. +Cflags: -Ifoo +Libs: -lbar 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/pkgconf-1.6.1/tests/parser.sh new/pkgconf-1.6.3/tests/parser.sh --- old/pkgconf-1.6.1/tests/parser.sh 2018-06-16 23:34:22.000000000 +0200 +++ new/pkgconf-1.6.3/tests/parser.sh 2019-07-12 13:41:09.000000000 +0200 @@ -31,7 +31,10 @@ fragment_quoting_7 \ msvc_fragment_quoting \ msvc_fragment_render_cflags \ - tuple_dequote + tuple_dequote \ + version_with_whitespace \ + version_with_whitespace_2 \ + version_with_whitespace_diagnostic comments_body() { @@ -283,3 +286,24 @@ -o inline:'-L/test/lib -lfoo \n' \ pkgconf --with-path="${selfdir}/lib1" --libs tuple-quoting } + +version_with_whitespace_body() +{ + atf_check \ + -o inline:'3.922\n' \ + pkgconf --with-path="${selfdir}/lib1" --modversion malformed-version +} + +version_with_whitespace_2_body() +{ + atf_check \ + -o inline:'malformed-version = 3.922\n' \ + pkgconf --with-path="${selfdir}/lib1" --print-provides malformed-version +} + +version_with_whitespace_diagnostic_body() +{ + atf_check \ + -o match:warning \ + pkgconf --with-path="${selfdir}/lib1" --validate malformed-version +} 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/pkgconf-1.6.1/tests/test_env.sh new/pkgconf-1.6.3/tests/test_env.sh --- old/pkgconf-1.6.1/tests/test_env.sh 2019-03-24 04:39:15.000000000 +0100 +++ new/pkgconf-1.6.3/tests/test_env.sh 2019-07-12 13:55:32.000000000 +0200 @@ -30,10 +30,10 @@ Haiku) LIBRARY_PATH_ENV="BELIBRARIES";; esac -prefix="/usr" +prefix="/usr/local" exec_prefix="${prefix}" datarootdir="${prefix}/share" -pcpath="/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig" +pcpath="${exec_prefix}/lib/pkgconfig:${datarootdir}/pkgconfig" tests_init() {
