Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hw-probe/files/
Date: Tue, 23 Nov 2021 20:37:24
Message-Id: 1637699807.22055a3a31ad98c96eded65dd5757ccda8050cff.conikost@gentoo
1 commit: 22055a3a31ad98c96eded65dd5757ccda8050cff
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Nov 23 20:01:15 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 23 20:36:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22055a3a
7
8 sys-apps/hw-probe: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/23059
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../hw-probe-1.5-disable-automatic-upload.patch | 36 ----------------------
16 1 file changed, 36 deletions(-)
17
18 diff --git a/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch b/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
19 deleted file mode 100644
20 index 4f16c0d87fae..000000000000
21 --- a/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
22 +++ /dev/null
23 @@ -1,36 +0,0 @@
24 -From 6a211f965c21f1aa2e8612bcd7e2966ce8e8c607 Mon Sep 17 00:00:00 2001
25 -From: Conrad Kostecki <conikost@g.o>
26 -Date: Wed, 23 Sep 2020 22:26:45 +0200
27 -Subject: [PATCH] hw-probe.pl: disable automatic upload
28 -
29 -Due security concerns, running 'hw-probe.pl' without any parameters
30 -shouldn't upload directly by default all data. Instead, the user should
31 -add '-upload' if he really wants that.
32 -
33 -Signed-off-by: Conrad Kostecki <conikost@g.o>
34 ----
35 - hw-probe.pl | 6 ++----
36 - 1 file changed, 2 insertions(+), 4 deletions(-)
37 -
38 -diff --git a/hw-probe.pl b/hw-probe.pl
39 -index b71f250..1bceb0e 100644
40 ---- a/hw-probe.pl
41 -+++ b/hw-probe.pl
42 -@@ -217,15 +217,13 @@
43 -
44 - if($#ARGV_COPY==-1)
45 - { # Run from STDIN
46 -- print "Executing hw-probe -all -upload\n\n";
47 -+ print "Executing hw-probe -all\n\n";
48 - $Opt{"All"} = 1;
49 -- $Opt{"Upload"} = 1;
50 - }
51 - elsif($#ARGV_COPY==0 and grep { $ARGV_COPY[0] eq $_ } ("-snap", "-flatpak"))
52 - { # Run by desktop file
53 -- print "Executing hw-probe -all -upload\n\n";
54 -+ print "Executing hw-probe -all\n\n";
55 - $Opt{"All"} = 1;
56 -- $Opt{"Upload"} = 1;
57 -
58 - if($SNAP_DESKTOP or $FLATPAK_DESKTOP)
59 - { # Desktop