From febf7cca500976f6af81501f83288f45fea3423993816869a80c8dea9250a233 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 1 May 2019 12:42:47 +0000 Subject: [PATCH] - Update to 1.6.1 + Fixed an issue where a personality may not be properly selected due to argv[0] containing a full path. + Fixed a regression where having an empty PKG_CONFIG_LIBDIR environment variable would not eliminate the default search paths. + Use POSIX realpath(3) instead of readlink() for deduplicating the search path. Use _fullpath() on Windows for the same purpose. + The dequoting logic for tuples has been improved to ensure that quotes *inside* a value remain quoted when necessary. + Fixed issue where packages which referenced missing packages in Requires.private may have crashed due to memory corruption issues in some circumstances. + Fixed warnings reported by GCC 8 diagnostics. + Add LIBPKGCONF_VERSION and LIBPKGCONF_VERSION_STR macros for determining libpkgconf version. + Add pkgconf_fragment_copy_list() to copy a fragment list to another fragment list. + Fix edge cases for path canonicalization (especially on Windows) - Add personality.d directories for cross-targets - Add pkgconf rpm macros for pkgconf directories - Simplify platform-pkg-config wrapper to work with POSIX sh OBS-URL: https://build.opensuse.org/package/show/devel:tools/pkgconf?expand=0&rev=8 --- pkgconf-1.5.3.tar.xz | 3 --- pkgconf-1.6.1.tar.xz | 3 +++ pkgconf.changes | 26 ++++++++++++++++++++++++++ pkgconf.spec | 25 ++++++++++++++++++++----- platform-pkg-config.in | 6 ++---- 5 files changed, 51 insertions(+), 12 deletions(-) delete mode 100644 pkgconf-1.5.3.tar.xz create mode 100644 pkgconf-1.6.1.tar.xz diff --git a/pkgconf-1.5.3.tar.xz b/pkgconf-1.5.3.tar.xz deleted file mode 100644 index 9e5d2a2..0000000 --- a/pkgconf-1.5.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715 -size 290240 diff --git a/pkgconf-1.6.1.tar.xz b/pkgconf-1.6.1.tar.xz new file mode 100644 index 0000000..995c6e3 --- /dev/null +++ b/pkgconf-1.6.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c +size 291028 diff --git a/pkgconf.changes b/pkgconf.changes index 7e1dfc8..74b1597 100644 --- a/pkgconf.changes +++ b/pkgconf.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed May 1 12:32:54 UTC 2019 - Neal Gompa + +- Update to 1.6.1 + + Fixed an issue where a personality may not be properly selected + due to argv[0] containing a full path. + + Fixed a regression where having an empty PKG_CONFIG_LIBDIR + environment variable would not eliminate the default search + paths. + + Use POSIX realpath(3) instead of readlink() for deduplicating the + search path. Use _fullpath() on Windows for the same purpose. + + The dequoting logic for tuples has been improved to ensure that + quotes *inside* a value remain quoted when necessary. + + Fixed issue where packages which referenced missing packages in + Requires.private may have crashed due to memory corruption issues + in some circumstances. + + Fixed warnings reported by GCC 8 diagnostics. + + Add LIBPKGCONF_VERSION and LIBPKGCONF_VERSION_STR macros for + determining libpkgconf version. + + Add pkgconf_fragment_copy_list() to copy a fragment list to + another fragment list. + + Fix edge cases for path canonicalization (especially on Windows) +- Add personality.d directories for cross-targets +- Add pkgconf rpm macros for pkgconf directories +- Simplify platform-pkg-config wrapper to work with POSIX sh + ------------------------------------------------------------------- Tue Aug 21 12:27:05 UTC 2018 - Neal Gompa diff --git a/pkgconf.spec b/pkgconf.spec index aef7795..155d558 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -2,7 +2,7 @@ # spec file for package pkgconf # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2018 Neal Gompa . +# Copyright (c) 2019 Neal Gompa . # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,12 +13,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # Compatibility macros %{!?make_build: %global make_build %{__make} %{?_smp_mflags}} +%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d} # pkgconf does not act as pkgconfig by default %bcond_with pkgconfig_compat @@ -37,7 +38,7 @@ %global devname lib%{name}-devel Name: pkgconf -Version: 1.5.3 +Version: 1.6.1 Release: 0 Summary: Package compiler and linker metadata toolkit License: ISC @@ -143,6 +144,16 @@ autoreconf -fiv find %{buildroot} -name '*.la' -print -delete +mkdir -p %{buildroot}%{_sysconfdir}/pkgconfig/personality.d +mkdir -p %{buildroot}%{_datadir}/pkgconfig/personality.d + +# pkgconf rpm macros +mkdir -p %{buildroot}%{_rpmmacrodir}/ + +cat > %{buildroot}%{_rpmmacrodir}/macros.pkgconf < %{buildroot}%{_mandir}/man1/pkg-config.1 mkdir -p %{buildroot}%{_libdir}/pkgconfig mkdir -p %{buildroot}%{_datadir}/pkgconfig @@ -181,6 +192,10 @@ rm -rf %{buildroot}%{_mandir}/man7 %{_mandir}/man1/%{name}.1* %{_mandir}/man5/pc.5* %{_mandir}/man5/%{name}-personality.5* +%{_rpmmacrodir}/macros.pkgconf +%dir %{_sysconfdir}/pkgconfig +%dir %{_sysconfdir}/pkgconfig/personality.d +%dir %{_datadir}/pkgconfig/personality.d %files -n %{libname} %license COPYING diff --git a/platform-pkg-config.in b/platform-pkg-config.in index adb2ad0..569c4b1 100644 --- a/platform-pkg-config.in +++ b/platform-pkg-config.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config # Platform: @TARGET_PLATFORM@ @@ -7,6 +7,4 @@ export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}" export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" -pkgconf $@ - -exit $? +exec pkgconf "$@"