1 |
commit: 789799cad385d9036ff428a5940cf38cc362476d |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Sep 26 14:34:57 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 27 00:14:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789799ca |
7 |
|
8 |
app-crypt/monkeysphere: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/17682 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../files/monkeysphere-0.37_default_shell.patch | 12 --- |
16 |
.../files/monkeysphere-0.37_hd_od.patch | 14 ---- |
17 |
.../files/monkeysphere-0.38-asprintf.patch | 45 ---------- |
18 |
...monkeysphere-0.38-revert-executable-patch.patch | 98 ---------------------- |
19 |
.../monkeysphere-0.38-syssharedir-whitespace.patch | 53 ------------ |
20 |
...re-0.39-make-tests-work-with-gnupg-2.1.15.patch | 45 ---------- |
21 |
6 files changed, 267 deletions(-) |
22 |
|
23 |
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch |
24 |
deleted file mode 100644 |
25 |
index f979114181d..00000000000 |
26 |
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch |
27 |
+++ /dev/null |
28 |
@@ -1,12 +0,0 @@ |
29 |
-diff -r d0c02fe6a949 src/share/common |
30 |
---- a/src/share/common Sun Oct 06 19:21:18 2013 +0200 |
31 |
-+++ b/src/share/common Sun Oct 06 19:21:49 2013 +0200 |
32 |
-@@ -108,7 +108,7 @@ |
33 |
- # if root, su command as monkeysphere user |
34 |
- 'root') |
35 |
- # requote arguments using bash builtin feature (see "help printf"): |
36 |
-- su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")" |
37 |
-+ su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")" |
38 |
- ;; |
39 |
- |
40 |
- # otherwise, fail |
41 |
|
42 |
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch |
43 |
deleted file mode 100644 |
44 |
index 7cdaa74b573..00000000000 |
45 |
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch |
46 |
+++ /dev/null |
47 |
@@ -1,14 +0,0 @@ |
48 |
-diff -r 6150774ec7f4 tests/keytrans |
49 |
---- a/tests/keytrans Sun Feb 16 20:11:02 2014 +0100 |
50 |
-+++ b/tests/keytrans Sun Feb 16 20:11:40 2014 +0100 |
51 |
-@@ -104,8 +104,8 @@ |
52 |
- <(gpg --list-packets < "$TEMPDIR"/converted.secret.key) |
53 |
- |
54 |
- diff -u \ |
55 |
-- <(hd "$TEMPDIR"/secret.key) \ |
56 |
-- <(hd "$TEMPDIR"/converted.secret.key) |
57 |
-+ <(od -xc "$TEMPDIR"/secret.key) \ |
58 |
-+ <(od -xc "$TEMPDIR"/converted.secret.key) |
59 |
- |
60 |
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:) |
61 |
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40) |
62 |
|
63 |
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch |
64 |
deleted file mode 100644 |
65 |
index dbf9d5f590c..00000000000 |
66 |
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch |
67 |
+++ /dev/null |
68 |
@@ -1,45 +0,0 @@ |
69 |
-From b756fd2e58ab013b5c9bfc2658ed9ad48868067c Mon Sep 17 00:00:00 2001 |
70 |
-From: Daniel Kahn Gillmor <dkg@×××××××××××××.net> |
71 |
-Date: Sun, 7 Aug 2016 18:24:47 -0400 |
72 |
-Subject: [PATCH] avoid warning about unused asprintf return value |
73 |
-MIME-Version: 1.0 |
74 |
-Content-Type: text/plain; charset=UTF-8 |
75 |
-Content-Transfer-Encoding: 8bit |
76 |
- |
77 |
-some versions of gcc produce this warning, which is treated as an |
78 |
-error due to our conservative defaults in Makefile: |
79 |
- |
80 |
-src/agent-transfer/main.c: In function ‘main’: |
81 |
-src/agent-transfer/main.c:676:5: error: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result [-Werror=unused-result] |
82 |
- asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip); |
83 |
- ^ |
84 |
-cc1: all warnings being treated as errors |
85 |
- |
86 |
-this patch avoids the warning. |
87 |
---- |
88 |
- src/agent-transfer/main.c | 9 +++++++-- |
89 |
- 1 file changed, 7 insertions(+), 2 deletions(-) |
90 |
- |
91 |
-diff --git a/src/agent-transfer/main.c b/src/agent-transfer/main.c |
92 |
-index 406aaa3..3038f5c 100644 |
93 |
---- a/src/agent-transfer/main.c |
94 |
-+++ b/src/agent-transfer/main.c |
95 |
-@@ -672,8 +672,13 @@ int main (int argc, const char* argv[]) { |
96 |
- return 1; |
97 |
- } |
98 |
- |
99 |
-- if (!args.comment) |
100 |
-- asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip); |
101 |
-+ if (!args.comment) { |
102 |
-+ err = asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip); |
103 |
-+ if (err < 0) { |
104 |
-+ fprintf (stderr, "failed to generate key comment\n"); |
105 |
-+ return 1; |
106 |
-+ } |
107 |
-+ } |
108 |
- |
109 |
- err = send_to_ssh_agent (&e, ssh_sock_fd, args.seconds, args.confirm, |
110 |
- args.comment ? args.comment : alt_comment); |
111 |
--- |
112 |
-2.7.3 |
113 |
- |
114 |
|
115 |
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch |
116 |
deleted file mode 100644 |
117 |
index 4d98c0a7cf5..00000000000 |
118 |
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch |
119 |
+++ /dev/null |
120 |
@@ -1,98 +0,0 @@ |
121 |
-From c75c7553a88e387013e2b4310f4c4956adfd8a98 Mon Sep 17 00:00:00 2001 |
122 |
-From: Daniel Kahn Gillmor <dkg@×××××××××××××.net> |
123 |
-Date: Mon, 8 Aug 2016 20:45:07 -0400 |
124 |
-Subject: [PATCH 1/2] avoid treating src/share/common as an executable |
125 |
- |
126 |
-having src/share/common treated as an executable (commit |
127 |
-ed10318d3760b56e57d5e1bef04ab57761ab8bd1) was actually a terrible |
128 |
-idea. |
129 |
- |
130 |
-In addition to causing "monkeysphere version" to print the version |
131 |
-number twice, it meant that any invocation of a monkeysphere command |
132 |
-that sourced src/share/common and had a first argument that happened |
133 |
-to be a function name would accidentally invoke that function. |
134 |
- |
135 |
-This commit reverts that idea. |
136 |
---- |
137 |
- Makefile | 2 +- |
138 |
- src/share/common | 5 ----- |
139 |
- src/share/ma/add_certifier | 2 +- |
140 |
- src/share/ma/update_users | 2 +- |
141 |
- src/share/mh/add_revoker | 2 +- |
142 |
- 5 files changed, 4 insertions(+), 9 deletions(-) |
143 |
- mode change 100755 => 100644 src/share/common |
144 |
- |
145 |
-diff --git a/Makefile b/Makefile |
146 |
-index 608a317..768564a 100755 |
147 |
---- a/Makefile |
148 |
-+++ b/Makefile |
149 |
-@@ -55,7 +55,7 @@ install: all installman |
150 |
- install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin |
151 |
- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication |
152 |
- install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere |
153 |
-- install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere |
154 |
-+ install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere |
155 |
- install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere |
156 |
- sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv |
157 |
- sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv |
158 |
-diff --git a/src/share/common b/src/share/common |
159 |
-old mode 100755 |
160 |
-new mode 100644 |
161 |
-index 66181a3..b10a040 |
162 |
---- a/src/share/common |
163 |
-+++ b/src/share/common |
164 |
-@@ -1,4 +1,3 @@ |
165 |
--#!/usr/bin/env bash |
166 |
- # -*-shell-script-*- |
167 |
- # This should be sourced by bash (though we welcome changes to make it POSIX sh compliant) |
168 |
- |
169 |
-@@ -1022,7 +1021,3 @@ report_cruft() { |
170 |
- printf "The directories above are backups left over from a monkeysphere transition.\nThey may contain copies of sensitive data (host keys, certifier lists), but\nthey are no longer needed by monkeysphere.\nYou may remove them at any time.\n\n" | log info |
171 |
- fi |
172 |
- } |
173 |
-- |
174 |
--if [ -n "$1" ] && [ "$(type -t "$1" || true)" = "function" ]; then |
175 |
-- "$@" |
176 |
--fi |
177 |
-diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier |
178 |
-index 1d450e7..5416aa9 100644 |
179 |
---- a/src/share/ma/add_certifier |
180 |
-+++ b/src/share/ma/add_certifier |
181 |
-@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then |
182 |
- # check the key is ok as monkeysphere user before loading |
183 |
- log debug "checking keys in file..." |
184 |
- fingerprint=$(su_monkeysphere_user \ |
185 |
-- "${SYSSHAREDIR}/common" list_primary_fingerprints < "$keyID") |
186 |
-+ bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID") |
187 |
- |
188 |
- if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then |
189 |
- failure "There was not exactly one gpg key in the file." |
190 |
-diff --git a/src/share/ma/update_users b/src/share/ma/update_users |
191 |
-index d23c125..4f83e0c 100644 |
192 |
---- a/src/share/ma/update_users |
193 |
-+++ b/src/share/ma/update_users |
194 |
-@@ -79,7 +79,7 @@ for uname in $unames ; do |
195 |
- |
196 |
- # process authorized_user_ids file, as monkeysphere user |
197 |
- su_monkeysphere_user \ |
198 |
-- /usr/bin/env "STRICT_MODES=$STRICT_MODES" "${SYSSHAREDIR}/common" process_authorized_user_ids - \ |
199 |
-+ /usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \ |
200 |
- < "$authorizedUserIDs" \ |
201 |
- > "$tmpAuthorizedKeys" |
202 |
- |
203 |
-diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker |
204 |
-index 28b11ac..e00ac4e 100644 |
205 |
---- a/src/share/mh/add_revoker |
206 |
-+++ b/src/share/mh/add_revoker |
207 |
-@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then |
208 |
- # check the key is ok as monkeysphere user before loading |
209 |
- log debug "checking keys in file..." |
210 |
- fingerprint=$(su_monkeysphere_user \ |
211 |
-- "${SYSSHAREDIR}/common" list_primary_fingerprints < "$revokerKeyID") |
212 |
-+ bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID") |
213 |
- |
214 |
- if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then |
215 |
- failure "There was not exactly one gpg key in the file." |
216 |
--- |
217 |
-2.7.3 |
218 |
- |
219 |
|
220 |
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch |
221 |
deleted file mode 100644 |
222 |
index 65d3ba6a95a..00000000000 |
223 |
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch |
224 |
+++ /dev/null |
225 |
@@ -1,53 +0,0 @@ |
226 |
-From 0e339de4772b6de1849dc55790821c3dd5943be3 Mon Sep 17 00:00:00 2001 |
227 |
-From: Daniel Kahn Gillmor <dkg@×××××××××××××.net> |
228 |
-Date: Tue, 9 Aug 2016 09:39:45 -0400 |
229 |
-Subject: [PATCH 2/2] ensure that this works even if SYSSHAREDIR has whitespace |
230 |
- |
231 |
---- |
232 |
- src/share/ma/add_certifier | 2 +- |
233 |
- src/share/ma/update_users | 2 +- |
234 |
- src/share/mh/add_revoker | 2 +- |
235 |
- 3 files changed, 3 insertions(+), 3 deletions(-) |
236 |
- |
237 |
-diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier |
238 |
-index 5416aa9..9488806 100644 |
239 |
---- a/src/share/ma/add_certifier |
240 |
-+++ b/src/share/ma/add_certifier |
241 |
-@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then |
242 |
- # check the key is ok as monkeysphere user before loading |
243 |
- log debug "checking keys in file..." |
244 |
- fingerprint=$(su_monkeysphere_user \ |
245 |
-- bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID") |
246 |
-+ bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$keyID") |
247 |
- |
248 |
- if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then |
249 |
- failure "There was not exactly one gpg key in the file." |
250 |
-diff --git a/src/share/ma/update_users b/src/share/ma/update_users |
251 |
-index 4f83e0c..a0ec21b 100644 |
252 |
---- a/src/share/ma/update_users |
253 |
-+++ b/src/share/ma/update_users |
254 |
-@@ -79,7 +79,7 @@ for uname in $unames ; do |
255 |
- |
256 |
- # process authorized_user_ids file, as monkeysphere user |
257 |
- su_monkeysphere_user \ |
258 |
-- /usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \ |
259 |
-+ /usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c "$(printf ". %q && process_authorized_user_ids -" "${SYSSHAREDIR}/common")"\ |
260 |
- < "$authorizedUserIDs" \ |
261 |
- > "$tmpAuthorizedKeys" |
262 |
- |
263 |
-diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker |
264 |
-index e00ac4e..de08961 100644 |
265 |
---- a/src/share/mh/add_revoker |
266 |
-+++ b/src/share/mh/add_revoker |
267 |
-@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then |
268 |
- # check the key is ok as monkeysphere user before loading |
269 |
- log debug "checking keys in file..." |
270 |
- fingerprint=$(su_monkeysphere_user \ |
271 |
-- bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID") |
272 |
-+ bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$revokerKeyID") |
273 |
- |
274 |
- if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then |
275 |
- failure "There was not exactly one gpg key in the file." |
276 |
--- |
277 |
-2.7.3 |
278 |
- |
279 |
|
280 |
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch |
281 |
deleted file mode 100644 |
282 |
index 776e633b3d7..00000000000 |
283 |
--- a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch |
284 |
+++ /dev/null |
285 |
@@ -1,45 +0,0 @@ |
286 |
-From b1dd8fb1b84c6eea25523c3ea746852b3dce6034 Mon Sep 17 00:00:00 2001 |
287 |
-From: Valo <valo@××××××××××××××.net> |
288 |
-Date: Wed, 31 Aug 2016 14:00:05 -0400 |
289 |
-Subject: [PATCH] Make tests pass with GnuPG 2.1.15 |
290 |
- |
291 |
-2.1.15 appears to always emit the fingerprint lines in these cases, |
292 |
-while 2.1.14 did not. |
293 |
---- |
294 |
- tests/keytrans | 6 +++--- |
295 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
296 |
- |
297 |
-diff --git a/tests/keytrans b/tests/keytrans |
298 |
-index 3076e3f..5c7d2c8 100755 |
299 |
---- a/tests/keytrans |
300 |
-+++ b/tests/keytrans |
301 |
-@@ -140,7 +140,7 @@ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest |
302 |
- sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8 |
303 |
- EOF |
304 |
- |
305 |
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//') |
306 |
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//') |
307 |
- |
308 |
- echo "##################################################" |
309 |
- echo "### sleeping to avoid test suite breakage on fast" |
310 |
-@@ -170,7 +170,7 @@ rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8 |
311 |
- EOF |
312 |
- |
313 |
- |
314 |
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//') |
315 |
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//') |
316 |
- |
317 |
- |
318 |
- echo "##################################################" |
319 |
-@@ -206,7 +206,7 @@ sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8 |
320 |
- EOF |
321 |
- |
322 |
- echo "test: diff expected gpg list output" |
323 |
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//') |
324 |
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//') |
325 |
- |
326 |
- sort >"$TEMPDIR"/expectedout <<EOF |
327 |
- $KEYFPR |
328 |
--- |
329 |
-2.7.3 |
330 |
- |