1 |
commit: 22d8731b3da6f49250e7c1f01fa3d8b3d67b8051 |
2 |
Author: David Roman <davidroman96 <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 12 13:50:53 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 3 22:54:47 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d8731b |
7 |
|
8 |
net-p2p/go-ipfs: drop 0.12.2 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/863485 |
11 |
Signed-off-by: David Roman <davidroman96 <AT> gmail.com> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
net-p2p/go-ipfs/Manifest | 2 - |
15 |
.../files/go-ipfs-0.12.2-upgrade-quic-go.patch | 39 ------------ |
16 |
net-p2p/go-ipfs/go-ipfs-0.12.2.ebuild | 71 ---------------------- |
17 |
3 files changed, 112 deletions(-) |
18 |
|
19 |
diff --git a/net-p2p/go-ipfs/Manifest b/net-p2p/go-ipfs/Manifest |
20 |
index 8c297f21c8d1..773ebd4ef95f 100644 |
21 |
--- a/net-p2p/go-ipfs/Manifest |
22 |
+++ b/net-p2p/go-ipfs/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST go-ipfs-0.12.2-deps.tar.xz 368885112 BLAKE2B a77bd1518f1c80369a2d7f4ed3c3a19e0294f662910b588c203bcfa630709ef82e42a622a9a6a8b4e218b1566a446eb80ae0fdbd98232bd2aba6c76ed8a828ec SHA512 1268e9727af7a7c856547bd8cce9a9fe5b58db1a6966c2aeb0923632dc96fee16c354261922d7132f791bcc3c2601728831e2e2ec29d9b7d2d8ea60903eafe50 |
25 |
-DIST go-ipfs-0.12.2.tar.gz 2112884 BLAKE2B fe6883443eaa55764beffb5b8726678615f1246d41924ca6eddaae0e67d241f85f24d9b9264eaae9a211d8f74009bc30dda2a35734ea38645736e4fe21212bc9 SHA512 a268618d66e5e82c89362e0273c0741a56d13ee95e1f545a0b55fa5a7bd719b0e678c7c6cb7dc268892f992156a1fff2f537688de589d7c05b8b48e9c90b94f1 |
26 |
DIST go-ipfs-0.13.1.tar.gz 13474891 BLAKE2B 2e6e056e27a8783c9d04ea5d8c41d86e45250f5ba95c57737aaf52d36d453be31baab21767008596710d7eb84f471460c32de70faf1764740ea551a5aa4bd38e SHA512 3257d49df61bb31d4054934506ea543df2d9ed1f57b9b6aeef001bb77fe9fdce646fec96ded72b7f9f99e3bc687da77997b1295ebb5a40e20e4df0413e15bfd7 |
27 |
|
28 |
diff --git a/net-p2p/go-ipfs/files/go-ipfs-0.12.2-upgrade-quic-go.patch b/net-p2p/go-ipfs/files/go-ipfs-0.12.2-upgrade-quic-go.patch |
29 |
deleted file mode 100644 |
30 |
index 44fea86bf31e..000000000000 |
31 |
--- a/net-p2p/go-ipfs/files/go-ipfs-0.12.2-upgrade-quic-go.patch |
32 |
+++ /dev/null |
33 |
@@ -1,39 +0,0 @@ |
34 |
-https://github.com/ipfs/go-ipfs/issues/8819#issuecomment-1077564642 |
35 |
-https://bugs.gentoo.org/835491 |
36 |
---- a/go.mod |
37 |
-+++ b/go.mod |
38 |
-@@ -89,6 +89,7 @@ require ( |
39 |
- github.com/libp2p/go-socket-activation v0.1.0 |
40 |
- github.com/libp2p/go-tcp-transport v0.4.0 |
41 |
- github.com/libp2p/go-ws-transport v0.5.0 |
42 |
-+ github.com/lucas-clemente/quic-go v0.26.0 // indirect |
43 |
- github.com/miekg/dns v1.1.43 |
44 |
- github.com/mitchellh/go-homedir v1.1.0 |
45 |
- github.com/multiformats/go-multiaddr v0.4.1 |
46 |
---- a/go.sum |
47 |
-+++ b/go.sum |
48 |
-@@ -1005,6 +1005,8 @@ github.com/lucas-clemente/quic-go v0.21.2/go.mod h1:vF5M1XqhBAHgbjKcJOXY3JZz3GP0 |
49 |
- github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= |
50 |
- github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= |
51 |
- github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= |
52 |
-+github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A= |
53 |
-+github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= |
54 |
- github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= |
55 |
- github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= |
56 |
- github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= |
57 |
-@@ -1017,9 +1019,15 @@ github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1j |
58 |
- github.com/marten-seemann/qtls-go1-15 v0.1.5/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= |
59 |
- github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= |
60 |
- github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= |
61 |
-+github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ= |
62 |
-+github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= |
63 |
- github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= |
64 |
- github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= |
65 |
- github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= |
66 |
-+github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc= |
67 |
-+github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= |
68 |
-+github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y= |
69 |
-+github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= |
70 |
- github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= |
71 |
- github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU= |
72 |
- github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= |
73 |
|
74 |
diff --git a/net-p2p/go-ipfs/go-ipfs-0.12.2.ebuild b/net-p2p/go-ipfs/go-ipfs-0.12.2.ebuild |
75 |
deleted file mode 100644 |
76 |
index 2c9295fc8135..000000000000 |
77 |
--- a/net-p2p/go-ipfs/go-ipfs-0.12.2.ebuild |
78 |
+++ /dev/null |
79 |
@@ -1,71 +0,0 @@ |
80 |
-# Copyright 1999-2022 Gentoo Authors |
81 |
-# Distributed under the terms of the GNU General Public License v2 |
82 |
- |
83 |
-EAPI=8 |
84 |
- |
85 |
-inherit bash-completion-r1 go-module systemd |
86 |
- |
87 |
-DESCRIPTION="Main implementation of IPFS" |
88 |
-HOMEPAGE="https://ipfs.io/" |
89 |
-SRC_URI="https://github.com/ipfs/go-ipfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
90 |
-# After dropped Go patch, might be able to use upstream vendor tarball |
91 |
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" |
92 |
- |
93 |
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0" |
94 |
-SLOT="0" |
95 |
-KEYWORDS="~amd64 ~x86" |
96 |
- |
97 |
-RDEPEND=" |
98 |
- !net-p2p/go-ipfs-bin |
99 |
- acct-group/ipfs |
100 |
- acct-user/ipfs |
101 |
- sys-fs/fuse:0 |
102 |
-" |
103 |
- |
104 |
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md docs/ ) |
105 |
- |
106 |
-PATCHES=( |
107 |
- # Should be able to drop once https://github.com/ipfs/go-ipfs/issues/8819 is fixed |
108 |
- # Needed for Go 1.18 compatibility |
109 |
- "${FILESDIR}"/${PN}-0.12.2-upgrade-quic-go.patch |
110 |
-) |
111 |
- |
112 |
-src_compile() { |
113 |
- default |
114 |
- |
115 |
- local mygoargs |
116 |
- mygoargs=( |
117 |
- -tags release |
118 |
- ) |
119 |
- |
120 |
- go build "${mygoargs[@]}" -o ipfs ./cmd/ipfs || die |
121 |
- go build "${mygoargs[@]}" -o ipfswatch ./cmd/ipfswatch || die |
122 |
- |
123 |
- IPFS_PATH="" ./ipfs commands completion bash > ipfs-completion.bash || die |
124 |
-} |
125 |
- |
126 |
-src_test() { |
127 |
- go test ./cmd/ipfs/... ./cmd/ipfswatch/... || die |
128 |
-} |
129 |
- |
130 |
-src_install() { |
131 |
- dobin ipfs |
132 |
- dobin ipfswatch |
133 |
- newbashcomp ipfs-completion.bash ipfs |
134 |
- einstalldocs |
135 |
- |
136 |
- systemd_dounit "${FILESDIR}/ipfs.service" |
137 |
- systemd_newunit "${FILESDIR}/ipfs-at.service" "ipfs@.service" |
138 |
- |
139 |
- newinitd "${FILESDIR}/ipfs.init" ipfs |
140 |
- newconfd "${FILESDIR}/ipfs.confd" ipfs |
141 |
- |
142 |
- keepdir /var/log/ipfs |
143 |
- fowners -R ipfs:ipfs /var/log/ipfs |
144 |
-} |
145 |
- |
146 |
-pkg_postinst() { |
147 |
- elog 'To be able to use the ipfs service you will need to create the ipfs repository' |
148 |
- elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)' |
149 |
- elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.' |
150 |
-} |