February 2023 - openSUSE Commits - openSUSE Mailing Lists

commit 000release-packages for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2023-02-01 16:40:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Wed Feb 1 16:40:22 2023 rev:2085 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-Addon-NonOss-release.spec: same change ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.oEBztT/_old 2023-02-01 16:42:08.770787398 +0100 +++ /var/tmp/diff_new_pack.oEBztT/_new 2023-02-01 16:42:08.774787423 +0100 @@ -29,6 +29,11 @@ Source100: weakremovers.inc BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE +%ifarch %ix86 +# on ix86 we need sed to rewrite the zypper repo files for the i586 port split +Requires: %{_bindir}/sed +Requires: %{_bindir}/grep +%endif Suggests: branding-openSUSE Suggests: distribution-logos-openSUSE-Tumbleweed Suggests: java-11-openjdk @@ -745,6 +750,14 @@ fi %{_sbindir}/issue-generator || : fi +# on i586, we are migrating from the main TW repo to the external ports repo +%ifarch %ix86 + + if ! %{_bindir}/grep -q "ports/i586" /etc/zypp/repos.d/*; then + %{_bindir}/sed -i "s|opensuse.org/tumbleweed/repo|opensuse.org/ports/i586/tumbleweed/repo|gi" /etc/zypp/repos.d/* || : + %{_bindir}/sed -i "s|opensuse.org/update/tumbleweed|opensuse.org/ports/i586/update/tumbleweed|…" /etc/zypp/repos.d/* || : + fi +%endif %files %defattr(644,root,root,755)

1 0

commit 000package-groups for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000package-groups for openSUSE:Factory checked in at 2023-02-01 16:38:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000package-groups (Old) and /work/SRC/openSUSE:Factory/.000package-groups.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000package-groups" Wed Feb 1 16:38:48 2023 rev:224 rq:1062275 version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release.spec.in ++++++ --- /var/tmp/diff_new_pack.a0BilW/_old 2023-02-01 16:42:05.766768609 +0100 +++ /var/tmp/diff_new_pack.a0BilW/_new 2023-02-01 16:42:05.766768609 +0100 @@ -29,6 +29,11 @@ Source100: weakremovers.inc BuildRequires: skelcd-control-openSUSE BuildRequires: skelcd-openSUSE +%ifarch %ix86 +# on ix86 we need sed to rewrite the zypper repo files for the i586 port split +Requires: %{_bindir}/sed +Requires: %{_bindir}/grep +%endif Suggests: branding-openSUSE Suggests: distribution-logos-openSUSE-Tumbleweed Suggests: java-11-openjdk @@ -258,6 +263,14 @@ fi %{_sbindir}/issue-generator || : fi +# on i586, we are migrating from the main TW repo to the external ports repo +%ifarch %ix86 + + if ! %{_bindir}/grep -q "ports/i586" /etc/zypp/repos.d/*; then + %{_bindir}/sed -i "s|opensuse.org/tumbleweed/repo|opensuse.org/ports/i586/tumbleweed/repo|gi" /etc/zypp/repos.d/* || : + %{_bindir}/sed -i "s|opensuse.org/update/tumbleweed|opensuse.org/ports/i586/update/tumbleweed|…" /etc/zypp/repos.d/* || : + fi +%endif %files %defattr(644,root,root,755)

1 0

commit xpra for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xpra for openSUSE:Factory checked in at 2023-02-01 16:39:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xpra (Old) and /work/SRC/openSUSE:Factory/.xpra.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xpra" Wed Feb 1 16:39:17 2023 rev:52 rq:1062338 version:5.0+git20221127.3e61ef1c Changes: -------- --- /work/SRC/openSUSE:Factory/xpra/xpra.changes 2022-12-07 17:36:21.364996142 +0100 +++ /work/SRC/openSUSE:Factory/.xpra.new.32243/xpra.changes 2023-02-01 16:40:45.834266729 +0100 @@ -1,0 +2,5 @@ +Mon Jan 16 14:21:33 UTC 2023 - Stefan Schubert <schubi(a)suse.com> + +- Migration of PAM settings to /usr/lib/pam.d. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpra.spec ++++++ --- /var/tmp/diff_new_pack.J8Uys2/_old 2023-02-01 16:40:46.450270747 +0100 +++ /var/tmp/diff_new_pack.J8Uys2/_new 2023-02-01 16:40:46.454270773 +0100 @@ -1,7 +1,7 @@ # # spec file for package xpra # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -90,6 +90,8 @@ #BuildRequires: pkgconfig(pam) #BuildRequires: pkgconfig(pam_misc) BuildRequires: pkgconfig(py3cairo) +BuildRequires: procps-devel +BuildRequires: qrencode-devel BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(vpx) >= 1.4.0 BuildRequires: pkgconfig(xcomposite) @@ -98,8 +100,6 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xres) BuildRequires: pkgconfig(xtst) -BuildRequires: procps-devel -BuildRequires: qrencode-devel Requires: dbus-1-x11 Requires: gstreamer-plugins-base Requires: gstreamer-plugins-good @@ -230,6 +230,11 @@ mkdir -pv %{buildroot}%{_sbindir} ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_pam_vendordir} +mv %{buildroot}%{_sysconfdir}/pam.d/xpra %{buildroot}%{_pam_vendordir} +%endif + %fdupes -s %{buildroot} %pre @@ -237,6 +242,18 @@ mkdir -p %{_rundir}/%{name} || exit 1 %service_add_pre %{name}.service %service_add_pre %{name}.socket +%if 0%{?suse_version} > 1500 +# Prepare for migration to /usr/lib; save any old .rpmsave +for i in pam.d/xpra ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: +done + +%posttrans +# Migration to /usr/lib, restore just created .rpmsave +for i in pam.d/xpra ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: +done +%endif %post %service_add_post %{name}.service @@ -259,15 +276,19 @@ %endif %license COPYING %dir %{_datadir}/xpra -%dir %{_sysconfdir}/pam.d %dir %{_sysconfdir}/xpra %dir %{_sysconfdir}/xpra/conf.d %dir %{_sysconfdir}/xpra/content-categories %dir %{_sysconfdir}/xpra/content-parent %dir %{_sysconfdir}/xpra/content-type %dir %{_sysconfdir}/xpra/http-headers -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf +%if 0%{?suse_version} > 1500 +%{_pam_vendordir}/xpra +%else +%dir %{_sysconfdir}/pam.d %config(noreplace) %{_sysconfdir}/pam.d/xpra +%endif +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf %config(noreplace) %{_sysconfdir}/xpra/*.conf %config(noreplace) %{_sysconfdir}/xpra/conf.d/*.conf %config(noreplace) %{_sysconfdir}/xpra/content-categories/*.conf

1 0

commit xorgproto for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xorgproto for openSUSE:Factory checked in at 2023-02-01 16:38:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorgproto (Old) and /work/SRC/openSUSE:Factory/.xorgproto.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorgproto" Wed Feb 1 16:38:26 2023 rev:11 rq:1062233 version:2022.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xorgproto/xorgproto.changes 2022-08-23 14:26:54.963261689 +0200 +++ /work/SRC/openSUSE:Factory/.xorgproto.new.32243/xorgproto.changes 2023-02-01 16:40:44.386257286 +0100 @@ -1,0 +2,10 @@ +Tue Jan 31 10:27:53 UTC 2023 - Stefan Dirsch <sndirsch(a)suse.com> + +- switched to multibuild for -doc package to avoid build cycles + +------------------------------------------------------------------- +Sun Jan 29 00:30:17 UTC 2023 - Christopher Yeleighton <giecrilj(a)stegny.2a.pl> + +- Build documentation (boo#1207721) + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorgproto.spec ++++++ --- /var/tmp/diff_new_pack.mEpyPJ/_old 2023-02-01 16:40:44.818260103 +0100 +++ /var/tmp/diff_new_pack.mEpyPJ/_new 2023-02-01 16:40:44.822260129 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xorgproto +# spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,45 @@ # -Name: xorgproto +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "doc" +%global psuffix -doc +%else +%global psuffix %{nil} +%endif + +%define srcname xorgproto + +Name: %{srcname}%{psuffix} Version: 2022.2 Release: 0 +%if "%{flavor}" == "doc" +Summary: The X11 Protocol collection (documentation) +%else Summary: The X11 Protocol collection +%endif License: MIT Group: Development/Libraries/X11 URL: https://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/proto/xorgproto #Git-Web: http://cgit.freedesktop.org/xorg/proto/xorgproto/ -Source0: https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.t… -Source1: https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.t… +Source0: https://xorg.freedesktop.org/releases/individual/proto/%{srcname}-%{version… +Source1: https://xorg.freedesktop.org/releases/individual/proto/%{srcname}-%{version… Source2: xorgproto.keyring +BuildRequires: fdupes BuildRequires: pkgconfig +%if "%{flavor}" == "doc" +BuildRequires: fop +BuildRequires: xmlto +BuildRequires: xorg-sgml-doctools +BuildRequires: xsltproc +%endif +BuildArch: noarch + +%if "%{flavor}" == "doc" +%description +Documentation for X11 protocol headers. +%else %description The X11 protocol headers for X11 development. @@ -39,6 +65,7 @@ videoproto, windowswmproto, xcmiscproto, xextproto, xf86bigfontproto, xf86dgaproto, xf86driproto, xf86miscproto, xf86vidmodeproto, xineramaproto, xproto and xproxymngproto. +%endif %package devel Summary: The X11 Protocol collection @@ -46,36 +73,67 @@ Obsoletes: xorgproto-devel < %{version} # the next is for obsoleting applewmproto <= 1.4.2 Obsoletes: bigreqsproto-devel <= 1.1.2 +Provides: bigreqsproto-devel = %{version} Obsoletes: compositeproto-devel <= 0.4.2 +Provides: compositeproto-devel = %{version} Obsoletes: damageproto-devel <= 1.2.1 +Provides: damageproto-devel = %{version} Obsoletes: dmxproto-devel <= 2.3.1 +Provides: dmxproto-devel = %{version} Obsoletes: dri2proto-devel <= 2.8 +Provides: dri2proto-devel = %{version} Obsoletes: dri3proto-devel <= 1.2 +Provides: dri3proto-devel = %{version} Obsoletes: fixesproto-devel <= 5.0 +Provides: fixesproto-devel = %{version} Obsoletes: fontsproto-devel <= 2.1.3 +Provides: fontsproto-devel = %{version} Obsoletes: glproto-devel <= 1.4.17 +Provides: glproto-devel = %{version} Obsoletes: inputproto-devel <= 2.3.2 +Provides: inputproto-devel = %{version} Obsoletes: kbproto-devel <= 1.0.7 +Provides: kbproto-devel = %{version} Obsoletes: presentproto-devel <= 1.2 +Provides: presentproto-devel = %{version} Obsoletes: randrproto-devel <= 1.6.0 +Provides: randrproto-devel = %{version} Obsoletes: recordproto-devel <= 1.14.2 +Provides: recordproto-devel = %{version} Obsoletes: renderproto-devel <= 0.11.1 +Provides: renderproto-devel = %{version} Obsoletes: resourceproto-devel <= 1.2.0 +Provides: resourceproto-devel = %{version} +Provides: scrnsaverproto-devel = %{version} Obsoletes: scrnsaverproto-devel <= 1.2.2 +Provides: trapproto-devel = %{version} Obsoletes: trapproto-devel <= 3.4.3 +Provides: videoproto-devel = %{version} Obsoletes: videoproto-devel <= 2.3.3 +Provides: windowswmproto-devel = %{version} Obsoletes: windowswmproto-devel <= 1.0.4 +Provides: xcmiscproto-devel = %{version} Obsoletes: xcmiscproto-devel <= 1.2.2 +Provides: xextproto-devel = %{version} Obsoletes: xextproto-devel <= 7.3.0 +Provides: xf86bigfontproto-devel = %{version} Obsoletes: xf86bigfontproto-devel <= 1.2.0 +Provides: xf86dgaproto-devel = %{version} Obsoletes: xf86dgaproto-devel <= 2.1 +Provides: xf86driproto-devel = %{version} Obsoletes: xf86driproto-devel <= 2.1.1 +Provides: xf86miscproto-devel = %{version} Obsoletes: xf86miscproto-devel <= 0.9.3 +Provides: xf86vidmodeproto-devel = %{version} Obsoletes: xf86vidmodeproto-devel <= 2.3.1 +Provides: xineramaproto-devel = %{version} Obsoletes: xineramaproto-devel <= 1.2.1 -Obsoletes: xorg-x11-proto-devel +Obsoletes: xorg-x11-proto-devel < %{version} +Provides: xorg-x11-proto-devel = %{version} Obsoletes: xproto-devel <= 7.0.32 +Provides: xproto-devel = %{version} Obsoletes: xproxymngproto-devel <= 1.0.3 +Provides: xproxymngproto-devel = %{version} %description devel The complete X11 protocol headers for X11 development. @@ -88,10 +146,9 @@ xproto and xproxymngproto. %prep -%setup -q +%setup -q -n %{srcname}-%{version} %build -#autoreconf -fi %if (0%{?suse_version} < 1550) %configure --enable-legacy %else @@ -102,18 +159,29 @@ %install %make_install %if (0%{?suse_version} < 1550) -# we seriously don't want to package that again ... -rm %{buildroot}%{_mandir}/man7/Xprint.7 %endif +%fdupes '%{buildroot}%{_datadir}' + +%if "%{flavor}" == "doc" +%files +%doc %{_datadir}/doc/* +%{nil <URL: https://bugzilla.opensuse.org/show_bug.cgi?id=1207721#c15> } +%exclude %{_datadir}/doc/*/*.{pdf,xml,ps,db} +%exclude %{_includedir} +%exclude %{_datarootdir}/pkgconfig +%else %files devel %license COPYING-* -%doc %{_datadir}/doc/* +%exclude %{_datadir}/doc %dir %{_includedir}/GL %{_includedir}/GL/*.h %{_includedir}/GL/internal %{_includedir}/X11/{dri,extensions,fonts} %{_includedir}/X11/*.h %{_datarootdir}/pkgconfig/*.pc +# we seriously don't want to package that again ... +%exclude %{_mandir}/man7/Xprint.7 +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>doc</package> </multibuild>

1 0

commit vulkan-validationlayers for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-validationlayers for openSUSE:Factory checked in at 2023-02-01 16:38:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-validationlayers (Old) and /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-validationlayers" Wed Feb 1 16:38:59 2023 rev:40 rq:1061903 version:1.3.239.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-validationlayers/vulkan-validationlayers.changes 2022-12-24 16:25:57.608739480 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.32243/vulkan-validationlayers.changes 2023-02-01 16:40:17.730083436 +0100 @@ -1,0 +2,12 @@ +Sun Jan 29 12:46:08 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.3.239.0 + * gpu: Fix VMA memory leak + * Add 2d view compatible VU + * Add Depth layout check for DS formats + * Remove old spirv_inst_iter system + * Add support for video core and decode extensions + * New pipeline_validation for CoreCheck + * New wsi_validation for CoreChecks + +------------------------------------------------------------------- Old: ---- sdk-1.3.236.0.tar.gz New: ---- sdk-1.3.239.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-validationlayers.spec ++++++ --- /var/tmp/diff_new_pack.dZAISc/_old 2023-02-01 16:40:18.238086748 +0100 +++ /var/tmp/diff_new_pack.dZAISc/_new 2023-02-01 16:40:18.242086775 +0100 @@ -1,7 +1,7 @@ # # spec file for package vulkan-validationlayers # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: vulkan-validationlayers -Version: 1.3.236.0 +Version: 1.3.239.0 Release: 0 -%define lname libVkLayer_utils-1_3_236_0 +%define lname libVkLayer_utils-1_3_239_0 Summary: Validation layers for Vulkan License: Apache-2.0 Group: Development/Tools/Other @@ -28,7 +28,7 @@ Source9: %name-rpmlintrc Patch1: ver.diff Patch2: xxhash.diff -BuildRequires: cmake >= 3.4 +BuildRequires: cmake >= 3.7.12 BuildRequires: gcc-c++ >= 4.8 BuildRequires: glslang-devel >= 11.13 BuildRequires: memory-constraints @@ -38,7 +38,7 @@ BuildRequires: spirv-tools-devel >= 2022.4+sdk236 BuildRequires: vulkan-headers BuildRequires: xxhash-devel -BuildRequires: pkgconfig(vulkan) >= 1.3.236 +BuildRequires: pkgconfig(vulkan) >= 1.3.239 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) Conflicts: vulkan < 1.1 @@ -71,7 +71,7 @@ %prep %autosetup -n Vulkan-ValidationLayers-sdk-%version -p1 -perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt +perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt */CMakeLists.txt %build %limit_build -m 2000 ++++++ sdk-1.3.236.0.tar.gz -> sdk-1.3.239.0.tar.gz ++++++ ++++ 168485 lines of diff (skipped) ++++++ ver.diff ++++++ --- /var/tmp/diff_new_pack.dZAISc/_old 2023-02-01 16:40:19.186092931 +0100 +++ /var/tmp/diff_new_pack.dZAISc/_new 2023-02-01 16:40:19.190092957 +0100 @@ -4,25 +4,28 @@ We do not want static archives in openSUSE, so need to turn on SHARED mode. As a result, a version needs to be added. --- - CMakeLists.txt | 3 ++- + layers/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: Vulkan-ValidationLayers-sdk-1.3.236.0/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-sdk-1.3.236.0.orig/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.3.236.0/CMakeLists.txt -@@ -255,11 +255,12 @@ endif() - # files directly in layers. +--- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt +@@ -23,7 +23,7 @@ + # https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640 + add_compile_definitions(XXH_NO_LONG_LONG) - add_library(VkLayer_utils -- STATIC -+ SHARED - layers/vk_layer_config.cpp - layers/vk_layer_extension_utils.cpp - layers/vk_layer_utils.cpp - layers/generated/vk_format_utils.cpp) +-add_library(VkLayer_utils STATIC) ++add_library(VkLayer_utils SHARED) + target_sources(VkLayer_utils PRIVATE + generated/vk_format_utils.h + generated/vk_format_utils.cpp +@@ -53,6 +53,7 @@ target_sources(VkLayer_utils PRIVATE + xxhash.h + xxhash.c + ) +set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@") target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers) - if (VVL_ENABLE_ASAN) - target_compile_options(VkLayer_utils PRIVATE -fsanitize=address) + set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX) + target_include_directories(VkLayer_utils PUBLIC ++++++ xxhash.diff ++++++ --- /var/tmp/diff_new_pack.dZAISc/_old 2023-02-01 16:40:19.214093114 +0100 +++ /var/tmp/diff_new_pack.dZAISc/_new 2023-02-01 16:40:19.218093140 +0100 @@ -7,38 +7,38 @@ xxhash as well, so that the ABI matches. --- - layers/CMakeLists.txt | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + layers/CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) -Index: Vulkan-ValidationLayers-sdk-1.3.236.0/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-sdk-1.3.236.0.orig/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.3.236.0/layers/CMakeLists.txt -@@ -45,8 +45,6 @@ if(BUILD_LAYER_SUPPORT_FILES) - vk_layer_logging.h - vk_layer_utils.h - vk_layer_utils.cpp -- xxhash.h -- xxhash.c - generated/vk_format_utils.h - generated/vk_format_utils.cpp - generated/vk_validation_error_messages.h -@@ -149,8 +147,7 @@ set(CORE_VALIDATION_LIBRARY_FILES - generated/synchronization_validation_types.cpp - gpu_validation.cpp - generated/corechecks_optick_instrumentation.cpp +--- Vulkan-ValidationLayers-sdk-1.3.239.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.239.0/layers/CMakeLists.txt +@@ -50,8 +50,6 @@ target_sources(VkLayer_utils PRIVATE + vk_layer_logging.cpp + vk_layer_utils.h + vk_layer_utils.cpp +- xxhash.h - xxhash.c -- xxhash.h) -+) - - set(OBJECT_LIFETIMES_LIBRARY_FILES - generated/object_tracker.cpp -@@ -279,6 +276,7 @@ endif() - target_link_libraries(VkLayer_khronos_validation PRIVATE - ${SPIRV_TOOLS_TARGET} - SPIRV-Tools-opt -+ -lxxhash - SPIRV-Headers::SPIRV-Headers ) + set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@") + target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers) +@@ -259,8 +257,6 @@ target_sources(VkLayer_khronos_validatio + video_validation.cpp + vk_layer_settings_ext.h + wsi_validation.cpp +- xxhash.c +- xxhash.h + ) + + target_compile_definitions(VkLayer_khronos_validation PUBLIC ${KHRONOS_LAYER_COMPILE_DEFINITIONS}) +@@ -279,7 +275,7 @@ if (USE_ROBIN_HOOD_HASHING) + endif() + # Order matters here. VkLayer_utils should be the last link library to ensure mimalloc overrides are picked up correctly. + # Otherwise, libraries after VkLayer_utils will not benefit from this performance improvement. +-target_link_libraries(VkLayer_khronos_validation PRIVATE VVL-SPIRV-LIBS VkLayer_utils) ++target_link_libraries(VkLayer_khronos_validation PRIVATE VVL-SPIRV-LIBS VkLayer_utils -lxxhash) + # There are 2 primary deliverables for the validation layers. + # - The actual library VkLayer_khronos_validation.(dll|so|dylib)

1 0

commit vulkan-tools for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-tools for openSUSE:Factory checked in at 2023-02-01 16:38:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-tools (Old) and /work/SRC/openSUSE:Factory/.vulkan-tools.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-tools" Wed Feb 1 16:38:54 2023 rev:40 rq:1061878 version:1.3.239.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-tools/vulkan-tools.changes 2022-12-24 14:51:11.179244689 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-tools.new.32243/vulkan-tools.changes 2023-02-01 16:40:16.906078061 +0100 @@ -1,0 +2,6 @@ +Sun Jan 29 12:41:31 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.3.239.0 + * No end-user visible changes + +------------------------------------------------------------------- Old: ---- sdk-1.3.236.0.tar.gz New: ---- sdk-1.3.239.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-tools.spec ++++++ --- /var/tmp/diff_new_pack.rakTS1/_old 2023-02-01 16:40:17.346080931 +0100 +++ /var/tmp/diff_new_pack.rakTS1/_new 2023-02-01 16:40:17.350080957 +0100 @@ -1,7 +1,7 @@ # # spec file for package vulkan-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: vulkan-tools -Version: 1.3.236.0 +Version: 1.3.239.0 Release: 0 Summary: Diagnostic utilities for Vulkan License: Apache-2.0 @@ -29,7 +29,7 @@ BuildRequires: glslang-devel >= 8.13.3743 BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: pkgconfig(vulkan) >= 1.3.236 +BuildRequires: pkgconfig(vulkan) >= 1.3.239 BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) ++++++ sdk-1.3.236.0.tar.gz -> sdk-1.3.239.0.tar.gz ++++++ ++++ 2792 lines of diff (skipped)

1 0

commit vulkan-loader for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-loader for openSUSE:Factory checked in at 2023-02-01 16:38:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-loader (Old) and /work/SRC/openSUSE:Factory/.vulkan-loader.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-loader" Wed Feb 1 16:38:55 2023 rev:45 rq:1061879 version:1.3.239.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-loader/vulkan-loader.changes 2022-12-24 14:51:10.147238667 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-loader.new.32243/vulkan-loader.changes 2023-02-01 16:40:15.998072139 +0100 @@ -1,0 +2,9 @@ +Sun Jan 29 12:38:42 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.3.239.0 + * layers: update documentation to make it clear the + VK_LAYER_PATH supports both explicit directories and files + * layers: modify TestLayerDetails so either files or + directories can be set on VK_LAYER_PATH env var + +------------------------------------------------------------------- Old: ---- sdk-1.3.236.0.tar.gz New: ---- sdk-1.3.239.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-loader.spec ++++++ --- /var/tmp/diff_new_pack.ljwBMS/_old 2023-02-01 16:40:16.530075609 +0100 +++ /var/tmp/diff_new_pack.ljwBMS/_new 2023-02-01 16:40:16.534075635 +0100 @@ -1,7 +1,7 @@ # # spec file for package vulkan-loader # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ # Prefer to go with just /^sdk-.*/ tags %define lname libvulkan1 Name: vulkan-loader -Version: 1.3.236.0 +Version: 1.3.239.0 Release: 0 Summary: Reference ICD loader for Vulkan License: Apache-2.0 ++++++ sdk-1.3.236.0.tar.gz -> sdk-1.3.239.0.tar.gz ++++++ ++++ 2100 lines of diff (skipped)

1 0

commit vulkan-headers for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-headers for openSUSE:Factory checked in at 2023-02-01 16:38:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-headers (Old) and /work/SRC/openSUSE:Factory/.vulkan-headers.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vulkan-headers" Wed Feb 1 16:38:52 2023 rev:41 rq:1061877 version:1.3.239.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-headers/vulkan-headers.changes 2022-12-24 14:51:58.411520272 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-headers.new.32243/vulkan-headers.changes 2023-02-01 16:40:14.914065070 +0100 @@ -1,0 +2,6 @@ +Sun Jan 29 12:32:09 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release SDK-1.3.239.0 + * No changelog was provided + +------------------------------------------------------------------- @@ -15 +21 @@ - (but do take a look in vulkan- + (but do take a look in vulkan-loader/vulkan-validationlayers 231) Old: ---- sdk-1.3.236.0.tar.gz New: ---- sdk-1.3.239.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-headers.spec ++++++ --- /var/tmp/diff_new_pack.Y8rT4q/_old 2023-02-01 16:40:15.326067757 +0100 +++ /var/tmp/diff_new_pack.Y8rT4q/_new 2023-02-01 16:40:15.330067782 +0100 @@ -1,7 +1,7 @@ # # spec file for package vulkan-headers # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ # Consider only updating the sources in lockstep. # Name: vulkan-headers -Version: 1.3.236.0 +Version: 1.3.239.0 Release: 0 Summary: Vulkan C and C++ API header files License: Apache-2.0 ++++++ sdk-1.3.236.0.tar.gz -> sdk-1.3.239.0.tar.gz ++++++ ++++ 19094 lines of diff (skipped)

1 0

commit ugrep for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ugrep for openSUSE:Factory checked in at 2023-02-01 16:39:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ugrep (Old) and /work/SRC/openSUSE:Factory/.ugrep.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ugrep" Wed Feb 1 16:39:38 2023 rev:36 rq:1062391 version:3.9.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ugrep/ugrep.changes 2023-01-15 17:58:26.318299958 +0100 +++ /work/SRC/openSUSE:Factory/.ugrep.new.32243/ugrep.changes 2023-02-01 16:39:52.077916133 +0100 @@ -1,0 +2,10 @@ +Wed Feb 1 07:32:36 UTC 2023 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- update to 3.9.7: + * handle gnutar archive extension field formats to search huge + files (>4GB) stored in (gnu) tar archives +- includes changes gro 3.9.6: + * Fixed a Unicode-specific regex pattern syntax issue that caused + a valid regex pattern to produce a regex syntax error message + +------------------------------------------------------------------- Old: ---- ugrep-3.9.5.tar.gz New: ---- ugrep-3.9.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ugrep.spec ++++++ --- /var/tmp/diff_new_pack.MtV6N8/_old 2023-02-01 16:39:52.741920464 +0100 +++ /var/tmp/diff_new_pack.MtV6N8/_new 2023-02-01 16:39:52.745920490 +0100 @@ -17,7 +17,7 @@ Name: ugrep -Version: 3.9.5 +Version: 3.9.7 Release: 0 Summary: Universal grep: a feature-rich grep implementation with focus on speed License: BSD-3-Clause ++++++ ugrep-3.9.5.tar.gz -> ugrep-3.9.7.tar.gz ++++++ Binary files old/ugrep-3.9.5/bin/win32/ugrep.exe and new/ugrep-3.9.7/bin/win32/ugrep.exe differ Binary files old/ugrep-3.9.5/bin/win64/ugrep.exe and new/ugrep-3.9.7/bin/win64/ugrep.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-3.9.5/include/reflex/absmatcher.h new/ugrep-3.9.7/include/reflex/absmatcher.h --- old/ugrep-3.9.5/include/reflex/absmatcher.h 2023-01-14 16:54:59.000000000 +0100 +++ new/ugrep-3.9.7/include/reflex/absmatcher.h 2023-01-31 17:06:32.000000000 +0100 @@ -1028,7 +1028,7 @@ return EOF; if (static_cast<unsigned char>(*s++ = c) >= 0x80) { - while (((++*s = get()) & 0xC0) == 0x80) + while (((*s++ = get()) & 0xC0) == 0x80) continue; got_ = static_cast<unsigned char>(buf_[cur_ = --pos_]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-3.9.5/lib/convert.cpp new/ugrep-3.9.7/lib/convert.cpp --- old/ugrep-3.9.5/lib/convert.cpp 2023-01-14 16:54:59.000000000 +0100 +++ new/ugrep-3.9.7/lib/convert.cpp 2023-01-31 17:06:32.000000000 +0100 @@ -2138,9 +2138,12 @@ { regex.append(par).append(&pattern[loc], pos - loc).push_back(')'); loc = pos; + --pos; } - if (pos > loc) + else if (pos > loc) + { --pos; + } } anc = false; beg = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-3.9.5/lib/pattern.cpp new/ugrep-3.9.7/lib/pattern.cpp --- old/ugrep-3.9.5/lib/pattern.cpp 2023-01-14 16:54:59.000000000 +0100 +++ new/ugrep-3.9.7/lib/pattern.cpp 2023-01-31 17:06:32.000000000 +0100 @@ -2810,9 +2810,12 @@ const std::string& filename = *i; size_t len = filename.length(); if ((len > 2 && filename.compare(len - 2, 2, ".h" ) == 0) + || (len > 3 && filename.compare(len - 3, 3, ".hh" ) == 0) || (len > 4 && filename.compare(len - 4, 4, ".hpp") == 0) + || (len > 4 && filename.compare(len - 4, 4, ".hxx") == 0) + || (len > 3 && filename.compare(len - 3, 3, ".cc" ) == 0) || (len > 4 && filename.compare(len - 4, 4, ".cpp") == 0) - || (len > 3 && filename.compare(len - 3, 3, ".cc" ) == 0)) + || (len > 4 && filename.compare(len - 4, 4, ".cxx") == 0)) { FILE *file = NULL; int err = 0; @@ -3212,7 +3215,8 @@ { const std::string& filename = *i; size_t len = filename.length(); - if (len > 3 && filename.compare(len - 3, 3, ".gv") == 0) + if ((len > 3 && filename.compare(len - 3, 3, ".gv") == 0) + || (len > 4 && filename.compare(len - 4, 4, ".dot") == 0)) { FILE *file = NULL; int err = 0; @@ -3359,9 +3363,12 @@ const std::string& filename = *i; size_t len = filename.length(); if ((len > 2 && filename.compare(len - 2, 2, ".h" ) == 0) + || (len > 3 && filename.compare(len - 3, 3, ".hh" ) == 0) || (len > 4 && filename.compare(len - 4, 4, ".hpp") == 0) + || (len > 4 && filename.compare(len - 4, 4, ".hxx") == 0) + || (len > 3 && filename.compare(len - 3, 3, ".cc" ) == 0) || (len > 4 && filename.compare(len - 4, 4, ".cpp") == 0) - || (len > 3 && filename.compare(len - 3, 3, ".cc" ) == 0)) + || (len > 4 && filename.compare(len - 4, 4, ".cxx") == 0)) { FILE *file = NULL; int err = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-3.9.5/src/ugrep.cpp new/ugrep-3.9.7/src/ugrep.cpp --- old/ugrep-3.9.5/src/ugrep.cpp 2023-01-14 16:54:59.000000000 +0100 +++ new/ugrep-3.9.7/src/ugrep.cpp 2023-01-31 17:06:32.000000000 +0100 @@ -1135,28 +1135,52 @@ while (!stop) { - // extract tar header fields (name and prefix strings are not \0-terminated!!) + // tar header fields name, size and prefix and make them \0-terminated by overwriting fields we do not use + buf[100] = '\0'; const char *name = reinterpret_cast<const char*>(buf); + // path prefix is up to 155 bytes (ustar) or up to 131 bytes (gnutar) + buf[345 + (is_ustar ? 155 : 131)] = '\0'; const char *prefix = reinterpret_cast<const char*>(buf + 345); - size_t size = strtoul(reinterpret_cast<const char*>(buf + 124), NULL, 8); - int padding = (BLOCKSIZE - size % BLOCKSIZE) % BLOCKSIZE; - unsigned char typeflag = buf[156]; + + // check GNU tar extension with leading byte 0x80 (unsigned positive) or leading byte 0xff (negative) + size_t size = 0; + if (buf[124] == 0x80) + { + // 11 byte big-endian size field without the leading 0x80 + for (short i = 125; i < 136; ++i) + size = (size << 8) + buf[i]; + } + else if (buf[124] == 0xff) + { + // a negative size makes no sense, but let's not ignore it and cast to unsigned + for (short i = 124; i < 136; ++i) + size = (size << 8) + buf[i]; + } + else + { + buf[136] = '\0'; + size = strtoull(reinterpret_cast<const char*>(buf + 124), NULL, 8); + } // header types + unsigned char typeflag = buf[156]; bool is_regular = typeflag == '0' || typeflag == '\0'; bool is_xhd = typeflag == 'x'; bool is_extended = typeflag == 'L'; - // assign the (long) tar pathname, path prefix is 155 bytes (ustar) or 131 bytes (gnutar) + // padding size + int padding = (BLOCKSIZE - size % BLOCKSIZE) % BLOCKSIZE; + + // assign the (long) tar pathname, name and prefix are now \0-terminated path.clear(); if (long_path.empty()) { if (*prefix != '\0') { - path.assign(prefix, strnlen(prefix, is_ustar ? 155 : 131)); + path.assign(prefix); path.push_back('/'); } - path.append(name, strnlen(name, 100)); + path.append(name); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ugrep-3.9.5/src/ugrep.hpp new/ugrep-3.9.7/src/ugrep.hpp --- old/ugrep-3.9.5/src/ugrep.hpp 2023-01-14 16:54:59.000000000 +0100 +++ new/ugrep-3.9.7/src/ugrep.hpp 2023-01-31 17:06:32.000000000 +0100 @@ -38,7 +38,7 @@ #define UGREP_HPP // ugrep version -#define UGREP_VERSION "3.9.5" +#define UGREP_VERSION "3.9.7" // disable mmap because mmap is almost always slower than the file reading speed improvements since 3.0.0 #define WITH_NO_MMAP

1 0

commit syft for openSUSE:Factory
by Source-Sync 01 Feb '23

01 Feb '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package syft for openSUSE:Factory checked in at 2023-02-01 16:39:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syft (Old) and /work/SRC/openSUSE:Factory/.syft.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syft" Wed Feb 1 16:39:05 2023 rev:24 rq:1062288 version:0.69.0 Changes: -------- --- /work/SRC/openSUSE:Factory/syft/syft.changes 2023-01-26 14:10:58.968433840 +0100 +++ /work/SRC/openSUSE:Factory/.syft.new.32243/syft.changes 2023-02-01 16:39:08.773633704 +0100 @@ -1,0 +2,8 @@ +Tue Jan 31 15:04:23 UTC 2023 - kastl(a)b1-systems.de + +- Update to version 0.69.0: + * Allow scanning unpacked container filesystems (#1485) + * fix: allow template for syft convert (#1521) + * 1465 attestation with private key (#1502) + +------------------------------------------------------------------- Old: ---- syft-0.68.1.tar.gz New: ---- syft-0.69.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syft.spec ++++++ --- /var/tmp/diff_new_pack.JZ1pKS/_old 2023-02-01 16:39:10.485644870 +0100 +++ /var/tmp/diff_new_pack.JZ1pKS/_new 2023-02-01 16:39:10.489644896 +0100 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: syft -Version: 0.68.1 +Version: 0.69.0 Release: 0 Summary: CLI tool and library for generating a Software Bill of Materials License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.JZ1pKS/_old 2023-02-01 16:39:10.553645313 +0100 +++ /var/tmp/diff_new_pack.JZ1pKS/_new 2023-02-01 16:39:10.557645339 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/anchore/syft</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.68.1</param> + <param name="revision">v0.69.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -16,7 +16,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">syft-0.68.1.tar.gz</param> + <param name="archive">syft-0.69.0.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.JZ1pKS/_old 2023-02-01 16:39:10.577645469 +0100 +++ /var/tmp/diff_new_pack.JZ1pKS/_new 2023-02-01 16:39:10.585645522 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/anchore/syft</param> - <param name="changesrevision">4c0aef09b8d7fb78200b04416f474b90b79370de</param></service></servicedata> + <param name="changesrevision">b81c9805dcc9bf25dad7659fd9c2bbf7dd3f3d90</param></service></servicedata> (No newline at EOF) ++++++ syft-0.68.1.tar.gz -> syft-0.69.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/cmd/syft/cli/attest/attest.go new/syft-0.69.0/cmd/syft/cli/attest/attest.go --- old/syft-0.68.1/cmd/syft/cli/attest/attest.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/cmd/syft/cli/attest/attest.go 2023-01-30 19:47:24.000000000 +0100 @@ -97,6 +97,7 @@ return sBytes, nil } +//nolint:funlen func execWorker(app *config.Application, si source.Input, writer sbom.Writer) <-chan error { errs := make(chan error) go func() { @@ -131,9 +132,18 @@ } args := []string{"attest", si.UserInput, "--type", "custom", "--predicate", f.Name()} + if app.Attest.Key != "" { + args = append(args, "--key", app.Attest.Key) + } + execCmd := exec.Command(cmd, args...) execCmd.Env = os.Environ() - execCmd.Env = append(execCmd.Env, "COSIGN_EXPERIMENTAL=1") + if app.Attest.Key != "" { + execCmd.Env = append(execCmd.Env, fmt.Sprintf("COSIGN_PASSWORD=%s", app.Attest.Password)) + } else { + // no key provided, use cosign's keyless mode + execCmd.Env = append(execCmd.Env, "COSIGN_EXPERIMENTAL=1") + } // bus adapter for ui to hook into stdout via an os pipe r, w, err := os.Pipe() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/cmd/syft/cli/attest.go new/syft-0.69.0/cmd/syft/cli/attest.go --- old/syft-0.68.1/cmd/syft/cli/attest.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/cmd/syft/cli/attest.go 2023-01-30 19:47:24.000000000 +0100 @@ -20,8 +20,7 @@ attestHelp = attestExample + attestSchemeHelp ) -//nolint:dupl -func Attest(v *viper.Viper, app *config.Application, ro *options.RootOptions, po *options.PackagesOptions) *cobra.Command { +func Attest(v *viper.Viper, app *config.Application, ro *options.RootOptions, po *options.PackagesOptions, ao *options.AttestOptions) *cobra.Command { cmd := &cobra.Command{ Use: "attest --output [FORMAT] <IMAGE>", Short: "Generate an SBOM as an attestation for the given [SOURCE] container image", @@ -50,11 +49,17 @@ }, } - // syft attest is an enhancment of the packages command, so it should have the same flags + // syft attest is an enhancement of the packages command, so it should have the same flags err := po.AddFlags(cmd, v) if err != nil { log.Fatal(err) } + + // syft attest has its own options not included as part of the packages command + err = ao.AddFlags(cmd, v) + if err != nil { + log.Fatal(err) + } return cmd } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/cmd/syft/cli/commands.go new/syft-0.69.0/cmd/syft/cli/commands.go --- old/syft-0.68.1/cmd/syft/cli/commands.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/cmd/syft/cli/commands.go 2023-01-30 19:47:24.000000000 +0100 @@ -45,12 +45,13 @@ // we also need the command to have information about the `root` options because of this alias ro := &options.RootOptions{} po := &options.PackagesOptions{} + ao := &options.AttestOptions{} packagesCmd := Packages(v, app, ro, po) // root options are also passed to the attestCmd so that a user provided config location can be discovered poweruserCmd := PowerUser(v, app, ro) convertCmd := Convert(v, app, ro, po) - attestCmd := Attest(v, app, ro, po) + attestCmd := Attest(v, app, ro, po, ao) // rootCmd is currently an alias for the packages command rootCmd := &cobra.Command{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/cmd/syft/cli/convert/convert.go new/syft-0.69.0/cmd/syft/cli/convert/convert.go --- old/syft-0.68.1/cmd/syft/cli/convert/convert.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/cmd/syft/cli/convert/convert.go 2023-01-30 19:47:24.000000000 +0100 @@ -11,9 +11,9 @@ "github.com/anchore/syft/syft" ) -func Run(ctx context.Context, app *config.Application, args []string) error { +func Run(_ context.Context, app *config.Application, args []string) error { log.Warn("convert is an experimental feature, run `syft convert -h` for help") - writer, err := options.MakeWriter(app.Outputs, app.File, "") + writer, err := options.MakeWriter(app.Outputs, app.File, app.OutputTemplatePath) if err != nil { return err } @@ -30,7 +30,9 @@ if err != nil { return fmt.Errorf("failed to open SBOM file: %w", err) } - defer f.Close() + defer func() { + _ = f.Close() + }() sbom, _, err := syft.Decode(f) if err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/cmd/syft/cli/options/attest.go new/syft-0.69.0/cmd/syft/cli/options/attest.go --- old/syft-0.68.1/cmd/syft/cli/options/attest.go 1970-01-01 01:00:00.000000000 +0100 +++ new/syft-0.69.0/cmd/syft/cli/options/attest.go 2023-01-30 19:47:24.000000000 +0100 @@ -0,0 +1,25 @@ +package options + +import ( + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/spf13/viper" +) + +type AttestOptions struct { + Key string +} + +var _ Interface = (*AttestOptions)(nil) + +func (o AttestOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { + cmd.Flags().StringVarP(&o.Key, "key", "k", "", "the key to use for the attestation") + return bindAttestConfigOptions(cmd.Flags(), v) +} + +func bindAttestConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error { + if err := v.BindPFlag("attest.key", flags.Lookup("key")); err != nil { + return err + } + return nil +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/internal/config/application.go new/syft-0.69.0/internal/config/application.go --- old/syft-0.68.1/internal/config/application.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/internal/config/application.go 2023-01-30 19:47:24.000000000 +0100 @@ -47,6 +47,7 @@ Log logging `yaml:"log" json:"log" mapstructure:"log"` // all logging-related options Catalogers []string `yaml:"catalogers" json:"catalogers" mapstructure:"catalogers"` Package pkg `yaml:"package" json:"package" mapstructure:"package"` + Attest attest `yaml:"attest" json:"attest" mapstructure:"attest"` FileMetadata FileMetadata `yaml:"file-metadata" json:"file-metadata" mapstructure:"file-metadata"` FileClassification fileClassification `yaml:"file-classification" json:"file-classification" mapstructure:"file-classification"` FileContents fileContents `yaml:"file-contents" json:"file-contents" mapstructure:"file-contents"` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/internal/config/attest.go new/syft-0.69.0/internal/config/attest.go --- old/syft-0.68.1/internal/config/attest.go 1970-01-01 01:00:00.000000000 +0100 +++ new/syft-0.69.0/internal/config/attest.go 2023-01-30 19:47:24.000000000 +0100 @@ -0,0 +1,13 @@ +package config + +import "github.com/spf13/viper" + +type attest struct { + Key string `yaml:"key" json:"key" mapstructure:"key"` + Password string `yaml:"password" json:"password" mapstructure:"password"` +} + +func (cfg attest) loadDefaultValues(v *viper.Viper) { + v.SetDefault("attest.key", "") + v.SetDefault("attest.password", "") +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/directory_resolver.go new/syft-0.69.0/syft/source/directory_resolver.go --- old/syft-0.68.1/syft/source/directory_resolver.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/syft/source/directory_resolver.go 2023-01-30 19:47:24.000000000 +0100 @@ -37,6 +37,7 @@ // directoryResolver implements path and content access for the directory data source. type directoryResolver struct { path string + base string currentWdRelativeToRoot string currentWd string fileTree *filetree.FileTree @@ -47,7 +48,7 @@ errPaths map[string]error } -func newDirectoryResolver(root string, pathFilters ...pathFilterFn) (*directoryResolver, error) { +func newDirectoryResolver(root string, base string, pathFilters ...pathFilterFn) (*directoryResolver, error) { currentWD, err := os.Getwd() if err != nil { return nil, fmt.Errorf("could not get CWD: %w", err) @@ -64,6 +65,18 @@ return nil, fmt.Errorf("could not evaluate root=%q symlinks: %w", root, err) } + cleanBase := "" + if base != "" { + cleanBase, err = filepath.EvalSymlinks(base) + if err != nil { + return nil, fmt.Errorf("could not evaluate base=%q symlinks: %w", base, err) + } + cleanBase, err = filepath.Abs(cleanBase) + if err != nil { + return nil, err + } + } + var currentWdRelRoot string if path.IsAbs(cleanRoot) { currentWdRelRoot, err = filepath.Rel(cleanCWD, cleanRoot) @@ -76,6 +89,7 @@ resolver := directoryResolver{ path: cleanRoot, + base: cleanBase, currentWd: cleanCWD, currentWdRelativeToRoot: currentWdRelRoot, fileTree: filetree.NewFileTree(), @@ -244,10 +258,25 @@ return "", fmt.Errorf("unable to readlink for path=%q: %w", p, err) } - // note: if the link is not absolute (e.g, /dev/stderr -> fd/2 ) we need to resolve it relative to the directory - // in question (e.g. resolve to /dev/fd/2) - if !filepath.IsAbs(linkTarget) { - linkTarget = filepath.Join(filepath.Dir(p), linkTarget) + if filepath.IsAbs(linkTarget) { + // if the link is absolute (e.g, /bin/ls -> /bin/busybox) we need to + // resolve relative to the root of the base directory + linkTarget = filepath.Join(r.base, filepath.Clean(linkTarget)) + } else { + // if the link is not absolute (e.g, /dev/stderr -> fd/2 ) we need to + // resolve it relative to the directory in question (e.g. resolve to + // /dev/fd/2) + if r.base == "" { + linkTarget = filepath.Join(filepath.Dir(p), linkTarget) + } else { + // if the base is set, then we first need to resolve the link, + // before finding it's location in the base + dir, err := filepath.Rel(r.base, filepath.Dir(p)) + if err != nil { + return "", fmt.Errorf("unable to resolve relative path for path=%q: %w", p, err) + } + linkTarget = filepath.Join(r.base, filepath.Clean(filepath.Join("/", dir, linkTarget))) + } } ref, err := r.fileTree.AddSymLink(file.Path(p), file.Path(linkTarget)) @@ -336,14 +365,17 @@ } // we should be resolving symlinks and preserving this information as a VirtualPath to the real file - evaluatedPath, err := filepath.EvalSymlinks(userStrPath) + exists, ref, err := r.fileTree.File(file.Path(userStrPath), filetree.FollowBasenameLinks) if err != nil { log.Tracef("unable to evaluate symlink for path=%q : %+v", userPath, err) continue } + if !exists { + continue + } // TODO: why not use stored metadata? - fileMeta, err := os.Stat(evaluatedPath) + fileMeta, err := os.Stat(string(ref.RealPath)) if errors.Is(err, os.ErrNotExist) { // note: there are other kinds of errors other than os.ErrNotExist that may be given that is platform // specific, but essentially hints at the same overall problem (that the path does not exist). Such an @@ -354,7 +386,7 @@ // invalid paths. This logging statement is meant to raise IO or permissions related problems. var pathErr *os.PathError if !errors.As(err, &pathErr) { - log.Warnf("path is not valid (%s): %+v", evaluatedPath, err) + log.Warnf("path is not valid (%s): %+v", ref.RealPath, err) } continue } @@ -368,15 +400,12 @@ userStrPath = windowsToPosix(userStrPath) } - exists, ref, err := r.fileTree.File(file.Path(userStrPath), filetree.FollowBasenameLinks) - if err == nil && exists { - loc := NewVirtualLocationFromDirectory( - r.responsePath(string(ref.RealPath)), // the actual path relative to the resolver root - r.responsePath(userStrPath), // the path used to access this file, relative to the resolver root - *ref, - ) - references = append(references, loc) - } + loc := NewVirtualLocationFromDirectory( + r.responsePath(string(ref.RealPath)), // the actual path relative to the resolver root + r.responsePath(userStrPath), // the path used to access this file, relative to the resolver root + *ref, + ) + references = append(references, loc) } return references, nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/directory_resolver_test.go new/syft-0.69.0/syft/source/directory_resolver_test.go --- old/syft-0.68.1/syft/source/directory_resolver_test.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/syft/source/directory_resolver_test.go 2023-01-30 19:47:24.000000000 +0100 @@ -57,7 +57,7 @@ } for _, c := range cases { t.Run(c.name, func(t *testing.T) { - resolver, err := newDirectoryResolver(c.relativeRoot) + resolver, err := newDirectoryResolver(c.relativeRoot, "") assert.NoError(t, err) refs, err := resolver.FilesByPath(c.input) @@ -111,7 +111,7 @@ absRoot, err := filepath.Abs(c.relativeRoot) require.NoError(t, err) - resolver, err := newDirectoryResolver(absRoot) + resolver, err := newDirectoryResolver(absRoot, "") assert.NoError(t, err) refs, err := resolver.FilesByPath(c.input) @@ -172,7 +172,7 @@ } for _, c := range cases { t.Run(c.name, func(t *testing.T) { - resolver, err := newDirectoryResolver(c.root) + resolver, err := newDirectoryResolver(c.root, "") assert.NoError(t, err) hasPath := resolver.HasPath(c.input) @@ -220,7 +220,7 @@ } for _, c := range cases { t.Run(c.name, func(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures") + resolver, err := newDirectoryResolver("./test-fixtures", "") assert.NoError(t, err) refs, err := resolver.FilesByPath(c.input...) assert.NoError(t, err) @@ -233,7 +233,7 @@ } func TestDirectoryResolver_FilesByGlobMultiple(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures") + resolver, err := newDirectoryResolver("./test-fixtures", "") assert.NoError(t, err) refs, err := resolver.FilesByGlob("**/image-symlinks/file*") assert.NoError(t, err) @@ -242,7 +242,7 @@ } func TestDirectoryResolver_FilesByGlobRecursive(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures/image-symlinks") + resolver, err := newDirectoryResolver("./test-fixtures/image-symlinks", "") assert.NoError(t, err) refs, err := resolver.FilesByGlob("**/*.txt") assert.NoError(t, err) @@ -250,7 +250,7 @@ } func TestDirectoryResolver_FilesByGlobSingle(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures") + resolver, err := newDirectoryResolver("./test-fixtures", "") assert.NoError(t, err) refs, err := resolver.FilesByGlob("**/image-symlinks/*1.txt") assert.NoError(t, err) @@ -277,7 +277,7 @@ for _, test := range tests { t.Run(test.name, func(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures/symlinks-simple") + resolver, err := newDirectoryResolver("./test-fixtures/symlinks-simple", "") assert.NoError(t, err) refs, err := resolver.FilesByPath(test.fixture) @@ -300,7 +300,7 @@ func TestDirectoryResolverDoesNotIgnoreRelativeSystemPaths(t *testing.T) { // let's make certain that "dev/place" is not ignored, since it is not "/dev/place" - resolver, err := newDirectoryResolver("test-fixtures/system_paths/target") + resolver, err := newDirectoryResolver("test-fixtures/system_paths/target", "") assert.NoError(t, err) // ensure the correct filter function is wired up by default expectedFn := reflect.ValueOf(isUnallowableFileType) @@ -431,7 +431,7 @@ func Test_directoryResolver_index(t *testing.T) { // note: this test is testing the effects from newDirectoryResolver, indexTree, and addPathToIndex - r, err := newDirectoryResolver("test-fixtures/system_paths/target") + r, err := newDirectoryResolver("test-fixtures/system_paths/target", "") if err != nil { t.Fatalf("unable to get indexed dir resolver: %+v", err) } @@ -608,7 +608,7 @@ } for _, test := range tests { t.Run(test.fixturePath, func(t *testing.T) { - resolver, err := newDirectoryResolver(test.fixturePath) + resolver, err := newDirectoryResolver(test.fixturePath, "") assert.NoError(t, err) locations, err := resolver.FilesByMIMEType(test.mimeType) assert.NoError(t, err) @@ -621,7 +621,7 @@ } func Test_IndexingNestedSymLinks(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures/symlinks-simple") + resolver, err := newDirectoryResolver("./test-fixtures/symlinks-simple", "") require.NoError(t, err) // check that we can get the real path @@ -674,7 +674,7 @@ return strings.HasSuffix(path, string(filepath.Separator)+"readme") } - resolver, err := newDirectoryResolver("./test-fixtures/symlinks-simple", filterFn) + resolver, err := newDirectoryResolver("./test-fixtures/symlinks-simple", "", filterFn) require.NoError(t, err) // the path to the real file is PRUNED from the index, so we should NOT expect a location returned @@ -694,7 +694,7 @@ } func Test_IndexingNestedSymLinksOutsideOfRoot(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures/symlinks-multiple-roots/root") + resolver, err := newDirectoryResolver("./test-fixtures/symlinks-multiple-roots/root", "") require.NoError(t, err) // check that we can get the real path @@ -712,7 +712,7 @@ } func Test_RootViaSymlink(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures/symlinked-root/nested/link-root") + resolver, err := newDirectoryResolver("./test-fixtures/symlinked-root/nested/link-root", "") require.NoError(t, err) locations, err := resolver.FilesByPath("./file1.txt") @@ -753,7 +753,7 @@ } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - r, err := newDirectoryResolver(".") + r, err := newDirectoryResolver(".", "") require.NoError(t, err) actual, err := r.FileContentsByLocation(test.location) @@ -819,7 +819,7 @@ func Test_SymlinkLoopWithGlobsShouldResolve(t *testing.T) { test := func(t *testing.T) { - resolver, err := newDirectoryResolver("./test-fixtures/symlinks-loop") + resolver, err := newDirectoryResolver("./test-fixtures/symlinks-loop", "") require.NoError(t, err) locations, err := resolver.FilesByGlob("**/file.target") @@ -853,7 +853,7 @@ return path != "/" } - resolver, err := newDirectoryResolver("/", filterFn) + resolver, err := newDirectoryResolver("/", "", filterFn) require.NoError(t, err) exists, ref, err := resolver.fileTree.File(file.Path("/")) @@ -870,7 +870,7 @@ tempFile, err := os.CreateTemp("", "") require.NoError(t, err) - resolver, err := newDirectoryResolver(tempFile.Name()) + resolver, err := newDirectoryResolver(tempFile.Name(), "") require.NoError(t, err) t.Run("filtering path with nil os.FileInfo", func(t *testing.T) { @@ -885,3 +885,76 @@ }) }) } + +func TestDirectoryResolver_FilesByPath_baseRoot(t *testing.T) { + cases := []struct { + name string + root string + input string + expected []string + }{ + { + name: "should find the base file", + root: "./test-fixtures/symlinks-base/", + input: "./base", + expected: []string{ + "base", + }, + }, + { + name: "should follow a link with a pivoted root", + root: "./test-fixtures/symlinks-base/", + input: "./foo", + expected: []string{ + "base", + }, + }, + { + name: "should follow a relative link with extra parents", + root: "./test-fixtures/symlinks-base/", + input: "./bar", + expected: []string{ + "base", + }, + }, + { + name: "should follow an absolute link with extra parents", + root: "./test-fixtures/symlinks-base/", + input: "./baz", + expected: []string{ + "base", + }, + }, + { + name: "should follow an absolute link with extra parents", + root: "./test-fixtures/symlinks-base/", + input: "./sub/link", + expected: []string{ + "sub/item", + }, + }, + { + name: "should follow chained pivoted link", + root: "./test-fixtures/symlinks-base/", + input: "./chain", + expected: []string{ + "base", + }, + }, + } + for _, c := range cases { + t.Run(c.name, func(t *testing.T) { + resolver, err := newDirectoryResolver(c.root, c.root) + assert.NoError(t, err) + + refs, err := resolver.FilesByPath(c.input) + require.NoError(t, err) + assert.Len(t, refs, len(c.expected)) + s := strset.New() + for _, actual := range refs { + s.Add(actual.RealPath) + } + assert.ElementsMatch(t, c.expected, s.List()) + }) + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/metadata.go new/syft-0.69.0/syft/source/metadata.go --- old/syft-0.68.1/syft/source/metadata.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/syft/source/metadata.go 2023-01-30 19:47:24.000000000 +0100 @@ -6,5 +6,6 @@ Scheme Scheme // the source data scheme type (directory or image) ImageMetadata ImageMetadata // all image info (image only) Path string // the root path to be cataloged (directory only) + Base string // the base path to be cataloged (directory only) Name string } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/source.go new/syft-0.69.0/syft/source/source.go --- old/syft-0.68.1/syft/source/source.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/syft/source/source.go 2023-01-30 19:47:24.000000000 +0100 @@ -32,6 +32,7 @@ Metadata Metadata directoryResolver *directoryResolver `hash:"ignore"` path string + base string mutex *sync.Mutex Exclusions []string `hash:"ignore"` } @@ -252,6 +253,11 @@ return NewFromDirectoryWithName(path, "") } +// NewFromDirectory creates a new source object tailored to catalog a given filesystem directory recursively. +func NewFromDirectoryRoot(path string) (Source, error) { + return NewFromDirectoryRootWithName(path, "") +} + // NewFromDirectoryWithName creates a new source object tailored to catalog a given filesystem directory recursively, with an explicitly provided name. func NewFromDirectoryWithName(path string, name string) (Source, error) { s := Source{ @@ -267,6 +273,23 @@ return s, nil } +// NewFromDirectoryRootWithName creates a new source object tailored to catalog a given filesystem directory recursively, with an explicitly provided name. +func NewFromDirectoryRootWithName(path string, name string) (Source, error) { + s := Source{ + mutex: &sync.Mutex{}, + Metadata: Metadata{ + Name: name, + Scheme: DirectoryScheme, + Path: path, + Base: path, + }, + path: path, + base: path, + } + s.SetID() + return s, nil +} + // NewFromFile creates a new source object tailored to catalog a file. func NewFromFile(path string) (Source, func()) { return NewFromFileWithName(path, "") @@ -428,7 +451,7 @@ if err != nil { return nil, err } - resolver, err := newDirectoryResolver(s.path, exclusionFunctions...) + resolver, err := newDirectoryResolver(s.path, s.base, exclusionFunctions...) if err != nil { return nil, fmt.Errorf("unable to create directory resolver: %w", err) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/source_test.go new/syft-0.69.0/syft/source/source_test.go --- old/syft-0.68.1/syft/source/source_test.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/syft/source/source_test.go 2023-01-30 19:47:24.000000000 +0100 @@ -121,7 +121,7 @@ Path: "test-fixtures/image-simple", }, }, - expected: artifact.ID("14b60020c4f9955"), + expected: artifact.ID("1b0dc351e6577b01"), }, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/bar new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/bar --- old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/bar 1970-01-01 01:00:00.000000000 +0100 +++ new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/bar 2023-02-01 16:39:11.193649487 +0100 @@ -0,0 +1 @@ +symbolic link to ../../base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/baz new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/baz --- old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/baz 1970-01-01 01:00:00.000000000 +0100 +++ new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/baz 2023-02-01 16:39:11.169649331 +0100 @@ -0,0 +1 @@ +symbolic link to /../../base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/chain new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/chain --- old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/chain 1970-01-01 01:00:00.000000000 +0100 +++ new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/chain 2023-02-01 16:39:11.161649278 +0100 @@ -0,0 +1 @@ +symbolic link to /foo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/foo new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/foo --- old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/foo 1970-01-01 01:00:00.000000000 +0100 +++ new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/foo 2023-02-01 16:39:11.181649409 +0100 @@ -0,0 +1 @@ +symbolic link to /base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/sub/link new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/sub/link --- old/syft-0.68.1/syft/source/test-fixtures/symlinks-base/sub/link 1970-01-01 01:00:00.000000000 +0100 +++ new/syft-0.69.0/syft/source/test-fixtures/symlinks-base/sub/link 2023-02-01 16:39:11.177649383 +0100 @@ -0,0 +1 @@ +symbolic link to ../sub/item diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/test/cli/all_formats_convertible_test.go new/syft-0.69.0/test/cli/all_formats_convertible_test.go --- old/syft-0.68.1/test/cli/all_formats_convertible_test.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/test/cli/all_formats_convertible_test.go 2023-01-30 19:47:24.000000000 +0100 @@ -1,6 +1,7 @@ package cli import ( + "fmt" "os" "path/filepath" "strings" @@ -9,13 +10,8 @@ "github.com/stretchr/testify/require" ) -type conversion struct { - To string - From string -} - func TestConvertCmdFlags(t *testing.T) { - commonAssertions := []traitAssertion{ + assertions := []traitAssertion{ func(tb testing.TB, stdout, _ string, _ int) { tb.Helper() if len(stdout) < 1000 { @@ -26,52 +22,48 @@ } tests := []struct { - name string - conversions []conversion - env map[string]string - assertions []traitAssertion + to string + from string + template string + env map[string]string }{ - { - name: "syft-format convertable to spdx-json", - conversions: []conversion{ - {To: "syft-json", From: "spdx-json"}, - {To: "syft-json", From: "cyclonedx-json"}, - {To: "spdx-json", From: "syft-json"}, - {To: "spdx-json", From: "cyclonedx-json"}, - {To: "cyclonedx-json", From: "syft-json"}, - {To: "cyclonedx-json", From: "spdx-json"}, - }, - assertions: commonAssertions, - }, + {to: "syft-json", from: "spdx-json"}, + {to: "syft-json", from: "cyclonedx-json"}, + {to: "spdx-json", from: "syft-json"}, + {to: "template", from: "syft-json", template: "test-fixtures/csv.template"}, + {to: "spdx-json", from: "cyclonedx-json"}, + {to: "cyclonedx-json", from: "syft-json"}, + {to: "cyclonedx-json", from: "spdx-json"}, } for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - for _, c := range test.conversions { - sbomArgs := []string{"dir:./test-fixtures/image-pkg-coverage", "-o", c.From} - cmd, stdout, stderr := runSyft(t, test.env, sbomArgs...) - if cmd.ProcessState.ExitCode() != 0 { - t.Fatalf("failure executing syft creating an sbom") - t.Log("STDOUT:\n", stdout) - t.Log("STDERR:\n", stderr) - t.Log("COMMAND:", strings.Join(cmd.Args, " ")) - return - } - - tempDir := t.TempDir() - sbomFile := filepath.Join(tempDir, "sbom.json") - require.NoError(t, os.WriteFile(sbomFile, []byte(stdout), 0666)) - - convertArgs := []string{"convert", sbomFile, "-o", c.To} - cmd, stdout, stderr = runSyft(t, test.env, convertArgs...) - for _, traitFn := range test.assertions { - traitFn(t, stdout, stderr, cmd.ProcessState.ExitCode()) - } - if t.Failed() { - t.Log("STDOUT:\n", stdout) - t.Log("STDERR:\n", stderr) - t.Log("COMMAND:", strings.Join(cmd.Args, " ")) - } + t.Run(fmt.Sprintf("from %s to %s", test.from, test.to), func(t *testing.T) { + sbomArgs := []string{"dir:./test-fixtures/image-pkg-coverage", "-o", test.from} + cmd, stdout, stderr := runSyft(t, test.env, sbomArgs...) + if cmd.ProcessState.ExitCode() != 0 { + t.Log("STDOUT:\n", stdout) + t.Log("STDERR:\n", stderr) + t.Log("COMMAND:", strings.Join(cmd.Args, " ")) + t.Fatalf("failure executing syft creating an sbom") + return + } + + tempDir := t.TempDir() + sbomFile := filepath.Join(tempDir, "sbom.json") + require.NoError(t, os.WriteFile(sbomFile, []byte(stdout), 0666)) + + convertArgs := []string{"convert", sbomFile, "-o", test.to} + if test.template != "" { + convertArgs = append(convertArgs, "--template", test.template) + } + cmd, stdout, stderr = runSyft(t, test.env, convertArgs...) + for _, traitFn := range assertions { + traitFn(t, stdout, stderr, cmd.ProcessState.ExitCode()) + } + if t.Failed() { + t.Log("STDOUT:\n", stdout) + t.Log("STDERR:\n", stderr) + t.Log("COMMAND:", strings.Join(cmd.Args, " ")) } }) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syft-0.68.1/ui/event_handlers.go new/syft-0.69.0/ui/event_handlers.go --- old/syft-0.68.1/ui/event_handlers.go 2023-01-25 18:18:24.000000000 +0100 +++ new/syft-0.69.0/ui/event_handlers.go 2023-01-30 19:47:24.000000000 +0100 @@ -618,6 +618,9 @@ text := s.Text() if strings.Contains(text, "tlog entry created with index") { tlogEntry = text + } else { + // no tlog entry create so user used personal PKI + tlogEntry = "signed attestation using provided key" } _, err = line.Write([]byte(fmt.Sprintf(" %s %s", auxInfoFormat.Sprintf("��"), text))) if err != nil { ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/syft/vendor.tar.gz /work/SRC/openSUSE:Factory/.syft.new.32243/vendor.tar.gz differ: char 5, line 1

1 0