1 |
commit: 5f3f9ae2abf4a8ab383507246d3faca52d611121 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 30 21:03:43 2020 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 2 22:11:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3f9ae2 |
7 |
|
8 |
www-apps/mirmon: revbump with getopt fixes |
9 |
|
10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
11 |
|
12 |
www-apps/mirmon/files/2.11-Fix-options.patch | 34 ++++++++++++++++++++++ |
13 |
...mirmon-2.11-r1.ebuild => mirmon-2.11-r2.ebuild} | 1 + |
14 |
2 files changed, 35 insertions(+) |
15 |
|
16 |
diff --git a/www-apps/mirmon/files/2.11-Fix-options.patch b/www-apps/mirmon/files/2.11-Fix-options.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..0e0924ea9dd |
19 |
--- /dev/null |
20 |
+++ b/www-apps/mirmon/files/2.11-Fix-options.patch |
21 |
@@ -0,0 +1,34 @@ |
22 |
+Fix option handling. |
23 |
+ |
24 |
+Add debug option to getopt inputs. |
25 |
+Add debug option to usage output. |
26 |
+Add version option to usage output. |
27 |
+ |
28 |
+Signed-off-by: Robin H. Johnson <robbat2@g.o> |
29 |
+ |
30 |
+--- mirmon-2.11.orig/mirmon 2020-04-30 13:32:52.803951845 -0700 |
31 |
++++ mirmon-2.11/mirmon 2020-04-30 13:33:58.051641169 -0700 |
32 |
+@@ -1900,12 +1900,14 @@ |
33 |
+ Usage: $prog [-v] [-q] [-t timeout] [-c conf] [-get all|update|url <url>] |
34 |
+ option v : be verbose |
35 |
+ option q : be quiet |
36 |
++option d : debug output |
37 |
+ option t : set timeout ; default $TIMEOUT |
38 |
+ option get : get all : probe all sites |
39 |
+ : get update : probe a selection of the sites (see doc) |
40 |
+ : get url <url> : probe some <url> (in the mirror-list). |
41 |
+ option c : configuration file ; default search : |
42 |
+ ( $DEF_CNF ) |
43 |
++option version : display version |
44 |
+ ------------------------------------------------------------------- |
45 |
+ Mirmon normally only reports errors and changes in the mirror list. |
46 |
+ This is $VERSION. |
47 |
+@@ -1924,7 +1926,7 @@ |
48 |
+ use Getopt::Long ; |
49 |
+ Getopt::Long::config ( 'no_ignore_case' ) ; |
50 |
+ my %opt = () ; |
51 |
+-Usage '' unless GetOptions ( \%opt, qw(v q t=i get=s c=s version) ) ; |
52 |
++Usage '' unless GetOptions ( \%opt, qw(d v q t=i get=s c=s version) ) ; |
53 |
+ Usage "Arg count\n" if @ARGV > 1 ; |
54 |
+ Usage "Arg count\n" if $opt{get} and $opt{get} eq 'url' and ! @ARGV ; |
55 |
+ |
56 |
|
57 |
diff --git a/www-apps/mirmon/mirmon-2.11-r1.ebuild b/www-apps/mirmon/mirmon-2.11-r2.ebuild |
58 |
similarity index 96% |
59 |
rename from www-apps/mirmon/mirmon-2.11-r1.ebuild |
60 |
rename to www-apps/mirmon/mirmon-2.11-r2.ebuild |
61 |
index 861191e7470..0d6ce1561b0 100644 |
62 |
--- a/www-apps/mirmon/mirmon-2.11-r1.ebuild |
63 |
+++ b/www-apps/mirmon/mirmon-2.11-r2.ebuild |
64 |
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND} |
65 |
|
66 |
PATCHES=( |
67 |
"${FILESDIR}/2.11-Add-ipv6-monitor-support-to-mirmon.patch" |
68 |
+ "${FILESDIR}/2.11-Fix-options.patch" |
69 |
) |
70 |
|
71 |
src_install() { |