July 2021 - openSUSE Commits - openSUSE Mailing Lists

commit 000release-packages for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2021-07-30 23:25:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Fri Jul 30 23:25:08 2021 rev:1088 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.3fW1hx/_old 2021-07-30 23:25:15.419423082 +0200 +++ /var/tmp/diff_new_pack.3fW1hx/_new 2021-07-30 23:25:15.423423078 +0200 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20210729 +Version: 20210730 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -176,9 +176,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20210729-0 +Provides: product(MicroOS) = 20210730-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210729 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20210730 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -194,7 +194,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20210729-0 +Provides: product_flavor(MicroOS) = 20210730-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -210,7 +210,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(kubic-dvd) -Provides: product_flavor(MicroOS) = 20210729-0 +Provides: product_flavor(MicroOS) = 20210730-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description kubic-dvd @@ -226,7 +226,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20210729-0 +Provides: product_flavor(MicroOS) = 20210730-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -242,7 +242,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kubic) -Provides: product_flavor(MicroOS) = 20210729-0 +Provides: product_flavor(MicroOS) = 20210730-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance-kubic @@ -299,11 +299,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20210729</version> + <version>20210730</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20210729</cpeid> + <cpeid>cpe:/o:opensuse:microos:20210730</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.3fW1hx/_old 2021-07-30 23:25:15.439423059 +0200 +++ /var/tmp/diff_new_pack.3fW1hx/_new 2021-07-30 23:25:15.443423054 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20210729) +# spec file for package openSUSE-Addon-NonOss-release (Version 20210730) # # Copyright (c) 2021 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20210729 +Version: 20210730 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20210729-0 +Provides: product(openSUSE-Addon-NonOss) = 20210730-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210729 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20210730 AutoReqProv: on @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20210729</version> + <version>20210730</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210729</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20210730</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.3fW1hx/_old 2021-07-30 23:25:15.455423040 +0200 +++ /var/tmp/diff_new_pack.3fW1hx/_new 2021-07-30 23:25:15.459423035 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20210729 +Version: 20210730 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -178,7 +178,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20210729-0 +Provides: product(openSUSE) = 20210730-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -192,7 +192,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210729 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20210730 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -206,7 +206,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -221,7 +221,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -236,7 +236,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -251,7 +251,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -266,7 +266,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -281,7 +281,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -296,7 +296,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -311,7 +311,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -326,7 +326,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -341,7 +341,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -356,7 +356,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -371,7 +371,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -386,7 +386,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -401,7 +401,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -416,7 +416,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -431,7 +431,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -446,7 +446,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -461,7 +461,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -476,7 +476,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20210729-0 +Provides: product_flavor(openSUSE) = 20210730-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -552,10 +552,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20210729</version> + <version>20210730</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20210729</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20210730</cpeid> <productline>openSUSE</productline> <register> <pool>

1 0

commit openjfx for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openjfx for openSUSE:Factory checked in at 2021-07-30 23:22:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjfx (Old) and /work/SRC/openSUSE:Factory/.openjfx.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openjfx" Fri Jul 30 23:22:28 2021 rev:6 rq:909430 version:11.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/openjfx/openjfx.changes 2021-07-27 14:32:33.815454300 +0200 +++ /work/SRC/openSUSE:Factory/.openjfx.new.1899/openjfx.changes 2021-07-30 23:23:00.631581448 +0200 @@ -1,0 +2,8 @@ +Fri Jul 30 13:57:35 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Added patch: + * openjfx-32bit-fix.patch + + Do not add -m32 on 32-bit architectures, since it breaks + build on arm and is not needed on x86 + +------------------------------------------------------------------- New: ---- openjfx-32bit-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openjfx.spec ++++++ --- /var/tmp/diff_new_pack.AK6pfQ/_old 2021-07-30 23:23:01.263580755 +0200 +++ /var/tmp/diff_new_pack.AK6pfQ/_new 2021-07-30 23:23:01.263580755 +0200 @@ -37,6 +37,7 @@ Patch103: openjfx-pango.patch Patch104: openjfx-architectures.patch Patch105: openjfx-no-return-in-nonvoid-function.patch +Patch106: openjfx-32bit-fix.patch Patch200: openjfx-rpm-build.patch BuildRequires: eclipse-swt BuildRequires: fdupes @@ -103,6 +104,7 @@ %patch103 -p1 %patch104 -p1 %patch105 -p1 +%patch106 -p1 %patch200 -p1 ++++++ openjfx-32bit-fix.patch ++++++ diff -urEbwB jfx11u-11.0.12-4/buildSrc/linux.gradle jfx11u-11.0.12-4/buildSrc/linux.gradle --- jfx11u-11.0.12-4/buildSrc/linux.gradle 2021-07-30 15:42:47.952930659 +0200 +++ jfx11u-11.0.12-4/buildSrc/linux.gradle 2021-07-30 15:44:06.821462951 +0200 @@ -46,10 +46,6 @@ "-fstack-protector", "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Wtrampolines"] // warning flags -if (!IS_64) { - commonFlags += "-m32" -} - if (IS_STATIC_BUILD) { commonFlags += "-DSTATIC_BUILD" }

1 0

commit password-store for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package password-store for openSUSE:Factory checked in at 2021-07-30 23:22:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/password-store (Old) and /work/SRC/openSUSE:Factory/.password-store.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "password-store" Fri Jul 30 23:22:27 2021 rev:14 rq:909409 version:1.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/password-store/password-store.changes 2021-06-19 23:04:55.231845310 +0200 +++ /work/SRC/openSUSE:Factory/.password-store.new.1899/password-store.changes 2021-07-30 23:23:00.127582002 +0200 @@ -1,0 +2,6 @@ +Wed Jul 21 07:40:23 UTC 2021 - Antonio Larrosa <alarrosa(a)suse.com> + +- Make password-store-dmenu require password-store, as it's + useless without pass. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ password-store.spec ++++++ --- /var/tmp/diff_new_pack.hHo8JE/_old 2021-07-30 23:23:00.491581603 +0200 +++ /var/tmp/diff_new_pack.hHo8JE/_new 2021-07-30 23:23:00.491581603 +0200 @@ -52,6 +52,7 @@ Summary: A dmenu interface to the "pass" program Group: Productivity/Other Requires: dmenu +Requires: password-store Recommends: xdotool BuildArch: noarch

1 0

commit ServiceReport for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ServiceReport for openSUSE:Factory checked in at 2021-07-30 23:22:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ServiceReport (Old) and /work/SRC/openSUSE:Factory/.ServiceReport.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ServiceReport" Fri Jul 30 23:22:26 2021 rev:5 rq:909402 version:2.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ServiceReport/ServiceReport.changes 2021-07-16 00:03:20.148295497 +0200 +++ /work/SRC/openSUSE:Factory/.ServiceReport.new.1899/ServiceReport.changes 2021-07-30 23:22:59.579582605 +0200 @@ -1,0 +2,5 @@ +Tue Jul 27 09:15:52 UTC 2021 - Johannes Segitz <jsegitz(a)suse.com> + +- Added hardening to systemd service(s). Added harden_servicereport.service.patch + +------------------------------------------------------------------- New: ---- harden_servicereport.service.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ServiceReport.spec ++++++ --- /var/tmp/diff_new_pack.DrsAA6/_old 2021-07-30 23:22:59.983582160 +0200 +++ /var/tmp/diff_new_pack.DrsAA6/_new 2021-07-30 23:22:59.983582160 +0200 @@ -28,6 +28,7 @@ Group: System/Management URL: https://github.com/linux-ras/ServiceReport Source: https://github.com/linux-ras/ServiceReport/archive/v%{version}.tar.gz#/%{na… +Patch: harden_servicereport.service.patch BuildRequires: %{python} BuildRequires: %{python}-setuptools BuildRequires: systemd-rpm-macros ++++++ harden_servicereport.service.patch ++++++ Index: ServiceReport-2.2.3/service/servicereport.service =================================================================== --- ServiceReport-2.2.3.orig/service/servicereport.service +++ ServiceReport-2.2.3/service/servicereport.service @@ -3,6 +3,17 @@ Description=ServiceReport Wants=kdump.service [Service] +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full +ProtectHome=true +PrivateDevices=true +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true Type=oneshot ExecStart=/usr/bin/servicereport -v

1 0

commit eclipse-jgit for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package eclipse-jgit for openSUSE:Factory checked in at 2021-07-30 23:22:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-jgit (Old) and /work/SRC/openSUSE:Factory/.eclipse-jgit.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eclipse-jgit" Fri Jul 30 23:22:25 2021 rev:6 rq:909405 version:5.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-jgit/eclipse-jgit.changes 2020-11-23 10:25:32.809028133 +0100 +++ /work/SRC/openSUSE:Factory/.eclipse-jgit.new.1899/eclipse-jgit.changes 2021-07-30 23:22:58.787583474 +0200 @@ -1,0 +2,18 @@ +Fri Jul 30 12:24:56 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Update to 5.11.0 + * fixes build against apache-sshd 2.7.0 +- Modified patches: + * 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch + * 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch + * jgit-shade.patch + * jgit-5.8.0-java8.patch -> jgit-5.11.0-java8.patch + + Rediff to changed context +- Added patch: + * jgit-apache-sshd-2.7.0.patch + + Adapt to apache-sshd api changes between 2.6.0 and 2.7.0 +- Removed patch: + * 0003-Remove-requirement-on-assertj-core.patch + + Not needed anymore + +------------------------------------------------------------------- jgit.changes: same change Old: ---- 0003-Remove-requirement-on-assertj-core.patch jgit-5.8.0-java8.patch jgit-5.8.0.202006091008-r.tar.gz New: ---- jgit-5.11.0-java8.patch jgit-5.11.0.202103091610-r.tar.xz jgit-apache-sshd-2.7.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-jgit.spec ++++++ --- /var/tmp/diff_new_pack.bWN4DX/_old 2021-07-30 23:22:59.295582916 +0200 +++ /var/tmp/diff_new_pack.bWN4DX/_new 2021-07-30 23:22:59.295582916 +0200 @@ -1,7 +1,7 @@ # # spec file for package eclipse-jgit # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,16 @@ # -%global gittag 5.8.0.202006091008-r +%global gittag 5.11.0.202103091610-r %define __provides_exclude osgi* Name: eclipse-jgit -Version: 5.8.0 +Version: 5.11.0 Release: 0 Summary: Eclipse JGit License: BSD-3-Clause Group: Development/Libraries/Java URL: https://www.eclipse.org/egit/ -# Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 -Source0: https://github.com/eclipse/jgit/archive/v%{gittag}/jgit-%{gittag}.tar.gz +Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz # Set the correct classpath for the command line tools Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # Switch to feature requirements for third-party bundles, also makes the following changes: @@ -34,14 +33,13 @@ # org.slf4j.api -> slf4j.api # org.slf4j.impl.log4j12 -> slf4j.simple Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch -# Remove req on assertj -Patch2: 0003-Remove-requirement-on-assertj-core.patch -Patch3: jgit-shade.patch -Patch4: jgit-5.8.0-java8.patch +Patch2: jgit-shade.patch +Patch3: jgit-5.11.0-java8.patch +Patch4: jgit-apache-sshd-2.7.0.patch # For main build BuildRequires: ant BuildRequires: apache-commons-compress -BuildRequires: apache-sshd >= 2.4 +BuildRequires: apache-sshd >= 2.7 BuildRequires: args4j BuildRequires: bouncycastle BuildRequires: bouncycastle-pg @@ -65,7 +63,7 @@ #!BuildIgnore: tycho-bootstrap #!BuildRequires: eclipse-emf-core eclipse-ecf-core Requires: apache-commons-compress -Requires: apache-sshd >= 2.4 +Requires: apache-sshd >= 2.7 Requires: args4j Requires: bouncycastle Requires: bouncycastle-pg @@ -104,9 +102,8 @@ done # Disable "errorprone" compiler -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='compile-with-errorprone']" pom.xml -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='default-compile']/pom:configuration" pom.xml -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:dependencies" pom.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:compilerArgs" pom.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:annotationProcessorPaths" pom.xml # Don't need target platform or repository modules with xmvn %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging ++++++ jgit.spec ++++++ --- /var/tmp/diff_new_pack.bWN4DX/_old 2021-07-30 23:22:59.319582890 +0200 +++ /var/tmp/diff_new_pack.bWN4DX/_new 2021-07-30 23:22:59.323582885 +0200 @@ -1,7 +1,7 @@ # # spec file for package jgit # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # -%global gittag 5.8.0.202006091008-r +%global gittag 5.11.0.202103091610-r Name: jgit -Version: 5.8.0 +Version: 5.11.0 Release: 0 Summary: Eclipse JGit License: BSD-3-Clause Group: Development/Libraries/Java URL: https://www.eclipse.org/egit/ # Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 -Source0: https://github.com/eclipse/jgit/archive/v%{gittag}/jgit-%{gittag}.tar.gz +Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz # Set the correct classpath for the command line tools Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # Switch to feature requirements for third-party bundles, also makes the following changes: @@ -33,10 +33,9 @@ # org.slf4j.api -> slf4j.api # org.slf4j.impl.log4j12 -> slf4j.simple Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch -# Remove req on assertj -Patch2: 0003-Remove-requirement-on-assertj-core.patch -Patch3: jgit-shade.patch -Patch4: jgit-5.8.0-java8.patch +Patch2: jgit-shade.patch +Patch3: jgit-5.11.0-java8.patch +Patch4: jgit-apache-sshd-2.7.0.patch # For main build BuildRequires: ant BuildRequires: fdupes @@ -100,9 +99,8 @@ done # Disable "errorprone" compiler -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='compile-with-errorprone']" pom.xml -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='default-compile']/pom:configuration" pom.xml -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:dependencies" pom.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:compilerArgs" pom.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:annotationProcessorPaths" pom.xml # Don't need target platform or repository modules with xmvn %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging ++++++ 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch ++++++ --- /var/tmp/diff_new_pack.bWN4DX/_old 2021-07-30 23:22:59.339582868 +0200 +++ /var/tmp/diff_new_pack.bWN4DX/_new 2021-07-30 23:22:59.339582868 +0200 @@ -1,7 +1,7 @@ -From 3efdb201d8b4da4bf0385c27a60011e2d8418ad8 Mon Sep 17 00:00:00 2001 +From 55bae4b1398715c987537b0957c08c8616ea8b61 Mon Sep 17 00:00:00 2001 From: Mat Booth <mat.booth(a)redhat.com> Date: Fri, 7 Dec 2018 10:04:44 +0000 -Subject: [PATCH 1/3] Ensure the correct classpath is set for the jgit command +Subject: [PATCH 1/2] Ensure the correct classpath is set for the jgit command line tool --- @@ -22,5 +22,5 @@ if [ -n "$JGIT_CLASSPATH" ] then -- -2.26.2 +2.28.0 ++++++ 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch ++++++ --- /var/tmp/diff_new_pack.bWN4DX/_old 2021-07-30 23:22:59.351582855 +0200 +++ /var/tmp/diff_new_pack.bWN4DX/_new 2021-07-30 23:22:59.351582855 +0200 @@ -1,157 +1,28 @@ -From 585b45026bc8ac1ed83aee70c7c6ff11b4267fe6 Mon Sep 17 00:00:00 2001 +From a6efa36a04bee412b06af2823281ff9b78827ebf Mon Sep 17 00:00:00 2001 From: Mat Booth <mat.booth(a)redhat.com> -Date: Fri, 7 Dec 2018 10:17:02 +0000 -Subject: [PATCH 2/3] Don't embed versions of third-party libs, use feature +Date: Fri, 29 Jan 2021 18:35:25 +0000 +Subject: [PATCH 2/2] Don't embed versions of third-party libs, use feature requirements instead --- - .../org.eclipse.jgit.feature/feature.xml | 27 +++++-------------- - .../feature.xml | 24 +++-------------- - .../feature.xml | 24 +++-------------- - .../feature.xml | 24 +++-------------- - .../org.eclipse.jgit.lfs.feature/feature.xml | 8 +----- - .../org.eclipse.jgit.pgm.feature/feature.xml | 24 +++-------------- - .../feature.xml | 24 +++-------------- - .../feature.xml | 16 ++--------- - 8 files changed, 24 insertions(+), 147 deletions(-) + .../feature.xml | 24 +++---------------- + .../feature.xml | 2 ++ + 2 files changed, 5 insertions(+), 21 deletions(-) -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml -index 57dd6ab..881012c 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml -@@ -22,6 +22,12 @@ - <discovery label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> - </url> - -+ <requires> -+ <import plugin="com.googlecode.javaewah.JavaEWAH" /> -+ <import plugin="org.apache.commons.compress" /> -+ <import plugin="slf4j.api" /> -+ </requires> -+ - <plugin - id="org.eclipse.jgit" - download-size="0" -@@ -36,25 +42,4 @@ - version="0.0.0" - unpack="false"/> - -- <plugin -- id="javaewah" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.apache.commons.compress" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.slf4j.api" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- - </feature> -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml -index 1a28bff..43d5e6a 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml -@@ -24,6 +24,9 @@ - - <requires> - <import plugin="org.eclipse.jgit" version="5.8.0" match="equivalent"/> -+ <import plugin="bcpg" /> -+ <import plugin="bcpkix" /> -+ <import plugin="bcprov" /> - </requires> - - <plugin -@@ -34,25 +37,4 @@ - fragment="true" - unpack="false"/> - -- <plugin -- id="org.bouncycastle.bcpg" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.bouncycastle.bcpkix" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.bouncycastle.bcprov" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- - </feature> -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -index ef01ff7..871ca05 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -@@ -24,6 +24,9 @@ - - <requires> - <import plugin="org.eclipse.jgit" version="5.8.0" match="equivalent"/> -+ <import plugin="org.apache.httpcomponents.httpcore"/> -+ <import plugin="org.apache.httpcomponents.httpclient"/> -+ <import plugin="org.apache.commons.codec"/> - </requires> - - <plugin -@@ -33,25 +36,4 @@ - version="0.0.0" - unpack="false"/> - -- <plugin -- id="org.apache.httpcomponents.httpcore" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.apache.httpcomponents.httpclient" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.apache.commons.codec" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- - </feature> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml -index f888808..25ca775 100644 +index 92d171f..ca1f6de 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml -@@ -25,6 +25,9 @@ +@@ -24,6 +24,9 @@ + <requires> <import plugin="com.jcraft.jsch"/> - <import plugin="org.eclipse.jgit" version="5.8.0" match="equivalent"/> + <import plugin="org.apache.commons.logging"/> + <import plugin="org.apache.sshd.osgi"/> + <import plugin="org.apache.sshd.sftp"/> + <import plugin="org.eclipse.jgit" version="5.11.0" match="equivalent"/> </requires> - <plugin @@ -55,25 +58,4 @@ version="0.0.0" unpack="false"/> @@ -178,142 +49,19 @@ - unpack="false"/> - </feature> -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml -index 0c74527..d2a6dc5 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml -@@ -24,6 +24,7 @@ - - <requires> - <import feature="org.eclipse.jgit" version="5.8.0" match="equivalent"/> -+ <import plugin="com.google.gson"/> - </requires> - - <plugin -@@ -40,11 +41,4 @@ - version="0.0.0" - unpack="false"/> - -- <plugin -- id="com.google.gson" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- - </feature> -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml -index 83db1de..8da7368 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml -@@ -38,6 +38,9 @@ - <import feature="org.eclipse.jgit" version="5.8.0" match="equivalent"/> - <import feature="org.eclipse.jgit.lfs" version="5.8.0" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="5.8.0" match="equivalent"/> -+ <import plugin="com.googlecode.javaewah.JavaEWAH" /> -+ <import plugin="org.apache.commons.compress" /> -+ <import plugin="org.kohsuke.args4j"/> - </requires> - - <plugin -@@ -54,25 +57,4 @@ - version="0.0.0" - unpack="false"/> - -- <plugin -- id="org.apache.commons.compress" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.kohsuke.args4j" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="javaewah" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- - </feature> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml -index 73facd9..a428902 100644 +index 48660d5..843896f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml -@@ -24,6 +24,9 @@ +@@ -24,6 +24,8 @@ <requires> - <import feature="org.eclipse.jgit" version="5.8.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.11.0" match="equivalent"/> + <import plugin="org.apache.sshd.osgi"/> + <import plugin="org.apache.sshd.sftp"/> -+ <import plugin="net.i2p.crypto.eddsa"/> - </requires> - - <plugin -@@ -33,25 +36,4 @@ - version="0.0.0" - unpack="false"/> - -- <plugin -- id="org.apache.sshd.osgi" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.apache.sshd.sftp" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="net.i2p.crypto.eddsa" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- - </feature> -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml -index 8caf411..a878949 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml -@@ -24,6 +24,8 @@ - - <requires> - <import plugin="org.eclipse.jgit" version="5.8.0" match="equivalent"/> -+ <import plugin="com.jcraft.jsch" /> -+ <import plugin="com.jcraft.jzlib"/> </requires> <plugin -@@ -34,18 +36,4 @@ - fragment="true" - unpack="false"/> - -- <plugin -- id="com.jcraft.jsch" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="com.jcraft.jzlib" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- - </feature> -- -2.26.2 +2.28.0 ++++++ jgit-5.8.0-java8.patch -> jgit-5.11.0-java8.patch ++++++ --- /work/SRC/openSUSE:Factory/eclipse-jgit/jgit-5.8.0-java8.patch 2020-07-17 20:50:25.852894051 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-jgit.new.1899/jgit-5.11.0-java8.patch 2021-07-30 23:22:58.807583452 +0200 @@ -1,5 +1,6 @@ ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2020-07-16 22:36:08.290442860 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2021-07-30 11:47:47.425624542 +0200 @@ -13,6 +13,7 @@ package org.eclipse.jgit.internal.storage.dfs; @@ -17,8 +18,9 @@ return b; } ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2020-07-16 22:33:28.081395320 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2021-07-30 11:47:47.425624542 +0200 @@ -21,6 +21,7 @@ import java.io.EOFException; import java.io.IOException; @@ -36,8 +38,9 @@ int bufLen = read(rc, buf); if (bufLen <= ptr) { throw packfileIsTruncated(); ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2020-07-16 22:34:32.497816502 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2021-07-30 11:47:47.425624542 +0200 @@ -13,6 +13,7 @@ import static org.eclipse.jgit.internal.storage.pack.PackExt.REFTABLE; @@ -55,8 +58,9 @@ return buf; } ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2020-07-16 22:49:51.215827431 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2021-07-30 11:47:47.425624542 +0200 @@ -13,6 +13,7 @@ package org.eclipse.jgit.internal.storage.file; @@ -92,8 +96,9 @@ final byte[] tmp = new byte[Math.min(s.remaining(), 512)]; s.get(tmp, 0, tmp.length); inf.setInput(tmp, 0, tmp.length); ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2020-07-01 15:56:03.812653298 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2020-07-16 22:47:40.366971204 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2021-07-30 11:47:47.425624542 +0200 @@ -31,6 +31,7 @@ import static org.eclipse.jgit.lib.Ref.Storage.PACKED; @@ -111,8 +116,9 @@ b.get(buf); } endPosition = pos + bufLen; ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2020-07-01 15:56:03.816653326 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2020-07-16 22:46:22.670462804 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2021-07-30 11:47:47.425624542 +0200 @@ -23,6 +23,7 @@ import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; @@ -139,17 +145,18 @@ tmp.get(buf); } if (pos == 0 && buf[FILE_HEADER_LEN] == FILE_BLOCK_TYPE) { ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2020-07-01 15:56:03.824653381 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2020-07-16 22:59:50.575747763 +0200 -@@ -15,6 +15,7 @@ - import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SYMREF; +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2021-07-30 11:47:47.425624542 +0200 +@@ -17,6 +17,7 @@ + import static org.eclipse.jgit.transport.GitProtocolConstants.REF_ATTR_SYMREF_TARGET; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; -@@ -65,7 +66,7 @@ +@@ -67,7 +68,7 @@ throws IOException { id.copyTo(binArr, 0); binArr[OBJECT_ID_STRING_LENGTH] = ' '; @@ -158,7 +165,7 @@ append(refName); if (first) { first = false; -@@ -88,7 +89,7 @@ +@@ -90,7 +91,7 @@ chBuf = CharBuffer.wrap(chArr); } str.getChars(0, n, chArr, 0); @@ -167,7 +174,7 @@ utf8.reset(); for (;;) { CoderResult cr = utf8.encode(chBuf, binBuf, true); -@@ -115,7 +116,7 @@ +@@ -117,7 +118,7 @@ System.arraycopy(binArr, 0, tmp, 0, cnt); binArr = tmp; binBuf = ByteBuffer.wrap(binArr); @@ -176,8 +183,9 @@ } @Override ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2020-07-01 15:56:03.824653381 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2020-07-16 22:57:18.914756147 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2021-07-30 11:47:47.425624542 +0200 @@ -18,6 +18,7 @@ import static org.eclipse.jgit.lib.ObjectChecker.encoding; import static org.eclipse.jgit.lib.ObjectChecker.tagger; @@ -222,8 +230,9 @@ } } ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2020-07-01 15:56:03.840653492 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2020-07-16 22:26:56.886837333 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2021-07-30 11:47:47.425624542 +0200 @@ -10,6 +10,7 @@ package org.eclipse.jgit.lfs.server.fs; @@ -246,8 +255,9 @@ } } catch (Throwable t) { LOG.log(Level.SEVERE, t.getMessage(), t); ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2020-07-01 15:56:03.840653492 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2020-07-16 22:27:35.039086792 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2021-07-30 11:47:47.425624542 +0200 @@ -11,6 +11,7 @@ import java.io.FileNotFoundException; ++++++ jgit-apache-sshd-2.7.0.patch ++++++ diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF --- jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 +++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF 2021-07-30 12:03:35.087914326 +0200 @@ -8,31 +8,31 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.apache.sshd.common;version="[2.6.0,2.7.0)", - org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)", - org.apache.sshd.common.file.virtualfs;version="[2.6.0,2.7.0)", - org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)", - org.apache.sshd.common.io;version="[2.6.0,2.7.0)", - org.apache.sshd.common.kex;version="[2.6.0,2.7.0)", - org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)", - org.apache.sshd.common.session;version="[2.6.0,2.7.0)", - org.apache.sshd.common.signature;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.threads;version="[2.6.0,2.7.0)", - org.apache.sshd.core;version="[2.6.0,2.7.0)", - org.apache.sshd.server;version="[2.6.0,2.7.0)", - org.apache.sshd.server.auth;version="[2.6.0,2.7.0)", - org.apache.sshd.server.auth.gss;version="[2.6.0,2.7.0)", - org.apache.sshd.server.auth.keyboard;version="[2.6.0,2.7.0)", - org.apache.sshd.server.auth.password;version="[2.6.0,2.7.0)", - org.apache.sshd.server.command;version="[2.6.0,2.7.0)", - org.apache.sshd.server.session;version="[2.6.0,2.7.0)", - org.apache.sshd.server.shell;version="[2.6.0,2.7.0)", - org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)", - org.apache.sshd.sftp;version="[2.6.0,2.7.0)", - org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)", +Import-Package: org.apache.sshd.common;version="[2.7.0,2.8.0)", + org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)", + org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.8.0)", + org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)", + org.apache.sshd.common.io;version="[2.7.0,2.8.0)", + org.apache.sshd.common.kex;version="[2.7.0,2.8.0)", + org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)", + org.apache.sshd.common.session;version="[2.7.0,2.8.0)", + org.apache.sshd.common.signature;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.threads;version="[2.7.0,2.8.0)", + org.apache.sshd.core;version="[2.7.0,2.8.0)", + org.apache.sshd.server;version="[2.7.0,2.8.0)", + org.apache.sshd.server.auth;version="[2.7.0,2.8.0)", + org.apache.sshd.server.auth.gss;version="[2.7.0,2.8.0)", + org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.8.0)", + org.apache.sshd.server.auth.password;version="[2.7.0,2.8.0)", + org.apache.sshd.server.command;version="[2.7.0,2.8.0)", + org.apache.sshd.server.session;version="[2.7.0,2.8.0)", + org.apache.sshd.server.shell;version="[2.7.0,2.8.0)", + org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)", + org.apache.sshd.sftp;version="[2.7.0,2.8.0)", + org.apache.sshd.sftp.server;version="[2.7.0,2.8.0)", org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", org.eclipse.jgit.api;version="[5.11.0,5.12.0)", org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF --- jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 +++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF 2021-07-30 12:03:35.087914326 +0200 @@ -33,51 +33,51 @@ org.apache.sshd.client.session, org.apache.sshd.client.keyverifier" Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.6.0,2.7.0)", - org.apache.sshd.client;version="[2.6.0,2.7.0)", - org.apache.sshd.client.auth;version="[2.6.0,2.7.0)", - org.apache.sshd.client.auth.keyboard;version="[2.6.0,2.7.0)", - org.apache.sshd.client.auth.password;version="[2.6.0,2.7.0)", - org.apache.sshd.client.auth.pubkey;version="[2.6.0,2.7.0)", - org.apache.sshd.client.channel;version="[2.6.0,2.7.0)", - org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)", - org.apache.sshd.client.config.keys;version="[2.6.0,2.7.0)", - org.apache.sshd.client.future;version="[2.6.0,2.7.0)", - org.apache.sshd.client.keyverifier;version="[2.6.0,2.7.0)", - org.apache.sshd.client.session;version="[2.6.0,2.7.0)", - org.apache.sshd.client.session.forward;version="[2.6.0,2.7.0)", - org.apache.sshd.common;version="[2.6.0,2.7.0)", - org.apache.sshd.common.auth;version="[2.6.0,2.7.0)", - org.apache.sshd.common.channel;version="[2.6.0,2.7.0)", - org.apache.sshd.common.compression;version="[2.6.0,2.7.0)", - org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)", - org.apache.sshd.common.config.keys.loader;version="[2.6.0,2.7.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.6.0,2.7.0)", - org.apache.sshd.common.digest;version="[2.6.0,2.7.0)", - org.apache.sshd.common.forward;version="[2.6.0,2.7.0)", - org.apache.sshd.common.future;version="[2.6.0,2.7.0)", - org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)", - org.apache.sshd.common.io;version="[2.6.0,2.7.0)", - org.apache.sshd.common.kex;version="[2.6.0,2.7.0)", - org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)", - org.apache.sshd.common.mac;version="[2.6.0,2.7.0)", - org.apache.sshd.common.random;version="[2.6.0,2.7.0)", - org.apache.sshd.common.session;version="[2.6.0,2.7.0)", - org.apache.sshd.common.session.helpers;version="[2.6.0,2.7.0)", - org.apache.sshd.common.signature;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.closeable;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.io;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.io.resource;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)", - org.apache.sshd.core;version="[2.6.0,2.7.0)", - org.apache.sshd.server.auth;version="[2.6.0,2.7.0)", - org.apache.sshd.sftp;version="[2.6.0,2.7.0)", - org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)", - org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)", + org.apache.sshd.agent;version="[2.7.0,2.8.0)", + org.apache.sshd.client;version="[2.7.0,2.8.0)", + org.apache.sshd.client.auth;version="[2.7.0,2.8.0)", + org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.8.0)", + org.apache.sshd.client.auth.password;version="[2.7.0,2.8.0)", + org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.8.0)", + org.apache.sshd.client.channel;version="[2.7.0,2.8.0)", + org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)", + org.apache.sshd.client.config.keys;version="[2.7.0,2.8.0)", + org.apache.sshd.client.future;version="[2.7.0,2.8.0)", + org.apache.sshd.client.keyverifier;version="[2.7.0,2.8.0)", + org.apache.sshd.client.session;version="[2.7.0,2.8.0)", + org.apache.sshd.client.session.forward;version="[2.7.0,2.8.0)", + org.apache.sshd.common;version="[2.7.0,2.8.0)", + org.apache.sshd.common.auth;version="[2.7.0,2.8.0)", + org.apache.sshd.common.channel;version="[2.7.0,2.8.0)", + org.apache.sshd.common.compression;version="[2.7.0,2.8.0)", + org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)", + org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.8.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.8.0)", + org.apache.sshd.common.digest;version="[2.7.0,2.8.0)", + org.apache.sshd.common.forward;version="[2.7.0,2.8.0)", + org.apache.sshd.common.future;version="[2.7.0,2.8.0)", + org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)", + org.apache.sshd.common.io;version="[2.7.0,2.8.0)", + org.apache.sshd.common.kex;version="[2.7.0,2.8.0)", + org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)", + org.apache.sshd.common.mac;version="[2.7.0,2.8.0)", + org.apache.sshd.common.random;version="[2.7.0,2.8.0)", + org.apache.sshd.common.session;version="[2.7.0,2.8.0)", + org.apache.sshd.common.session.helpers;version="[2.7.0,2.8.0)", + org.apache.sshd.common.signature;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.closeable;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.io;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.io.resource;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)", + org.apache.sshd.core;version="[2.7.0,2.8.0)", + org.apache.sshd.server.auth;version="[2.7.0,2.8.0)", + org.apache.sshd.sftp;version="[2.7.0,2.8.0)", + org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)", + org.apache.sshd.sftp.common;version="[2.7.0,2.8.0)", org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", org.eclipse.jgit.fnmatch;version="[5.11.0,5.12.0)", diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java --- jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java 2021-03-09 22:10:22.000000000 +0100 +++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java 2021-07-30 12:04:40.688349950 +0200 @@ -133,8 +133,8 @@ } @Override - protected IoWriteFuture sendIdentification(String ident) - throws IOException { + protected IoWriteFuture sendIdentification(String ident, + List<String> extraLines) throws Exception { StatefulProxyConnector proxy = proxyHandler; if (proxy != null) { try { @@ -142,7 +142,8 @@ // from the peer only once the initial sendKexInit() following // this call to sendIdentification() has returned! proxy.runWhenDone(() -> { - JGitClientSession.super.sendIdentification(ident); + JGitClientSession.super.sendIdentification(ident, + extraLines); return null; }); // Called only from the ClientSessionImpl constructor, where the @@ -154,12 +155,11 @@ throw new IOException(other.getLocalizedMessage(), other); } } - return super.sendIdentification(ident); + return super.sendIdentification(ident, extraLines); } @Override - protected byte[] sendKexInit() - throws IOException, GeneralSecurityException { + protected byte[] sendKexInit() throws Exception { StatefulProxyConnector proxy = proxyHandler; if (proxy != null) { try { diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF --- jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 +++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF 2021-07-30 12:03:35.087914326 +0200 @@ -7,18 +7,18 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)", - org.apache.sshd.common;version="[2.6.0,2.7.0)", - org.apache.sshd.common.auth;version="[2.6.0,2.7.0)", - org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)", - org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)", - org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)", - org.apache.sshd.common.session;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)", - org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)", - org.apache.sshd.core;version="[2.6.0,2.7.0)", - org.apache.sshd.server;version="[2.6.0,2.7.0)", - org.apache.sshd.server.forward;version="[2.6.0,2.7.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)", + org.apache.sshd.common;version="[2.7.0,2.8.0)", + org.apache.sshd.common.auth;version="[2.7.0,2.8.0)", + org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)", + org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)", + org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)", + org.apache.sshd.common.session;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)", + org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)", + org.apache.sshd.core;version="[2.7.0,2.8.0)", + org.apache.sshd.server;version="[2.7.0,2.8.0)", + org.apache.sshd.server.forward;version="[2.7.0,2.8.0)", org.eclipse.jgit.api;version="[5.11.0,5.12.0)", org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.0,5.12.0)", diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/META-INF/MANIFEST.MF --- jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 +++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/META-INF/MANIFEST.MF 2021-07-30 11:58:52.578038135 +0200 @@ -15,7 +15,6 @@ org.apache.commons.compress.compressors.bzip2;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", - org.assertj.core.api;version="[3.14.0,4.0.0)", org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", org.eclipse.jgit.api;version="[5.11.0,5.12.0)", org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/pom.xml jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/pom.xml --- jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/pom.xml 2021-03-09 22:10:22.000000000 +0100 +++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/pom.xml 2021-07-30 11:57:51.365631621 +0200 @@ -66,11 +66,6 @@ </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - </dependency> - - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>2.23.0</version> Only in jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport: RequestValidatorTestCase.java ++++++ jgit-shade.patch ++++++ --- /var/tmp/diff_new_pack.bWN4DX/_old 2021-07-30 23:22:59.379582824 +0200 +++ /var/tmp/diff_new_pack.bWN4DX/_new 2021-07-30 23:22:59.379582824 +0200 @@ -1,7 +1,7 @@ -diff -urEbwB jgit-5.7.0.202003110725-r.orig/org.eclipse.jgit.pgm/pom.xml jgit-5.7.0.202003110725-r/org.eclipse.jgit.pgm/pom.xml ---- jgit-5.7.0.202003110725-r.orig/org.eclipse.jgit.pgm/pom.xml 2020-04-07 12:24:45.966217181 +0200 -+++ jgit-5.7.0.202003110725-r/org.eclipse.jgit.pgm/pom.xml 2020-04-07 12:48:09.474568774 +0200 -@@ -145,19 +145,40 @@ +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.pgm/pom.xml jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.pgm/pom.xml +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.pgm/pom.xml 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.pgm/pom.xml 2021-07-30 11:40:33.894748622 +0200 +@@ -157,19 +157,40 @@ </plugin> <plugin> @@ -49,7 +49,7 @@ </configuration> </execution> </executions> -@@ -172,13 +193,11 @@ +@@ -184,13 +205,11 @@ <phase>package</phase> <configuration> <target> @@ -68,18 +68,26 @@ </target> </configuration> <goals> -diff -urEbwB jgit-5.7.0.202003110725-r.orig/pom.xml jgit-5.7.0.202003110725-r/pom.xml ---- jgit-5.7.0.202003110725-r.orig/pom.xml 2020-04-07 12:24:45.782216086 +0200 -+++ jgit-5.7.0.202003110725-r/pom.xml 2020-04-07 12:27:10.879079553 +0200 -@@ -385,11 +385,6 @@ +Only in jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.pgm: pom.xml.orig +diff -urEbwB jgit-5.11.0.202103091610-r/pom.xml jgit-5.11.0.202103091610-r.new/pom.xml +--- jgit-5.11.0.202103091610-r/pom.xml 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/pom.xml 2021-07-30 11:41:51.715264903 +0200 +@@ -394,16 +394,6 @@ <artifactId>maven-resources-plugin</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> </plugin> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> -- <version>2.1.5.RELEASE</version> +- <version>2.4.1</version> +- </plugin> +- <plugin> +- <groupId>org.eclipse.dash</groupId> +- <artifactId>license-tool-plugin</artifactId> +- <version>0.0.1-SNAPSHOT</version> - </plugin> </plugins> </pluginManagement> +Only in jgit-5.11.0.202103091610-r.new: pom.xml.orig +Only in jgit-5.11.0.202103091610-r.new: pom.xml.rej

1 0

commit apache-sshd for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apache-sshd for openSUSE:Factory checked in at 2021-07-30 23:22:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-sshd (Old) and /work/SRC/openSUSE:Factory/.apache-sshd.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-sshd" Fri Jul 30 23:22:25 2021 rev:3 rq:909404 version:2.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-sshd/apache-sshd.changes 2020-07-17 20:50:31.808900264 +0200 +++ /work/SRC/openSUSE:Factory/.apache-sshd.new.1899/apache-sshd.changes 2021-07-30 23:22:57.743584621 +0200 @@ -1,0 +2,226 @@ +Fri Jul 30 08:13:19 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to version 2.7.0 +- Changes in version 2.5.0 + * Major code re-factoring + + Reception of an SSH_MSG_UNIMPLEMENTED response to a + SSH_MSG_GLOBAL_REQUEST is translated internally into same code + flow as if an SSH_MSH_REQUEST_FAILURE has been received - see + SSHD-968. + + Server SFTP subsystem internal code dealing with the local + files has been delegated to the SftpFileSystemAccessor in + order to allow easier hooking into the SFTP subsystem. + - Resolving a local file path for an SFTP remote one + - Reading/Writing a file's attribute(s) + - Creating files links + - Copying / Renaming / Deleting files + + SftpVersionSelector is now consulted when client sends initial + command (as well as when session is re-negotiated) + + ScpCommandFactory is also a ShellFactory that can be used to + provide a minimalistic shell that is good enough for WinSCP. + + Rework SFTP streams so that the client asks and receives as + much data as possible - see SSHD-979. + * Minor code helpers + + Handling of debug/ignore/unimplemented messages has been split + into handleXXX and doInvokeXXXMsgHandler methods where the + former validate the messages and deal with the idle timeout, + and the latter execute the actual invcation. + + Added overloaded methods that accept a java.time.Duration + specifier for timeout value. + + The argument representing the SFTP subsystem in invocations to + SftpFileSystemAccessor has been enhanced to expose as much of + the available functionality as possible. + * Behavioral changes and enhancements + + SSHD-964 - Send SSH_MSG_CHANNEL_EOF when tunnel channel being + closed. + + SSHD-967 - Extra bytes written when + SftpRemotePathChannel#transferTo is used. + + SSHD-968 - Interpret SSH_MSG_UNIMPLEMENTED response to a + heartbeat request as a liveness indicator + + SSHD-970 - transferTo function of SftpRemotePathChannel will + loop if count parameter is greater than file size + + SSHD-972 - Add support for peers using OpenSSH "security key" + key types + + SSHD-977 - Apply consistent logging policy to caught + exceptions + + SSHD-660 - Added support for server-side signed certificate + keys + + SSHD-984 - Utility method to export KeyPair in OpenSSH format + + SSHD-992 - Provide more hooks into the SFTP server subsystem + via SftpFileSystemAccessor + + SSHD-997 - Fixed OpenSSH private key decoders for RSA and + Ed25519 + + SSHD-998 - Take into account SFTP version preference when + establishing initial channel + + SSHD-989 - Read correctly ECDSA key pair from PKCS8 encoded + data + + SSHD-1009 - Provide a minimalistic shell for supporting WinSCP + SCP mode. +- Changes in version 2.5.1 + * Behavioral changes and enhancements + + SSHD-1022 NPE in SftpOutputStreamAsync#flush() if no data + written in between. +- Changes in version 2.6.0 + * Major code re-factoring + + SshServerMain uses by default an ECDSA key instead of an RSA + one. This can be overridden either by -key-type / -key-size or + -key-file command line option. + + SSHD-1034 Rename org.apache.sshd.common.ForwardingFilter to + Forwarder. + + SSHD-1035 Move property definitions to common locations. + + SSHD-1038 Refactor packages from a module into a cleaner + hierarchy. + + SSHD-1080 Rework the PacketWriter to split according to the + various semantics + + SSHD-1084 Revert the usage of asynchronous streams when + forwarding ports. + * Minor code helpers + + SSHD-1004 Using a more constant time MAC validation to + minimize timing side channel information leak. + + SSHD-1030 Added a NoneFileSystemFactory implementation + + SSHD-1042 Added more callbacks to SftpEventListener + + SSHD-1040 Make server key available after KEX completed. + + SSHD-1060 Do not store logger level in fields. + + SSHD-1064 Fixed ClientSession#executeRemoteCommand handling + of STDERR in case of exception to behave according to its + documentation + + SSHD-1076 Break down ClientUserAuthService#auth method into + several to allow for flexible override + + SSHD-1077 Added command line option to request specific SFTP + version in SftpCommandMain + + SSHD-1079 Experimental async mode on the local port forwarder + + SSHD-1086 Added SFTP aware directory scanning helper classes + + SSHD-1089 Added wrappers for one-time single session usage of + SFTP/SCP clients + + Propagate SCP file transfer ACK data to ScpTransferListener + before validating it. + * Behavioral changes and enhancements + + SSHD-506 Added support for AES-GCM ciphers. + + SSHD-954 Improve validation of DH public key values. + + SSHD-1004 Deprecate DES, RC4 and Blowfish ciphers from default + setup. + + SSHD-1004 Deprecate SHA-1 based key exchanges and signatures + from default setup. + + SSHD-1004 Deprecate MD5-based and truncated HMAC algorithms + from default setup. + + SSHD-1005 Added support for SCP remote-to-remote file transfer + + SSHD-1020 SSH connections getting closed abruptly with timeout + exceptions. + + SSHD-1026 Improve build reproductibility. + + SSHD-1028 Fix SSH_MSG_DISCONNECT: Too many concurrent + connections. + + SSHD-1032 Fix possible ArrayIndexOutOfBoundsException in + ChannelAsyncOutputStream. + + SSHD-1033 Fix simultaneous usage of dynamic and local port + forwarding. + + SSHD-1039 Fix support for some basic options in ssh/sshd cli. + + SSHD-1047 Support for SSH jumps. + + SSHD-1048 Wrap instead of rethrow IOException in Future. + + SSHD-1050 Fixed race condition in AuthFuture if exception + caught before authentication started. + + SSHD-1053 Fixed handling of certified keys authentication. + + SSHD-1056 Added support for SCP remote-to-remote directory + transfer - including '-3' option of SCP command CLI. + + SSHD-1057 Added capability to select a ShellFactory based on + the current session + use it for "WinSCP" + + SSHD-1058 Improve exception logging strategy. + + SSHD-1059 Do not send heartbeat if KEX state not DONE + + SSHD-1063 Fixed known-hosts file server key verifier matching + of same host with different ports + + SSHD-1066 Allow multiple binding to local port tunnel on + different addresses + + SSHD-1070 OutOfMemoryError when use async port forwarding + + SSHD-1100 Updated used moduli for DH group KEX + + SSHD-1102 Provide filter support for SftpDirectoryStream + + SSHD-1104 Take into account possible key type aliases when + using public key authentication + + SSHD-1107 Allow configuration of minimum DH group exchange key + size via property or programmatically + + SSHD-1108 Increased minimum default DH group exchange key size + to 2048 (but support 1024) +- Changes in version 2.7.0 + * Major code re-factoring + + SSHD-1133 Re-factored locations and names of ServerSession and + server-side ChannelSession related classes + + Moved some helper methods and classes to more natural + locations + * Minor code helpers + + SSHD-525 Added support for "posix-rename(a)openssh.com" SFTP + extension + + SSHD-1083 Relaxed required Nio2Connector/Acceptor required + constructor arguments + + SSHD-1085 Added CliLogger + more verbosity on SshClientMain + + SSHD-1109 Route tests JUL logging via SLF4JBridgeHandler + + SSHD-1109 Provide full slf4j logger capabilities to CliLogger + and use it in all CLI classes + + SSHD-1110 Replace Class#newInstance() calls with + Class#getDefaultConstructor().newInstance() + + SSHD-1111 Fixed SshClientCliSupport compression option + detection + + SSHD-1116 Provide SessionContext argument to + HostKeyIdentityProvider#loadHostKeys + + SSHD-1116 Provide SessionContext argument to + PasswordIdentityProvider#loadPasswords + + SSHD-1116 Provide SessionContext argument to + AuthenticationIdentitiesProvider#loadIdentities + + SSHD-1125 Added option to require immediate close of channel + in command ExitCallback invocation + + SSHD-1127 Consolidated SftpSubsystem support implementations + into SftpSubsystemConfigurator + + SSHD-1148 Generate a unique thread name for each SftpSubsystem + instance + * Behavioral changes and enhancements + + SSHD-1085 Added more notifications related to channel state + change for detecting channel closing or closed earlier. + + SSHD-1091 Renamed sshd-contrib top-level package in order to + align naming convention. + + SSHD-1097 Added more SessionListener callbacks related to the + initial version and key exchange + + SSHD-1097 Added more capability to send peer identification + via ReservedSessionMessagesHandler + + SSHD-1097 Implemented endless tarpit example in sshd-contrib + + SSHD-1109 Replace log4j with logback as the slf4j logger + implementation for tests + + SSHD-1114 Added callbacks for client-side password + authentication progress + + SSHD-1114 Added callbacks for client-side public key + authentication progress + + SSHD-1114 Added callbacks for client-side host-based + authentication progress + + SSHD-1114 Added capability for interactive password + authentication participation via UserInteraction + + SSHD-1114 Added capability for interactive key based + authentication participation via UserInteraction + + SSHD-1123 Add option to chunk data in ChannelAsyncOutputStream + if window size is smaller than packet size + + SSHD-1125 Added mechanism to throttle pending write requests + in BufferedIoOutputStream ++++ 29 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/apache-sshd/apache-sshd.changes ++++ and /work/SRC/openSUSE:Factory/.apache-sshd.new.1899/apache-sshd.changes Old: ---- apache-sshd-2.4.0-java8.patch apache-sshd-2.4.0-src.tar.gz New: ---- 0002-Fix-manifest-generation.patch apache-sshd-2.7.0-java8.patch apache-sshd-2.7.0-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-sshd.spec ++++++ --- /var/tmp/diff_new_pack.aKJ01s/_old 2021-07-30 23:22:58.135584190 +0200 +++ /var/tmp/diff_new_pack.aKJ01s/_new 2021-07-30 23:22:58.139584186 +0200 @@ -1,7 +1,7 @@ # # spec file for package apache-sshd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 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: apache-sshd -Version: 2.4.0 +Version: 2.7.0 Release: 0 Summary: Apache SSHD # One file has ISC licensing: @@ -27,12 +27,14 @@ Source0: https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}… # Avoid optional dep on tomcat native APR library Patch0: 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch -Patch1: apache-sshd-2.4.0-java8.patch +Patch1: 0002-Fix-manifest-generation.patch +Patch2: apache-sshd-2.7.0-java8.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.i2p.crypto:eddsa) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) @@ -59,14 +61,17 @@ %prep %setup -q -%patch1 -p1 # Avoid optional dep on tomcat native APR library %patch0 -p1 +%patch1 -p1 +%patch2 -p1 + rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix # Avoid unnecessary dep on spring framework %pom_remove_dep :spring-framework-bom +%pom_remove_dep :testcontainers-bom sshd-sftp # Build the core modules only %pom_disable_module assembly @@ -81,11 +86,13 @@ # Disable plugins we don't need for RPM builds %pom_remove_plugin :apache-rat-plugin -%pom_remove_plugin :groovy-maven-plugin +%pom_remove_plugin :gmavenplus-plugin %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-pmd-plugin %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :impsort-maven-plugin +%pom_remove_plugin :formatter-maven-plugin . sshd-core # Suppress generation of uses clauses %pom_xpath_inject "pom:configuration/pom:instructions" "<_nouses>true</_nouses>" . ++++++ 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch ++++++ --- /var/tmp/diff_new_pack.aKJ01s/_old 2021-07-30 23:22:58.151584173 +0200 +++ /var/tmp/diff_new_pack.aKJ01s/_new 2021-07-30 23:22:58.155584168 +0200 @@ -14,7 +14,7 @@ index 867ca88..7c29678 100644 --- a/pom.xml +++ b/pom.xml -@@ -397,11 +397,6 @@ +@@ -406,11 +406,6 @@ <artifactId>mina-core</artifactId> <version>2.0.21</version> </dependency> @@ -30,19 +30,19 @@ index 6171c5c..73a43a7 100644 --- a/sshd-core/pom.xml +++ b/sshd-core/pom.xml -@@ -42,12 +42,6 @@ - <version>${project.version}</version> +@@ -43,12 +43,6 @@ </dependency> -- <dependency> + <dependency> - <groupId>tomcat</groupId> - <artifactId>tomcat-apr</artifactId> - <optional>true</optional> - </dependency> - - <dependency> +- <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpg-jdk15on</artifactId> + <optional>true</optional> diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java b/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java index ab19539..5757e68 100644 --- a/sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java @@ -55,23 +55,23 @@ -import org.apache.sshd.agent.unix.UnixAgentFactory; import org.apache.sshd.common.FactoryManager; import org.apache.sshd.common.PropertyResolver; - import org.apache.sshd.common.PropertyResolverUtils; -@@ -52,9 +50,7 @@ public class ProxyAgentFactory implements SshAgentFactory { + import org.apache.sshd.common.channel.ChannelFactory; +@@ -51,9 +49,7 @@ public class ProxyAgentFactory implements SshAgentFactory { @Override public List<ChannelFactory> getChannelForwardingFactories(FactoryManager manager) { - return isPreferredUnixAgent(manager) -- ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS -- : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; +- ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS +- : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; + return LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS; } @Override -@@ -105,16 +101,6 @@ public class ProxyAgentFactory implements SshAgentFactory { +@@ -104,16 +100,6 @@ public class ProxyAgentFactory implements SshAgentFactory { } public static boolean isPreferredUnixAgent(PropertyResolver resolver) { -- if (PropertyResolverUtils.getBooleanProperty(resolver, PREFER_UNIX_AGENT, OsUtils.isUNIX())) { +- if (CoreModuleProperties.PREFER_UNIX_AGENT.getRequired(resolver)) { - try { - if (AprLibrary.getInstance() != null) { - return true; ++++++ 0002-Fix-manifest-generation.patch ++++++ diff -up ./pom.xml.fix ./pom.xml --- ./pom.xml.fix 2021-04-20 21:32:51.749782800 -0400 +++ ./pom.xml 2021-04-20 21:33:22.600740917 -0400 @@ -1020,7 +1020,6 @@ </goals> <configuration> <instructions> - <Import-Package>org.apache.sshd*;version="[$(version;==;${sshd.osgi.version.clean}),$(version;=+;${sshd.osgi.version.clean}))",*</Import-Package> <Export-Package>*;-noimport:=true</Export-Package> </instructions> <noWarningProjectTypes>pom</noWarningProjectTypes> ++++++ apache-sshd-2.4.0-java8.patch -> apache-sshd-2.7.0-java8.patch ++++++ --- /work/SRC/openSUSE:Factory/apache-sshd/apache-sshd-2.4.0-java8.patch 2020-07-17 20:50:31.056899479 +0200 +++ /work/SRC/openSUSE:Factory/.apache-sshd.new.1899/apache-sshd-2.7.0-java8.patch 2021-07-30 23:22:57.711584657 +0200 @@ -1,8 +1,8 @@ ---- apache-sshd-2.4.0/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java 2020-07-16 23:25:44.981904289 +0200 -+++ apache-sshd-2.4.0/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java 2020-07-16 23:49:34.043250054 +0200 -@@ -362,13 +362,13 @@ - if (debugEnabled) { - log.debug("handleReadCycleCompletion({}) read {} bytes", this, result); +--- apache-sshd-2.7.0/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java 2021-07-30 09:48:59.082251041 +0200 ++++ apache-sshd-2.7.0/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java 2021-07-30 09:54:40.568508196 +0200 +@@ -353,13 +353,13 @@ + log.trace("handleReadCycleCompletion({}) read {} bytes after {} nanos at cycle={}", + this, result, System.nanoTime() - lastReadCycleStart.get(), readCyclesCounter); } - buffer.flip(); + ((java.nio.Buffer)buffer).flip(); @@ -16,37 +16,37 @@ doReadCycle(buffer, completionHandler); } else { if (debugEnabled) { ---- apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpRemotePathChannel.java 2020-07-16 23:25:44.961904157 +0200 -+++ apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpRemotePathChannel.java 2020-07-16 23:38:16.702818800 +0200 -@@ -20,6 +20,7 @@ - package org.apache.sshd.client.subsystem.sftp; +--- apache-sshd-2.7.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpRemotePathChannel.java 2021-07-30 09:48:59.150251491 +0200 ++++ apache-sshd-2.7.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/SftpRemotePathChannel.java 2021-07-30 09:54:40.572508221 +0200 +@@ -21,6 +21,7 @@ import java.io.IOException; + import java.io.StreamCorruptedException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.AsynchronousCloseException; -@@ -123,7 +124,7 @@ - int read = sftp.read(handle, curPos, wrap.array(), wrap.arrayOffset() + wrap.position(), wrap.remaining()); +@@ -153,7 +154,7 @@ if (read > 0) { + // reference equality on purpose if (wrap == buffer) { - wrap.position(wrap.position() + read); + ((Buffer)wrap).position(wrap.position() + read); } else { buffer.put(wrap.array(), wrap.arrayOffset(), read); } -@@ -191,7 +192,7 @@ - int written = wrap.remaining(); - sftp.write(handle, curPos, wrap.array(), wrap.arrayOffset() + wrap.position(), written); +@@ -258,7 +259,7 @@ + wrap.arrayOffset() + wrap.position(), written); + // reference equality on purpose if (wrap == buffer) { - wrap.position(wrap.position() + written); + ((Buffer)wrap).position(wrap.position() + written); } curPos += written; totalWritten += written; ---- apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpSubsystemHelper.java 2020-07-16 23:25:44.961904157 +0200 -+++ apache-sshd-2.4.0/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpSubsystemHelper.java 2020-07-16 23:51:17.255925762 +0200 -@@ -980,7 +980,7 @@ +--- apache-sshd-2.7.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/AbstractSftpSubsystemHelper.java 2021-07-30 09:48:59.150251491 +0200 ++++ apache-sshd-2.7.0/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/AbstractSftpSubsystemHelper.java 2021-07-30 09:55:19.804767492 +0200 +@@ -942,7 +942,7 @@ if (remainLen < digestBuf.length) { bb = ByteBuffer.wrap(digestBuf, 0, remainLen); } @@ -55,7 +55,7 @@ int readLen = channel.read(bb); if (readLen < 0) { -@@ -1005,7 +1005,7 @@ +@@ -967,7 +967,7 @@ if (remainLen < digestBuf.length) { bb = ByteBuffer.wrap(digestBuf, 0, remainLen); } @@ -64,7 +64,7 @@ int readLen = channel.read(bb); if (readLen < 0) { -@@ -1140,7 +1140,7 @@ +@@ -1101,7 +1101,7 @@ if (remainLen < digestBuf.length) { bb = ByteBuffer.wrap(digestBuf, 0, remainLen); } ++++++ apache-sshd-2.4.0-src.tar.gz -> apache-sshd-2.7.0-src.tar.gz ++++++ ++++ 191837 lines of diff (skipped)

1 0

commit eclipse-egit for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package eclipse-egit for openSUSE:Factory checked in at 2021-07-30 23:22:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-egit (Old) and /work/SRC/openSUSE:Factory/.eclipse-egit.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eclipse-egit" Fri Jul 30 23:22:24 2021 rev:3 rq:909403 version:5.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-egit/eclipse-egit.changes 2020-07-16 12:12:14.090587520 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-egit.new.1899/eclipse-egit.changes 2021-07-30 23:22:57.103585324 +0200 @@ -1,0 +2,6 @@ +Fri Jul 30 12:34:45 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to eclipse-egit 5.11.0 + * Needed because of change of eclipse-jgit to 5.11.0 + +------------------------------------------------------------------- Old: ---- egit-v5.8.0.202006091008-r.tar.gz New: ---- egit-5.11.0.202103091610-r.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-egit.spec ++++++ --- /var/tmp/diff_new_pack.UkgdGB/_old 2021-07-30 23:22:57.567584814 +0200 +++ /var/tmp/diff_new_pack.UkgdGB/_new 2021-07-30 23:22:57.571584810 +0200 @@ -1,7 +1,7 @@ # # spec file for package eclipse-egit # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,21 @@ # -%global gittag 5.8.0.202006091008-r +%global gittag 5.11.0.202103091610-r Name: eclipse-egit -Version: 5.8.0 +Version: 5.11.0 Release: 0 Summary: Eclipse Git Integration License: EPL-2.0 Group: Development/Libraries/Java URL: https://www.eclipse.org/egit # Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 -Source0: https://github.com/eclipse/egit/archive/v%{gittag}/egit-v%{gittag}.tar.gz +Source0: https://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{gittag}.tar.xz BuildRequires: eclipse-jdt-bootstrap BuildRequires: eclipse-jgit >= %{version} BuildRequires: eclipse-license2 BuildRequires: eclipse-platform-bootstrap +BuildRequires: fdupes BuildRequires: maven-antrun-plugin BuildRequires: tycho #!BuildIgnore: eclipse-jdt @@ -85,6 +86,7 @@ %install %mvn_install +%fdupes -s %{buildroot}%{_datadir}/eclipse/droplets %files -f .mfiles-egit %license LICENSE

1 0

commit sbt for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sbt for openSUSE:Factory checked in at 2021-07-30 23:22:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbt (Old) and /work/SRC/openSUSE:Factory/.sbt.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sbt" Fri Jul 30 23:22:23 2021 rev:8 rq:909399 version:0.13.18 Changes: -------- --- /work/SRC/openSUSE:Factory/sbt/sbt.changes 2021-07-28 19:21:13.783541877 +0200 +++ /work/SRC/openSUSE:Factory/.sbt.new.1899/sbt.changes 2021-07-30 23:22:55.059587569 +0200 @@ -1,0 +2,8 @@ +Fri Jul 30 12:20:42 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Build package as noarch, since it does not have archfull + binaries +- Build with java 8 to avoid weird build problems with recent + java 11 on i586 and armv7l + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbt.spec ++++++ --- /var/tmp/diff_new_pack.wNEImw/_old 2021-07-30 23:22:56.475586014 +0200 +++ /var/tmp/diff_new_pack.wNEImw/_new 2021-07-30 23:22:56.475586014 +0200 @@ -142,6 +142,9 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(oro:oro) +BuildConflicts: java >= 9 +BuildConflicts: java-devel >= 9 +BuildConflicts: java-headless >= 9 Requires: apache-commons-lang3 Requires: apache-ivy Requires: atinject @@ -183,6 +186,7 @@ Requires: slf4j Requires: template-resolver Requires: test-interface +BuildArch: noarch %if %{with bootstrap} Name: %{short_name}-bootstrap %else ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.wNEImw/_old 2021-07-30 23:22:56.519585965 +0200 +++ /var/tmp/diff_new_pack.wNEImw/_new 2021-07-30 23:22:56.519585965 +0200 @@ -8,16 +8,4 @@ </disk> </hardware> - <overwrite> - <conditions> - <arch>armv7l</arch> - <arch>armv6l</arch> - </conditions> - <hardware> - <physicalmemory> - <size unit="M">512</size> - </physicalmemory> - </hardware> - </overwrite> - </constraints>

1 0

commit scala for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scala for openSUSE:Factory checked in at 2021-07-30 23:22:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scala (Old) and /work/SRC/openSUSE:Factory/.scala.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scala" Fri Jul 30 23:22:23 2021 rev:7 rq:909398 version:2.10.7 Changes: -------- --- /work/SRC/openSUSE:Factory/scala/scala.changes 2020-06-26 21:50:17.682763925 +0200 +++ /work/SRC/openSUSE:Factory/.scala.new.1899/scala.changes 2021-07-30 23:22:54.199588513 +0200 @@ -1,0 +2,6 @@ +Thu Jul 29 21:25:14 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Bootstrap the build with our own built jar instead of downloading + prebuilt binaries from www.scala-lang.org + +------------------------------------------------------------------- Old: ---- scala-2.10.7.tgz New: ---- scala-compiler.jar scala-library.jar scala-reflect.jar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scala.spec ++++++ --- /var/tmp/diff_new_pack.D5GiPe/_old 2021-07-30 23:22:54.803587850 +0200 +++ /var/tmp/diff_new_pack.D5GiPe/_new 2021-07-30 23:22:54.807587846 +0200 @@ -1,7 +1,7 @@ # -# spec file for package scala +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,12 +35,11 @@ Summary: A hybrid functional/object-oriented language for the JVM License: BSD-3-Clause AND CC0-1.0 AND SUSE-Public-Domain Group: Development/Libraries/Java -URL: http://www.scala-lang.org/ +URL: https://www.scala-lang.org/ Source0: %{base_name}-%{version}.tar.xz Source1: scala-library-2.10.0-bnd.properties # git log --pretty=format:"%H%n%ci" v%{version} | head -n 2 | sed -e 's/\-//g' -e 's/\s\+.*//g' Source3: scala.gitinfo -Source4: http://www.scala-lang.org/files/archive/%{base_name}-%{version}.tgz Source23: scala-mime-info.xml Source24: scala.ant.d # Change the default classpath (SCALA_HOME) @@ -69,6 +68,9 @@ BuildRequires: javapackages-local BuildRequires: jline >= 2.10 BuildRequires: junit +BuildConflicts: java >= 9 +BuildConflicts: java-devel >= 9 +BuildConflicts: java-headless >= 9 Requires: jansi Requires: java-headless >= 1.7 # Require full javapackages-tools since scripts use @@ -77,6 +79,11 @@ Requires: jline >= 2.10 BuildArch: noarch %if %{with bootstrap} +Source100: scala-compiler.jar +Source101: scala-library.jar +Source102: scala-reflect.jar +%endif +%if %{with bootstrap} Name: %{base_name}-bootstrap %else Name: %{base_name} @@ -95,9 +102,7 @@ %package apidoc Summary: Documentation for the Scala programming language Group: Documentation/HTML -%if %{without bootstrap} Obsoletes: %{base_name}-bootstrap-apidoc -%endif %description apidoc Scala is a general purpose programming language for the JVM that blends @@ -159,7 +164,6 @@ %if %{with bootstrap} %global do_bootstrap -DdoBootstrapBuild=yes %global docs_target %{nil} -tar -xzvf %{SOURCE4} --strip-components=1 %{base_name}-%{version}/lib %else %global do_bootstrap %{nil} %global docs_target docs @@ -173,6 +177,10 @@ ln -s $(find-jar scala/scala-library) scala-library.jar rm -rf scala-reflect.jar ln -s $(find-jar scala/scala-reflect) scala-reflect.jar +%else + cp %{SOURCE100} scala-compiler.jar + cp %{SOURCE101} scala-library.jar + cp %{SOURCE102} scala-reflect.jar %endif pushd ant rm -rf ant.jar @@ -195,7 +203,7 @@ # Add the -verbose flag to scalac on zero architectures. The build # is slow, OBS thinks it is stuck and kills it before it has chance # to finish -%ant \ +%{ant} \ build %{docs_target} || exit 1 pushd build/pack/lib mv scala-library.jar scala-library.jar.no ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.D5GiPe/_old 2021-07-30 23:22:54.831587820 +0200 +++ /var/tmp/diff_new_pack.D5GiPe/_new 2021-07-30 23:22:54.831587820 +0200 @@ -1,10 +1,10 @@ <constraints> <hardware> <physicalmemory> - <size unit="G">3</size> + <size unit="G">4</size> </physicalmemory> <disk> - <size unit="G">3</size> + <size unit="G">4</size> </disk> </hardware> </constraints>

1 0

commit python-hvac for openSUSE:Factory
by Source-Sync 30 Jul '21

30 Jul '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-hvac for openSUSE:Factory checked in at 2021-07-30 23:22:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-hvac (Old) and /work/SRC/openSUSE:Factory/.python-hvac.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-hvac" Fri Jul 30 23:22:22 2021 rev:9 rq:909394 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-hvac/python-hvac.changes 2021-06-19 23:03:38.823727449 +0200 +++ /work/SRC/openSUSE:Factory/.python-hvac.new.1899/python-hvac.changes 2021-07-30 23:22:53.239589568 +0200 @@ -1,0 +2,10 @@ +Fri Jul 30 10:50:47 UTC 2021 - Mark��ta Machov�� <mmachova(a)suse.com> + +- Update to 0.11.0 + * This is intended to by the last hvac release supporting Python 2.7. + * Userpass: Add use_token param on login(), Accept passthrough **kwargs on create user. + * Support CA-related Environment Variables. + * Allow Omission of Password Argument on Userpass create_or_update_user(). + * Add deprecation notices for some Client() methods. + +------------------------------------------------------------------- Old: ---- v0.10.14.tar.gz New: ---- v0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-hvac.spec ++++++ --- /var/tmp/diff_new_pack.eOAAqW/_old 2021-07-30 23:22:53.659589107 +0200 +++ /var/tmp/diff_new_pack.eOAAqW/_new 2021-07-30 23:22:53.663589102 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-hvac -Version: 0.10.14 +Version: 0.11.0 Release: 0 Summary: HashiCorp Vault API client License: BSD-3-Clause ++++++ v0.10.14.tar.gz -> v0.11.0.tar.gz ++++++ ++++ 36714 lines of diff (skipped)

1 0