1 |
commit: 57f96abad1e4e36bb9570ab70b1ab7ec9c78ff28 |
2 |
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> |
3 |
AuthorDate: Wed Mar 30 16:26:31 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 3 02:56:54 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f96aba |
7 |
|
8 |
net-misc/curl: Added verify-sig integration. |
9 |
|
10 |
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/24820 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
net-misc/curl/Manifest | 4 ++++ |
15 |
net-misc/curl/curl-7.79.1-r1.ebuild | 9 ++++++--- |
16 |
net-misc/curl/curl-7.80.0-r1.ebuild | 9 ++++++--- |
17 |
net-misc/curl/curl-7.81.0-r1.ebuild | 9 ++++++--- |
18 |
net-misc/curl/curl-7.82.0-r2.ebuild | 9 ++++++--- |
19 |
5 files changed, 28 insertions(+), 12 deletions(-) |
20 |
|
21 |
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest |
22 |
index 78e192325a11..8478ecaaa8d5 100644 |
23 |
--- a/net-misc/curl/Manifest |
24 |
+++ b/net-misc/curl/Manifest |
25 |
@@ -1,4 +1,8 @@ |
26 |
DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d |
27 |
+DIST curl-7.79.1.tar.xz.asc 488 BLAKE2B cf1864b15ee4b47a61a03968c4fd9526d4c8d0c5a8a0a1357de61758640e6dfda57334df1e63afd94c0064b7e61527623dd20446b27fa0130e0bf92c647d9820 SHA512 4f7930fde0a21358cf0bd8d5cbde5a05efc34202265b4744e59f49d9dc269987f47b4ead77c33e2ae03acabd7b6d6a731c69b91999eea70542f49d9ea0c2ba94 |
28 |
DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab |
29 |
+DIST curl-7.80.0.tar.xz.asc 488 BLAKE2B 5cde8a91059bb19b9ee9b1aa4c3225522398a0d5837edf3d99b7f9ea758e5df2a729ce1d0a9763967c2319c30d94ba80ff50888dec07665a818216d42b91feee SHA512 e11adb85fb061bba8838f435f6afb200924f24cb7351d9a8208ec3d317d8ef8c1e16f06dedfc623acc749931015c42dcd86236a53602c6632b3a750841345b05 |
30 |
DIST curl-7.81.0.tar.xz 2486388 BLAKE2B bf8a3a03564648a9d7a5b4e7a523d840230f03237cf9eb5b07dcb4f531b036eb8111c1944bedd0c1df188e09a09468b3487d24ea50781124bc33d194546691f4 SHA512 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df |
31 |
+DIST curl-7.81.0.tar.xz.asc 488 BLAKE2B 9280f10b14ddd95a1405fda79f8c51528c91c5e86b8f90d16d20d7f11d212e6e4391377eed971d0b0b27f5f4692c702e9d7a11705f0558ad39df38608d6a0648 SHA512 ca32a639900a9f8211005227dfb594f809c5ca5ec1eb87e944ef33cca60e4844f5b6ebe49de79fba53068e5dee9652b1d43a7d3a74e05419a2ffb5b40dab8176 |
32 |
DIST curl-7.82.0.tar.xz 2446764 BLAKE2B 838accae4a45c090909cff91477a023789a79535691c80e507fd9e9712861b0c08e25ecd26079cb8ac8946cdf429a50991a7521e7b550b43c19e455625bc0750 SHA512 a977d69360d1793f8872096a21f5c0271e7ad145cd69ad45f4056a0657772f0f298b04bdb41aefd4ea5c4478352c60d80b5a118642280a07a7198aa80ffb1d57 |
33 |
+DIST curl-7.82.0.tar.xz.asc 488 BLAKE2B 9da4ea63671621df956aa5dc191cfc6c8d2a8b1958416ca58ffc04d43ed65b89244968588879e6bd3299ca8f60b1eccb34dede012f8a2a37acf3ca34021da958 SHA512 1f14d8ab55360ba735dff916369ee318e98767718394654ce9443b6013509b6d3ed5597685b142e9823cec7496373b709a8656515d66039c06783879655151fe |
34 |
|
35 |
diff --git a/net-misc/curl/curl-7.79.1-r1.ebuild b/net-misc/curl/curl-7.79.1-r1.ebuild |
36 |
index fc93e21ea1cc..ac8292e30cfe 100644 |
37 |
--- a/net-misc/curl/curl-7.79.1-r1.ebuild |
38 |
+++ b/net-misc/curl/curl-7.79.1-r1.ebuild |
39 |
@@ -3,11 +3,12 @@ |
40 |
|
41 |
EAPI="7" |
42 |
|
43 |
-inherit autotools prefix multilib-minimal |
44 |
+inherit autotools prefix multilib-minimal verify-sig |
45 |
|
46 |
DESCRIPTION="A Client that groks URLs" |
47 |
HOMEPAGE="https://curl.haxx.se/" |
48 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
49 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
50 |
+ verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
51 |
|
52 |
LICENSE="curl" |
53 |
SLOT="0" |
54 |
@@ -15,6 +16,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s |
55 |
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" |
56 |
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" |
57 |
IUSE+=" nghttp3 quiche" |
58 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
59 |
|
60 |
# c-ares must be disabled for threads |
61 |
# only one default ssl provider can be enabled |
62 |
@@ -84,7 +86,8 @@ BDEPEND="dev-lang/perl |
63 |
test? ( |
64 |
sys-apps/diffutils |
65 |
dev-lang/perl |
66 |
- )" |
67 |
+ ) |
68 |
+ verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
69 |
|
70 |
DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
71 |
|
72 |
|
73 |
diff --git a/net-misc/curl/curl-7.80.0-r1.ebuild b/net-misc/curl/curl-7.80.0-r1.ebuild |
74 |
index 5dc026fde598..f1c2d6838600 100644 |
75 |
--- a/net-misc/curl/curl-7.80.0-r1.ebuild |
76 |
+++ b/net-misc/curl/curl-7.80.0-r1.ebuild |
77 |
@@ -3,11 +3,12 @@ |
78 |
|
79 |
EAPI="7" |
80 |
|
81 |
-inherit autotools prefix multilib-minimal |
82 |
+inherit autotools prefix multilib-minimal verify-sig |
83 |
|
84 |
DESCRIPTION="A Client that groks URLs" |
85 |
HOMEPAGE="https://curl.haxx.se/" |
86 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
87 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
88 |
+ verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
89 |
|
90 |
LICENSE="curl" |
91 |
SLOT="0" |
92 |
@@ -15,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ |
93 |
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" |
94 |
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" |
95 |
IUSE+=" nghttp3 quiche" |
96 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
97 |
|
98 |
# c-ares must be disabled for threads |
99 |
# only one default ssl provider can be enabled |
100 |
@@ -78,7 +80,8 @@ BDEPEND="dev-lang/perl |
101 |
virtual/pkgconfig |
102 |
test? ( |
103 |
sys-apps/diffutils |
104 |
- )" |
105 |
+ ) |
106 |
+ verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
107 |
|
108 |
DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
109 |
|
110 |
|
111 |
diff --git a/net-misc/curl/curl-7.81.0-r1.ebuild b/net-misc/curl/curl-7.81.0-r1.ebuild |
112 |
index 772988452027..e47b2c09b3db 100644 |
113 |
--- a/net-misc/curl/curl-7.81.0-r1.ebuild |
114 |
+++ b/net-misc/curl/curl-7.81.0-r1.ebuild |
115 |
@@ -3,11 +3,12 @@ |
116 |
|
117 |
EAPI="8" |
118 |
|
119 |
-inherit autotools prefix multilib-minimal |
120 |
+inherit autotools prefix multilib-minimal verify-sig |
121 |
|
122 |
DESCRIPTION="A Client that groks URLs" |
123 |
HOMEPAGE="https://curl.haxx.se/" |
124 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
125 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
126 |
+ verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
127 |
|
128 |
LICENSE="curl" |
129 |
SLOT="0" |
130 |
@@ -15,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ |
131 |
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" |
132 |
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" |
133 |
IUSE+=" nghttp3 quiche" |
134 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
135 |
|
136 |
# c-ares must be disabled for threads |
137 |
# only one default ssl provider can be enabled |
138 |
@@ -78,7 +80,8 @@ BDEPEND="dev-lang/perl |
139 |
virtual/pkgconfig |
140 |
test? ( |
141 |
sys-apps/diffutils |
142 |
- )" |
143 |
+ ) |
144 |
+ verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
145 |
|
146 |
DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
147 |
|
148 |
|
149 |
diff --git a/net-misc/curl/curl-7.82.0-r2.ebuild b/net-misc/curl/curl-7.82.0-r2.ebuild |
150 |
index 8c5dfc70c6e7..e4a7ea60d92d 100644 |
151 |
--- a/net-misc/curl/curl-7.82.0-r2.ebuild |
152 |
+++ b/net-misc/curl/curl-7.82.0-r2.ebuild |
153 |
@@ -3,11 +3,12 @@ |
154 |
|
155 |
EAPI="8" |
156 |
|
157 |
-inherit autotools prefix multilib-minimal |
158 |
+inherit autotools prefix multilib-minimal verify-sig |
159 |
|
160 |
DESCRIPTION="A Client that groks URLs" |
161 |
HOMEPAGE="https://curl.haxx.se/" |
162 |
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" |
163 |
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz |
164 |
+ verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" |
165 |
|
166 |
LICENSE="curl" |
167 |
SLOT="0" |
168 |
@@ -15,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~ |
169 |
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" |
170 |
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" |
171 |
IUSE+=" nghttp3 quiche" |
172 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc |
173 |
|
174 |
# c-ares must be disabled for threads |
175 |
# only one default ssl provider can be enabled |
176 |
@@ -78,7 +80,8 @@ BDEPEND="dev-lang/perl |
177 |
virtual/pkgconfig |
178 |
test? ( |
179 |
sys-apps/diffutils |
180 |
- )" |
181 |
+ ) |
182 |
+ verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" |
183 |
|
184 |
DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |