June 2023 - openSUSE Commits - openSUSE Mailing Lists

commit wayvnc for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wayvnc for openSUSE:Factory checked in at 2023-06-30 19:58:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wayvnc (Old) and /work/SRC/openSUSE:Factory/.wayvnc.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wayvnc" Fri Jun 30 19:58:40 2023 rev:7 rq:1096024 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/wayvnc/wayvnc.changes 2023-01-28 18:45:02.334510653 +0100 +++ /work/SRC/openSUSE:Factory/.wayvnc.new.13546/wayvnc.changes 2023-06-30 19:58:59.289684837 +0200 @@ -1,0 +2,8 @@ +Thu Jun 29 16:31:23 UTC 2023 - Joan Torres <joan.torres(a)suse.com> + +- Drop egl, gegl, gles and glx dependencies which aren't needed + for build. +- libdrm_intel is not required neither available for s390x so stop + requiring it when is s390x arch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wayvnc.spec ++++++ --- /var/tmp/diff_new_pack.UfQ9s2/_old 2023-06-30 19:58:59.809687931 +0200 +++ /var/tmp/diff_new_pack.UfQ9s2/_new 2023-06-30 19:58:59.813687954 +0200 @@ -30,16 +30,13 @@ BuildRequires: pkgconfig BuildRequires: scdoc BuildRequires: wayland-devel -BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(gegl-0.4) -BuildRequires: pkgconfig(gegl-sc-0.4) -BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(glx) BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libdrm_amdgpu) +%ifnarch s390x BuildRequires: pkgconfig(libdrm_intel) +%endif BuildRequires: pkgconfig(libdrm_nouveau) BuildRequires: pkgconfig(libdrm_radeon) BuildRequires: pkgconfig(libglvnd)

1 0

commit wine for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2023-06-30 19:58:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Fri Jun 30 19:58:36 2023 rev:413 rq:1095999 version:8.11 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2023-06-28 21:29:31.088499118 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new.13546/wine.changes 2023-06-30 19:58:54.641657192 +0200 @@ -1,0 +2,20 @@ +Thu Jun 29 08:01:59 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- Add reverts to fix startup on 64bit + (https://bugs.winehq.org/show_bug.cgi?id=55139): + * 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch + * 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch + * 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch + * 0004-Revert-loader-Make-the-loader-position-independent-o.patch + +------------------------------------------------------------------- +Mon Jun 26 07:57:27 UTC 2023 - Marcus Meissner <meissner(a)suse.com> + +- Updated to 8.11 release + - More mouse cursor clipping improvements. + - Support for TLS alerts. + - Increased available address space in WoW64 mode. + - Various bug fixes. +- update staging to 8.11 release + +------------------------------------------------------------------- Old: ---- wine-8.10.tar.xz wine-8.10.tar.xz.sign wine-staging-8.10.tar.xz New: ---- 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch 0004-Revert-loader-Make-the-loader-position-independent-o.patch wine-8.11.tar.xz wine-8.11.tar.xz.sign wine-staging-8.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.lZN7EV/_old 2023-06-30 19:58:55.969665091 +0200 +++ /var/tmp/diff_new_pack.lZN7EV/_new 2023-06-30 19:58:55.973665114 +0200 @@ -29,8 +29,8 @@ %endif # needs to be on top due to usage of %version macro below -%define realver 8.10 -Version: 8.10 +%define realver 8.11 +Version: 8.11 Release: 0 %if "%{flavor}" != "" @@ -148,6 +148,11 @@ Source5: ubuntuwine.tar.bz2 Source7: baselibs.conf Source8: wine-rpmlintrc +# PATCH-FIX-UPSTREAM (hopefully temporary reverts for https://bugs.winehq.org/show_bug.cgi?id=55139) +Patch1: 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch +Patch2: 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch +Patch3: 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch +Patch4: 0004-Revert-loader-Make-the-loader-position-independent-o.patch # SUSE specific patches # - currently none, but add them here Recommends: wine-gecko >= 2.47.3 @@ -168,7 +173,7 @@ ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version -%define staging_version 8.10 +%define staging_version 8.11 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel ++++++ 0001-Revert-loader-Build-the-preloader-as-PIE-on-64-bit.patch ++++++ From 8da3c054568e33f682b7282dfe0cdf048960b13a Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fvogt(a)suse.de> Date: Thu, 29 Jun 2023 09:59:30 +0200 Subject: [PATCH 1/4] Revert "loader: Build the preloader as PIE on 64-bit." This reverts commit ac1761d1dae8bf114a05e28ed6886deba6c2c860. --- configure | 38 +------------------------------------- configure.ac | 11 +---------- loader/preloader.c | 7 +++---- 3 files changed, 5 insertions(+), 51 deletions(-) diff --git a/configure b/configure index d530de3ced1..635e3b7f25f 100755 --- a/configure +++ b/configure @@ -10245,47 +10245,11 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes then : WINELOADER_LDFLAGS="-Wl,--export-dynamic" fi - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs" case $host_os in linux*) as_fn_append WINELOADER_LDFLAGS " -pie" - case $HOST_ARCH in - i386|arm) - as_fn_append WINEPRELOADER_LDFLAGS " -static -Wl,-Ttext=0x7d400000" ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -static-pie" >&5 -printf %s "checking whether the compiler supports -static-pie... " >&6; } -if test ${ac_cv_cflags__static_pie+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -static-pie" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__static_pie=yes -else $as_nop - ac_cv_cflags__static_pie=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__static_pie" >&5 -printf "%s\n" "$ac_cv_cflags__static_pie" >&6; } -if test "x$ac_cv_cflags__static_pie" = xyes -then : - as_fn_append WINEPRELOADER_LDFLAGS " -static-pie" -else $as_nop - as_fn_append WINEPRELOADER_LDFLAGS " -static -Wl,-Ttext=0x7d7d00000000" -fi - ;; - esac + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" ;; *) case $HOST_ARCH in diff --git a/configure.ac b/configure.ac index 90c95c89ffb..c8880886b1c 100644 --- a/configure.ac +++ b/configure.ac @@ -769,20 +769,11 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs" case $host_os in linux*) AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) - case $HOST_ARCH in - i386|arm) - AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static -Wl,-Ttext=0x7d400000"]) ;; - *) - WINE_TRY_CFLAGS([-static-pie], - [AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static-pie"])], - [AS_VAR_APPEND([WINEPRELOADER_LDFLAGS],[" -static -Wl,-Ttext=0x7d7d00000000"])]) - ;; - esac + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" ;; *) case $HOST_ARCH in diff --git a/loader/preloader.c b/loader/preloader.c index 635e85ee7cb..5e1eabfa308 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -353,7 +353,7 @@ __ASM_GLOBAL_FUNC(_start, "movq %rsp,%rax\n\t" "leaq -144(%rsp),%rsp\n\t" /* allocate some space for extra aux values */ "movq %rax,(%rsp)\n\t" /* orig stack pointer */ - "movq thread_data(%rip),%rsi\n\t" + "movq $thread_data,%rsi\n\t" "movq $0x1002,%rdi\n\t" /* ARCH_SET_FS */ "movq $158,%rax\n\t" /* SYS_arch_prctl */ "syscall\n\t" @@ -441,8 +441,7 @@ __ASM_GLOBAL_FUNC(_start, "mov x0, SP\n\t" "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ "str x0, [SP]\n\t" /* orig stack pointer */ - "adrp x0, thread_data\n\t" - "add x0, x0, :lo12:thread_data\n\t" + "ldr x0, =thread_data\n\t" "msr tpidr_el0, x0\n\t" "mov x0, SP\n\t" /* ptr to orig stack pointer */ "bl wld_start\n\t" @@ -1401,7 +1400,7 @@ void* wld_start( void **stack ) page_size = get_auxiliary( av, AT_PAGESZ, 4096 ); page_mask = page_size - 1; - preloader_start = (char *)((unsigned long)_start & ~page_mask); + preloader_start = (char *)_start - ((unsigned long)_start & page_mask); preloader_end = (char *)((unsigned long)(_end + page_mask) & ~page_mask); #ifdef DUMP_AUX_INFO -- 2.41.0 ++++++ 0002-Revert-loader-Always-build-the-main-loader-as-PIE-if.patch ++++++ From 374a2c3ae41efcdcd99c5c0fb2220d03ea14f372 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fvogt(a)suse.de> Date: Thu, 29 Jun 2023 09:59:35 +0200 Subject: [PATCH 2/4] Revert "loader: Always build the main loader as PIE if we have a preloader." This reverts commit c55578f3a54c63084657e7d79c043b22b10df989. --- configure | 93 +++++++++++++++++++++++++++++++++------------------- configure.ac | 31 +++++++++--------- 2 files changed, 76 insertions(+), 48 deletions(-) diff --git a/configure b/configure index 635e3b7f25f..4d00a023d18 100755 --- a/configure +++ b/configure @@ -10245,77 +10245,104 @@ if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes then : WINELOADER_LDFLAGS="-Wl,--export-dynamic" fi + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - case $host_os in - linux*) - as_fn_append WINELOADER_LDFLAGS " -pie" - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - ;; - *) - case $HOST_ARCH in - i386|arm) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x60000000" >&5 -printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x60000000... " >&6; } -if test ${ac_cv_cflags__Wl__Ttext_segment_0x60000000+y} + case $host_cpu in + *i[3456789]86* | arm*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 +printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } +if test ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+y} then : printf %s "(cached) " >&6 else $as_nop ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x60000000" +CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x7bc00000" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_cflags__Wl__Ttext_segment_0x60000000=yes + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=yes else $as_nop - ac_cv_cflags__Wl__Ttext_segment_0x60000000=no + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&5 -printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&6; } -if test "x$ac_cv_cflags__Wl__Ttext_segment_0x60000000" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&5 +printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } +if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes then : - as_fn_append WINELOADER_LDFLAGS " -Wl,-Ttext-segment=0x60000000" + case $host_os in + freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; + esac else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x60000400" >&5 -printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x60000400... " >&6; } -if test ${ac_cv_cflags__Wl___section_start__interp_0x60000400+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400" >&5 +printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400... " >&6; } +if test ${ac_cv_cflags__Wl___section_start__interp_0x7d000400+y} then : printf %s "(cached) " >&6 else $as_nop ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x60000400" +CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7d000400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_cflags__Wl___section_start__interp_0x60000400=yes + ac_cv_cflags__Wl___section_start__interp_0x7d000400=yes else $as_nop - ac_cv_cflags__Wl___section_start__interp_0x60000400=no + ac_cv_cflags__Wl___section_start__interp_0x7d000400=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x60000400" >&5 -printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x60000400" >&6; } -if test "x$ac_cv_cflags__Wl___section_start__interp_0x60000400" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&5 +printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&6; } +if test "x$ac_cv_cflags__Wl___section_start__interp_0x7d000400" = xyes then : - as_fn_append WINELOADER_LDFLAGS " -Wl,--section-start,.interp=0x60000400" + case $host_os in + freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; + esac fi fi - ;; - *) - as_fn_append WINELOADER_LDFLAGS " -pie" - ;; - esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-z,max-page-size=0x1000" >&5 +printf %s "checking whether the compiler supports -Wl,-z,max-page-size=0x1000... " >&6; } +if test ${ac_cv_cflags__Wl__z_max_page_size_0x1000+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-z,max-page-size=0x1000" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__Wl__z_max_page_size_0x1000=yes +else $as_nop + ac_cv_cflags__Wl__z_max_page_size_0x1000=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__z_max_page_size_0x1000" >&5 +printf "%s\n" "$ac_cv_cflags__Wl__z_max_page_size_0x1000" >&6; } +if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes +then : + WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000" +fi + ;; + *) + WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" ;; esac ;; diff --git a/configure.ac b/configure.ac index c8880886b1c..2255db13046 100644 --- a/configure.ac +++ b/configure.ac @@ -769,24 +769,25 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-z,defs],[UNIXLDFLAGS="$UNIXLDFLAGS -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" - case $host_os in - linux*) - AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" + case $host_cpu in + *i[[3456789]]86* | arm*) + WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], + [case $host_os in + freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; + esac], + [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400], + [case $host_os in + freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; + esac])]) + WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], + [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) ;; *) - case $HOST_ARCH in - i386|arm) - WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x60000000], - [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,-Ttext-segment=0x60000000"])], - [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x60000400], - [AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -Wl,--section-start,.interp=0x60000400"])])]) - ;; - *) - AS_VAR_APPEND([WINELOADER_LDFLAGS],[" -pie"]) - ;; - esac + WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" ;; esac ;; -- 2.41.0 ++++++ 0003-Revert-loader-Force-building-the-main-loader-as-PIE-.patch ++++++ From 45b2eb83cc87c8a261f78eb10058ac644d6b5556 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fvogt(a)suse.de> Date: Thu, 29 Jun 2023 09:59:41 +0200 Subject: [PATCH 3/4] Revert "loader: Force building the main loader as PIE on 64-bit." This reverts commit 78ed343842dcd8ffb95c416420953e121959d40d. --- configure | 29 ++++++++++++++++++++++++++++- configure.ac | 3 ++- loader/Makefile.in | 1 - 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4d00a023d18..a38400ad529 100755 --- a/configure +++ b/configure @@ -10342,7 +10342,34 @@ then : fi ;; *) - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 +printf %s "checking whether the compiler supports -Wl,-pie... " >&6; } +if test ${ac_cv_cflags__Wl__pie+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-pie" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__Wl__pie=yes +else $as_nop + ac_cv_cflags__Wl__pie=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 +printf "%s\n" "$ac_cv_cflags__Wl__pie" >&6; } +if test "x$ac_cv_cflags__Wl__pie" = xyes +then : + WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie" +fi ;; esac ;; diff --git a/configure.ac b/configure.ac index 2255db13046..b9b3ee4ffc3 100644 --- a/configure.ac +++ b/configure.ac @@ -787,7 +787,8 @@ case $host_os in [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) ;; *) - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -pie" + WINE_TRY_CFLAGS([-Wl,-pie], + [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"]) ;; esac ;; diff --git a/loader/Makefile.in b/loader/Makefile.in index 30413fc8677..7302c231915 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -12,7 +12,6 @@ SOURCES = \ PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) -UNIX_CFLAGS = -fPIE preloader_EXTRADEFS = -fno-builtin -- 2.41.0 ++++++ 0004-Revert-loader-Make-the-loader-position-independent-o.patch ++++++ From 26027b7b84b6fa2fa3b04092c8e6201dc0cad772 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fvogt(a)suse.de> Date: Thu, 29 Jun 2023 09:59:47 +0200 Subject: [PATCH 4/4] Revert "loader: Make the loader position-independent on 64-bit." This reverts commit cc2cfb9b792bee681b96c5859084fd6d4d0bbed7. --- configure | 32 +------------------------------- configure.ac | 6 +----- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/configure b/configure index a38400ad529..1de33458d28 100755 --- a/configure +++ b/configure @@ -10248,7 +10248,7 @@ fi WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" case $host_cpu in - *i[3456789]86* | arm*) + *i[3456789]86* | x86_64 | *aarch64* | arm*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } if test ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+y} @@ -10339,36 +10339,6 @@ printf "%s\n" "$ac_cv_cflags__Wl__z_max_page_size_0x1000" >&6; } if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes then : WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000" -fi - ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 -printf %s "checking whether the compiler supports -Wl,-pie... " >&6; } -if test ${ac_cv_cflags__Wl__pie+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-pie" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__Wl__pie=yes -else $as_nop - ac_cv_cflags__Wl__pie=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 -printf "%s\n" "$ac_cv_cflags__Wl__pie" >&6; } -if test "x$ac_cv_cflags__Wl__pie" = xyes -then : - WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie" fi ;; esac diff --git a/configure.ac b/configure.ac index b9b3ee4ffc3..23f4250220d 100644 --- a/configure.ac +++ b/configure.ac @@ -772,7 +772,7 @@ case $host_os in WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" case $host_cpu in - *i[[3456789]]86* | arm*) + *i[[3456789]]86* | x86_64 | *aarch64* | arm*) WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; @@ -786,10 +786,6 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-z,max-page-size=0x1000], [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) ;; - *) - WINE_TRY_CFLAGS([-Wl,-pie], - [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-pie"]) - ;; esac ;; esac -- 2.41.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lZN7EV/_old 2023-06-30 19:58:56.085665780 +0200 +++ /var/tmp/diff_new_pack.lZN7EV/_new 2023-06-30 19:58:56.089665804 +0200 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="url">https://github.com/wine-staging/wine-staging.git</param> - <param name="revision">refs/tags/v8.10</param> + <param name="revision">refs/tags/v8.11</param> <param name="match-tag">v*.*</param> <param name="scm">git</param> </service> ++++++ wine-8.10.tar.xz -> wine-8.11.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-8.10.tar.xz /work/SRC/openSUSE:Factory/.wine.new.13546/wine-8.11.tar.xz differ: char 26, line 1 ++++++ wine-staging-8.10.tar.xz -> wine-staging-8.11.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-staging-8.10.tar.xz /work/SRC/openSUSE:Factory/.wine.new.13546/wine-staging-8.11.tar.xz differ: char 15, line 1

1 0

commit okteto for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package okteto for openSUSE:Factory checked in at 2023-06-30 19:58:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okteto (Old) and /work/SRC/openSUSE:Factory/.okteto.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "okteto" Fri Jun 30 19:58:34 2023 rev:54 rq:1095997 version:2.16.5 Changes: -------- --- /work/SRC/openSUSE:Factory/okteto/okteto.changes 2023-06-27 23:16:57.107492288 +0200 +++ /work/SRC/openSUSE:Factory/.okteto.new.13546/okteto.changes 2023-06-30 19:58:51.557638848 +0200 @@ -1,0 +2,6 @@ +Thu Jun 29 10:13:25 UTC 2023 - kastl(a)b1-systems.de + +- Update to version 2.16.5: + * fix: wrong registry hostname parse as url (#3743) (#3758) + +------------------------------------------------------------------- Old: ---- okteto-2.16.4.obscpio New: ---- okteto-2.16.5.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okteto.spec ++++++ --- /var/tmp/diff_new_pack.SpUFja/_old 2023-06-30 19:58:52.625645201 +0200 +++ /var/tmp/diff_new_pack.SpUFja/_new 2023-06-30 19:58:52.633645248 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: okteto -Version: 2.16.4 +Version: 2.16.5 Release: 0 Summary: Develop your applications directly in your Kubernetes Cluster License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SpUFja/_old 2023-06-30 19:58:52.681645534 +0200 +++ /var/tmp/diff_new_pack.SpUFja/_new 2023-06-30 19:58:52.685645558 +0200 @@ -3,10 +3,10 @@ <param name="url">https://github.com/okteto/okteto</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">2.16.4</param> + <param name="revision">2.16.5</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> - <param name="match-tag">2.16.4</param> + <param name="match-tag">2.16.5</param> </service> <service name="set_version" mode="disabled"> <param name="basename">okteto</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.SpUFja/_old 2023-06-30 19:58:52.709645700 +0200 +++ /var/tmp/diff_new_pack.SpUFja/_new 2023-06-30 19:58:52.717645748 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/okteto/okteto</param> - <param name="changesrevision">b88a1be3200f966f58b7f340c5b6247915ddd7bb</param></service></servicedata> + <param name="changesrevision">cb48d733e7008c0ad1d077d4cafcccc043fb02a6</param></service></servicedata> (No newline at EOF) ++++++ okteto-2.16.4.obscpio -> okteto-2.16.5.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/http/intercept_test.go new/okteto-2.16.5/pkg/http/intercept_test.go --- old/okteto-2.16.4/pkg/http/intercept_test.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/http/intercept_test.go 2023-06-29 07:40:21.000000000 +0200 @@ -47,7 +47,7 @@ i.AppendURLs(tt.input...) r := []string{} - for k, _ := range i { + for k := range i { r = append(r, k) } assert.ElementsMatch(t, tt.expected, r) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/http/options.go new/okteto-2.16.5/pkg/http/options.go --- old/okteto-2.16.4/pkg/http/options.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/http/options.go 2023-06-29 07:40:21.000000000 +0200 @@ -6,4 +6,5 @@ Certs []*x509.Certificate ServerName string URLsToIntercept []string + TLSDial TLSDialFunc } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/http/transport.go new/okteto-2.16.5/pkg/http/transport.go --- old/okteto-2.16.4/pkg/http/transport.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/http/transport.go 2023-06-29 07:40:21.000000000 +0200 @@ -37,6 +37,17 @@ } } +type TLSDialFunc func(network string, addr string, config *tls.Config) (TLSConn, error) + +func DefaultTLSDial(network string, addr string, config *tls.Config) (TLSConn, error) { + return tls.Dial(network, addr, config) +} + +type TLSConn interface { + net.Conn + Handshake() error +} + // StrictSSLTransport returns an *http.Transport with RootCAs set with both the SystemCertPool and the given *x509.Certificates // If obtaining SystemCertPool fails, it uses an empty *x509.CertPool as base func StrictSSLTransport(opts *SSLTransportOption) *http.Transport { @@ -50,6 +61,9 @@ } for _, cert := range opts.Certs { + if cert == nil { + continue + } pool.AddCert(cert) } @@ -69,14 +83,18 @@ addr = opts.ServerName } - conn, err := tls.Dial("tcp", addr, transport.TLSClientConfig) + tlsDial := opts.TLSDial + if tlsDial == nil { + tlsDial = DefaultTLSDial + } + tlsConn, err := tlsDial("tcp", addr, transport.TLSClientConfig) if err != nil { return nil, fmt.Errorf("tcp dial failed for %s: %w", addr, err) } - if err := conn.Handshake(); err != nil { + if err := tlsConn.Handshake(); err != nil { return nil, fmt.Errorf("tls handshake failed for %s: %w", addr, err) } - return conn, err + return tlsConn, nil } return transport diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/okteto/config.go new/okteto-2.16.5/pkg/okteto/config.go --- old/okteto-2.16.4/pkg/okteto/config.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/okteto/config.go 2023-06-29 07:40:21.000000000 +0200 @@ -26,3 +26,4 @@ func (Config) GetContextCertificate() (*x509.Certificate, error) { return GetContextCertificate() } func (Config) IsInsecureSkipTLSVerifyPolicy() bool { return Context().IsInsecure } func (Config) GetServerNameOverride() string { return GetServerNameOverride() } +func (Config) GetContextName() string { return Context().Name } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/registry/client.go new/okteto-2.16.5/pkg/registry/client.go --- old/okteto-2.16.4/pkg/registry/client.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/registry/client.go 2023-06-29 07:40:21.000000000 +0200 @@ -42,6 +42,7 @@ IsInsecureSkipTLSVerifyPolicy() bool GetContextCertificate() (*x509.Certificate, error) GetServerNameOverride() string + GetContextName() string } type oktetoHelperConfig interface { @@ -65,14 +66,16 @@ // client operates with the registry API type client struct { - config ClientConfigInterface - get func(ref name.Reference, options ...remote.Option) (*remote.Descriptor, error) + config ClientConfigInterface + get func(ref name.Reference, options ...remote.Option) (*remote.Descriptor, error) + tlsDial oktetoHttp.TLSDialFunc } func newOktetoRegistryClient(config ClientConfigInterface) client { return client{ - config: config, - get: remote.Get, + config: config, + get: remote.Get, + tlsDial: oktetoHttp.DefaultTLSDial, } } @@ -170,11 +173,16 @@ return remote.WithTransport(c.getTransport()) } func (c client) getTransport() http.RoundTripper { - sslTransportOption := &oktetoHttp.SSLTransportOption{} + sslTransportOption := &oktetoHttp.SSLTransportOption{ + TLSDial: c.tlsDial, + } if serverName := c.config.GetServerNameOverride(); serverName != "" { sslTransportOption.ServerName = serverName - sslTransportOption.URLsToIntercept = []string{c.config.GetRegistryURL()} + sslTransportOption.URLsToIntercept = []string{ + "//" + c.config.GetRegistryURL(), + c.config.GetContextName(), + } } transport := oktetoHttp.StrictSSLTransport(sslTransportOption) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/registry/client_test.go new/okteto-2.16.5/pkg/registry/client_test.go --- old/okteto-2.16.4/pkg/registry/client_test.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/registry/client_test.go 2023-06-29 07:40:21.000000000 +0200 @@ -14,17 +14,74 @@ package registry import ( + "context" + "crypto/tls" "crypto/x509" + "fmt" + "net" + "net/http" + "sync" "testing" + "time" "github.com/google/go-containerregistry/pkg/name" containerv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/remote/transport" oktetoErrors "github.com/okteto/okteto/pkg/errors" + oktetoHttp "github.com/okteto/okteto/pkg/http" "github.com/stretchr/testify/assert" ) +type fakeTLSConn struct { + handshake bool + handshakeErr error +} + +func (c *fakeTLSConn) Handshake() error { + c.handshake = true + return c.handshakeErr +} + +func (*fakeTLSConn) Close() error { return fmt.Errorf("Close() unimplemented") } + +func (*fakeTLSConn) LocalAddr() net.Addr { return nil } + +func (*fakeTLSConn) RemoteAddr() net.Addr { return nil } + +func (*fakeTLSConn) Read([]byte) (int, error) { return 0, fmt.Errorf("Read() unimplemented") } + +func (*fakeTLSConn) Write([]byte) (int, error) { return 0, fmt.Errorf("Write() unimplemented") } + +func (*fakeTLSConn) SetDeadline(time.Time) error { return fmt.Errorf("SetDeadline() unimplemented") } + +func (*fakeTLSConn) SetReadDeadline(time.Time) error { + return fmt.Errorf("SetReadDeadline() unimplemented") +} + +func (*fakeTLSConn) SetWriteDeadline(time.Time) error { + return fmt.Errorf("SetWriteDeadline() unimplemented") +} + +type fakeTLSDialArgs struct { + network string + addr string + config *tls.Config +} + +type fakeTLSDial struct { + requests []fakeTLSDialArgs + err error + mtx sync.RWMutex +} + +func (t *fakeTLSDial) tlsDial(network string, addr string, config *tls.Config) (oktetoHttp.TLSConn, error) { + t.mtx.Lock() + t.requests = append(t.requests, fakeTLSDialArgs{network: network, addr: addr, config: config}) + t.mtx.Unlock() + return &fakeTLSConn{}, t.err +} + // FakeClient has everything needed to set up a test faking API calls type fakeClient struct { GetImageDigest getDigest @@ -68,6 +125,7 @@ isInsecure bool cert *x509.Certificate serverName string + contextName string } func (f fakeClientConfig) GetRegistryURL() string { return f.registryURL } @@ -76,6 +134,7 @@ func (f fakeClientConfig) IsInsecureSkipTLSVerifyPolicy() bool { return f.isInsecure } func (f fakeClientConfig) GetContextCertificate() (*x509.Certificate, error) { return f.cert, nil } func (f fakeClientConfig) GetServerNameOverride() string { return f.serverName } +func (f fakeClientConfig) GetContextName() string { return f.contextName } func TestGetDigest(t *testing.T) { unautorizedErr := &transport.Error{ @@ -256,3 +315,127 @@ }) } } + +func TestGetTransport(t *testing.T) { + type expected struct { + input fakeTLSDialArgs + output fakeTLSDialArgs + } + var tests = []struct { + name string + config ClientConfigInterface + expected []expected + }{ + { + name: "default", + config: fakeClientConfig{ + registryURL: "registry.instance.foo", + contextName: "https://okteto.instance.foo", + }, + expected: []expected{ + { + input: fakeTLSDialArgs{network: "tcp", addr: "registry.instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "registry.instance.foo:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "okteto.instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "okteto.instance.foo:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "google.com:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "google.com:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + }, + }, + { + name: "default with server name", + config: fakeClientConfig{ + registryURL: "registry.instance.foo", + contextName: "https://okteto.instance.foo", + serverName: "1.2.3.4:443", + }, + expected: []expected{ + { + input: fakeTLSDialArgs{network: "tcp", addr: "registry.instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "1.2.3.4:443", config: &tls.Config{ServerName: "registry.instance.foo"}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "okteto.instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "1.2.3.4:443", config: &tls.Config{ServerName: "okteto.instance.foo"}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "google.com:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "google.com:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + }, + }, + { + name: "public override", + config: fakeClientConfig{ + registryURL: "registry.instance.foo", + contextName: "https://instance.foo", + }, + expected: []expected{ + { + input: fakeTLSDialArgs{network: "tcp", addr: "registry.instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "registry.instance.foo:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "instance.foo:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "google.com:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "google.com:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + }, + }, + { + name: "public override with server name", + config: fakeClientConfig{ + registryURL: "registry.instance.foo", + contextName: "https://instance.foo", + serverName: "1.2.3.4:443", + }, + expected: []expected{ + { + input: fakeTLSDialArgs{network: "tcp", addr: "registry.instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "1.2.3.4:443", config: &tls.Config{ServerName: "registry.instance.foo"}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "instance.foo:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "1.2.3.4:443", config: &tls.Config{ServerName: "instance.foo"}}, // skipcq: GO-S1020, GSC-G402 + }, + { + input: fakeTLSDialArgs{network: "tcp", addr: "google.com:443"}, + output: fakeTLSDialArgs{network: "tcp", addr: "google.com:443", config: &tls.Config{}}, // skipcq: GO-S1020, GSC-G402 + }, + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + for _, e := range tt.expected { + dialer := &fakeTLSDial{} + client := client{config: tt.config, tlsDial: dialer.tlsDial} + + roundTripper := client.getTransport() + transport, ok := roundTripper.(*http.Transport) + assert.True(t, ok, "getTransport() is not *http.Transport") + + conn, err := transport.DialTLSContext(context.TODO(), e.input.network, e.input.addr) + assert.NoError(t, err, "transport.DialTLSContext returned error") + assert.NotNil(t, conn, "transport.DialTLSContext returned nil net.Conn") + + assert.Len(t, dialer.requests, 1) + + assert.Equal(t, e.output.network, dialer.requests[0].network) + assert.Equal(t, e.output.addr, dialer.requests[0].addr) + + assert.NotNil(t, dialer.requests[0].config) + assert.Equal(t, e.output.config.ServerName, dialer.requests[0].config.ServerName) + } + }) + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/registry/registry.go new/okteto-2.16.5/pkg/registry/registry.go --- old/okteto-2.16.4/pkg/registry/registry.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/registry/registry.go 2023-06-29 07:40:21.000000000 +0200 @@ -34,6 +34,7 @@ IsInsecureSkipTLSVerifyPolicy() bool GetContextCertificate() (*x509.Certificate, error) GetServerNameOverride() string + GetContextName() string } type registryConfig interface { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteto-2.16.4/pkg/registry/registry_test.go new/okteto-2.16.5/pkg/registry/registry_test.go --- old/okteto-2.16.4/pkg/registry/registry_test.go 2023-06-26 14:39:35.000000000 +0200 +++ new/okteto-2.16.5/pkg/registry/registry_test.go 2023-06-29 07:40:21.000000000 +0200 @@ -32,6 +32,7 @@ InsecureSkipTLSVerifyPolicy bool ContextCertificate *x509.Certificate ServerName string + ContextName string } func (fc FakeConfig) IsOktetoCluster() bool { return fc.IsOktetoClusterCfg } @@ -45,6 +46,7 @@ return fc.ContextCertificate, nil } func (fc FakeConfig) GetServerNameOverride() string { return fc.ServerName } +func (fc FakeConfig) GetContextName() string { return fc.ContextName } func TestGetImageTagWithDigest(t *testing.T) { type expected struct { ++++++ okteto.obsinfo ++++++ --- /var/tmp/diff_new_pack.SpUFja/_old 2023-06-30 19:58:53.121648151 +0200 +++ /var/tmp/diff_new_pack.SpUFja/_new 2023-06-30 19:58:53.125648175 +0200 @@ -1,5 +1,5 @@ name: okteto -version: 2.16.4 -mtime: 1687783175 -commit: b88a1be3200f966f58b7f340c5b6247915ddd7bb +version: 2.16.5 +mtime: 1688017221 +commit: cb48d733e7008c0ad1d077d4cafcccc043fb02a6 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/okteto/vendor.tar.gz /work/SRC/openSUSE:Factory/.okteto.new.13546/vendor.tar.gz differ: char 5, line 1

1 0

commit plplot for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2023-06-30 19:58:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plplot" Fri Jun 30 19:58:32 2023 rev:72 rq:1096047 version:5.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2023-05-04 17:11:49.332803265 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new.13546/plplot.changes 2023-06-30 19:58:49.261625192 +0200 @@ -1,0 +2,25 @@ +Sun Jun 25 06:45:13 UTC 2023 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Adapt specfile to build plplot against multiple python flavours. +- Set $HOME to current dir during %check to ensure fontconfig does + not complain about un-writable cache dirs. +- Add plplot-libharu-version-check.patch: Fix check for libharu + version when configuring build with cmake. +- New subpackages: + * plplot-driver-pdf: PDf driver based on libharu; new + BuildRequires: libharu-devel. + * plplot-pyqt5-cmake: CMake files for building cmake based + projects using python3-plplot-pyqt5. CMake files are not + versioned according to python3 versioning, and so can only + help when using the pyqt5 bindings with the primary python3 + version. NOTE: Currently pkg is noop as pyqt5 bindings do not + build for python 3.11, since sip4 is not available for the + latter. +- Make doc package noarch. +- Have python310-plplot-pyqt5 obsolete plplot-python3-qt5. +- Have python311-plplot explicitly obsolete python3-plplot to + avoid file conflicts during upgrades. +- Let python310-plplot = %{version}-%{release} conflict with + python3-plplot < %{version}-%{release}. + +------------------------------------------------------------------- New: ---- plplot-libharu-version-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.cuV4BC/_old 2023-06-30 19:58:50.033629784 +0200 +++ /var/tmp/diff_new_pack.cuV4BC/_new 2023-06-30 19:58:50.041629832 +0200 @@ -40,7 +40,7 @@ %bcond_without qhull # FIXME Doesn't build with fPIC (it seems) -%bcond_with ada +%define ada_enabled 0 %define X_display ":98" @@ -55,6 +55,9 @@ %define wx_shlib libplplotwxwidgets1 # DONT SPLIT OUT plplot-tcltk-libs INTO INDIVIDUAL SHARED LIBS AS THEY ARE ALL REQUIRED TOGETHER AND THEIR SO NUMBERING CHANGE IN-STEP WITH EACH OTHER +# Until we have sip for python 3.11 +#%%define pythons python310 + Name: plplot Version: 5.15.0 Release: 0 @@ -75,12 +78,14 @@ Patch4: 0001-Use-reentrant-libqhull_r-instead-of-deprecated-libqh.patch # PATCH-FIX-UPSTREAM support-python3-pythondemos.patch Use print function, so the script works with Python 3 Patch5: support-python3-pythondemos.patch +# PATCH-FIX-UPSTREAM plplot-libharu-version-check.patch badshah400(a)gmail.com -- Include correct header for libharu version checks +Patch6: plplot-libharu-version-check.patch # List based on build_ada in gcc.spec ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le s390 s390x ia64 aarch64 riscv64 BuildRequires: cmake >= 3.13.2 BuildRequires: fdupes BuildRequires: freefont -%if %{with ada} +%if 0%{?ada_enabled} BuildRequires: gcc-ada %endif BuildRequires: gcc-fortran >= 6 @@ -88,6 +93,7 @@ BuildRequires: itk BuildRequires: java-devel BuildRequires: lapack-devel +BuildRequires: libharu-devel >= 2.3.0 BuildRequires: libtool BuildRequires: ncurses-devel %if %{with ocaml_camlidl} @@ -96,13 +102,12 @@ BuildRequires: ocamlfind(camlidl) BuildRequires: ocamlfind(findlib) %endif +BuildRequires: %{python_module devel} +BuildRequires: %{python_module numpy-devel} +BuildRequires: %{python_module qt5-devel} +BuildRequires: %{python_module sip4-devel if %python-base < 3.11} BuildRequires: pkgconfig -BuildRequires: python3-devel -BuildRequires: python3-numpy-devel -BuildRequires: python3-qt5-devel -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 -BuildRequires: python3-sip4-devel -%endif +BuildRequires: python-rpm-macros %if %{with qhull} BuildRequires: qhull-devel %endif @@ -114,6 +119,7 @@ BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(shapelib) @@ -122,16 +128,17 @@ %if %{?octave_enabled} BuildRequires: octave-devel %endif -BuildRequires: wxWidgets-devel >= 3 +BuildRequires: wxGTK3-devel >= 3.1 BuildRequires: xorg-x11-server BuildRequires: perl(XML::DOM) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(lasi) BuildRequires: pkgconfig(lua) - Requires: libtool -Requires: python3-numpy +Requires: python-numpy Recommends: %{name}-doc = %{version} +%define python_subpackage_only 1 +%python_subpackages %description PLplot is a library of functions that are useful for making scientific @@ -231,7 +238,7 @@ %preun devel /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir -%files devel -f %{name}.filelist.ocaml +%files devel -f %{_builddir}/%{name}.filelist.ocaml %license COPYING.LIB Copyright %doc AUTHORS FAQ README README.release %{_bindir}/pltek @@ -305,6 +312,7 @@ Summary: Documentation for PLplot and its bindings License: LGPL-2.1-or-later Group: Documentation/Other +BuildArch: noarch %description doc PLplot is a library of functions that are useful for making scientific @@ -318,7 +326,7 @@ %{_docdir}/%{name}-doc/* ########################################################################## -%if %{with ada} +%if 0%{?ada_enabled} %package -n %{ada_shlib} ########################################################################## Summary: Shared libraries for PLplot's Ada bindings @@ -503,25 +511,52 @@ %endif ########################################################################## -%package python3-qt +%if "%{python_flavor}" != "python311" +%package -n python-plplot-pyqt5 ########################################################################## -Summary: PLplot functions for scientific plotting with python-qt4 +Summary: PLplot functions for scientific plotting with python-qt5 License: LGPL-2.1-or-later Group: Development/Libraries/Python Requires: %{name}-common = %{version} -Requires: python3-qt5 +Requires: python-qt5 +# Python 3.10 is the last version of Python with sip4 support +%if "%{python_flavor}" == "python3" || "%{python_flavor}" == "python310" +Obsoletes: plplot-python3-qt < %{version}-%{release} +Provides: plplot-python3-qt = %{version}-%{release} +Recommends: plplot-pyqt5-cmake +%endif -%description python3-qt +%description -n python-plplot-pyqt5 PLplot is a library of functions that are useful for making scientific plots. This package provides the PLplot functions required for scientific plotting with python-qt. -%files python3-qt -%{python3_sitearch}/plplot_pyqt5.so +%files %{python_files plplot-pyqt5} +%{python_sitearch}/plplot_pyqt5.so +%endif +########################################################################## + +%package -n plplot-pyqt5-cmake +########################################################################## +Summary: PLplot functions for scientific plotting with python-qt5 +License: LGPL-2.1-or-later +Group: Development/Libraries/Python +Requires: python3-plplot-pyqt5 + +%description -n plplot-pyqt5-cmake +PLplot is a library of functions that are useful for making scientific +plots. + +This package provides the cmake files optionally required for building +cmake based projects with plplot-pyqt5. + +%if ("%{python_flavor}" == "python3" || "%{python_provides}" == "python3") && "%{python_flavor}" != "python311" +%files -n plplot-pyqt5-cmake %{_libdir}/cmake/plplot/export_plplot_pyqt5.cmake %{_libdir}/cmake/plplot/export_plplot_pyqt5-*.cmake +%endif ########################################################################## %package -n %{qt_shlib} @@ -655,9 +690,9 @@ %{_libdir}/cmake/plplot/export_plplottcltk-*.cmake %{_libdir}/cmake/plplot/export_Pltk_init.cmake %{_libdir}/cmake/plplot/export_Pltk_init-*.cmake -%{python3_sitearch}/Plframe.py* -%{python3_sitearch}/TclSup.py* -%{python3_sitearch}/*Pltk_init.* +%{python_sitearch}/Plframe.py* +%{python_sitearch}/TclSup.py* +%{python_sitearch}/*Pltk_init.* %endif ########################################################################## @@ -858,29 +893,35 @@ %{_libdir}/libqsastime.so.* ########################################################################## -%package -n python3-%{name} +%package -n python-%{name} ########################################################################## Summary: PLplot functions for scientific plotting with Python License: LGPL-2.1-or-later Group: System/Libraries Requires: %{name}-common = %{version} -Provides: python-%{name} +Requires: python-base +Requires: python-numpy +# For update from the last python3-plplot package built against python3.10 +%if "%{python_flavor}" == "python310" +Conflicts: python3-%{name} < %{version}-%{release} +%endif +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +Obsoletes: python3-%{name} < %{version}-%{release} +Provides: python3-%{name} = %{version}-%{release} +%endif -%description -n python3-%{name} +%description -n python-%{name} PLplot is a library of functions that are useful for making scientific plots. This package provides the PLplot's Python binding. -%files -n python3-%{name} -%{python3_sitearch}/_plplotc.so -%{python3_sitearch}/plplot.py* -%{python3_sitearch}/plplotc.py* -%{python3_sitearch}/_plplotc.so -%{python3_sitearch}/plplot.py* -%{python3_sitearch}/plplotc.py* -%{_datadir}/plplot%{version}/examples/python/ -%{_datadir}/plplot%{version}/examples/test_python.sh +%files %{python_files %{name}} +%{python_sitearch}/_plplotc.so +%{python_sitearch}/plplot.py +%{python_sitearch}/plplotc.py +%{_datadir}/plplot%{version}/examples/python%{python_version}/ +%{_datadir}/plplot%{version}/examples/test_python%{python_version}.sh ########################################################################## %package driver-cairo @@ -923,6 +964,26 @@ %{_libdir}/cmake/plplot/export_ntk-*.cmake ########################################################################## +%package driver-pdf +########################################################################## +Summary: PLplot driver using the pdf backend +License: LGPL-2.1-or-later +Group: System/Libraries +Requires: plplot-common = %{version} + +%description driver-pdf +PLplot is a library of functions that are useful for making scientific +plots. + +This package provides the pdf driver for plotting using PLplot. + +%files driver-pdf +%{_libdir}/plplot%{version}/drivers/pdf.driver_info +%{_libdir}/plplot%{version}/drivers/pdf.so +%{_libdir}/cmake/plplot/export_pdf.cmake +%{_libdir}/cmake/plplot/export_pdf-*.cmake +########################################################################## + %package driver-ps ########################################################################## Summary: PLplot driver using the ps backend @@ -1045,56 +1106,94 @@ Xvfb -noreset %{X_display} >& Xvfb.log & trap "kill $! || true" EXIT sleep 5 -%cmake \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ - -DENABLE_compiler_diagnostics=ON \ - -DPL_FREETYPE_FONT_PATH:PATH="%{_datadir}/fonts/truetype" \ - -DUSE_RPATH:BOOL=OFF \ - -DCMAKE_SKIP_RPATH:BOOL=OFF \ - -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ - -DENABLE_ada:BOOL=%{?with_ada:ON}%{!?with_ada:OFF} \ -%if 0%{?octave_enabled} - -DENABLE_octave:BOOL=ON \ - -DTRY_OCTAVE4=ON \ -%else - -DENABLE_octave:BOOL=OFF \ -%endif - -DENABLE_d:BOOL=ON \ +%{python_expand #Set the $python var +# Define cmake common opts +export CMAKE_COMMON_OPTS="-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ +-DENABLE_compiler_diagnostics=ON \ +-DPL_FREETYPE_FONT_PATH:PATH=\"%{_datadir}/fonts/truetype\" \ +-DUSE_RPATH:BOOL=OFF \ +-DCMAKE_SKIP_RPATH:BOOL=OFF \ +-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ +-DBUILD_DOC:BOOL=OFF \ +-DBUILD_TEST:BOOL=ON \ +-DENABLE_python:BOOL=ON \ +-DENABLE_qt:BOOL=ON \ +-DPLPLOT_PYTHON_EXACT_VERSION=%{$python_version} \ +-DPLPLOT_USE_QT5:BOOL=ON \ +-DPLD_pdfcairo:BOOL=ON \ +-DPLD_pngcairo:BOOL=ON \ +-DPLD_pscairo:BOOL=ON \ +-DPLD_epscairo:BOOL=ON \ +-DPLD_svgcairo:BOOL=ON \ +-DPLD_epsqt:BOOL=OFF \ +-DPLD_pdfqt:BOOL=ON \ +-DPLD_bmpqt:BOOL=ON \ +-DPLD_jpgqt:BOOL=ON \ +-DPLD_pngqt:BOOL=ON \ +-DPLD_ppmqt:BOOL=ON \ +-DPLD_tiffqt:BOOL=ON \ +-DPLD_svgqt:BOOL=ON \ +-DPLD_pdf:BOOL=ON \ +-DPLD_ps:BOOL=ON \ +-DPLD_psc:BOOL=ON \ +-DPLD_psttf:BOOL=ON \ +-DPLD_psttfc:BOOL=ON \ +-DPLD_qtwidget:BOOL=ON \ +-DPLD_svg:BOOL=ON \ +-DPLD_xfig:BOOL=ON \ +-DPLD_xcairo:BOOL=ON \ +-DPLD_extcairo:BOOL=ON \ +-DPLD_extqt:BOOL=ON \ +-DPLD_wxpng:BOOL=OFF \ +-DPLD_wxwidgets:BOOL=ON +" + +mkdir ../$python +cp -pr ./* ../$python +pushd ../$python +if [ ${python_flavor} = python311 ]; then + export CMAKE_COMMON_OPTS="${CMAKE_COMMON_OPTS} -DENABLE_pyqt5:BOOL=OFF" +else + export CMAKE_COMMON_OPTS="${CMAKE_COMMON_OPTS} -DENABLE_pyqt5:BOOL=ON" +fi +%cmake ${CMAKE_COMMON_OPTS} \ +%if "$python_" == "python3_" || "%{$python_provides}" == "python3" + -DENABLE_ada:BOOL=%{?ada_enabled:ON}%{!?ada_enabled:OFF} \ + -DENABLE_cxx:BOOL=ON \ + -DENABLE_d:BOOL=OFF \ + -DENABLE_fortran:BOOL=ON \ -DENABLE_itcl:BOOL=ON \ -%if 0%{?tk_enabled} - -DENABLE_itk:BOOL=ON \ - -DENABLE_tk:BOOL=ON \ -%else - -DENABLE_itk:BOOL=OFF \ - -DENABLE_tk:BOOL=OFF \ -%endif -%if %{with ocaml_camlidl} - -DENABLE_ocaml:BOOL=ON \ -%else - -DENABLE_ocaml:BOOL=OFF \ -%endif - -DPLD_aqt:BOOL=ON \ - -DPLD_plmeta:BOOL=OFF \ - -DPLD_svg:BOOL=ON \ - -DPLD_wxwidgets:BOOL=ON \ - -DBUILD_DOC:BOOL=OFF \ + -DENABLE_itk:BOOL=%{?tk_enabled:ON}%{!?tk_enabled:OFF} \ + -DENABLE_java:BOOL=ON \ + -DENABLE_lua:BOOL=ON \ + -DENABLE_ocaml:BOOL=%{?with_ocaml_camlidl:ON}%{!?with_ocaml_camlidl:OFF} \ + -DENABLE_octave:BOOL=%{?octave_enabled:ON}%{!?octave_enabled:OFF} \ + -DENABLE_tcl:BOOL=ON \ + -DENABLE_tk:BOOL=%{?tk_enabled:ON}%{!?tk_enabled:OFF} \ + -DENABLE_wxwidgets:BOOL=ON \ -DPREBUILT_DOC:BOOL=ON \ -DJAVAWRAPPER_DIR:PATH="%{_libdir}/plplot%{version}" \ - -DBUILD_TEST:BOOL=ON \ - -DENABLE_lua:BOOL=ON \ - -DPLPLOT_USE_QT5:BOOL=ON + -DTRY_OCTAVE4=ON +%else + -DDEFAULT_NO_BINDINGS:BOOL=ON \ + -DPREBUILT_DOC:BOOL=OFF +%endif %cmake_build +popd +} %install +%{python_expand pushd ../$python %cmake_install -> %{name}.filelist.ocaml +> %{_builddir}/%{name}.filelist.ocaml %if %{with ocaml_camlidl} : creating '%{name}.files' and '%{name}.files.devel' %ocaml_create_file_list -mv %{name}.files.devel %{name}.filelist.ocaml +mv %{name}.files.devel %{_builddir}/%{name}.filelist.ocaml %endif +%if "$python_" == "python3_" || "%{$python_provides}" == "python3" # Fix up tclIndex files so they are the same on all builds for file in %{buildroot}%{_datadir}/plplot%{version}/examples/*/tclIndex do @@ -1127,21 +1226,42 @@ #Remove a fortran static library rm %{buildroot}%{_libdir}/libplfortrandemolib*.a -#Fix python hashbangs for examples (/usr/bin/env python -> /usr/bin/python3) -sed -i "1{s/\/usr\/bin\/env python/\/usr\/bin\/python3/;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/x* -sed -i "1{s/\/usr\/bin\/env python/\/usr\/bin\/python3/;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/*.py -sed -i "1{s/\/usr\/bin\/env python/\/usr\/bin\/python3/;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/pytkdemo +sed -i "1{s@/usr/bin/env python@%{_bindir}/python%{$python_bin_suffix}@;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/pytkdemo +%endif + +#Fix python hashbangs for examples (/usr/bin/env python -> /usr/bin/pythonX.Y) +sed -i "1{s@/usr/bin/env python@%{_bindir}/python%{$python_bin_suffix}@;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/x* +sed -i "1{s@/usr/bin/env python@%{_bindir}/python%{$python_bin_suffix}@;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/*.py + +# Move examples to versioned python dirs +mv %{buildroot}%{_datadir}/plplot%{version}/examples/python \ + %{buildroot}%{_datadir}/plplot%{version}/examples/python%{$python_version} +mv %{buildroot}%{_datadir}/plplot%{version}/examples/test_python.sh \ + %{buildroot}%{_datadir}/plplot%{version}/examples/test_python%{$python_version}.sh + +# Only keep for primary flavour +if [ "${python_flavor}" != "python3" ] && [ "%{$python_provides}" != "python3" ] +then + rm %{buildroot}%{_libdir}/cmake/plplot/export_plplot_pyqt5*.cmake +fi %fdupes %{buildroot}%{_datadir}/ +popd +} %check -pushd %__builddir export DISPLAY=%{X_display} Xvfb %{X_display} >& Xvfb.log & +trap "kill $! || true" EXIT sleep 5 +%{python_expand pushd ../$python +cd %__builddir # Octave tests fail, known issue with tests # Qt tests fail on Xvfb +# Avoid fontconfig warnings about un-writable cache dirs by setting HOME to pwd +export HOME=. ctest -V -E "octave|qt" %{?_smp_mflags} popd +} %changelog ++++++ plplot-libharu-version-check.patch ++++++ Index: plplot-5.15.0/cmake/modules/pdf.cmake =================================================================== --- plplot-5.15.0.orig/cmake/modules/pdf.cmake +++ plplot-5.15.0/cmake/modules/pdf.cmake @@ -47,6 +47,7 @@ if(PLD_pdf) # Determine that version in cross-platform way. set(check_libharu_version_source " #include \"hpdf.h\" +#include \"hpdf_version.h\" int main(void) { // True if version is 2.3.0 or later....

1 0

commit xpra for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '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-06-30 19:58:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xpra (Old) and /work/SRC/openSUSE:Factory/.xpra.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xpra" Fri Jun 30 19:58:30 2023 rev:53 rq:1095879 version:5.0+git20230617.2a908f54 Changes: -------- --- /work/SRC/openSUSE:Factory/xpra/xpra.changes 2023-02-01 16:40:45.834266729 +0100 +++ /work/SRC/openSUSE:Factory/.xpra.new.13546/xpra.changes 2023-06-30 19:58:47.413614200 +0200 @@ -1,0 +2,1394 @@ +Wed Jun 28 21:10:27 UTC 2023 - Scott Bradnick <scott.bradnick(a)suse.com> + +- Adding "Source100: xpra-rpmlintrc" to appease SR#1095874 + being declined + +------------------------------------------------------------------- +Wed Jun 21 20:34:45 UTC 2023 - Scott Bradnick <scott.bradnick(a)suse.com> + +- Adding more Recommends per: + https://github.com/Xpra-org/xpra/blob/master/docs/Build/Dependencies.md + +------------------------------------------------------------------- +Tue Jun 20 14:55:16 UTC 2023 - scott.bradnick(a)suse.com + +- Update to version 5.0+git20230617.2a908f54: + * minor type hint fixes + * use the more common filename + * more type hints + * replace buster with trixie + * same file, but more consistent filename + * #3863 use the new key everywhere + * more type hints + * unused import + * get_nsview_ptr needs a gdk window + * misname callback + * PyOpenGL-accelerate 3.1.7 requires numpy to load + * more type hints + * try harder to format the log record + * don't ship cython's html files + * no need for nested exceptions + * skip None values + * '<' means '<=' and we have to use '<<' to mean less than + * replace 'assert' with more specific exception types + * try harder to prevent conflicts with older 'xpra' packages + * wrap all tuples, for better compatibility with type hints + * older versions of Python struggle with the type hints syntax + * more type hints + * missing build deps + * better exception message + * compatibility with newer versions of python-cryptography + * reuse the new util function + * don't access stderr directly + * don't build nvidia modules if cuda is disabled + * #3895 use xpra[_cmd].exe to launch subcommands + * unused import + * #3895 better error message + * fixup pydev spurious import, and add more hints + * avoid crashes on MS Windows when exiting using key shortcuts + * Make pulseaudio scheduling configurable via XPRA_PULSEAUDIO_* env-vars + * cosmetic (for testing gpg signature) + * testing signature + * minor type hints updates + * more type hints + * do_process_mouse_common must return a bool + * #3872 dumb capture and encode streaming mode + * #3750 make code reusable + * more type hints + * #3750 register the correct type + * more type hints + * whitespace + * silence warning + * minor type hint update + * better debug logging and error handling + * also handle 'ValueError' in fallback path + * better debug logging, type hint + * #3883 all focus updates must go through 'recheck' + * better wording + * remove debug + * show more of the overly large packets + * handle one pixel oddities more gracefully + * missing return value (oops) + * always free the AVFrame in error paths + * fix libspng link + * fixup mess that pydev added + * fix invalid type hint + * improve type hints + * more type hints + * more type hints + * fix vsock parsing: use the new function name + * pylsqpack 0.3.17 + * more type hints + * fix type hint + * more type hints + * fix linter warning + * fix linter warnings + * don't rely on initialization order + * VideoSubregion needs timeout_add and source_remove defined + * remove unused import + * more type hints + * #3882 fixup 053b87fb56664ca2bebed23a577af4c508440691 + * improved type hints + * type hints for delegated platform functions + * return None explicitly + * whitespace + * remove now unused import + * linter warning + * don't bother with session tickets + * more linter warnings + * more complete implementation: add close_notify + * doh: server_window_signals is a whitelist + * add type hints + * f-stringify + * re-enable wheel event handler + * debug to match actual code + * missed module from name stripping + * minor linter type hints warnings + * saner handling of scalar X11 properties + * #1995 the new api doesn't use the 'format' attribute + * better detection of X11 vs Wayland + * add debug logging, use default display from env + * oops: forgot to update this test + * setuptools workaround needs another workaround + * use consistent datatypes for authentication functions + * fix more linter warnings and add type hints + * fix more linter warnings and add type hints + * silence linter warnings + * factors use a dictionary with further details + * rounding gives us more "precision" of sorts + * add type hints + * add docstring, fix linter warnings + * a cleaner / simpler method makes the linter happier + * hide python logging logger instance attribute + * don't access the 'logging' logger directly + * remove unused code + * keep track of shell commands + * merge 'gtk_base' into gtk3 + * make code easier to follow + * use List to make it easier to manipulate + * remove unused attribute + * clearer decision making + * fix crashes on win32 when using keys to close + * move all environment init to platform support files + * filename was wrong, did not match anything + * #3875 all entrypoints need the cryptography openssl workaround + * fix linter warnings on non-posix OSes + * some Cython / gcc versions can't handle XIf_predicate + * #3877 fixup 1da6fe5bbe9e456d5aae12bfd1e6501dbce67281 + * add xsettings type + * syntax compatible with older Python versions + * use hints from 'typing' module + * #3872 add 'stream' encoding option + * type hints + * missed from mass rename + * fix minor linter warnings + * minor type hints updates + * missed from mass renaming + * minor linter warnings, type hints + * actually replace with new option name + * hook horizontal wheel events + * re-enable event handlers (was libffi build issue?) + * remove unused code + * don't close twice - as was intended? + * actually update the 'senstivity' of the maximize option + * doh: check all values + * don't raise generic 'Exception' + * #1995 fixup type name + * simplify server mixin names + * simplify source mixin names + * use typing module for hints + * move gtk bits to gtk server base + +------------------------------------------------------------------- +Mon May 29 15:30:52 UTC 2023 - scott.bradnick(a)suse.com + +- Update to version 5.0+git20230529.246ad1fe: + * round to nearest for smoother scrolling + * more mypy type hints + * typo + * #3868 catch KeyError and log it + * more mypy type hints and fixes + * #3859 fix undefined variable + * Mar 12 2023 was a Sunday + * doh + * find_session_by_name now always returns a string + * accept tuples as packets, silence validation warnings during tests + * more mostly automatic type hints + * more mypy inspired type hints and tweaks + * #3867 update clipboard to use XIDs directly + * more mypy inspired type hints + * mypy finds latent bugs + * mypy config and fixes + * repos: define available architectures (amd64, arm64) for deb822-format On multi-arch systems (e.g. i386<->amd64) without specification of supported architectures "apt update" warns about missing packages (e.g. "Skipping acquire of configured file 'main/binary-i386/Packages' as repository 'https://xpra.org jammy InRelease' doesn't support architecture 'i386'") + * add type hints + * Fix side buttons on win32 shadow server + * control-c just gets out + +------------------------------------------------------------------- +Thu May 25 19:50:20 UTC 2023 - scott.bradnick(a)suse.com + +- Update to version 5.0+git20230525.b53aab5f: + * #3582 only include socket info when XPRA_FULL_INFO>0 + * move exception handling + * trays don't send the buttons parameter + * strip newlines from backtrace + * simplify: make_instance will discard None values + * explicit: always return a type, or None + * unused import ++++ 1197 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/xpra/xpra.changes ++++ and /work/SRC/openSUSE:Factory/.xpra.new.13546/xpra.changes Old: ---- xpra-5.0+git20221127.3e61ef1c.tar.gz New: ---- xpra-5.0+git20230617.2a908f54.tar.gz xpra-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpra.spec ++++++ --- /var/tmp/diff_new_pack.lAcAWN/_old 2023-06-30 19:58:48.837622670 +0200 +++ /var/tmp/diff_new_pack.lAcAWN/_new 2023-06-30 19:58:48.841622694 +0200 @@ -36,7 +36,7 @@ # ---- %global __requires_exclude ^typelib\$GtkosxApplication\$|typelib\$GdkGLExt\$|typelib\$GtkGLExt\$.*$ Name: xpra -Version: 5.0+git20221127.3e61ef1c +Version: 5.0+git20230617.2a908f54 Release: 0 Summary: Remote display server for applications and desktops License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-3.0-or-later AND MIT @@ -44,6 +44,7 @@ URL: https://www.xpra.org/ Source0: %{name}-%{version}.tar.gz Source1: xpra-icon.png +Source100: xpra-rpmlintrc # ---- BuildRequires: ImageMagick BuildRequires: brotli @@ -126,14 +127,27 @@ Recommends: lsb-release Recommends: pinentry Recommends: pulseaudio-module-x11 +Recommends: python3-asn1crypto +Recommends: python3-cffi +Recommends: python3-cryptography +Recommends: python3-decorator Recommends: python3-dnspython +Recommends: python3-idna +Recommends: python3-ipaddress Recommends: python3-netifaces Recommends: python3-opencv Recommends: python3-opengl Recommends: python3-opengl-accelerate +Recommends: python3-packaging Recommends: python3-paramiko +Recommends: python3-pyasn1 +Recommends: python3-pycparser Recommends: python3-pyinotify +Recommends: python3-pynacl +Recommends: python3-pyparsing Recommends: python3-pyxdg +Recommends: python3-setuptools +Recommends: python3-six Recommends: xdg-menu # Overflow errors on 32-bit ExcludeArch: %ix86 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lAcAWN/_old 2023-06-30 19:58:48.877622908 +0200 +++ /var/tmp/diff_new_pack.lAcAWN/_new 2023-06-30 19:58:48.881622932 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param>    <!-- BAD CLIPBOARD <param name="revision">df36fcc</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.lAcAWN/_old 2023-06-30 19:58:48.901623051 +0200 +++ /var/tmp/diff_new_pack.lAcAWN/_new 2023-06-30 19:58:48.905623075 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/Xpra-org/xpra</param> - <param name="changesrevision">3e61ef1c89c7c3c882ebe94fb18ec1cc07bcc744</param></service></servicedata> + <param name="changesrevision">2a908f54bbac96291cb64bd65a5da8ed6868db6e</param></service></servicedata> (No newline at EOF) ++++++ xpra-5.0+git20221127.3e61ef1c.tar.gz -> xpra-5.0+git20230617.2a908f54.tar.gz ++++++ /work/SRC/openSUSE:Factory/xpra/xpra-5.0+git20221127.3e61ef1c.tar.gz /work/SRC/openSUSE:Factory/.xpra.new.13546/xpra-5.0+git20230617.2a908f54.tar.gz differ: char 12, line 1 ++++++ xpra-rpmlintrc ++++++ addFilter("potential-bashisms /usr/bin/xpra_Xdummy"); addFilter("dbus-policy-allow-receive <allow receive_sender="org.xpra.Server"/> /etc/dbus-1/system.d/xpra.conf"); ++++++ xpra.obsinfo ++++++ --- /var/tmp/diff_new_pack.lAcAWN/_old 2023-06-30 19:58:48.969623455 +0200 +++ /var/tmp/diff_new_pack.lAcAWN/_new 2023-06-30 19:58:48.973623479 +0200 @@ -1,5 +1,5 @@ name: xpra -version: 5.0+git20221127.3e61ef1c -mtime: 1669537672 -commit: 3e61ef1c89c7c3c882ebe94fb18ec1cc07bcc744 +version: 5.0+git20230617.2a908f54 +mtime: 1686936021 +commit: 2a908f54bbac96291cb64bd65a5da8ed6868db6e

1 0

commit libharu for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libharu for openSUSE:Factory checked in at 2023-06-30 19:58:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libharu (Old) and /work/SRC/openSUSE:Factory/.libharu.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libharu" Fri Jun 30 19:58:29 2023 rev:10 rq:1096044 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libharu/libharu.changes 2022-09-14 13:45:27.349965808 +0200 +++ /work/SRC/openSUSE:Factory/.libharu.new.13546/libharu.changes 2023-06-30 19:58:45.373602067 +0200 @@ -1,0 +2,29 @@ +Thu Jun 29 07:07:46 UTC 2023 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Move Conflicts against libhpdf2_4_2 to devel package. + +------------------------------------------------------------------- +Mon Jun 26 12:52:05 UTC 2023 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Add libharu-so-versioning.patch -- Add correct versioning to + shared object libhpdf.so [gh#libharu/libharu#284]; patch sent + upstream. +- Drop so version setting snippet from specfile in light of + above patch. +- Re-name shared library as libhpdf2; add Conflicts against + previously named libhpdf2_4_2, which violated the SLPP. +- Use fdupes to clean up a duplicate. + +------------------------------------------------------------------- +Sat Oct 15 00:32:47 UTC 2022 - Stefan Br��ns <stefan.bruens(a)rwth-aachen.de> + +- update to 2.4.3: + * Add static hpdf_version.h header + * hpdf_version.h included again + * File attachment issue resolved + * Renamed *_LIBZ defines to _*ZLIB, enables compression of + PDF files again. +- Clean up spec file +- Add SOVERSION to library, remove rpmlintrc + +------------------------------------------------------------------- Old: ---- libharu-2.4.2.tar.gz libharu-rpmlintrc New: ---- libharu-2.4.3.tar.gz libharu-so-versioning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libharu.spec ++++++ --- /var/tmp/diff_new_pack.CjmsDi/_old 2023-06-30 19:58:46.093606349 +0200 +++ /var/tmp/diff_new_pack.CjmsDi/_new 2023-06-30 19:58:46.097606373 +0200 @@ -1,7 +1,7 @@ # # spec file for package libharu # -# 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,18 +16,20 @@ # -%define relver 2_4_2 +%define relver 2 %define lname libhpdf%{relver} Name: libharu -Version: 2.4.2 +Version: 2.4.3 Release: 0 Summary: Library for generating PDF files License: Zlib Group: Productivity/Office/Other URL: http://libharu.org Source0: https://github.com/libharu/libharu/archive/refs/tags/v%{version}.tar.gz#/%{… -Source1: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM libharu-so-versioning.patch gh#libharu/libharu#284 badshah400(a)gmail.com -- Add correct versioning to shared object libhpdf.so +Patch0: libharu-so-versioning.patch BuildRequires: cmake +BuildRequires: fdupes BuildRequires: libpng-devel BuildRequires: zlib-devel @@ -45,9 +47,9 @@ %package -n %{lname} Summary: Library for generating PDF files -# used wrong shlib packaging name.. Group: System/Libraries + %description -n %{lname} libHaru is a library for generating PDF files. It supports the following features: @@ -66,21 +68,25 @@ Requires: %{lname} = %{version} Requires: libpng-devel Requires: zlib-devel +Conflicts: libhpdf2_4_2 %description devel This package contains libraries and header files for developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 %build -%cmake -DLIBHPDF_STATIC=NO -%make_jobs +%cmake \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + %{nil} +%cmake_build %install %cmake_install -find %{buildroot} -type f -name "*.la" -delete -print + +%fdupes %{buildroot}%{_datadir}/%{name}/ %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig @@ -88,9 +94,10 @@ %files -n %{lname} %license LICENSE %doc README.md -%{_libdir}/libhpdf.so +%{_libdir}/libhpdf.so.* %files devel +%{_libdir}/libhpdf.so %{_includedir}/*.h %{_datadir}/%{name}/ ++++++ libharu-2.4.2.tar.gz -> libharu-2.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/CMakeLists.txt new/libharu-2.4.3/CMakeLists.txt --- old/libharu-2.4.2/CMakeLists.txt 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/CMakeLists.txt 2022-10-14 12:04:02.000000000 +0200 @@ -1,24 +1,18 @@ cmake_minimum_required(VERSION 3.10) +file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/include/hpdf_version.h HPDF_VERSION_H_CONTENTS REGEX " HPDF_(MAJOR|MINOR|BUGFIX)_VERSION ") +string(REGEX MATCH "MAJOR_VERSION [0-9]+" HPDF_MAJOR_VERSION ${HPDF_VERSION_H_CONTENTS}) +string(REGEX MATCH "MINOR_VERSION [0-9]+" HPDF_MINOR_VERSION ${HPDF_VERSION_H_CONTENTS}) +string(REGEX MATCH "BUGFIX_VERSION [0-9]+" HPDF_BUGFIX_VERSION ${HPDF_VERSION_H_CONTENTS}) +string(REGEX MATCH "[0-9]+" HPDF_MAJOR_VERSION ${HPDF_MAJOR_VERSION}) +string(REGEX MATCH "[0-9]+" HPDF_MINOR_VERSION ${HPDF_MINOR_VERSION}) +string(REGEX MATCH "[0-9]+" HPDF_BUGFIX_VERSION ${HPDF_BUGFIX_VERSION}) + project(libharu - VERSION 2.4.2 + VERSION ${HPDF_MAJOR_VERSION}.${HPDF_MINOR_VERSION}.${HPDF_BUGFIX_VERSION} DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files." LANGUAGES C) -set(PROJECT_VERSION_EXTRA "") -if (PROJECT_VERSION_EXTRA) - set(PROJECT_VERSION_TEXT "${PROJECT_VERSION}-${PROJECT_VERSION_EXTRA}") -else() - set(PROJECT_VERSION_TEXT ${PROJECT_VERSION}) -endif() - -# Set version id -math(EXPR PROJECT_VERSION_ID " - 10000 * ${PROJECT_VERSION_MAJOR} + - 100 * ${PROJECT_VERSION_MINOR} + - ${PROJECT_VERSION_PATCH} -") - include(GNUInstallDirs) @@ -55,7 +49,7 @@ # check zlib availability find_package(ZLIB) - + # check png availability find_package(PNG) @@ -85,13 +79,7 @@ set (LIBHPDF_HAVE_LIBPNG ${PNG_FOUND}) # support different zlib defines -set (LIBHPDF_HAVE_LIBZ ${ZLIB_FOUND}) - -# create hpdf_version.h -configure_file( - ${PROJECT_SOURCE_DIR}/include/hpdf_version.h.cmake - ${PROJECT_BINARY_DIR}/include/hpdf_version.h -) +set (LIBHPDF_HAVE_ZLIB ${ZLIB_FOUND}) # create hpdf_config.h configure_file( @@ -143,8 +131,8 @@ include/hpdf_pdfa.h include/hpdf_3dmeasure.h include/hpdf_exdata.h + include/hpdf_version.h ${PROJECT_BINARY_DIR}/include/hpdf_config.h - ${PROJECT_BINARY_DIR}/include/hpdf_version.h ) # install header files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/cmake/modules/summary.cmake new/libharu-2.4.3/cmake/modules/summary.cmake --- old/libharu-2.4.2/cmake/modules/summary.cmake 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/cmake/modules/summary.cmake 2022-10-14 12:04:02.000000000 +0200 @@ -42,7 +42,7 @@ DEVPAK: ${DEVPAK} Optional libraries: -HAVE_LIBZ: ${LIBHPDF_HAVE_LIBZ} +HAVE_ZLIB: ${LIBHPDF_HAVE_ZLIB} HAVE_LIBPNG: ${LIBHPDF_HAVE_LIBPNG} ") message("${_output_results}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/demo/CMakeLists.txt new/libharu-2.4.3/demo/CMakeLists.txt --- old/libharu-2.4.2/demo/CMakeLists.txt 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/demo/CMakeLists.txt 2022-10-14 12:04:02.000000000 +0200 @@ -9,6 +9,7 @@ # ======================================================================= set( demos_NAMES + attach character_map encoding_list encryption @@ -57,7 +58,7 @@ if(DEMO_C_FLAGS) set_target_properties(${demo} PROPERTIES COMPILE_FLAGS ${DEMO_C_FLAGS}) endif(DEMO_C_FLAGS) -endforeach(demo) +endforeach() # some demos need grid_sheet.c compiled in foreach(demo ${demos_with_grid_NAMES}) @@ -69,7 +70,7 @@ if(DEMO_C_FLAGS) set_target_properties(${demo} PROPERTIES COMPILE_FLAGS ${DEMO_C_FLAGS}) endif(DEMO_C_FLAGS) -endforeach(demo) +endforeach() # the grid_sheet demo needs extra defines add_executable(grid_sheet grid_sheet.c) @@ -88,7 +89,7 @@ ) foreach(demo ${demos_NAMES} ${demos_with_grid_NAMES} grid_sheet) install(FILES ${demo}.c DESTINATION demo) -endforeach(demo) +endforeach() # install demo files install( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/demo/attach.c new/libharu-2.4.3/demo/attach.c --- old/libharu-2.4.2/demo/attach.c 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/demo/attach.c 2022-10-14 12:04:02.000000000 +0200 @@ -18,7 +18,7 @@ #include <setjmp.h> #include "hpdf.h" -const char *text = "This PDF should have an attachment named attach.c"; +const char *text = "This PDF should have an attachment named basn3p08.png"; jmp_buf env; @@ -76,8 +76,7 @@ HPDF_Page_EndText (page); /* attach a file to the document */ - HPDF_AttachFile (pdf, "attach.c"); - HPDF_AttachFile (pdf, "jpeg_demo.c"); + HPDF_AttachFile (pdf, "pngsuite/basn3p08.png"); /* save the document to a file */ HPDF_SaveToFile (pdf, fname); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/include/hpdf.h new/libharu-2.4.3/include/hpdf.h --- old/libharu-2.4.2/include/hpdf.h 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/include/hpdf.h 2022-10-14 12:04:02.000000000 +0200 @@ -18,6 +18,7 @@ #define _HPDF_H #include "hpdf_config.h" +#include "hpdf_version.h" #define HPDF_UNUSED(a) ((void)(a)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/include/hpdf_config.h.cmake new/libharu-2.4.3/include/hpdf_config.h.cmake --- old/libharu-2.4.2/include/hpdf_config.h.cmake 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/include/hpdf_config.h.cmake 2022-10-14 12:04:02.000000000 +0200 @@ -8,7 +8,7 @@ #cmakedefine LIBHPDF_HAVE_LIBPNG /* Define to 1 if you have the `z' library (-lz). */ -#cmakedefine LIBHPDF_HAVE_LIBZ +#cmakedefine LIBHPDF_HAVE_ZLIB /* Define to 1 if you have the <memory.h> header file. */ #cmakedefine LIBHPDF_HAVE_MEMORY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/include/hpdf_version.h new/libharu-2.4.3/include/hpdf_version.h --- old/libharu-2.4.2/include/hpdf_version.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libharu-2.4.3/include/hpdf_version.h 2022-10-14 12:04:02.000000000 +0200 @@ -0,0 +1,10 @@ +#define HPDF_MAJOR_VERSION 2 +#define HPDF_MINOR_VERSION 4 +#define HPDF_BUGFIX_VERSION 3 +#define HPDF_EXTRA_VERSION "" + +#define hpdf_vquote(x) #x +#define hpdf_vexp(x) hpdf_vquote(x) + +#define HPDF_VERSION_TEXT (hpdf_vexp(HPDF_MAJOR_VERSION) "." hpdf_vexp(HPDF_MINOR_VERSION) "." hpdf_vexp(HPDF_BUGFIX_VERSION) HPDF_EXTRA_VERSION) +#define HPDF_VERSION_ID ((HPDF_MAJOR_VERSION) * 10000 + (HPDF_MINOR_VERSION) * 100 + (HPDF_BUGFIX_VERSION)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/include/hpdf_version.h.cmake new/libharu-2.4.3/include/hpdf_version.h.cmake --- old/libharu-2.4.2/include/hpdf_version.h.cmake 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/include/hpdf_version.h.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#define HPDF_MAJOR_VERSION @PROJECT_VERSION_MAJOR@ -#define HPDF_MINOR_VERSION @PROJECT_VERSION_MINOR@ -#define HPDF_BUGFIX_VERSION @PROJECT_VERSION_PATCH@ -#define HPDF_EXTRA_VERSION "@PROJECT_VERSION_EXTRA@" -#define HPDF_VERSION_TEXT "@PROJECT_VERSION_TEXT@" -#define HPDF_VERSION_ID @PROJECT_VERSION_ID@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/src/hpdf_array.c new/libharu-2.4.3/src/hpdf_array.c --- old/libharu-2.4.2/src/hpdf_array.c 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/src/hpdf_array.c 2022-10-14 12:04:02.000000000 +0200 @@ -289,7 +289,7 @@ void *ptr = HPDF_List_ItemAt (array->list, i); void *obj_ptr; - header = (HPDF_Obj_Header *)obj; + header = (HPDF_Obj_Header *)ptr; if (header->obj_class == HPDF_OCLASS_PROXY) obj_ptr = ((HPDF_Proxy)ptr)->obj; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/src/hpdf_namedict.c new/libharu-2.4.3/src/hpdf_namedict.c --- old/libharu-2.4.2/src/hpdf_namedict.c 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/src/hpdf_namedict.c 2022-10-14 12:04:02.000000000 +0200 @@ -135,27 +135,13 @@ icount = HPDF_Array_Items(items); - /* If we're larger than the last element, append */ - if (icount) { - HPDF_String last = HPDF_Array_GetItem(items, icount - 2, HPDF_OCLASS_STRING); - - if (HPDF_String_Cmp(name, last) > 0) { - HPDF_Array_Add(items, name); - HPDF_Array_Add(items, obj); - return HPDF_OK; - } - } - - /* Walk backwards through the list until we're smaller than an element= - * That's the element to insert in front of. */ - for (i = icount - 4; i >= 0; i -= 2) { - HPDF_String elem = HPDF_Array_GetItem(items, i, HPDF_OCLASS_STRING); - - if (i == 0 || HPDF_String_Cmp(name, elem) < 0) { - HPDF_Array_Insert(items, elem, name); - HPDF_Array_Insert(items, elem, obj); - return HPDF_OK; - } + for( i = 0; i < icount; i += 2 ) { + HPDF_String elem = HPDF_Array_GetItem( items, i, HPDF_OCLASS_STRING ); + if( HPDF_String_Cmp( name, elem ) < 0 ) { + HPDF_Array_Insert( items, elem, name ); + HPDF_Array_Insert( items, elem, obj ); + return HPDF_OK; + } } /* Items list is empty */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/src/hpdf_string.c new/libharu-2.4.3/src/hpdf_string.c --- old/libharu-2.4.2/src/hpdf_string.c 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/src/hpdf_string.c 2022-10-14 12:04:02.000000000 +0200 @@ -196,7 +196,19 @@ HPDF_String_Cmp (HPDF_String s1, HPDF_String s2) { - if (s1->len < s2->len) return -1; - if (s1->len > s2->len) return +1; - return memcmp(s1->value, s2->value, s1->len); + HPDF_INT32 res; + HPDF_UINT minLen; + + minLen = s1->len; + if( s1->len > s2->len ) { + minLen = s2->len; + } + + res = memcmp( s1->value, s2->value, minLen ); + if( res == 0 ) { + if( s1->len < s2->len ) res = -1; + if( s1->len > s2->len ) res = +1; + } + + return res; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libharu-2.4.2/win32/include/hpdf_config.h new/libharu-2.4.3/win32/include/hpdf_config.h --- old/libharu-2.4.2/win32/include/hpdf_config.h 2022-09-11 13:21:37.000000000 +0200 +++ new/libharu-2.4.3/win32/include/hpdf_config.h 2022-10-14 12:04:02.000000000 +0200 @@ -10,7 +10,7 @@ #define LIBHPDF_HAVE_LIBPNG 1 /* Define to 1 if you have the `z' library (-lz). */ -#define LIBHPDF_HAVE_LIBZ 1 +#define LIBHPDF_HAVE_ZLIB 1 /* Define to 1 if you have the <memory.h> header file. */ #undef LIBHPDF_HAVE_MEMORY_H ++++++ libharu-so-versioning.patch ++++++ Index: libharu-2.4.3/src/CMakeLists.txt =================================================================== --- libharu-2.4.3.orig/src/CMakeLists.txt +++ libharu-2.4.3/src/CMakeLists.txt @@ -93,3 +93,6 @@ install( LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +set_target_properties(hpdf PROPERTIES VERSION ${HPDF_MAJOR_VERSION}.${HPDF_MINOR_VERSION}.${HPDF_BUGFIX_VERSION}) +set_target_properties(hpdf PROPERTIES SOVERSION ${HPDF_MAJOR_VERSION})

1 0

commit sad for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sad for openSUSE:Factory checked in at 2023-06-30 19:58:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sad (Old) and /work/SRC/openSUSE:Factory/.sad.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sad" Fri Jun 30 19:58:27 2023 rev:5 rq:1096158 version:0.4.23 Changes: -------- --- /work/SRC/openSUSE:Factory/sad/sad.changes 2022-07-01 13:45:33.586952659 +0200 +++ /work/SRC/openSUSE:Factory/.sad.new.13546/sad.changes 2023-06-30 19:58:42.897587340 +0200 @@ -2 +2,36 @@ -Fri Jul 01 02:09:05 UTC 2022 - socvirnyl.estela(a)gmail.com +Sun Jun 25 23:33:45 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela(a)gmail.com> + +- Update to version 0.4.23: + * use python3 uuid + * update frozenstr literal + * Bump uuid from 1.2.2 to 1.3.1 + * Bump clap from 4.0.27 to 4.1.14 + * Bump tokio from 1.23.0 to 1.25.0 + * Bump which from 4.3.0 to 4.4.0 + * Bump regex from 1.7.0 to 1.7.1 + * Bump tokio from 1.22.0 to 1.23.0 + * Bump async-channel from 1.7.1 to 1.8.0 + * Bump clap from 4.0.18 to 4.0.27 + * Bump aho-corasick from 0.7.19 to 0.7.20 + * Bump tokio from 1.21.2 to 1.22.0 + * Bump uuid from 1.2.1 to 1.2.2 + * Bump regex from 1.6.0 to 1.7.0 + * Bump futures from 0.3.24 to 0.3.25 + * Bump clap from 4.0.4 to 4.0.18 + * Bump uuid from 1.1.2 to 1.2.1 + * update fmt + * Bump clap from 3.2.19 to 4.0.4 + * Bump tokio from 1.20.1 to 1.21.2 + * Bump aho-corasick from 0.7.18 to 0.7.19 + * Bump which from 4.2.5 to 4.3.0 + * Bump clap from 3.2.17 to 3.2.19 + * Bump futures from 0.3.23 to 0.3.24 + * Bump futures from 0.3.21 to 0.3.23 + * Bump clap from 3.2.5 to 3.2.17 + * Bump async-channel from 1.6.1 to 1.7.1 + * Bump tokio from 1.19.2 to 1.20.1 + * Bump regex from 1.5.6 to 1.6.0 + * Bump tokio from 1.18.2 to 1.19.2 + +------------------------------------------------------------------- +Fri Jul 01 02:09:05 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela(a)gmail.com> Old: ---- sad-0.4.22.tar.xz New: ---- sad-0.4.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sad.spec ++++++ --- /var/tmp/diff_new_pack.rBrnYR/_old 2023-06-30 19:58:44.397596262 +0200 +++ /var/tmp/diff_new_pack.rBrnYR/_new 2023-06-30 19:58:44.405596309 +0200 @@ -1,7 +1,7 @@ # # spec file for package sad # -# 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: sad -Version: 0.4.22 +Version: 0.4.23 Release: 0 Summary: CLI search and replace batch file editing tool URL: https://github.com/ms-jpq/sad @@ -26,6 +26,7 @@ Source1: vendor.tar.xz Source2: cargo_config BuildRequires: cargo-packaging +BuildRequires: python3 Recommends: fzf %description ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rBrnYR/_old 2023-06-30 19:58:44.441596523 +0200 +++ /var/tmp/diff_new_pack.rBrnYR/_new 2023-06-30 19:58:44.445596547 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/ms-jpq/sad</param> <param name="versionformat">@PARENT_TAG@</param> <param name="scm">git</param> - <param name="revision">3d709fc2d8c1f504e92378c46f19360b91c65828</param> + <param name="revision">ecbb271</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> <param name="changesgenerate">enable</param> ++++++ sad-0.4.22.tar.xz -> sad-0.4.23.tar.xz ++++++ ++++ 1678 lines of diff (skipped) ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/sad/vendor.tar.xz /work/SRC/openSUSE:Factory/.sad.new.13546/vendor.tar.xz differ: char 26, line 1

1 0

commit python-bleach for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-bleach for openSUSE:Factory checked in at 2023-06-30 19:58:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-bleach (Old) and /work/SRC/openSUSE:Factory/.python-bleach.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-bleach" Fri Jun 30 19:58:26 2023 rev:19 rq:1096012 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-bleach/python-bleach.changes 2023-05-09 13:08:11.709327142 +0200 +++ /work/SRC/openSUSE:Factory/.python-bleach.new.13546/python-bleach.changes 2023-06-30 19:58:41.973581844 +0200 @@ -1,0 +2,6 @@ +Thu Jun 29 11:31:20 UTC 2023 - Mark��ta Machov�� <mmachova(a)suse.com> + +- Add patch strip-spaces.patch (bsc#1212852) + * sent upstream: https://github.com/mozilla/bleach/pull/706 + +------------------------------------------------------------------- New: ---- strip-spaces.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-bleach.spec ++++++ --- /var/tmp/diff_new_pack.ROQwGo/_old 2023-06-30 19:58:42.637585793 +0200 +++ /var/tmp/diff_new_pack.ROQwGo/_new 2023-06-30 19:58:42.641585817 +0200 @@ -26,6 +26,8 @@ URL: https://github.com/jsocol/bleach Source: https://files.pythonhosted.org/packages/source/b/bleach/bleach-%{version}.t… Patch0: de-vendor.patch +# https://github.com/mozilla/bleach/pull/706 +Patch1: strip-spaces.patch BuildRequires: %{python_module html5lib >= 1.1} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -62,8 +64,7 @@ %check # gh#mozilla/bleach#503 -# https://github.com/mozilla/bleach/issues/543 -%pytest -k 'not (test_uri_value_allowed_protocols or test_bleach_html_parser or test_css_parsing_gauntlet_regex_backtracking)' +%pytest -k 'not test_uri_value_allowed_protocols' %files %{python_files} %license LICENSE ++++++ strip-spaces.patch ++++++ Index: bleach-6.0.0/tests/test_parse_shim.py =================================================================== --- bleach-6.0.0.orig/tests/test_parse_shim.py +++ bleach-6.0.0/tests/test_parse_shim.py @@ -48,14 +48,12 @@ class ParseResult: ParseResult(scheme="non-special", netloc=":@test", path="/x"), ), ("http:foo.com", ParseResult(scheme="http", path="foo.com")), - # NOTE(willkg): The wpt tests set the scheme to http becaue that's what + # NOTE(willkg): The wpt tests set the scheme to http because that's what # the base url is. Since our parser is not using a baseurl, it sets the - # scheme to "". Further, our parser includes spaces at the beginning, - # but I don't see that as being problematic. - ("\t :foo.com \n", ParseResult(path=" :foo.com ")), + # scheme to "". # NOTE(willkg): The wpt tests set the path to "/foo/foo.com" because # the base url is at "/foo" - (" foo.com ", ParseResult(path=" foo.com ")), + ("foo.com ", ParseResult(path="foo.com ")), ("a:\t foo.com", ParseResult(scheme="a", path=" foo.com")), ( "http://f:21/ b ? d # e ",

1 0

commit python310 for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python310 for openSUSE:Factory checked in at 2023-06-30 19:58:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python310 (Old) and /work/SRC/openSUSE:Factory/.python310.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python310" Fri Jun 30 19:58:24 2023 rev:33 rq:1095863 version:3.10.12 Changes: -------- --- /work/SRC/openSUSE:Factory/python310/python310.changes 2023-06-22 23:24:56.369668004 +0200 +++ /work/SRC/openSUSE:Factory/.python310.new.13546/python310.changes 2023-06-30 19:58:40.461572851 +0200 @@ -1,0 +2,31 @@ +Wed Jun 28 16:57:46 UTC 2023 - Matej Cepl <mcepl(a)suse.com> + +- Update to 3.10.12: + - gh-103142: The version of OpenSSL used in Windows and + Mac installers has been upgraded to 1.1.1u to address + CVE-2023-2650, CVE-2023-0465, CVE-2023-0466, CVE-2023-0464, + as well as CVE-2023-0286, CVE-2022-4303, and CVE-2022-4303 + fixed previously in 1.1.1t (gh-101727). + - gh-102153: urllib.parse.urlsplit() now strips leading C0 + control and space characters following the specification for + URLs defined by WHATWG in response to CVE-2023-24329 + (bsc#1208471). + - gh-99889: Fixed a security in flaw in uu.decode() that could + allow for directory traversal based on the input if no + out_file was specified. + - gh-104049: Do not expose the local on-disk + location in directory indexes produced by + http.client.SimpleHTTPRequestHandler. + - gh-103935: trace.__main__ now uses io.open_code() for files + to be executed instead of raw open(). + - gh-102953: The extraction methods in tarfile, and + shutil.unpack_archive(), have a new filter argument that + allows limiting tar features than may be surprising or + dangerous, such as creating files outside the destination + directory. See Extraction filters for details (fixing + CVE-2007-4559, bsc#1203750). +- Remove upstreamed patches: + - CVE-2023-24329-blank-URL-bypass.patch + - CVE-2007-4559-filter-tarfile_extractall.patch + +------------------------------------------------------------------- Old: ---- CVE-2007-4559-filter-tarfile_extractall.patch CVE-2023-24329-blank-URL-bypass.patch Python-3.10.11.tar.xz Python-3.10.11.tar.xz.asc New: ---- Python-3.10.12.tar.xz Python-3.10.12.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python310.spec ++++++ --- /var/tmp/diff_new_pack.L8cSWb/_old 2023-06-30 19:58:41.625579774 +0200 +++ /var/tmp/diff_new_pack.L8cSWb/_new 2023-06-30 19:58:41.629579798 +0200 @@ -103,7 +103,7 @@ %define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so %bcond_without profileopt Name: %{python_pkg_name}%{psuffix} -Version: 3.10.11 +Version: 3.10.12 Release: 0 Summary: Python 3 Interpreter License: Python-2.0 @@ -166,13 +166,6 @@ # PATCH-FIX-UPSTREAM bpo-46811 gh#python/cpython#7da97f61816f mcepl(a)suse.com # NOTE: SUSE version of expat 2.4.4 is patched in SUSE for CVE-2022-25236 Patch36: support-expat-CVE-2022-25236-patched.patch -# PATCH-FIX-UPSTREAM CVE-2023-24329-blank-URL-bypass.patch bsc#1208471 mcepl(a)suse.com -# blocklist bypass via the urllib.parse component when supplying -# a URL that starts with blank characters -Patch37: CVE-2023-24329-blank-URL-bypass.patch -# PATCH-FIX-UPSTREAM CVE-2007-4559-filter-tarfile_extractall.patch bsc#1203750 mcepl(a)suse.com -# PEP 706 �� Filter for tarfile.extractall -Patch38: CVE-2007-4559-filter-tarfile_extractall.patch # PATCH-FIX-UPSTREAM bpo-37596-make-set-marshalling.patch bsc#1211765 mcepl(a)suse.com # Make `set` and `frozenset` marshalling deterministic Patch39: bpo-37596-make-set-marshalling.patch @@ -447,8 +440,6 @@ %endif %patch35 -p1 %patch36 -p1 -%patch37 -p1 -%patch38 -p1 %patch39 -p1 # drop Autoconf version requirement ++++++ Python-3.10.11.tar.xz -> Python-3.10.12.tar.xz ++++++ /work/SRC/openSUSE:Factory/python310/Python-3.10.11.tar.xz /work/SRC/openSUSE:Factory/.python310.new.13546/Python-3.10.12.tar.xz differ: char 27, line 1

1 0

commit abseil-cpp for openSUSE:Factory
by Source-Sync 30 Jun '23

30 Jun '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package abseil-cpp for openSUSE:Factory checked in at 2023-06-30 19:58:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abseil-cpp (Old) and /work/SRC/openSUSE:Factory/.abseil-cpp.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abseil-cpp" Fri Jun 30 19:58:23 2023 rev:29 rq:1095946 version:20230125.3 Changes: -------- --- /work/SRC/openSUSE:Factory/abseil-cpp/abseil-cpp.changes 2023-05-28 19:21:35.600516030 +0200 +++ /work/SRC/openSUSE:Factory/.abseil-cpp.new.13546/abseil-cpp.changes 2023-06-30 19:58:38.937563786 +0200 @@ -1,0 +2,5 @@ +Thu Jun 29 09:52:24 UTC 2023 - Fabian Vogt <fvogt(a)suse.com> + +- Add baselibs.conf to make protobuf happy. Hopefully temporary. + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abseil-cpp.spec ++++++ --- /var/tmp/diff_new_pack.5k4TSx/_old 2023-06-30 19:58:39.817569020 +0200 +++ /var/tmp/diff_new_pack.5k4TSx/_new 2023-06-30 19:58:39.821569044 +0200 @@ -24,6 +24,7 @@ License: Apache-2.0 URL: https://abseil.io/ Source0: https://github.com/abseil/abseil-cpp/archive/%{version}.tar.gz#/%{name}-%{v… +Source1: baselibs.conf BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: fdupes ++++++ baselibs.conf ++++++ libabsl2301_0_0

1 0