sicherha pushed to rpms/mold (rawhide). "Bump version to 1.6.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-10-22 15:26:20 UTC
From 8eff4703e522bd023a611881fd20d3dda6e75f59 Mon Sep 17 00:00:00 2001
From: Christoph Erhardt <fedora(a)sicherha.de>
Date: Oct 22 2022 15:26:09 +0000
Subject: Bump version to 1.6.0
---
diff --git a/0002-ELF-Fix-test-for-PPC64LE.patch b/0002-ELF-Fix-test-for-PPC64LE.patch
deleted file mode 100644
index 09f0b5a..0000000
--- a/0002-ELF-Fix-test-for-PPC64LE.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f6f03510d6c19e6009c903fed00294813126db3b Mon Sep 17 00:00:00 2001
-Message-Id: <f6f03510d6c19e6009c903fed00294813126db3b.1664460024.git.github(a)sicherha.de>
-In-Reply-To: <db11436c0ccbfee0f617ae7498c25fb2f4e76626.1664460024.git.github(a)sicherha.de>
-References: <db11436c0ccbfee0f617ae7498c25fb2f4e76626.1664460024.git.github(a)sicherha.de>
-From: Rui Ueyama <ruiu(a)bluewhale.systems>
-Date: Thu, 29 Sep 2022 15:41:28 +0800
-Subject: [PATCH 2/2] [ELF] Fix test for PPC64LE
-
-`readelf --symbols` print out auxiliary information after a symbol name
-for PPC64, so something like `foo$` didn't match.
-
- 7: 0000000000000000 80 FUNC GLOBAL DEFAULT 3 main [<localentry>: 8]
- 8: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND .TOC.
- 9: 0000000000000000 72 FUNC GLOBAL DEFAULT 11 foo [<localentry>: 8]
- 10: 0000000000000000 40 FUNC GLOBAL DEFAULT 19 bar
-
-Fixes https://github.com/rui314/mold/issues/739
----
- test/elf/relocatable-archive.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/elf/relocatable-archive.sh b/test/elf/relocatable-archive.sh
-index e5544bb8..759cd871 100755
---- a/test/elf/relocatable-archive.sh
-+++ b/test/elf/relocatable-archive.sh
-@@ -38,8 +38,8 @@ ar crs $t/e.a $t/a.o $t/b.o $t/c.o
- ./mold -r -o $t/f.o $t/d.o $t/e.a
-
- readelf --symbols $t/f.o > $t/log
--grep -q 'foo$' $t/log
--grep -q 'bar$' $t/log
--! grep -q 'baz$' $t/log || false
-+grep -q 'foo\b' $t/log
-+grep -q 'bar\b' $t/log
-+! grep -q 'baz\b' $t/log || false
-
- echo OK
---
-2.37.3
-
diff --git a/0002-ELF-i386-Allow-R_386_PC32-after-R_386_TLS_-GD-LDM.patch b/0002-ELF-i386-Allow-R_386_PC32-after-R_386_TLS_-GD-LDM.patch
new file mode 100644
index 0000000..8ff0bde
--- /dev/null
+++ b/0002-ELF-i386-Allow-R_386_PC32-after-R_386_TLS_-GD-LDM.patch
@@ -0,0 +1,44 @@
+From 2f5b3be6214d8157736e60f68693352a3ffd5a47 Mon Sep 17 00:00:00 2001
+Message-Id: <2f5b3be6214d8157736e60f68693352a3ffd5a47.1666197268.git.github(a)sicherha.de>
+In-Reply-To: <6c0c571d629d924e3f59d8710de6589848204e17.1666197268.git.github(a)sicherha.de>
+References: <6c0c571d629d924e3f59d8710de6589848204e17.1666197268.git.github(a)sicherha.de>
+From: Rui Ueyama <ruiu(a)bluewhale.systems>
+Date: Wed, 19 Oct 2022 19:33:18 +0800
+Subject: [PATCH 2/3] [ELF][i386] Allow R_386_PC32 after R_386_TLS_{GD,LDM}
+
+I don't know why GCC sometimes creates a PC32 relocation instead of
+PLT32 after a TLS_GD/TLS_LDM. I believe it's strictly speaking a
+violation of the psABI. But we need to handle such input.
+
+Fixes https://github.com/rui314/mold/issues/794
+---
+ elf/arch-i386.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/elf/arch-i386.cc b/elf/arch-i386.cc
+index 46391844..20563faa 100644
+--- a/elf/arch-i386.cc
++++ b/elf/arch-i386.cc
+@@ -485,7 +485,8 @@ void InputSection<E>::scan_relocations(Context<E> &ctx) {
+ Fatal(ctx) << *this << ": TLS_GD reloc must be followed by PLT or GOT32";
+
+ if (u32 ty = rels[i + 1].r_type;
+- ty != R_386_PLT32 && ty != R_386_GOT32 && ty != R_386_GOT32X)
++ ty != R_386_PLT32 && ty != R_386_PC32 &&
++ ty != R_386_GOT32 && ty != R_386_GOT32X)
+ Fatal(ctx) << *this << ": TLS_GD reloc must be followed by PLT or GOT32";
+
+ if (relax_tlsgd(ctx, sym))
+@@ -498,7 +499,8 @@ void InputSection<E>::scan_relocations(Context<E> &ctx) {
+ Fatal(ctx) << *this << ": TLS_LDM reloc must be followed by PLT or GOT32";
+
+ if (u32 ty = rels[i + 1].r_type;
+- ty != R_386_PLT32 && ty != R_386_GOT32 && ty != R_386_GOT32X)
++ ty != R_386_PLT32 && ty != R_386_PC32 &&
++ ty != R_386_GOT32 && ty != R_386_GOT32X)
+ Fatal(ctx) << *this << ": TLS_LDM reloc must be followed by PLT or GOT32";
+
+ if (relax_tlsld(ctx))
+--
+2.37.3
+
diff --git a/0003-ELF-i386-Fix-assertion-failure.patch b/0003-ELF-i386-Fix-assertion-failure.patch
new file mode 100644
index 0000000..2ce9d75
--- /dev/null
+++ b/0003-ELF-i386-Fix-assertion-failure.patch
@@ -0,0 +1,40 @@
+From b6d3255e1a498d5a966bd303eb09390aa24ef596 Mon Sep 17 00:00:00 2001
+Message-Id: <b6d3255e1a498d5a966bd303eb09390aa24ef596.1666197268.git.github(a)sicherha.de>
+In-Reply-To: <6c0c571d629d924e3f59d8710de6589848204e17.1666197268.git.github(a)sicherha.de>
+References: <6c0c571d629d924e3f59d8710de6589848204e17.1666197268.git.github(a)sicherha.de>
+From: Rui Ueyama <ruiu(a)bluewhale.systems>
+Date: Wed, 19 Oct 2022 20:14:53 +0800
+Subject: [PATCH 3/3] [ELF][i386] Fix assertion failure
+
+https://github.com/rui314/mold/issues/794
+---
+ elf/arch-i386.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/elf/arch-i386.cc b/elf/arch-i386.cc
+index 20563faa..87524fd1 100644
+--- a/elf/arch-i386.cc
++++ b/elf/arch-i386.cc
+@@ -234,7 +234,8 @@ void InputSection<E>::apply_reloc_alloc(Context<E> &ctx, u8 *base) {
+ } else {
+ // Relax GD to LE
+ switch (rels[i + 1].r_type) {
+- case R_386_PLT32: {
++ case R_386_PLT32:
++ case R_386_PC32: {
+ static const u8 insn[] = {
+ 0x65, 0xa1, 0, 0, 0, 0, // mov %gs:0, %eax
+ 0x81, 0xe8, 0, 0, 0, 0, // add $val, %eax
+@@ -266,7 +267,8 @@ void InputSection<E>::apply_reloc_alloc(Context<E> &ctx, u8 *base) {
+ } else {
+ // Relax LD to LE
+ switch (rels[i + 1].r_type) {
+- case R_386_PLT32: {
++ case R_386_PLT32:
++ case R_386_PC32: {
+ static const u8 insn[] = {
+ 0x31, 0xc0, // xor %eax, %eax
+ 0x65, 0x8b, 0x00, // mov %gs:(%eax), %eax
+--
+2.37.3
+
diff --git a/0004-Fix-name-lookup-for-section-symbols-when-st_shndx-SH.patch b/0004-Fix-name-lookup-for-section-symbols-when-st_shndx-SH.patch
new file mode 100644
index 0000000..54d5859
--- /dev/null
+++ b/0004-Fix-name-lookup-for-section-symbols-when-st_shndx-SH.patch
@@ -0,0 +1,40 @@
+From 8bfdf07e71706162ab98159bf1a412d31ff31e0e Mon Sep 17 00:00:00 2001
+Message-Id: <8bfdf07e71706162ab98159bf1a412d31ff31e0e.1666443387.git.github(a)sicherha.de>
+In-Reply-To: <6c0c571d629d924e3f59d8710de6589848204e17.1666443387.git.github(a)sicherha.de>
+References: <6c0c571d629d924e3f59d8710de6589848204e17.1666443387.git.github(a)sicherha.de>
+From: Christoph Erhardt <github(a)sicherha.de>
+Date: Sat, 22 Oct 2022 14:41:42 +0200
+Subject: [PATCH 4/4] Fix name lookup for section symbols when `st_shndx ==
+ SHN_XINDEX`
+
+When the section-header index has the escape value `SHN_XINDEX`, the
+actual index must be looked up in the separate `SHT_SYMTAB_SHNDX` table.
+Trying to use `SHN_XINDEX` (= 0xffff) as an index results in an
+out-of-bounds read. The error can be observed when running the
+`x86_64_many-sections.sh` test on RHEL 8 or 9 (but not on Fedora,
+because there the assembler doesn't emit section symbols).
+
+Instead of using `st_shndx` directly, call the pre-existing helper
+method `get_shndx()` to get the correct behaviour.
+
+Signed-off-by: Christoph Erhardt <github(a)sicherha.de>
+---
+ elf/input-files.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elf/input-files.cc b/elf/input-files.cc
+index 15ccd634..3c5ca619 100644
+--- a/elf/input-files.cc
++++ b/elf/input-files.cc
+@@ -439,7 +439,7 @@ void ObjectFile<E>::initialize_symbols(Context<E> &ctx) {
+
+ std::string_view name;
+ if (esym.st_type == STT_SECTION)
+- name = this->shstrtab.data() + this->elf_sections[esym.st_shndx].sh_name;
++ name = this->shstrtab.data() + this->elf_sections[get_shndx(esym)].sh_name;
+ else
+ name = this->symbol_strtab.data() + esym.st_name;
+
+--
+2.37.3
+
diff --git a/mold.spec b/mold.spec
index 1a4366c..c8e6959 100644
--- a/mold.spec
+++ b/mold.spec
@@ -1,5 +1,5 @@
Name: mold
-Version: 1.5.1
+Version: 1.6.0
Release: 1%{?dist}
Summary: A Modern Linker
@@ -17,11 +17,15 @@ Patch0: tbb-strip-werror.patch
# Allow building against the system-provided `xxhash.h`
Patch2: 0001-Use-system-compatible-include-path-for-xxhash.h.patch
-# Fix unit test failing on ppc64
-Patch3: 0002-ELF-Fix-test-for-PPC64LE.patch
+# Fix test failure on i386 (https://github.com/rui314/mold/issues/794)
+Patch3: 0002-ELF-i386-Allow-R_386_PC32-after-R_386_TLS_-GD-LDM.patch
+Patch4: 0003-ELF-i386-Fix-assertion-failure.patch
+
+# Fix test failure on epel8/epel9 (https://github.com/rui314/mold/pull/809)
+Patch5: 0004-Fix-name-lookup-for-section-symbols-when-st_shndx-SH.patch
# mold can currently produce native binaries for these architectures only
-ExclusiveArch: %{ix86} x86_64 %{arm32} aarch64 ppc64le %{riscv32} %{riscv64} sparc64 sparc64v
+ExclusiveArch: %{ix86} x86_64 %{arm32} aarch64 %{power64} %{riscv32} %{riscv64} s390x sparc64 sparc64v
BuildRequires: cmake
%if 0%{?el8}
@@ -36,6 +40,9 @@ BuildRequires: openssl-devel
BuildRequires: xxhash-devel
BuildRequires: zlib-devel
+# Required by bundled oneTBB
+BuildRequires: hwloc-devel
+
# The following packages are only required for executing the tests
BuildRequires: clang
BuildRequires: gdb
@@ -104,6 +111,11 @@ fi
%{_mandir}/man1/mold.1*
%changelog
+* Sat Oct 22 2022 Christoph Erhardt <fedora(a)sicherha.de> - 1.6.0-1
+- Bump version to 1.6.0
+- Add new supported architectures
+- Drop upstreamed patch
+
* Thu Sep 29 2022 Christoph Erhardt <fedora(a)sicherha.de> - 1.5.1-1
- Bump version to 1.5.1 (#2130132)
- Switch to CMake build
diff --git a/sources b/sources
index ce2f44f..99d30c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mold-1.5.1.tar.gz) = 340a45c5190ce5ba87eaa05238da7c70400bf4a2788a095935b9675593078ad76bbd95e67aa36b3ec683428724a3c6bc27c7e0a69569afce461682dc4bd16b10
+SHA512 (mold-1.6.0.tar.gz) = dcb498da95ee02a08b175861ae24f3793705671670f6f3487eebd3aab2487fd2163fc1747c9ca2fd1c3570a5f1f0bcfd7d4d91bf6a904a1ba098be6cbbe8c857
https://src.fedoraproject.org/rpms/mold/c/8eff4703e522bd023a611881fd20d3d...
1Â year, 7Â months
martinkg pushed to rpms/vdr-skinnopacity (f36). "Update to 1.1.13"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-10-22 15:24:56 UTC
From bf16912c5c80bb82e70235c424bc8bd301db4b96 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser(a)online.de>
Date: Oct 22 2022 15:22:18 +0000
Subject: Update to 1.1.13
---
diff --git a/.gitignore b/.gitignore
index 0090be0..e2fd2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/SkinNopacity-1.1.10.tar.bz2
/SkinNopacity-1.1.11.tar.bz2
/SkinNopacity-1.1.12.tar.bz2
+/SkinNopacity-1.1.13.tar.bz2
diff --git a/sources b/sources
index 822610a..a391c08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (SkinNopacity-1.1.12.tar.bz2) = 2226b5b301273cfc3ee05d77ac0e8fb886c98f451185c5c0a860acb78fd3514520f8421be01b383b2200e5ff570d0b7ef7b8928284eea1555fb60a00ec44f881
+SHA512 (SkinNopacity-1.1.13.tar.bz2) = 04464e36d2b868e106ce32daf1489a0770eeea62eb71040764ddedf1c697fd42c911a3c3649474162369805d415f82b0518204b3ca300c59c4e22ab1c8774c9c
diff --git a/vdr-skinnopacity.spec b/vdr-skinnopacity.spec
index 6c86bd1..b881e1a 100644
--- a/vdr-skinnopacity.spec
+++ b/vdr-skinnopacity.spec
@@ -11,8 +11,8 @@
Name: vdr-skinnopacity
-Version: 1.1.12
-Release: 2%{?dist}
+Version: 1.1.13
+Release: 1%{?dist}
Summary: A highly customizable native true color skin for the Video Disc Recorder
License: GPLv2+
@@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \
%{vdr_resdir}/plugins/skinnopacity/icons/
%changelog
+* Sat Oct 22 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.13-1
+- Update to 1.1.13
+
* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
https://src.fedoraproject.org/rpms/vdr-skinnopacity/c/bf16912c5c80bb82e70...
1Â year, 7Â months
martinkg pushed to rpms/vdr-skinnopacity (f37). "Update to 1.1.13"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-10-22 15:22:53 UTC
From bf16912c5c80bb82e70235c424bc8bd301db4b96 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser(a)online.de>
Date: Oct 22 2022 15:22:18 +0000
Subject: Update to 1.1.13
---
diff --git a/.gitignore b/.gitignore
index 0090be0..e2fd2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/SkinNopacity-1.1.10.tar.bz2
/SkinNopacity-1.1.11.tar.bz2
/SkinNopacity-1.1.12.tar.bz2
+/SkinNopacity-1.1.13.tar.bz2
diff --git a/sources b/sources
index 822610a..a391c08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (SkinNopacity-1.1.12.tar.bz2) = 2226b5b301273cfc3ee05d77ac0e8fb886c98f451185c5c0a860acb78fd3514520f8421be01b383b2200e5ff570d0b7ef7b8928284eea1555fb60a00ec44f881
+SHA512 (SkinNopacity-1.1.13.tar.bz2) = 04464e36d2b868e106ce32daf1489a0770eeea62eb71040764ddedf1c697fd42c911a3c3649474162369805d415f82b0518204b3ca300c59c4e22ab1c8774c9c
diff --git a/vdr-skinnopacity.spec b/vdr-skinnopacity.spec
index 6c86bd1..b881e1a 100644
--- a/vdr-skinnopacity.spec
+++ b/vdr-skinnopacity.spec
@@ -11,8 +11,8 @@
Name: vdr-skinnopacity
-Version: 1.1.12
-Release: 2%{?dist}
+Version: 1.1.13
+Release: 1%{?dist}
Summary: A highly customizable native true color skin for the Video Disc Recorder
License: GPLv2+
@@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \
%{vdr_resdir}/plugins/skinnopacity/icons/
%changelog
+* Sat Oct 22 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.13-1
+- Update to 1.1.13
+
* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
https://src.fedoraproject.org/rpms/vdr-skinnopacity/c/bf16912c5c80bb82e70...
1Â year, 7Â months
martinkg pushed to rpms/vdr-skinnopacity (rawhide). "Update to 1.1.13"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-10-22 15:22:24 UTC
From bf16912c5c80bb82e70235c424bc8bd301db4b96 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser(a)online.de>
Date: Oct 22 2022 15:22:18 +0000
Subject: Update to 1.1.13
---
diff --git a/.gitignore b/.gitignore
index 0090be0..e2fd2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/SkinNopacity-1.1.10.tar.bz2
/SkinNopacity-1.1.11.tar.bz2
/SkinNopacity-1.1.12.tar.bz2
+/SkinNopacity-1.1.13.tar.bz2
diff --git a/sources b/sources
index 822610a..a391c08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (SkinNopacity-1.1.12.tar.bz2) = 2226b5b301273cfc3ee05d77ac0e8fb886c98f451185c5c0a860acb78fd3514520f8421be01b383b2200e5ff570d0b7ef7b8928284eea1555fb60a00ec44f881
+SHA512 (SkinNopacity-1.1.13.tar.bz2) = 04464e36d2b868e106ce32daf1489a0770eeea62eb71040764ddedf1c697fd42c911a3c3649474162369805d415f82b0518204b3ca300c59c4e22ab1c8774c9c
diff --git a/vdr-skinnopacity.spec b/vdr-skinnopacity.spec
index 6c86bd1..b881e1a 100644
--- a/vdr-skinnopacity.spec
+++ b/vdr-skinnopacity.spec
@@ -11,8 +11,8 @@
Name: vdr-skinnopacity
-Version: 1.1.12
-Release: 2%{?dist}
+Version: 1.1.13
+Release: 1%{?dist}
Summary: A highly customizable native true color skin for the Video Disc Recorder
License: GPLv2+
@@ -77,6 +77,9 @@ install -Dpm 644 %{SOURCE1} \
%{vdr_resdir}/plugins/skinnopacity/icons/
%changelog
+* Sat Oct 22 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 1.1.13-1
+- Update to 1.1.13
+
* Sat Jul 23 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
https://src.fedoraproject.org/rpms/vdr-skinnopacity/c/bf16912c5c80bb82e70...
1Â year, 7Â months
eclipseo pushed to rpms/golang-github-distribution-3 (rawhide).
"Update to 3.0.0 pre1 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-10-22 15:22:03 UTC
From 5d43055f9e6e3db2d773a6d3344c079d952d6aaa Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Oct 22 2022 15:21:53 +0000
Subject: Update to 3.0.0 pre1
Close: rhbz#2067394, rhbz#2067427
---
diff --git a/.gitignore b/.gitignore
index 58d7be4..413090d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/distribution-b60926597a1bd5d4841d0cb010ddd0c357f53803.tar.gz
+/distribution-0122d7ddaec0be0f16a788ed7b4130b444c21df1.tar.gz
diff --git a/golang-github-distribution-3.spec b/golang-github-distribution-3.spec
index eb5848e..56981cd 100644
--- a/golang-github-distribution-3.spec
+++ b/golang-github-distribution-3.spec
@@ -1,78 +1,41 @@
-# Generated by go2rpm 1.6.0
+# Generated by go2rpm 1.8.2
%bcond_without check
# https://github.com/distribution/distribution
%global goipath github.com/distribution/distribution/v3
-%global forgeurl https://github.com/distribution/distribution
-Version: 2.8.0~beta.1
-%global commit b60926597a1bd5d4841d0cb010ddd0c357f53803
+Version: 3.0.0
+%global commit 0122d7ddaec0be0f16a788ed7b4130b444c21df1
%gometa
-%global goaltipaths github.com/docker/distribution
-
%global common_description %{expand:
-The toolkit to pack, ship, store, and deliver container content.}
+The Docker toolset to pack, ship, store, and deliver content.
+
+This repository's main product is the Docker Registry 2.0 implementation for
+storing and distributing Docker images. It supersedes the docker/docker-registry
+project with a new API design, focused around security and performance.}
%global golicenses LICENSE
-%global godocs docs ADOPTERS.md BUILDING.md CODE-OF-CONDUCT.md\\\
- CONTRIBUTING.md GOVERNANCE.md README.md ROADMAP.md
+%global godocs docs BUILDING.md CONTRIBUTING.md README.md ROADMAP.md
Name: %{goname}
-Release: %autorelease
-Summary: The toolkit to pack, ship, store, and deliver container content
+Release: %autorelease -p -e pre1
+Summary: Docker toolkit to pack, ship, store, and deliver container content
-# Upstream license specification: Apache-2.0
-License: ASL 2.0
+License: Apache-2.0
URL: %{gourl}
-Source0: %{gosource}
-
-BuildRequires: golang(github.com/aws/aws-sdk-go/aws)
-BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr)
-BuildRequires: golang(github.com/aws/aws-sdk-go/aws/corehandlers)
-BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials)
-BuildRequires: golang(github.com/aws/aws-sdk-go/aws/endpoints)
-BuildRequires: golang(github.com/aws/aws-sdk-go/aws/request)
-BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session)
-BuildRequires: golang(github.com/aws/aws-sdk-go/service/cloudfront/sign)
-BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3)
-BuildRequires: golang(github.com/Azure/azure-sdk-for-go/storage)
-BuildRequires: golang(github.com/bshuster-repo/logrus-logstash-hook)
-BuildRequires: golang(github.com/bugsnag/bugsnag-go)
-BuildRequires: golang(github.com/denverdino/aliyungo/cdn/auth)
-BuildRequires: golang(github.com/docker/go-events)
-BuildRequires: golang(github.com/docker/go-metrics)
-BuildRequires: golang(github.com/docker/libtrust)
-BuildRequires: golang(github.com/gomodule/redigo/redis)
-BuildRequires: golang(github.com/gorilla/handlers)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/mitchellh/mapstructure)
-BuildRequires: golang(github.com/ncw/swift)
-BuildRequires: golang(github.com/opencontainers/go-digest)
-BuildRequires: golang(github.com/opencontainers/image-spec/specs-go/v1)
-BuildRequires: golang(github.com/Shopify/logrus-bugsnag)
-BuildRequires: golang(github.com/sirupsen/logrus)
-BuildRequires: golang(github.com/spf13/cobra)
-BuildRequires: golang(github.com/yvasiyarov/gorelic)
-BuildRequires: golang(golang.org/x/crypto/acme)
-BuildRequires: golang(golang.org/x/crypto/acme/autocert)
-BuildRequires: golang(golang.org/x/crypto/bcrypt)
-BuildRequires: golang(gopkg.in/check.v1)
-BuildRequires: golang(gopkg.in/yaml.v2)
-
-%if %{with check}
-# Tests
-BuildRequires: golang(github.com/ncw/swift/swifttest)
-%endif
+Source: %{gosource}
-%description
-%{common_description}
+%description %{common_description}
%gopkg
%prep
%goprep
+%generate_buildrequires
+%go_generate_buildrequires
+
%build
for cmd in cmd/* ; do
%gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
@@ -85,19 +48,32 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%if %{with check}
%check
-%gocheck -d health/checks \
- -d registry/storage \
- -t registry/storage/driver
+for test in "TestHTTPChecker" \
+ "TestFileReaderSeek" \
+ "TestListObjectsV2" \
+ "TestGracefulShutdown" \
+; do
+awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test)
+done
+%if 0%{?__isa_bits} == 32
+%gocheck -d registry/storage/driver/inmemory \
+ -d registry/handlers \
+ -d registry/storage/driver/swift \
+ -d registry/storage/driver/filesystem
+%else
+%gocheck -d registry/storage/driver/inmemory \
+ -d registry/handlers
+%endif
%endif
%files
%license LICENSE
-%doc docs ADOPTERS.md BUILDING.md CODE-OF-CONDUCT.md CONTRIBUTING.md
-%doc GOVERNANCE.md README.md ROADMAP.md
-%{_bindir}/*
+%doc docs BUILDING.md CONTRIBUTING.md README.md ROADMAP.md
+%{_bindir}/digest
+%{_bindir}/registry-api-descriptor-template
+%{_bindir}/registry
%gopkgfiles
%changelog
-* Sat Jan 29 2022 Robert-André Mauchin <zebob.m(a)gmail.com> 2.8.0~beta.1-1
-- Uncommitted changes
+%autochangelog
diff --git a/sources b/sources
index ccaab67..0994251 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (distribution-b60926597a1bd5d4841d0cb010ddd0c357f53803.tar.gz) = 5ec9e7e328d25aaba490066965bd25992efcedb478a446c40e803ce4e0fa7d438a7b7a7bcfb9ed62465571e66abc9bed00d8fee582fd4ecdc1b390aeec0fee68
+SHA512 (distribution-0122d7ddaec0be0f16a788ed7b4130b444c21df1.tar.gz) = 8a9c65de03c37a47537c9a286c3cf92b3e14a0c9cd35f6ab16c92cbf80b5f5c9291b6814a675b6dbc148532088846760ad55b74ce4138478233ec968a03d2c9d
https://src.fedoraproject.org/rpms/golang-github-distribution-3/c/5d43055...
1Â year, 7Â months
eclipseo pushed to rpms/golang-github-moby-buildkit (rawhide).
"Update tp 0.10.4 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-10-22 15:12:46 UTC
From f52156dd870d7c334ad679507dd6653097c50e80 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Oct 22 2022 15:12:35 +0000
Subject: Update tp 0.10.4
Close: rhbz#2010717, rhbz#2045544, rhbz#2067399, rhbz#2067431, rhbz#2074260
---
diff --git a/0001-Remove-dependency-on-InstrumentationLibrary.patch b/0001-Remove-dependency-on-InstrumentationLibrary.patch
new file mode 100644
index 0000000..b488a44
--- /dev/null
+++ b/0001-Remove-dependency-on-InstrumentationLibrary.patch
@@ -0,0 +1,468 @@
+From 368fcecd85c2997051797152d4c0b412063a429b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Sun, 16 Oct 2022 21:40:26 +0200
+Subject: [PATCH] Remove dependency on InstrumentationLibrary
+
+---
+ .directory | 4 +
+ cmd/buildkitd/main.go | 5 -
+ control/control.go | 5 -
+ util/.directory | 4 +
+ util/tracing/transform/attribute.go | 91 --------
+ util/tracing/transform/instrumentation.go | 17 --
+ util/tracing/transform/span.go | 254 ----------------------
+ 7 files changed, 8 insertions(+), 372 deletions(-)
+ create mode 100644 .directory
+ create mode 100644 util/.directory
+ delete mode 100644 util/tracing/transform/attribute.go
+ delete mode 100644 util/tracing/transform/instrumentation.go
+ delete mode 100644 util/tracing/transform/span.go
+
+diff --git a/.directory b/.directory
+new file mode 100644
+index 00000000..89400592
+--- /dev/null
++++ b/.directory
+@@ -0,0 +1,4 @@
++[Dolphin]
++HeaderColumnWidths=683,96,170,105
++Timestamp=2022,10,16,21,33,17.709
++Version=4
+diff --git a/cmd/buildkitd/main.go b/cmd/buildkitd/main.go
+index 126ba0db..c90b93dc 100644
+--- a/cmd/buildkitd/main.go
++++ b/cmd/buildkitd/main.go
+@@ -51,7 +51,6 @@ import (
+ "github.com/moby/buildkit/util/tracing/detect"
+ _ "github.com/moby/buildkit/util/tracing/detect/jaeger"
+ _ "github.com/moby/buildkit/util/tracing/env"
+- "github.com/moby/buildkit/util/tracing/transform"
+ "github.com/moby/buildkit/version"
+ "github.com/moby/buildkit/worker"
+ ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
+@@ -803,9 +802,5 @@ type traceCollector struct {
+ }
+
+ func (t *traceCollector) Export(ctx context.Context, req *tracev1.ExportTraceServiceRequest) (*tracev1.ExportTraceServiceResponse, error) {
+- err := t.exporter.ExportSpans(ctx, transform.Spans(req.GetResourceSpans()))
+- if err != nil {
+- return nil, err
+- }
+ return &tracev1.ExportTraceServiceResponse{}, nil
+ }
+diff --git a/control/control.go b/control/control.go
+index 0d3e7976..91fbdf37 100644
+--- a/control/control.go
++++ b/control/control.go
+@@ -22,7 +22,6 @@ import (
+ "github.com/moby/buildkit/solver/pb"
+ "github.com/moby/buildkit/util/imageutil"
+ "github.com/moby/buildkit/util/throttle"
+- "github.com/moby/buildkit/util/tracing/transform"
+ "github.com/moby/buildkit/worker"
+ "github.com/pkg/errors"
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
+@@ -198,10 +197,6 @@ func (c *Controller) Export(ctx context.Context, req *tracev1.ExportTraceService
+ if c.opt.TraceCollector == nil {
+ return nil, status.Errorf(codes.Unavailable, "trace collector not configured")
+ }
+- err := c.opt.TraceCollector.ExportSpans(ctx, transform.Spans(req.GetResourceSpans()))
+- if err != nil {
+- return nil, err
+- }
+ return &tracev1.ExportTraceServiceResponse{}, nil
+ }
+
+diff --git a/util/.directory b/util/.directory
+new file mode 100644
+index 00000000..f736a0a1
+--- /dev/null
++++ b/util/.directory
+@@ -0,0 +1,4 @@
++[Dolphin]
++HeaderColumnWidths=683,96,170,105
++Timestamp=2022,10,16,21,33,56.665
++Version=4
+diff --git a/util/tracing/transform/attribute.go b/util/tracing/transform/attribute.go
+deleted file mode 100644
+index 2debe883..00000000
+--- a/util/tracing/transform/attribute.go
++++ /dev/null
+@@ -1,91 +0,0 @@
+-package transform
+-
+-import (
+- "go.opentelemetry.io/otel/attribute"
+- commonpb "go.opentelemetry.io/proto/otlp/common/v1"
+-)
+-
+-// Attributes transforms a slice of OTLP attribute key-values into a slice of KeyValues
+-func Attributes(attrs []*commonpb.KeyValue) []attribute.KeyValue {
+- if len(attrs) == 0 {
+- return nil
+- }
+-
+- out := make([]attribute.KeyValue, 0, len(attrs))
+- for _, a := range attrs {
+- kv := attribute.KeyValue{
+- Key: attribute.Key(a.Key),
+- Value: toValue(a.Value),
+- }
+- out = append(out, kv)
+- }
+- return out
+-}
+-
+-func toValue(v *commonpb.AnyValue) attribute.Value {
+- switch vv := v.Value.(type) {
+- case *commonpb.AnyValue_BoolValue:
+- return attribute.BoolValue(vv.BoolValue)
+- case *commonpb.AnyValue_IntValue:
+- return attribute.Int64Value(vv.IntValue)
+- case *commonpb.AnyValue_DoubleValue:
+- return attribute.Float64Value(vv.DoubleValue)
+- case *commonpb.AnyValue_StringValue:
+- return attribute.StringValue(vv.StringValue)
+- case *commonpb.AnyValue_ArrayValue:
+- return arrayValues(vv.ArrayValue.Values)
+- default:
+- return attribute.StringValue("INVALID")
+- }
+-}
+-
+-func boolArray(kv []*commonpb.AnyValue) attribute.Value {
+- arr := make([]bool, len(kv))
+- for i, v := range kv {
+- arr[i] = v.GetBoolValue()
+- }
+- return attribute.BoolSliceValue(arr)
+-}
+-
+-func intArray(kv []*commonpb.AnyValue) attribute.Value {
+- arr := make([]int64, len(kv))
+- for i, v := range kv {
+- arr[i] = v.GetIntValue()
+- }
+- return attribute.Int64SliceValue(arr)
+-}
+-
+-func doubleArray(kv []*commonpb.AnyValue) attribute.Value {
+- arr := make([]float64, len(kv))
+- for i, v := range kv {
+- arr[i] = v.GetDoubleValue()
+- }
+- return attribute.Float64SliceValue(arr)
+-}
+-
+-func stringArray(kv []*commonpb.AnyValue) attribute.Value {
+- arr := make([]string, len(kv))
+- for i, v := range kv {
+- arr[i] = v.GetStringValue()
+- }
+- return attribute.StringSliceValue(arr)
+-}
+-
+-func arrayValues(kv []*commonpb.AnyValue) attribute.Value {
+- if len(kv) == 0 {
+- return attribute.StringSliceValue([]string{})
+- }
+-
+- switch kv[0].Value.(type) {
+- case *commonpb.AnyValue_BoolValue:
+- return boolArray(kv)
+- case *commonpb.AnyValue_IntValue:
+- return intArray(kv)
+- case *commonpb.AnyValue_DoubleValue:
+- return doubleArray(kv)
+- case *commonpb.AnyValue_StringValue:
+- return stringArray(kv)
+- default:
+- return attribute.StringSliceValue([]string{})
+- }
+-}
+diff --git a/util/tracing/transform/instrumentation.go b/util/tracing/transform/instrumentation.go
+deleted file mode 100644
+index 216a364c..00000000
+--- a/util/tracing/transform/instrumentation.go
++++ /dev/null
+@@ -1,17 +0,0 @@
+-package transform
+-
+-import (
+- commonpb "go.opentelemetry.io/proto/otlp/common/v1"
+-
+- "go.opentelemetry.io/otel/sdk/instrumentation"
+-)
+-
+-func instrumentationLibrary(il *commonpb.InstrumentationLibrary) instrumentation.Library {
+- if il == nil {
+- return instrumentation.Library{}
+- }
+- return instrumentation.Library{
+- Name: il.Name,
+- Version: il.Version,
+- }
+-}
+diff --git a/util/tracing/transform/span.go b/util/tracing/transform/span.go
+deleted file mode 100644
+index f07d0c98..00000000
+--- a/util/tracing/transform/span.go
++++ /dev/null
+@@ -1,254 +0,0 @@
+-package transform
+-
+-import (
+- "time"
+-
+- "go.opentelemetry.io/otel/attribute"
+- "go.opentelemetry.io/otel/codes"
+- "go.opentelemetry.io/otel/sdk/instrumentation"
+- "go.opentelemetry.io/otel/sdk/resource"
+- tracesdk "go.opentelemetry.io/otel/sdk/trace"
+- "go.opentelemetry.io/otel/trace"
+- v11 "go.opentelemetry.io/proto/otlp/common/v1"
+- v1 "go.opentelemetry.io/proto/otlp/resource/v1"
+- tracepb "go.opentelemetry.io/proto/otlp/trace/v1"
+-)
+-
+-const (
+- maxMessageEventsPerSpan = 128
+-)
+-
+-// Spans transforms slice of OTLP ResourceSpan into a slice of SpanSnapshots.
+-func Spans(sdl []*tracepb.ResourceSpans) []tracesdk.ReadOnlySpan {
+- if len(sdl) == 0 {
+- return nil
+- }
+-
+- var out []tracesdk.ReadOnlySpan
+-
+- for _, sd := range sdl {
+- if sd == nil {
+- continue
+- }
+-
+- for _, sdi := range sd.InstrumentationLibrarySpans {
+- sda := make([]tracesdk.ReadOnlySpan, len(sdi.Spans))
+- for i, s := range sdi.Spans {
+- sda[i] = &readOnlySpan{
+- pb: s,
+- il: sdi.InstrumentationLibrary,
+- resource: sd.Resource,
+- schemaURL: sd.SchemaUrl,
+- }
+- }
+- out = append(out, sda...)
+- }
+- }
+-
+- return out
+-}
+-
+-type readOnlySpan struct {
+- // Embed the interface to implement the private method.
+- tracesdk.ReadOnlySpan
+-
+- pb *tracepb.Span
+- il *v11.InstrumentationLibrary
+- resource *v1.Resource
+- schemaURL string
+-}
+-
+-func (s *readOnlySpan) Name() string {
+- return s.pb.Name
+-}
+-
+-func (s *readOnlySpan) SpanContext() trace.SpanContext {
+- var tid trace.TraceID
+- copy(tid[:], s.pb.TraceId)
+- var sid trace.SpanID
+- copy(sid[:], s.pb.SpanId)
+-
+- st, _ := trace.ParseTraceState(s.pb.TraceState)
+-
+- return trace.NewSpanContext(trace.SpanContextConfig{
+- TraceID: tid,
+- SpanID: sid,
+- TraceState: st,
+- })
+-}
+-
+-func (s *readOnlySpan) Parent() trace.SpanContext {
+- if len(s.pb.ParentSpanId) == 0 {
+- return trace.SpanContext{}
+- }
+- var tid trace.TraceID
+- copy(tid[:], s.pb.TraceId)
+- var psid trace.SpanID
+- copy(psid[:], s.pb.ParentSpanId)
+- return trace.NewSpanContext(trace.SpanContextConfig{
+- TraceID: tid,
+- SpanID: psid,
+- })
+-}
+-
+-func (s *readOnlySpan) SpanKind() trace.SpanKind {
+- return spanKind(s.pb.Kind)
+-}
+-
+-func (s *readOnlySpan) StartTime() time.Time {
+- return time.Unix(0, int64(s.pb.StartTimeUnixNano))
+-}
+-
+-func (s *readOnlySpan) EndTime() time.Time {
+- return time.Unix(0, int64(s.pb.EndTimeUnixNano))
+-}
+-
+-func (s *readOnlySpan) Attributes() []attribute.KeyValue {
+- return Attributes(s.pb.Attributes)
+-}
+-
+-func (s *readOnlySpan) Links() []tracesdk.Link {
+- return links(s.pb.Links)
+-}
+-
+-func (s *readOnlySpan) Events() []tracesdk.Event {
+- return spanEvents(s.pb.Events)
+-}
+-
+-func (s *readOnlySpan) Status() tracesdk.Status {
+- return tracesdk.Status{
+- Code: statusCode(s.pb.Status),
+- Description: s.pb.Status.GetMessage(),
+- }
+-}
+-
+-func (s *readOnlySpan) InstrumentationLibrary() instrumentation.Library {
+- return instrumentationLibrary(s.il)
+-}
+-
+-// Resource returns information about the entity that produced the span.
+-func (s *readOnlySpan) Resource() *resource.Resource {
+- if s.resource == nil {
+- return nil
+- }
+- if s.schemaURL != "" {
+- return resource.NewWithAttributes(s.schemaURL, Attributes(s.resource.Attributes)...)
+- }
+- return resource.NewSchemaless(Attributes(s.resource.Attributes)...)
+-}
+-
+-// DroppedAttributes returns the number of attributes dropped by the span
+-// due to limits being reached.
+-func (s *readOnlySpan) DroppedAttributes() int {
+- return int(s.pb.DroppedAttributesCount)
+-}
+-
+-// DroppedLinks returns the number of links dropped by the span due to
+-// limits being reached.
+-func (s *readOnlySpan) DroppedLinks() int {
+- return int(s.pb.DroppedLinksCount)
+-}
+-
+-// DroppedEvents returns the number of events dropped by the span due to
+-// limits being reached.
+-func (s *readOnlySpan) DroppedEvents() int {
+- return int(s.pb.DroppedEventsCount)
+-}
+-
+-// ChildSpanCount returns the count of spans that consider the span a
+-// direct parent.
+-func (s *readOnlySpan) ChildSpanCount() int {
+- return 0
+-}
+-
+-var _ tracesdk.ReadOnlySpan = &readOnlySpan{}
+-
+-// status transform a OTLP span status into span code.
+-func statusCode(st *tracepb.Status) codes.Code {
+- switch st.Code {
+- case tracepb.Status_STATUS_CODE_ERROR:
+- return codes.Error
+- default:
+- return codes.Ok
+- }
+-}
+-
+-// links transforms OTLP span links to span Links.
+-func links(links []*tracepb.Span_Link) []tracesdk.Link {
+- if len(links) == 0 {
+- return nil
+- }
+-
+- sl := make([]tracesdk.Link, 0, len(links))
+- for _, otLink := range links {
+- // This redefinition is necessary to prevent otLink.*ID[:] copies
+- // being reused -- in short we need a new otLink per iteration.
+- otLink := otLink
+-
+- var tid trace.TraceID
+- copy(tid[:], otLink.TraceId)
+- var sid trace.SpanID
+- copy(sid[:], otLink.SpanId)
+-
+- sctx := trace.NewSpanContext(trace.SpanContextConfig{
+- TraceID: tid,
+- SpanID: sid,
+- })
+-
+- sl = append(sl, tracesdk.Link{
+- SpanContext: sctx,
+- Attributes: Attributes(otLink.Attributes),
+- })
+- }
+- return sl
+-}
+-
+-// spanEvents transforms OTLP span events to span Events.
+-func spanEvents(es []*tracepb.Span_Event) []tracesdk.Event {
+- if len(es) == 0 {
+- return nil
+- }
+-
+- evCount := len(es)
+- if evCount > maxMessageEventsPerSpan {
+- evCount = maxMessageEventsPerSpan
+- }
+- events := make([]tracesdk.Event, 0, evCount)
+- messageEvents := 0
+-
+- // Transform message events
+- for _, e := range es {
+- if messageEvents >= maxMessageEventsPerSpan {
+- break
+- }
+- messageEvents++
+- events = append(events,
+- tracesdk.Event{
+- Name: e.Name,
+- Time: time.Unix(0, int64(e.TimeUnixNano)),
+- Attributes: Attributes(e.Attributes),
+- DroppedAttributeCount: int(e.DroppedAttributesCount),
+- },
+- )
+- }
+-
+- return events
+-}
+-
+-// spanKind transforms a an OTLP span kind to SpanKind.
+-func spanKind(kind tracepb.Span_SpanKind) trace.SpanKind {
+- switch kind {
+- case tracepb.Span_SPAN_KIND_INTERNAL:
+- return trace.SpanKindInternal
+- case tracepb.Span_SPAN_KIND_CLIENT:
+- return trace.SpanKindClient
+- case tracepb.Span_SPAN_KIND_SERVER:
+- return trace.SpanKindServer
+- case tracepb.Span_SPAN_KIND_PRODUCER:
+- return trace.SpanKindProducer
+- case tracepb.Span_SPAN_KIND_CONSUMER:
+- return trace.SpanKindConsumer
+- default:
+- return trace.SpanKindUnspecified
+- }
+-}
+--
+2.37.3
+
diff --git a/golang-github-moby-buildkit.spec b/golang-github-moby-buildkit.spec
index e859962..13bbc6b 100644
--- a/golang-github-moby-buildkit.spec
+++ b/golang-github-moby-buildkit.spec
@@ -1,256 +1,116 @@
-# Generated by go2rpm 1.5.0
+# Generated by go2rpm 1.8.1
%bcond_without check
-%bcond_with bootstrap
# https://github.com/moby/buildkit
%global goipath github.com/moby/buildkit
-Version: 0.9.0
+Version: 0.10.4
%gometa
-%if %{with bootstrap}
-%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$
-%endif
-
%global common_description %{expand:
BuildKit is a toolkit for converting source code to build artifacts in an
efficient, expressive and repeatable manner.}
%global golicenses LICENSE
-%global godocs docs examples AUTHORS README.md docs
+%global godocs docs examples AUTHORS README.md
Name: %{goname}
Release: %autorelease
Summary: Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit
-# Upstream license specification: Apache-2.0
-License: ASL 2.0
+License: Apache-2.0
URL: %{gourl}
-Source0: %{gosource}
-# Fail if import comment is kept
-Patch0: 0001-Remove-import-comment.patch
-# See otel rc2 release note https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md...
-Patch1: 0001-Replace-trace.Link-with-tracesdk.Link.patch
-
-%if %{without bootstrap}
-BuildRequires: golang(github.com/agext/levenshtein)
-BuildRequires: golang(github.com/BurntSushi/toml)
-BuildRequires: golang(github.com/containerd/console)
-BuildRequires: golang(github.com/containerd/containerd)
-BuildRequires: golang(github.com/containerd/containerd/api/services/content/v1)
-BuildRequires: golang(github.com/containerd/containerd/api/services/snapshots/v1)
-BuildRequires: golang(github.com/containerd/containerd/archive)
-BuildRequires: golang(github.com/containerd/containerd/archive/compression)
-BuildRequires: golang(github.com/containerd/containerd/cio)
-BuildRequires: golang(github.com/containerd/containerd/containers)
-BuildRequires: golang(github.com/containerd/containerd/content)
-BuildRequires: golang(github.com/containerd/containerd/content/local)
-BuildRequires: golang(github.com/containerd/containerd/content/proxy)
-BuildRequires: golang(github.com/containerd/containerd/defaults)
-BuildRequires: golang(github.com/containerd/containerd/diff)
-BuildRequires: golang(github.com/containerd/containerd/diff/apply)
-BuildRequires: golang(github.com/containerd/containerd/diff/walking)
-BuildRequires: golang(github.com/containerd/containerd/errdefs)
-BuildRequires: golang(github.com/containerd/containerd/filters)
-BuildRequires: golang(github.com/containerd/containerd/gc)
-BuildRequires: golang(github.com/containerd/containerd/images)
-BuildRequires: golang(github.com/containerd/containerd/images/archive)
-BuildRequires: golang(github.com/containerd/containerd/images/converter)
-BuildRequires: golang(github.com/containerd/containerd/images/converter/uncompress)
-BuildRequires: golang(github.com/containerd/containerd/labels)
-BuildRequires: golang(github.com/containerd/containerd/leases)
-BuildRequires: golang(github.com/containerd/containerd/log)
-BuildRequires: golang(github.com/containerd/containerd/metadata)
-BuildRequires: golang(github.com/containerd/containerd/mount)
-BuildRequires: golang(github.com/containerd/containerd/namespaces)
-BuildRequires: golang(github.com/containerd/containerd/oci)
-BuildRequires: golang(github.com/containerd/containerd/pkg/dialer)
-BuildRequires: golang(github.com/containerd/containerd/pkg/seed)
-BuildRequires: golang(github.com/containerd/containerd/pkg/userns)
-BuildRequires: golang(github.com/containerd/containerd/platforms)
-BuildRequires: golang(github.com/containerd/containerd/reference)
-BuildRequires: golang(github.com/containerd/containerd/remotes)
-BuildRequires: golang(github.com/containerd/containerd/remotes/docker)
-BuildRequires: golang(github.com/containerd/containerd/remotes/docker/auth)
-BuildRequires: golang(github.com/containerd/containerd/remotes/docker/schema1)
-BuildRequires: golang(github.com/containerd/containerd/remotes/errors)
-BuildRequires: golang(github.com/containerd/containerd/rootfs)
-BuildRequires: golang(github.com/containerd/containerd/services/content/contentserver)
-BuildRequires: golang(github.com/containerd/containerd/snapshots)
-BuildRequires: golang(github.com/containerd/containerd/snapshots/native)
-BuildRequires: golang(github.com/containerd/containerd/snapshots/overlay)
-BuildRequires: golang(github.com/containerd/containerd/snapshots/overlay/overlayutils)
-BuildRequires: golang(github.com/containerd/containerd/snapshots/proxy)
-BuildRequires: golang(github.com/containerd/containerd/sys)
-BuildRequires: golang(github.com/containerd/continuity)
-BuildRequires: golang(github.com/containerd/continuity/fs)
-BuildRequires: golang(github.com/containerd/continuity/sysx)
-BuildRequires: golang(github.com/containerd/fuse-overlayfs-snapshotter)
-BuildRequires: golang(github.com/containerd/go-cni)
-BuildRequires: golang(github.com/containerd/go-runc)
-BuildRequires: golang(github.com/containerd/stargz-snapshotter/fs)
-BuildRequires: golang(github.com/containerd/stargz-snapshotter/fs/config)
-BuildRequires: golang(github.com/containerd/stargz-snapshotter/fs/source)
-BuildRequires: golang(github.com/containerd/stargz-snapshotter/snapshot)
-BuildRequires: golang(github.com/containerd/typeurl)
-BuildRequires: golang(github.com/coreos/go-systemd/v22/activation)
-BuildRequires: golang(github.com/coreos/go-systemd/v22/daemon)
-BuildRequires: golang(github.com/docker/cli/cli/config)
-BuildRequires: golang(github.com/docker/cli/cli/config/configfile)
-BuildRequires: golang(github.com/docker/cli/cli/connhelper/commandconn)
-BuildRequires: golang(github.com/docker/distribution/reference)
-BuildRequires: golang(github.com/docker/docker/api/types/container)
-BuildRequires: golang(github.com/docker/docker/api/types/strslice)
-BuildRequires: golang(github.com/docker/libnetwork/resolvconf)
-BuildRequires: golang(github.com/docker/libnetwork/types)
-BuildRequires: golang(github.com/docker/docker/pkg/archive)
-BuildRequires: golang(github.com/docker/docker/pkg/chrootarchive)
-BuildRequires: golang(github.com/docker/docker/pkg/fileutils)
-BuildRequires: golang(github.com/docker/docker/pkg/idtools)
-BuildRequires: golang(github.com/docker/docker/pkg/reexec)
-BuildRequires: golang(github.com/docker/docker/pkg/signal)
-BuildRequires: golang(github.com/docker/docker/profiles/seccomp)
-BuildRequires: golang(github.com/docker/docker/testutil/daemon)
-BuildRequires: golang(github.com/docker/go-connections/nat)
-BuildRequires: golang(github.com/docker/go-connections/sockets)
-BuildRequires: golang(github.com/gofrs/flock)
-BuildRequires: golang(github.com/gogo/googleapis/google/rpc)
-BuildRequires: golang(github.com/gogo/protobuf/gogoproto)
-BuildRequires: golang(github.com/gogo/protobuf/proto)
-BuildRequires: golang(github.com/gogo/protobuf/sortkeys)
-BuildRequires: golang(github.com/gogo/protobuf/types)
-BuildRequires: golang(github.com/golang/protobuf/jsonpb)
-BuildRequires: golang(github.com/golang/protobuf/proto)
-BuildRequires: golang(github.com/golang/protobuf/ptypes/any)
-BuildRequires: golang(github.com/golang/protobuf/ptypes/timestamp)
-BuildRequires: golang(github.com/google/shlex)
-BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-middleware)
-BuildRequires: golang(github.com/hashicorp/go-immutable-radix)
-BuildRequires: golang(github.com/hashicorp/golang-lru/simplelru)
-BuildRequires: golang(github.com/mitchellh/hashstructure)
-BuildRequires: golang(github.com/moby/locker)
-BuildRequires: golang(github.com/morikuni/aec)
-BuildRequires: golang(github.com/opencontainers/go-digest)
-BuildRequires: golang(github.com/opencontainers/image-spec/identity)
-BuildRequires: golang(github.com/opencontainers/image-spec/specs-go)
-BuildRequires: golang(github.com/opencontainers/image-spec/specs-go/v1)
-BuildRequires: golang(github.com/opencontainers/runc/libcontainer/user)
-BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go)
-BuildRequires: golang(github.com/opencontainers/selinux/go-selinux)
-BuildRequires: golang(github.com/opencontainers/selinux/go-selinux/label)
-BuildRequires: golang(github.com/pkg/errors)
-BuildRequires: golang(github.com/pkg/profile)
-BuildRequires: golang(github.com/serialx/hashring)
-BuildRequires: golang(github.com/sirupsen/logrus)
-BuildRequires: golang(github.com/stretchr/testify/assert)
-BuildRequires: golang(github.com/stretchr/testify/require)
-BuildRequires: golang(github.com/tonistiigi/fsutil)
-BuildRequires: golang(github.com/tonistiigi/fsutil/copy)
-BuildRequires: golang(github.com/tonistiigi/fsutil/types)
-BuildRequires: golang(github.com/tonistiigi/go-actions-cache)
-BuildRequires: golang(github.com/tonistiigi/units)
-BuildRequires: golang(github.com/tonistiigi/vt100)
-BuildRequires: golang(github.com/urfave/cli)
-BuildRequires: golang(go.etcd.io/bbolt)
-BuildRequires: golang(go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc...
-BuildRequires: golang(go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace)
-BuildRequires: golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)
-BuildRequires: golang(go.opentelemetry.io/otel)
-BuildRequires: golang(go.opentelemetry.io/otel/attribute)
-BuildRequires: golang(go.opentelemetry.io/otel/codes)
-BuildRequires: golang(go.opentelemetry.io/otel/exporters/jaeger)
-BuildRequires: golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace)
-BuildRequires: golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc)
-BuildRequires: golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp)
-BuildRequires: golang(go.opentelemetry.io/otel/propagation)
-BuildRequires: golang(go.opentelemetry.io/otel/sdk/instrumentation)
-BuildRequires: golang(go.opentelemetry.io/otel/sdk/resource)
-BuildRequires: golang(go.opentelemetry.io/otel/sdk/trace)
-BuildRequires: golang(go.opentelemetry.io/otel/semconv/v1.4.0)
-BuildRequires: golang(go.opentelemetry.io/otel/trace)
-BuildRequires: golang(go.opentelemetry.io/proto/otlp/collector/trace/v1)
-BuildRequires: golang(go.opentelemetry.io/proto/otlp/common/v1)
-BuildRequires: golang(go.opentelemetry.io/proto/otlp/resource/v1)
-BuildRequires: golang(go.opentelemetry.io/proto/otlp/trace/v1)
-BuildRequires: golang(golang.org/x/crypto/nacl/sign)
-BuildRequires: golang(golang.org/x/crypto/ssh)
-BuildRequires: golang(golang.org/x/crypto/ssh/agent)
-BuildRequires: golang(golang.org/x/net/context)
-BuildRequires: golang(golang.org/x/net/http2)
-BuildRequires: golang(golang.org/x/net/trace)
-BuildRequires: golang(golang.org/x/sync/errgroup)
-BuildRequires: golang(golang.org/x/sync/semaphore)
-BuildRequires: golang(golang.org/x/sys/unix)
-BuildRequires: golang(golang.org/x/time/rate)
-BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status)
-BuildRequires: golang(google.golang.org/grpc)
-BuildRequires: golang(google.golang.org/grpc/backoff)
-BuildRequires: golang(google.golang.org/grpc/codes)
-BuildRequires: golang(google.golang.org/grpc/credentials)
-BuildRequires: golang(google.golang.org/grpc/health)
-BuildRequires: golang(google.golang.org/grpc/health/grpc_health_v1)
-BuildRequires: golang(google.golang.org/grpc/metadata)
-BuildRequires: golang(google.golang.org/grpc/status)
-
-%if %{with check}
-# Tests
-BuildRequires: golang(github.com/containerd/continuity/fs/fstest)
-BuildRequires: golang(github.com/google/go-cmp/cmp)
-%endif
-%endif
+Source: %{gosource}
+Patch0: 0001-Remove-dependency-on-InstrumentationLibrary.patch
-%description
-%{common_description}
+%description %{common_description}
%gopkg
%prep
%goprep
+# Remove in next release
+sed -i "s|github.com/containerd/stargz-snapshotter/snapshot/overlayutils|github.c..." $(find . -iname "*.go" -type f)
%patch0 -p1
-%patch1 -p1
-# Unmove this in a future version of moby/moby
-# See https://github.com/moby/libnetwork/issues/2522
-sed -i "s|github.com/docker/docker/libnetwork/resolvconf|github.com/docker/libnet..." $(find . -iname "*.go" -type f)
-sed -i "s|github.com/docker/docker/libnetwork/types|github.com/docker/libnetwork/..." $(find . -iname "*.go" -type f)
-%if %{without bootstrap}
+%generate_buildrequires
+%go_generate_buildrequires
+
%build
for cmd in cmd/* ; do
%gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
done
-%endif
%install
%gopkginstall
-%if %{without bootstrap}
install -m 0755 -vd %{buildroot}%{_bindir}
install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
-%endif
-%if %{without bootstrap}
%if %{with check}
%check
-for test in "TestJobsIntegration" \
+for test in "TestMergeOp" \
+ "TestSnapshotExtract" \
+ "TestGetRemotes" \
+ "TestExtractOnMutable" \
+ "TestDiffOp" \
+ "TestChecksumHardlinks" \
+ "TestChecksumBasicFile" \
+ "TestSymlinkAbsDirSuffix" \
+ "TestChecksumIncludeDoubleStar" \
+ "TestChecksumSymlinkNoParentScan" \
+ "TestSymlinksNoFollow" \
+ "TestSymlinkNeedsScan" \
+ "TestPersistence" \
+ "TestChecksumIncludeSymlink" \
+ "TestChecksumWildcardOrFilter" \
+ "TestSymlinkThroughParent" \
+ "TestSymlinkInPathScan" \
+ "TestChecksumIncludeExclude" \
+ "TestClientGatewayIntegration" \
+ "TestIntegration" \
+ "TestCLIIntegration" \
+ "TestFrontendIntegration" \
+ "TestTargetBuildInfo" \
+ "TestMerge" \
+ "TestHardlinks" \
+ "TestUsage" \
+ "TestJobsIntegration" \
+ "TestSubdir" \
+ "TestMultipleReposKeepGitDir" \
+ "TestFetchByTagKeepGitDir" \
+ "TestRepeatedFetchKeepGitDir" \
+ "TestFetchByAnnotatedTagKeepGitDir" \
+ "TestFetchBySHAKeepGitDir" \
+ "TestSubdirKeepGitDir" \
+ "TestMultipleRepos" \
+ "TestFetchByAnnotatedTag" \
+ "TestFetchByTag" \
+ "TestRepeatedFetch" \
+ "TestFetchBySHA" \
+ "TestHTTPDefaultName" \
+ "TestHTTPSource" \
+ "TestHTTPChecksum" \
+ "TestSimpleDiff" \
+ "TestRenameDiff" \
+ "TestEmptyFileDiff" \
+ "TestNestedDeletion" \
+ "TestDirectoryReplace" \
+ "TestRemoveDirectoryTree" \
+ "TestRemoveDirectoryTreeWithDash" \
+ "TestFileReplace" \
+ "TestParentDirectoryPermission" \
+ "TestUpdateWithSameTime" \
+ "TestLchtimes" \
; do
awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test)
done
-# cache: operation not permitted
-%gocheck -t cmd \
- -d cache/contenthash \
- -d client \
- -d frontend \
- -d frontend/dockerfile \
- -t source \
- -d cache
-%endif
+%gocheck
%endif
-%if %{without bootstrap}
%files
%license LICENSE
-%doc docs examples AUTHORS README.md docs
+%doc docs examples AUTHORS README.md
%{_bindir}/*
-%endif
%gopkgfiles
https://src.fedoraproject.org/rpms/golang-github-moby-buildkit/c/f52156dd...
1Â year, 7Â months