* [PR PATCH] go-ipfs: update to 0.17.0.
@ 2022-12-05 16:39 sgn
2022-12-05 16:40 ` sgn
` (21 more replies)
0 siblings, 22 replies; 23+ messages in thread
From: sgn @ 2022-12-05 16:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages go-ipfs
https://github.com/void-linux/void-packages/pull/40919
go-ipfs: update to 0.17.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40919.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-ipfs-40919.patch --]
[-- Type: text/x-diff, Size: 1923 bytes --]
From 633934987f5d06d9e713f4551dcec9564558acea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 5 Dec 2022 23:38:14 +0700
Subject: [PATCH] go-ipfs: update to 0.17.0.
---
srcpkgs/go-ipfs/template | 16 ++++++++--------
srcpkgs/go-ipfs/update | 1 +
2 files changed, 9 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/go-ipfs/update
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e459..316f1d3619da 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,19 +1,19 @@
# Template file for 'go-ipfs'
pkgname=go-ipfs
-version=0.11.0
+version=0.17.0
revision=1
build_style=go
-go_import_path="github.com/ipfs/go-ipfs"
-go_package="${go_import_path}/cmd/ipfs"
+go_import_path="github.com/ipfs/kubo"
+go_package="${go_import_path}/cmd/ipfs ${go_import_path}/cmd/ipfswatch"
hostmakedepends="git"
depends="fs-repo-migrations>=1.7.1"
-short_desc="Global versioned P2P merkle DAG file system"
+short_desc="Global versioned P2P merkle DAG file system - kubo"
maintainer="Christopher Brannon <chris@the-brannons.com>"
license="MIT, Apache-2.0"
-homepage="https://ipfs.io"
-changelog="https://github.com/ipfs/go-ipfs/blob/master/CHANGELOG.md"
-distfiles="https://github.com/ipfs/go-ipfs/archive/v${version}.tar.gz"
-checksum=fb97e50a5d259f0c07c6b6602b52d2bc71b08eaa8601fbbacb454540630be20c
+homepage="https://ipfs.tech"
+changelog="https://github.com/ipfs/kubo/blob/master/CHANGELOG.md"
+distfiles="https://github.com/ipfs/kubo/archive/v${version}.tar.gz"
+checksum=de9f5838464967b8d933c5ac28d7dccd7f9e28257604962df1ca73770768053f
system_accounts="_ipfs"
make_dirs="/var/lib/ipfs 0700 _ipfs _ipfs"
diff --git a/srcpkgs/go-ipfs/update b/srcpkgs/go-ipfs/update
new file mode 100644
index 000000000000..2045ef121f7c
--- /dev/null
+++ b/srcpkgs/go-ipfs/update
@@ -0,0 +1 @@
+pkgname=kubo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
@ 2022-12-05 16:40 ` sgn
2022-12-05 17:17 ` CMB
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2022-12-05 16:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1337694659
Comment:
@sug0 @ElDifinitivo @CMB @NeelChotai
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
2022-12-05 16:40 ` sgn
@ 2022-12-05 17:17 ` CMB
2022-12-06 0:43 ` sgn
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: CMB @ 2022-12-05 17:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]
New comment by CMB on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1337769752
Comment:
Upstream renamed to kubo. Why not rename the package to follow
upstream's name?
[link to relevant section of the void-packages manual](https://github.com/void-linux/void-packages/blob/master/Manual.md#renaming-a-package)
We also have a hot mess in the form of the fs-repo-migrations package.
This is a thing that gets used once after upgrade, to convert the IPFS
repository layout and metadata to a possibly new format.
Most distros don't even bother packaging it, because the ipfs binary
is capable of downloading and running repo migration binaries from the Internet.
When I made the go-ipfs package back in the day, I packaged fs-repo-migrations,
because downloading and running random binaries from the net is not cool.
Nix and Void are possibly the only two distros that package it.
Upstream has made it
difficult to package [fs-repo-migrations issue 148](https://github.com/ipfs/fs-repo-migrations/issues/148),
but that problem is soluble. There's even a draft [pull request](https://github.com/void-linux/void-packages/pull/37775) for it!
Unfortunately, the package fails at runtime when built with Go 1.19.
[fs-repo-migrations issue 156](https://github.com/ipfs/fs-repo-migrations/issues/156)
So if this gets merged, our only recourse right now is to have people remove fs-repo-migrations and use binaries from upstream. Unfortunately that won't work for people on musl.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
2022-12-05 16:40 ` sgn
2022-12-05 17:17 ` CMB
@ 2022-12-06 0:43 ` sgn
2022-12-06 0:58 ` CMB
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2022-12-06 0:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1749 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1338495695
Comment:
> Upstream renamed to kubo. Why not rename the package to follow upstream's name? [link to relevant section of the void-packages manual](https://github.com/void-linux/void-packages/blob/master/Manual.md#renaming-a-package)
I'm not care that must, the binary's name is still `ipfs`.
>
> We also have a hot mess in the form of the fs-repo-migrations package. This is a thing that gets used once after upgrade, to convert the IPFS repository layout and metadata to a possibly new format. Most distros don't even bother packaging it, because the ipfs binary is capable of downloading and running repo migration binaries from the Internet. When I made the go-ipfs package back in the day, I packaged fs-repo-migrations, because downloading and running random binaries from the net is not cool. Nix and Void are possibly the only two distros that package it. Upstream has made it difficult to package [fs-repo-migrations issue 148](https://github.com/ipfs/fs-repo-migrations/issues/148), but that problem is soluble. There's even a draft [pull request](https://github.com/void-linux/void-packages/pull/37775) for it! Unfortunately, the package fails at runtime when built with Go 1.19. [fs-repo-migrations issue 156](https://github.com/ipfs/fs-repo-migrations/issues/156)
Let's see.
> So if this gets merged, our only recourse right now is to have people remove fs-repo-migrations and use binaries from upstream. Unfortunately that won't work for people on musl.
This is about trying to see if https://github.com/void-linux/void-packages/issues/39083 can be resolved.
I can look into them later.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (2 preceding siblings ...)
2022-12-06 0:43 ` sgn
@ 2022-12-06 0:58 ` CMB
2022-12-17 16:51 ` sug0
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: CMB @ 2022-12-06 0:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by CMB on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1338506254
Comment:
> I'm not care that must, the binary's name is still ipfs.
Fair enough.
> This is about trying to see if #39083 can be resolved.
> I can look into them later.
Ok. So if it builds, then ship it I guess?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (3 preceding siblings ...)
2022-12-06 0:58 ` CMB
@ 2022-12-17 16:51 ` sug0
2022-12-17 16:52 ` sug0
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 16:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356330311
Comment:
it's broken under `armv7l-musl`, which is the host architecture of my ipfs node
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (4 preceding siblings ...)
2022-12-17 16:51 ` sug0
@ 2022-12-17 16:52 ` sug0
2022-12-17 17:07 ` sgn
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 16:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356330311
Comment:
it's broken under `armv7l-musl`, which is the host architecture of my ipfs node
```
Error: linux-musl not supported, you must build the binary from source for your platform
```
I think this is because it's trying to fetch `fs-repo-migrations`, and there isn't a build for my arch.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (5 preceding siblings ...)
2022-12-17 16:52 ` sug0
@ 2022-12-17 17:07 ` sgn
2022-12-17 19:28 ` sug0
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2022-12-17 17:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356333390
Comment:
You need to install `fs-repo-migrations` package.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (6 preceding siblings ...)
2022-12-17 17:07 ` sgn
@ 2022-12-17 19:28 ` sug0
2022-12-17 19:30 ` sug0
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 19:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356403961
Comment:
`fs-repo-migrations` is segfaulting on `armv7l-musl` actually. there's another annoying issue: the migrations logic in ipfs is hard-coded to reject musl targets
https://github.com/ipfs/kubo/blob/430a65ad5f78dc2aed0f54946b2c5922fa4b1ee1/repo/fsrepo/migrations/migrations.go#L258-L260
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (7 preceding siblings ...)
2022-12-17 19:28 ` sug0
@ 2022-12-17 19:30 ` sug0
2022-12-17 22:06 ` sug0
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356403961
Comment:
`fs-repo-migrations` is segfaulting on `armv7l-musl` actually. there's another annoying issue: the migrations logic in ipfs is hard-coded to reject musl targets: https://github.com/ipfs/kubo/blob/430a65ad5f78dc2aed0f54946b2c5922fa4b1ee1/repo/fsrepo/migrations/migrations.go#L258-L260
technically it's possible to package each individual `fs-repo-migrations` binary, and remove `fs-repo-migrations`'s package
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (8 preceding siblings ...)
2022-12-17 19:30 ` sug0
@ 2022-12-17 22:06 ` sug0
2022-12-17 22:07 ` sug0
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 22:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 7416 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356485181
Comment:
@sgn I've written a couple of patches that remove the need to package `fs-repo-migrations`:
I've updated the `go-ipfs` template. the diff against this PR is:
<details>
<summary>diff against this PR</summary>
```patch
diff --git a/srcpkgs/go-ipfs/files/README.voidlinux b/srcpkgs/go-ipfs/files/README.voidlinux
new file mode 100644
index 00000000..3840b85d
--- /dev/null
+++ b/srcpkgs/go-ipfs/files/README.voidlinux
@@ -0,0 +1,3 @@
+To migrate between repository versions, install `ipfs-migrate-repo`. This
+package provides the same functionality as `fs-repo-migrations`, but will
+work with `musl` targets, while `fs-repo-migrations` might not.
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 316f1d36..1cd14657 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -6,7 +6,6 @@ build_style=go
go_import_path="github.com/ipfs/kubo"
go_package="${go_import_path}/cmd/ipfs ${go_import_path}/cmd/ipfswatch"
hostmakedepends="git"
-depends="fs-repo-migrations>=1.7.1"
short_desc="Global versioned P2P merkle DAG file system - kubo"
maintainer="Christopher Brannon <chris@the-brannons.com>"
license="MIT, Apache-2.0"
@@ -29,5 +28,6 @@ post_install() {
vlicense LICENSE-MIT
vdoc README.md
vdoc CHANGELOG.md
+ vdoc "${FILESDIR}/README.voidlinux"
vsv ipfs
}
```
</details>
now for the new packages, which replace `fs-repo-migrations`:
<details>
<summary>fs-repo-11-to-12</summary>
```patch
From afe3ade012b0172a4b33244064628dcab50dd62a Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:28:06 +0000
Subject: [PATCH] New package: fs-repo-11-to-12-1.0.2_1
---
.../0001-fs-repo-11-to-12-no-qtls-init.patch | 31 +++++++++++++++++++
srcpkgs/fs-repo-11-to-12/template | 22 +++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
create mode 100644 srcpkgs/fs-repo-11-to-12/template
diff --git a/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
new file mode 100644
index 00000000..f21ca95d
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
@@ -0,0 +1,31 @@
+diff --git a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+index 1bf13d8..94aa684 100644
+--- a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
++++ b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+@@ -1,26 +1,10 @@
+ package qtls
+
+ import (
+- "crypto/tls"
+ "reflect"
+ "unsafe"
+ )
+
+-func init() {
+- if !structsEqual(&tls.ConnectionState{}, &connectionState{}) {
+- panic("qtls.ConnectionState doesn't match")
+- }
+- if !structsEqual(&tls.ClientSessionState{}, &clientSessionState{}) {
+- panic("qtls.ClientSessionState doesn't match")
+- }
+- if !structsEqual(&tls.Config{}, &config{}) {
+- panic("qtls.Config doesn't match")
+- }
+- if !structsEqual(&tls.ClientHelloInfo{}, &clientHelloInfo{}) {
+- panic("qtls.ClientHelloInfo doesn't match")
+- }
+-}
+-
+ func toConnectionState(c connectionState) ConnectionState {
+ return *(*ConnectionState)(unsafe.Pointer(&c))
+ }
diff --git a/srcpkgs/fs-repo-11-to-12/template b/srcpkgs/fs-repo-11-to-12/template
new file mode 100644
index 00000000..93ff060b
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-11-to-12'
+pkgname=fs-repo-11-to-12
+version=1.0.2
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12"
+short_desc="Tool to upgrade an IPFS repository from version 11 to 12"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=e6d6320e280f3118873dfb194b68681fa2747b7893d99831fa6fa2bbb67ebd71
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>fs-repo-12-to-13</summary>
```patch
From e37a435c6467187dac7c931ccba51aaace9e29d5 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:34:38 +0000
Subject: [PATCH] New package: fs-repo-12-to-13-1.0.0_1
---
srcpkgs/fs-repo-12-to-13/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/fs-repo-12-to-13/template
diff --git a/srcpkgs/fs-repo-12-to-13/template b/srcpkgs/fs-repo-12-to-13/template
new file mode 100644
index 00000000..331b8dd8
--- /dev/null
+++ b/srcpkgs/fs-repo-12-to-13/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-12-to-13'
+pkgname=fs-repo-12-to-13
+version=1.0.0
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-12-to-13"
+short_desc="Tool to upgrade an IPFS repository from version 12 to 13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=454b32a86efc410d6edfef20726b36472c1d8f11abc60f2f0722d6fa8d65f94b
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>ipfs-repo-migrations</summary>
```patch
From 1341ce00d9b3b0c8a0be4e72371f8eb9a7165699 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:43:42 +0000
Subject: [PATCH] New package: ipfs-migrate-repo-13-1.0.0_1
---
srcpkgs/ipfs-migrate-repo/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/ipfs-migrate-repo/template
diff --git a/srcpkgs/ipfs-migrate-repo/template b/srcpkgs/ipfs-migrate-repo/template
new file mode 100644
index 00000000..768e3737
--- /dev/null
+++ b/srcpkgs/ipfs-migrate-repo/template
@@ -0,0 +1,16 @@
+# Template file for 'ipfs-migrate-repo'
+pkgname=ipfs-migrate-repo
+version=1.0.0
+revision=1
+short_desc="Tool to upgrade an IPFS repository to newer versions"
+depends="fs-repo-11-to-12 fs-repo-12-to-13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/sug0/ipfs-migrate-repo"
+distfiles="https://github.com/sug0/ipfs-migrate-repo/archive/v${version}.tar.gz"
+checksum=6c2d2e709646b3a615a5a94fce70df5fb0df9742ba7818f5f942f22dd62a48de
+
+do_install() {
+ vdoc README.md
+ vbin ipfs-migrate-repo
+}
--
2.39.0
```
</details>
unfortunately, `armv7l-musl` is segfaulting with `fs-repo-11-to-12`, but for some reason `fs-repo-12-to-13` works fine...
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (9 preceding siblings ...)
2022-12-17 22:06 ` sug0
@ 2022-12-17 22:07 ` sug0
2022-12-17 22:27 ` sug0
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 22:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 7413 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356485181
Comment:
@sgn I've written a couple of patches that remove the need to package `fs-repo-migrations`:
I've updated the `go-ipfs` template. the diff against this PR is:
<details>
<summary>diff against this PR</summary>
```patch
diff --git a/srcpkgs/go-ipfs/files/README.voidlinux b/srcpkgs/go-ipfs/files/README.voidlinux
new file mode 100644
index 00000000..3840b85d
--- /dev/null
+++ b/srcpkgs/go-ipfs/files/README.voidlinux
@@ -0,0 +1,3 @@
+To migrate between repository versions, install `ipfs-migrate-repo`. This
+package provides the same functionality as `fs-repo-migrations`, but will
+work with `musl` targets, while `fs-repo-migrations` might not.
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 316f1d36..1cd14657 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -6,7 +6,6 @@ build_style=go
go_import_path="github.com/ipfs/kubo"
go_package="${go_import_path}/cmd/ipfs ${go_import_path}/cmd/ipfswatch"
hostmakedepends="git"
-depends="fs-repo-migrations>=1.7.1"
short_desc="Global versioned P2P merkle DAG file system - kubo"
maintainer="Christopher Brannon <chris@the-brannons.com>"
license="MIT, Apache-2.0"
@@ -29,5 +28,6 @@ post_install() {
vlicense LICENSE-MIT
vdoc README.md
vdoc CHANGELOG.md
+ vdoc "${FILESDIR}/README.voidlinux"
vsv ipfs
}
```
</details>
now for the new packages, which replace `fs-repo-migrations`:
<details>
<summary>fs-repo-11-to-12</summary>
```patch
From afe3ade012b0172a4b33244064628dcab50dd62a Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:28:06 +0000
Subject: [PATCH] New package: fs-repo-11-to-12-1.0.2_1
---
.../0001-fs-repo-11-to-12-no-qtls-init.patch | 31 +++++++++++++++++++
srcpkgs/fs-repo-11-to-12/template | 22 +++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
create mode 100644 srcpkgs/fs-repo-11-to-12/template
diff --git a/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
new file mode 100644
index 00000000..f21ca95d
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
@@ -0,0 +1,31 @@
+diff --git a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+index 1bf13d8..94aa684 100644
+--- a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
++++ b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+@@ -1,26 +1,10 @@
+ package qtls
+
+ import (
+- "crypto/tls"
+ "reflect"
+ "unsafe"
+ )
+
+-func init() {
+- if !structsEqual(&tls.ConnectionState{}, &connectionState{}) {
+- panic("qtls.ConnectionState doesn't match")
+- }
+- if !structsEqual(&tls.ClientSessionState{}, &clientSessionState{}) {
+- panic("qtls.ClientSessionState doesn't match")
+- }
+- if !structsEqual(&tls.Config{}, &config{}) {
+- panic("qtls.Config doesn't match")
+- }
+- if !structsEqual(&tls.ClientHelloInfo{}, &clientHelloInfo{}) {
+- panic("qtls.ClientHelloInfo doesn't match")
+- }
+-}
+-
+ func toConnectionState(c connectionState) ConnectionState {
+ return *(*ConnectionState)(unsafe.Pointer(&c))
+ }
diff --git a/srcpkgs/fs-repo-11-to-12/template b/srcpkgs/fs-repo-11-to-12/template
new file mode 100644
index 00000000..93ff060b
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-11-to-12'
+pkgname=fs-repo-11-to-12
+version=1.0.2
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12"
+short_desc="Tool to upgrade an IPFS repository from version 11 to 12"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=e6d6320e280f3118873dfb194b68681fa2747b7893d99831fa6fa2bbb67ebd71
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>fs-repo-12-to-13</summary>
```patch
From e37a435c6467187dac7c931ccba51aaace9e29d5 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:34:38 +0000
Subject: [PATCH] New package: fs-repo-12-to-13-1.0.0_1
---
srcpkgs/fs-repo-12-to-13/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/fs-repo-12-to-13/template
diff --git a/srcpkgs/fs-repo-12-to-13/template b/srcpkgs/fs-repo-12-to-13/template
new file mode 100644
index 00000000..331b8dd8
--- /dev/null
+++ b/srcpkgs/fs-repo-12-to-13/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-12-to-13'
+pkgname=fs-repo-12-to-13
+version=1.0.0
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-12-to-13"
+short_desc="Tool to upgrade an IPFS repository from version 12 to 13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=454b32a86efc410d6edfef20726b36472c1d8f11abc60f2f0722d6fa8d65f94b
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>ipfs-migrate-repo</summary>
```patch
From 1341ce00d9b3b0c8a0be4e72371f8eb9a7165699 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:43:42 +0000
Subject: [PATCH] New package: ipfs-migrate-repo-13-1.0.0_1
---
srcpkgs/ipfs-migrate-repo/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/ipfs-migrate-repo/template
diff --git a/srcpkgs/ipfs-migrate-repo/template b/srcpkgs/ipfs-migrate-repo/template
new file mode 100644
index 00000000..768e3737
--- /dev/null
+++ b/srcpkgs/ipfs-migrate-repo/template
@@ -0,0 +1,16 @@
+# Template file for 'ipfs-migrate-repo'
+pkgname=ipfs-migrate-repo
+version=1.0.0
+revision=1
+short_desc="Tool to upgrade an IPFS repository to newer versions"
+depends="fs-repo-11-to-12 fs-repo-12-to-13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/sug0/ipfs-migrate-repo"
+distfiles="https://github.com/sug0/ipfs-migrate-repo/archive/v${version}.tar.gz"
+checksum=6c2d2e709646b3a615a5a94fce70df5fb0df9742ba7818f5f942f22dd62a48de
+
+do_install() {
+ vdoc README.md
+ vbin ipfs-migrate-repo
+}
--
2.39.0
```
</details>
unfortunately, `armv7l-musl` is segfaulting with `fs-repo-11-to-12`, but for some reason `fs-repo-12-to-13` works fine...
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (10 preceding siblings ...)
2022-12-17 22:07 ` sug0
@ 2022-12-17 22:27 ` sug0
2022-12-17 22:28 ` sug0
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 7404 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356485181
Comment:
@sgn I've written a couple of patches that remove the need to package `fs-repo-migrations`:
I've updated the `go-ipfs` template. the diff against this PR is:
<details>
<summary>diff against this PR</summary>
```patch
diff --git a/srcpkgs/go-ipfs/files/README.voidlinux b/srcpkgs/go-ipfs/files/README.voidlinux
new file mode 100644
index 00000000..3840b85d
--- /dev/null
+++ b/srcpkgs/go-ipfs/files/README.voidlinux
@@ -0,0 +1,3 @@
+To migrate between repository versions, install `ipfs-migrate-repo`. This
+package provides the same functionality as `fs-repo-migrations`, but will
+work with `musl` targets, while `fs-repo-migrations` might not.
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 316f1d36..1cd14657 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -6,7 +6,6 @@ build_style=go
go_import_path="github.com/ipfs/kubo"
go_package="${go_import_path}/cmd/ipfs ${go_import_path}/cmd/ipfswatch"
hostmakedepends="git"
-depends="fs-repo-migrations>=1.7.1"
short_desc="Global versioned P2P merkle DAG file system - kubo"
maintainer="Christopher Brannon <chris@the-brannons.com>"
license="MIT, Apache-2.0"
@@ -29,5 +28,6 @@ post_install() {
vlicense LICENSE-MIT
vdoc README.md
vdoc CHANGELOG.md
+ vdoc "${FILESDIR}/README.voidlinux"
vsv ipfs
}
```
</details>
now for the new packages, which replace `fs-repo-migrations`:
<details>
<summary>fs-repo-11-to-12</summary>
```patch
From afe3ade012b0172a4b33244064628dcab50dd62a Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:28:06 +0000
Subject: [PATCH] New package: fs-repo-11-to-12-1.0.2_1
---
.../0001-fs-repo-11-to-12-no-qtls-init.patch | 31 +++++++++++++++++++
srcpkgs/fs-repo-11-to-12/template | 22 +++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
create mode 100644 srcpkgs/fs-repo-11-to-12/template
diff --git a/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
new file mode 100644
index 00000000..f21ca95d
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
@@ -0,0 +1,31 @@
+diff --git a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+index 1bf13d8..94aa684 100644
+--- a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
++++ b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+@@ -1,26 +1,10 @@
+ package qtls
+
+ import (
+- "crypto/tls"
+ "reflect"
+ "unsafe"
+ )
+
+-func init() {
+- if !structsEqual(&tls.ConnectionState{}, &connectionState{}) {
+- panic("qtls.ConnectionState doesn't match")
+- }
+- if !structsEqual(&tls.ClientSessionState{}, &clientSessionState{}) {
+- panic("qtls.ClientSessionState doesn't match")
+- }
+- if !structsEqual(&tls.Config{}, &config{}) {
+- panic("qtls.Config doesn't match")
+- }
+- if !structsEqual(&tls.ClientHelloInfo{}, &clientHelloInfo{}) {
+- panic("qtls.ClientHelloInfo doesn't match")
+- }
+-}
+-
+ func toConnectionState(c connectionState) ConnectionState {
+ return *(*ConnectionState)(unsafe.Pointer(&c))
+ }
diff --git a/srcpkgs/fs-repo-11-to-12/template b/srcpkgs/fs-repo-11-to-12/template
new file mode 100644
index 00000000..93ff060b
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-11-to-12'
+pkgname=fs-repo-11-to-12
+version=1.0.2
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12"
+short_desc="Tool to upgrade an IPFS repository from version 11 to 12"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=e6d6320e280f3118873dfb194b68681fa2747b7893d99831fa6fa2bbb67ebd71
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>fs-repo-12-to-13</summary>
```patch
From e37a435c6467187dac7c931ccba51aaace9e29d5 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:34:38 +0000
Subject: [PATCH] New package: fs-repo-12-to-13-1.0.0_1
---
srcpkgs/fs-repo-12-to-13/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/fs-repo-12-to-13/template
diff --git a/srcpkgs/fs-repo-12-to-13/template b/srcpkgs/fs-repo-12-to-13/template
new file mode 100644
index 00000000..331b8dd8
--- /dev/null
+++ b/srcpkgs/fs-repo-12-to-13/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-12-to-13'
+pkgname=fs-repo-12-to-13
+version=1.0.0
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-12-to-13"
+short_desc="Tool to upgrade an IPFS repository from version 12 to 13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=454b32a86efc410d6edfef20726b36472c1d8f11abc60f2f0722d6fa8d65f94b
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>ipfs-migrate-repo</summary>
```patch
From e65c4a3813de5edbfddb8a823fe50a529092322b Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 22:26:35 +0000
Subject: [PATCH] New package: ipfs-migrate-repo-1.0.2_1
---
srcpkgs/ipfs-migrate-repo/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/ipfs-migrate-repo/template
diff --git a/srcpkgs/ipfs-migrate-repo/template b/srcpkgs/ipfs-migrate-repo/template
new file mode 100644
index 00000000..b032a988
--- /dev/null
+++ b/srcpkgs/ipfs-migrate-repo/template
@@ -0,0 +1,16 @@
+# Template file for 'ipfs-migrate-repo'
+pkgname=ipfs-migrate-repo
+version=1.0.2
+revision=1
+short_desc="Tool to upgrade an IPFS repository to newer versions"
+depends="fs-repo-11-to-12 fs-repo-12-to-13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/sug0/ipfs-migrate-repo"
+distfiles="https://github.com/sug0/ipfs-migrate-repo/archive/v${version}.tar.gz"
+checksum=3e3064ddf0d10bc053f2f1fcea9989071d5ed9471cb924cc845fdf65870e3e4d
+
+do_install() {
+ vdoc README.md
+ vbin ipfs-migrate-repo
+}
--
2.39.0
```
</details>
unfortunately, `armv7l-musl` is segfaulting with `fs-repo-11-to-12`, but for some reason `fs-repo-12-to-13` works fine...
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (11 preceding siblings ...)
2022-12-17 22:27 ` sug0
@ 2022-12-17 22:28 ` sug0
2022-12-18 15:53 ` sug0
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-17 22:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 7522 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356485181
Comment:
@sgn I've written a couple of patches that remove the need to package `fs-repo-migrations`:
I've updated the `go-ipfs` template. the diff against this PR is:
<details>
<summary>diff against this PR</summary>
```patch
diff --git a/srcpkgs/go-ipfs/files/README.voidlinux b/srcpkgs/go-ipfs/files/README.voidlinux
new file mode 100644
index 00000000..3840b85d
--- /dev/null
+++ b/srcpkgs/go-ipfs/files/README.voidlinux
@@ -0,0 +1,3 @@
+To migrate between repository versions, install `ipfs-migrate-repo`. This
+package provides the same functionality as `fs-repo-migrations`, but will
+work with `musl` targets, while `fs-repo-migrations` might not.
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 316f1d36..1cd14657 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -6,7 +6,6 @@ build_style=go
go_import_path="github.com/ipfs/kubo"
go_package="${go_import_path}/cmd/ipfs ${go_import_path}/cmd/ipfswatch"
hostmakedepends="git"
-depends="fs-repo-migrations>=1.7.1"
short_desc="Global versioned P2P merkle DAG file system - kubo"
maintainer="Christopher Brannon <chris@the-brannons.com>"
license="MIT, Apache-2.0"
@@ -29,5 +28,6 @@ post_install() {
vlicense LICENSE-MIT
vdoc README.md
vdoc CHANGELOG.md
+ vdoc "${FILESDIR}/README.voidlinux"
vsv ipfs
}
```
</details>
now for the new packages, which replace `fs-repo-migrations`:
<details>
<summary>fs-repo-11-to-12</summary>
```patch
From afe3ade012b0172a4b33244064628dcab50dd62a Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:28:06 +0000
Subject: [PATCH] New package: fs-repo-11-to-12-1.0.2_1
---
.../0001-fs-repo-11-to-12-no-qtls-init.patch | 31 +++++++++++++++++++
srcpkgs/fs-repo-11-to-12/template | 22 +++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
create mode 100644 srcpkgs/fs-repo-11-to-12/template
diff --git a/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
new file mode 100644
index 00000000..f21ca95d
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
@@ -0,0 +1,31 @@
+diff --git a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+index 1bf13d8..94aa684 100644
+--- a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
++++ b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+@@ -1,26 +1,10 @@
+ package qtls
+
+ import (
+- "crypto/tls"
+ "reflect"
+ "unsafe"
+ )
+
+-func init() {
+- if !structsEqual(&tls.ConnectionState{}, &connectionState{}) {
+- panic("qtls.ConnectionState doesn't match")
+- }
+- if !structsEqual(&tls.ClientSessionState{}, &clientSessionState{}) {
+- panic("qtls.ClientSessionState doesn't match")
+- }
+- if !structsEqual(&tls.Config{}, &config{}) {
+- panic("qtls.Config doesn't match")
+- }
+- if !structsEqual(&tls.ClientHelloInfo{}, &clientHelloInfo{}) {
+- panic("qtls.ClientHelloInfo doesn't match")
+- }
+-}
+-
+ func toConnectionState(c connectionState) ConnectionState {
+ return *(*ConnectionState)(unsafe.Pointer(&c))
+ }
diff --git a/srcpkgs/fs-repo-11-to-12/template b/srcpkgs/fs-repo-11-to-12/template
new file mode 100644
index 00000000..93ff060b
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-11-to-12'
+pkgname=fs-repo-11-to-12
+version=1.0.2
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12"
+short_desc="Tool to upgrade an IPFS repository from version 11 to 12"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=e6d6320e280f3118873dfb194b68681fa2747b7893d99831fa6fa2bbb67ebd71
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>fs-repo-12-to-13</summary>
not needed yet, but it's a future proof against go-ipfs 0.18, that receives yet another repository version upgrade
```patch
From e37a435c6467187dac7c931ccba51aaace9e29d5 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:34:38 +0000
Subject: [PATCH] New package: fs-repo-12-to-13-1.0.0_1
---
srcpkgs/fs-repo-12-to-13/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/fs-repo-12-to-13/template
diff --git a/srcpkgs/fs-repo-12-to-13/template b/srcpkgs/fs-repo-12-to-13/template
new file mode 100644
index 00000000..331b8dd8
--- /dev/null
+++ b/srcpkgs/fs-repo-12-to-13/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-12-to-13'
+pkgname=fs-repo-12-to-13
+version=1.0.0
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-12-to-13"
+short_desc="Tool to upgrade an IPFS repository from version 12 to 13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=454b32a86efc410d6edfef20726b36472c1d8f11abc60f2f0722d6fa8d65f94b
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>ipfs-migrate-repo</summary>
```patch
From e65c4a3813de5edbfddb8a823fe50a529092322b Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 22:26:35 +0000
Subject: [PATCH] New package: ipfs-migrate-repo-1.0.2_1
---
srcpkgs/ipfs-migrate-repo/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/ipfs-migrate-repo/template
diff --git a/srcpkgs/ipfs-migrate-repo/template b/srcpkgs/ipfs-migrate-repo/template
new file mode 100644
index 00000000..b032a988
--- /dev/null
+++ b/srcpkgs/ipfs-migrate-repo/template
@@ -0,0 +1,16 @@
+# Template file for 'ipfs-migrate-repo'
+pkgname=ipfs-migrate-repo
+version=1.0.2
+revision=1
+short_desc="Tool to upgrade an IPFS repository to newer versions"
+depends="fs-repo-11-to-12 fs-repo-12-to-13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/sug0/ipfs-migrate-repo"
+distfiles="https://github.com/sug0/ipfs-migrate-repo/archive/v${version}.tar.gz"
+checksum=3e3064ddf0d10bc053f2f1fcea9989071d5ed9471cb924cc845fdf65870e3e4d
+
+do_install() {
+ vdoc README.md
+ vbin ipfs-migrate-repo
+}
--
2.39.0
```
</details>
unfortunately, `armv7l-musl` is segfaulting with `fs-repo-11-to-12`, but for some reason `fs-repo-12-to-13` works fine...
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (12 preceding siblings ...)
2022-12-17 22:28 ` sug0
@ 2022-12-18 15:53 ` sug0
2022-12-18 16:33 ` sug0
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-18 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 7524 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356485181
Comment:
@sgn I've written a couple of patches that remove the need to package `fs-repo-migrations`:
I've updated the `go-ipfs` template. the diff against this PR is:
<details>
<summary>diff against this PR</summary>
```patch
diff --git a/srcpkgs/go-ipfs/files/README.voidlinux b/srcpkgs/go-ipfs/files/README.voidlinux
new file mode 100644
index 00000000..3840b85d
--- /dev/null
+++ b/srcpkgs/go-ipfs/files/README.voidlinux
@@ -0,0 +1,3 @@
+To migrate between repository versions, install `ipfs-migrate-repo`. This
+package provides the same functionality as `fs-repo-migrations`, but will
+work with `musl` targets, while `fs-repo-migrations` might not.
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 316f1d36..1cd14657 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -6,7 +6,6 @@ build_style=go
go_import_path="github.com/ipfs/kubo"
go_package="${go_import_path}/cmd/ipfs ${go_import_path}/cmd/ipfswatch"
hostmakedepends="git"
-depends="fs-repo-migrations>=1.7.1"
short_desc="Global versioned P2P merkle DAG file system - kubo"
maintainer="Christopher Brannon <chris@the-brannons.com>"
license="MIT, Apache-2.0"
@@ -29,5 +28,6 @@ post_install() {
vlicense LICENSE-MIT
vdoc README.md
vdoc CHANGELOG.md
+ vdoc "${FILESDIR}/README.voidlinux"
vsv ipfs
}
```
</details>
now for the new packages, which replace `fs-repo-migrations`:
<details>
<summary>fs-repo-11-to-12</summary>
```patch
From afe3ade012b0172a4b33244064628dcab50dd62a Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:28:06 +0000
Subject: [PATCH] New package: fs-repo-11-to-12-1.0.2_1
---
.../0001-fs-repo-11-to-12-no-qtls-init.patch | 31 +++++++++++++++++++
srcpkgs/fs-repo-11-to-12/template | 22 +++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
create mode 100644 srcpkgs/fs-repo-11-to-12/template
diff --git a/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
new file mode 100644
index 00000000..f21ca95d
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
@@ -0,0 +1,31 @@
+diff --git a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+index 1bf13d8..94aa684 100644
+--- a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
++++ b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+@@ -1,26 +1,10 @@
+ package qtls
+
+ import (
+- "crypto/tls"
+ "reflect"
+ "unsafe"
+ )
+
+-func init() {
+- if !structsEqual(&tls.ConnectionState{}, &connectionState{}) {
+- panic("qtls.ConnectionState doesn't match")
+- }
+- if !structsEqual(&tls.ClientSessionState{}, &clientSessionState{}) {
+- panic("qtls.ClientSessionState doesn't match")
+- }
+- if !structsEqual(&tls.Config{}, &config{}) {
+- panic("qtls.Config doesn't match")
+- }
+- if !structsEqual(&tls.ClientHelloInfo{}, &clientHelloInfo{}) {
+- panic("qtls.ClientHelloInfo doesn't match")
+- }
+-}
+-
+ func toConnectionState(c connectionState) ConnectionState {
+ return *(*ConnectionState)(unsafe.Pointer(&c))
+ }
diff --git a/srcpkgs/fs-repo-11-to-12/template b/srcpkgs/fs-repo-11-to-12/template
new file mode 100644
index 00000000..93ff060b
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-11-to-12'
+pkgname=fs-repo-11-to-12
+version=1.0.2
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12"
+short_desc="Tool to upgrade an IPFS repository from version 11 to 12"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=e6d6320e280f3118873dfb194b68681fa2747b7893d99831fa6fa2bbb67ebd71
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>fs-repo-12-to-13</summary>
not needed yet, but it's a future proof against go-ipfs 0.18, that receives yet another repository version upgrade
```patch
From e37a435c6467187dac7c931ccba51aaace9e29d5 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:34:38 +0000
Subject: [PATCH] New package: fs-repo-12-to-13-1.0.0_1
---
srcpkgs/fs-repo-12-to-13/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/fs-repo-12-to-13/template
diff --git a/srcpkgs/fs-repo-12-to-13/template b/srcpkgs/fs-repo-12-to-13/template
new file mode 100644
index 00000000..331b8dd8
--- /dev/null
+++ b/srcpkgs/fs-repo-12-to-13/template
@@ -0,0 +1,22 @@
+# Template file for 'fs-repo-12-to-13'
+pkgname=fs-repo-12-to-13
+version=1.0.0
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-12-to-13"
+short_desc="Tool to upgrade an IPFS repository from version 12 to 13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=454b32a86efc410d6edfef20726b36472c1d8f11abc60f2f0722d6fa8d65f94b
+
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>ipfs-migrate-repo</summary>
```patch
From e65c4a3813de5edbfddb8a823fe50a529092322b Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 22:26:35 +0000
Subject: [PATCH] New package: ipfs-migrate-repo-1.0.2_1
---
srcpkgs/ipfs-migrate-repo/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/ipfs-migrate-repo/template
diff --git a/srcpkgs/ipfs-migrate-repo/template b/srcpkgs/ipfs-migrate-repo/template
new file mode 100644
index 00000000..b032a988
--- /dev/null
+++ b/srcpkgs/ipfs-migrate-repo/template
@@ -0,0 +1,16 @@
+# Template file for 'ipfs-migrate-repo'
+pkgname=ipfs-migrate-repo
+version=1.0.2
+revision=1
+short_desc="Tool to upgrade an IPFS repository to newer versions"
+depends="fs-repo-11-to-12 fs-repo-12-to-13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/sug0/ipfs-migrate-repo"
+distfiles="https://github.com/sug0/ipfs-migrate-repo/archive/v${version}.tar.gz"
+checksum=3e3064ddf0d10bc053f2f1fcea9989071d5ed9471cb924cc845fdf65870e3e4d
+
+do_install() {
+ vdoc README.md
+ vbin ipfs-migrate-repo
+}
--
2.39.0
```
</details>
unfortunately, `armv7l-musl` is segfaulting with `fs-repo-11-to-12`, but for some reason `fs-repo-12-to-13` works fine...
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (13 preceding siblings ...)
2022-12-18 15:53 ` sug0
@ 2022-12-18 16:33 ` sug0
2022-12-18 16:46 ` sug0
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-18 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356832759
Comment:
disabling cgo when building these new go packages fixes segmentation faults in `armv7l-musl`
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (14 preceding siblings ...)
2022-12-18 16:33 ` sug0
@ 2022-12-18 16:46 ` sug0
2022-12-18 16:46 ` sug0
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-18 16:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4591 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356832759
Comment:
disabling cgo when building these new go packages fixes segmentation faults in `armv7l-musl`
<details>
<summary>fs-repo-11-to-12</summary>
```patch
From 39c9205a26fd6cc563e6261aedc4c6b7a8d178c8 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:28:06 +0000
Subject: [PATCH 1/2] New package: fs-repo-11-to-12-1.0.2_1
---
.../0001-fs-repo-11-to-12-no-qtls-init.patch | 31 +++++++++++++++++++
srcpkgs/fs-repo-11-to-12/template | 21 +++++++++++++
2 files changed, 52 insertions(+)
create mode 100644 srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
create mode 100644 srcpkgs/fs-repo-11-to-12/template
diff --git a/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
new file mode 100644
index 00000000..f21ca95d
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
@@ -0,0 +1,31 @@
+diff --git a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+index 1bf13d8..94aa684 100644
+--- a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
++++ b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+@@ -1,26 +1,10 @@
+ package qtls
+
+ import (
+- "crypto/tls"
+ "reflect"
+ "unsafe"
+ )
+
+-func init() {
+- if !structsEqual(&tls.ConnectionState{}, &connectionState{}) {
+- panic("qtls.ConnectionState doesn't match")
+- }
+- if !structsEqual(&tls.ClientSessionState{}, &clientSessionState{}) {
+- panic("qtls.ClientSessionState doesn't match")
+- }
+- if !structsEqual(&tls.Config{}, &config{}) {
+- panic("qtls.Config doesn't match")
+- }
+- if !structsEqual(&tls.ClientHelloInfo{}, &clientHelloInfo{}) {
+- panic("qtls.ClientHelloInfo doesn't match")
+- }
+-}
+-
+ func toConnectionState(c connectionState) ConnectionState {
+ return *(*ConnectionState)(unsafe.Pointer(&c))
+ }
diff --git a/srcpkgs/fs-repo-11-to-12/template b/srcpkgs/fs-repo-11-to-12/template
new file mode 100644
index 00000000..07cd9f4f
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/template
@@ -0,0 +1,21 @@
+# Template file for 'fs-repo-11-to-12'
+pkgname=fs-repo-11-to-12
+version=1.0.2
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12"
+short_desc="Tool to upgrade an IPFS repository from version 11 to 12"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=e6d6320e280f3118873dfb194b68681fa2747b7893d99831fa6fa2bbb67ebd71
+
+export CGO_ENABLED=0
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>fs-repo-12-to-13</summary>
```patch
From ab3e71db9b054319b46aa7f33d9caa42a143b23d Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:34:38 +0000
Subject: [PATCH 2/2] New package: fs-repo-12-to-13-1.0.0_1
---
srcpkgs/fs-repo-12-to-13/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/fs-repo-12-to-13/template
diff --git a/srcpkgs/fs-repo-12-to-13/template b/srcpkgs/fs-repo-12-to-13/template
new file mode 100644
index 00000000..a4dc1862
--- /dev/null
+++ b/srcpkgs/fs-repo-12-to-13/template
@@ -0,0 +1,21 @@
+# Template file for 'fs-repo-12-to-13'
+pkgname=fs-repo-12-to-13
+version=1.0.0
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-12-to-13"
+short_desc="Tool to upgrade an IPFS repository from version 12 to 13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=454b32a86efc410d6edfef20726b36472c1d8f11abc60f2f0722d6fa8d65f94b
+
+export CGO_ENABLED=0
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (15 preceding siblings ...)
2022-12-18 16:46 ` sug0
@ 2022-12-18 16:46 ` sug0
2023-03-08 23:12 ` sug0
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2022-12-18 16:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4635 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1356832759
Comment:
disabling cgo when building these new go packages fixes segmentation faults in `armv7l-musl`
<details>
<summary>fs-repo-11-to-12</summary>
```patch
From 39c9205a26fd6cc563e6261aedc4c6b7a8d178c8 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:28:06 +0000
Subject: [PATCH 1/2] New package: fs-repo-11-to-12-1.0.2_1
---
.../0001-fs-repo-11-to-12-no-qtls-init.patch | 31 +++++++++++++++++++
srcpkgs/fs-repo-11-to-12/template | 21 +++++++++++++
2 files changed, 52 insertions(+)
create mode 100644 srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
create mode 100644 srcpkgs/fs-repo-11-to-12/template
diff --git a/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
new file mode 100644
index 00000000..f21ca95d
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/patches/0001-fs-repo-11-to-12-no-qtls-init.patch
@@ -0,0 +1,31 @@
+diff --git a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+index 1bf13d8..94aa684 100644
+--- a/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
++++ b/fs-repo-11-to-12/vendor/github.com/marten-seemann/qtls-go1-15/unsafe.go
+@@ -1,26 +1,10 @@
+ package qtls
+
+ import (
+- "crypto/tls"
+ "reflect"
+ "unsafe"
+ )
+
+-func init() {
+- if !structsEqual(&tls.ConnectionState{}, &connectionState{}) {
+- panic("qtls.ConnectionState doesn't match")
+- }
+- if !structsEqual(&tls.ClientSessionState{}, &clientSessionState{}) {
+- panic("qtls.ClientSessionState doesn't match")
+- }
+- if !structsEqual(&tls.Config{}, &config{}) {
+- panic("qtls.Config doesn't match")
+- }
+- if !structsEqual(&tls.ClientHelloInfo{}, &clientHelloInfo{}) {
+- panic("qtls.ClientHelloInfo doesn't match")
+- }
+-}
+-
+ func toConnectionState(c connectionState) ConnectionState {
+ return *(*ConnectionState)(unsafe.Pointer(&c))
+ }
diff --git a/srcpkgs/fs-repo-11-to-12/template b/srcpkgs/fs-repo-11-to-12/template
new file mode 100644
index 00000000..07cd9f4f
--- /dev/null
+++ b/srcpkgs/fs-repo-11-to-12/template
@@ -0,0 +1,21 @@
+# Template file for 'fs-repo-11-to-12'
+pkgname=fs-repo-11-to-12
+version=1.0.2
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12"
+short_desc="Tool to upgrade an IPFS repository from version 11 to 12"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=e6d6320e280f3118873dfb194b68681fa2747b7893d99831fa6fa2bbb67ebd71
+
+export CGO_ENABLED=0
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
<details>
<summary>fs-repo-12-to-13</summary>
```patch
From ab3e71db9b054319b46aa7f33d9caa42a143b23d Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Sat, 17 Dec 2022 21:34:38 +0000
Subject: [PATCH 2/2] New package: fs-repo-12-to-13-1.0.0_1
---
srcpkgs/fs-repo-12-to-13/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/fs-repo-12-to-13/template
diff --git a/srcpkgs/fs-repo-12-to-13/template b/srcpkgs/fs-repo-12-to-13/template
new file mode 100644
index 00000000..a4dc1862
--- /dev/null
+++ b/srcpkgs/fs-repo-12-to-13/template
@@ -0,0 +1,21 @@
+# Template file for 'fs-repo-12-to-13'
+pkgname=fs-repo-12-to-13
+version=1.0.0
+revision=1
+_tag=${pkgname}/v${version}
+build_style=go
+wrksrc="fs-repo-migrations-${pkgname}-v${version}"
+build_wrksrc="${pkgname}"
+go_import_path="github.com/ipfs/fs-repo-migrations/fs-repo-12-to-13"
+short_desc="Tool to upgrade an IPFS repository from version 12 to 13"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ipfs/fs-repo-migrations"
+distfiles="https://github.com/ipfs/fs-repo-migrations/archive/${_tag}.tar.gz"
+checksum=454b32a86efc410d6edfef20726b36472c1d8f11abc60f2f0722d6fa8d65f94b
+
+export CGO_ENABLED=0
+
+post_install() {
+ vlicense ../LICENSE
+}
--
2.39.0
```
</details>
These updated templates depend on #41167
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (16 preceding siblings ...)
2022-12-18 16:46 ` sug0
@ 2023-03-08 23:12 ` sug0
2023-06-07 2:06 ` github-actions
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sug0 @ 2023-03-08 23:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New comment by sug0 on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1461014831
Comment:
@sgn ping. what do you think of the patches I posted here?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (17 preceding siblings ...)
2023-03-08 23:12 ` sug0
@ 2023-06-07 2:06 ` github-actions
2023-06-22 1:59 ` [PR PATCH] [Closed]: " github-actions
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: github-actions @ 2023-06-07 2:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1579755216
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Closed]: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (18 preceding siblings ...)
2023-06-07 2:06 ` github-actions
@ 2023-06-22 1:59 ` github-actions
2023-08-04 7:34 ` eoli3n
2023-08-04 7:35 ` eoli3n
21 siblings, 0 replies; 23+ messages in thread
From: github-actions @ 2023-06-22 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
There's a closed pull request on the void-packages repository
go-ipfs: update to 0.17.0.
https://github.com/void-linux/void-packages/pull/40919
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (19 preceding siblings ...)
2023-06-22 1:59 ` [PR PATCH] [Closed]: " github-actions
@ 2023-08-04 7:34 ` eoli3n
2023-08-04 7:35 ` eoli3n
21 siblings, 0 replies; 23+ messages in thread
From: eoli3n @ 2023-08-04 7:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1665144576
Comment:
is that dead ?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: go-ipfs: update to 0.17.0.
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
` (20 preceding siblings ...)
2023-08-04 7:34 ` eoli3n
@ 2023-08-04 7:35 ` eoli3n
21 siblings, 0 replies; 23+ messages in thread
From: eoli3n @ 2023-08-04 7:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by eoli3n on void-packages repository
https://github.com/void-linux/void-packages/pull/40919#issuecomment-1665144576
Comment:
is that dead ?
IMO, the package should be renamed "kubo" and 0.21.0 is out.
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2023-08-04 7:35 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-05 16:39 [PR PATCH] go-ipfs: update to 0.17.0 sgn
2022-12-05 16:40 ` sgn
2022-12-05 17:17 ` CMB
2022-12-06 0:43 ` sgn
2022-12-06 0:58 ` CMB
2022-12-17 16:51 ` sug0
2022-12-17 16:52 ` sug0
2022-12-17 17:07 ` sgn
2022-12-17 19:28 ` sug0
2022-12-17 19:30 ` sug0
2022-12-17 22:06 ` sug0
2022-12-17 22:07 ` sug0
2022-12-17 22:27 ` sug0
2022-12-17 22:28 ` sug0
2022-12-18 15:53 ` sug0
2022-12-18 16:33 ` sug0
2022-12-18 16:46 ` sug0
2022-12-18 16:46 ` sug0
2023-03-08 23:12 ` sug0
2023-06-07 2:06 ` github-actions
2023-06-22 1:59 ` [PR PATCH] [Closed]: " github-actions
2023-08-04 7:34 ` eoli3n
2023-08-04 7:35 ` eoli3n
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).