[gentoo-commits] proj/portage:master commit in: man/, /

[Zac Medico]

commit:     cd5e6d8d4e84bc042c041f75e428410d6cdb5475
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 01:02:55 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 04:09:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd5e6d8d

glsa-check: install in /usr/bin (bug 463952)

In order to eliminate the duplicate implementation from gentoolkit,
install glsa-check into /usr/bin and add man page from gentoolkit.

Bug: https://bugs.gentoo.org/463952
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 man/glsa-check.1 | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py         |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/man/glsa-check.1 b/man/glsa-check.1
new file mode 100644
index 000000000..67527230c
--- /dev/null
+++ b/man/glsa-check.1
@@ -0,0 +1,66 @@
+.TH "GLSA-CHECK" "1" "Aug 2019" "Portage VERSION" "Portage"
+.SH "NAME"
+.LP
+glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
+.SH "SYNTAX"
+.LP
+glsa\-check <\fIoption\fP> [\fIglsa\-list\fP]
+
+[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames containing GLSAs or the special identifiers 'all' and 'affected'
+.SH "DESCRIPTION"
+.LP
+This tool is used to locally monitor and manage Gentoo Linux Security Advisories.
+Please read:
+.br
+http://www.gentoo.org/security
+.br
+before reporting a bug.
+.LP
+Note: In order for this tool to be effective, you must regularly sync your local portage tree.
+.SH "OPTIONS"
+.LP
+.TP
+.B \-l, \-\-list
+list the a summary for all GLSAs in glsa\-list and whether they affect the system
+.TP
+.B \-d, \-\-dump, \-\-print
+show all information about the GLSAs in glsa\-list
+.TP
+.B \-t, \-\-test
+test if this system is affected by the GLSAs in glsa\-list and output the GLSA IDs
+.TP
+.B \-p, \-\-pretend
+show the necessary steps to apply the GLSAs in glsa\-list
+.TP
+.B \-f, \-\-fix
+try to auto\-apply the GLSAs in in glsa\-list using emerge. This will only upgrade packages to later version, but not remove packages when no upgrade path exists (experimental)
+.TP
+.B \-i, \-\-inject
+inject the given GLSA into the glsa_injected file
+.TP
+.B \-n, \-\-nocolor
+disable colors (option)
+.TP
+.B \-h, \-\-help
+show this help message
+.TP
+.B \-V, \-\-version
+some information about this tool
+.TP
+.B \-v, \-\-verbose
+print more messages (option)
+.TP
+.B \-c, \-\-cve
+show CVE ids in listing mode (option)
+.TP
+.B \-q, \-\-quiet
+be less verbose and do not send empty mail (option)
+.TP
+.B \-m, \-\-mail
+send a mail with the given GLSAs to the administrator
+.SH "FILES"
+.LP
+.TP
+.B /var/lib/portage/glsa_injected
+List of GLSA ids that have been injected and will never show up as 'affected' on this system.
+The file must contain one GLSA id (e.g. '200804\-02') per line.

diff --git a/setup.py b/setup.py
index 156537a31..c71deb97f 100755
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ import sys
 x_scripts = {
 	'bin': [
 		'bin/ebuild', 'bin/egencache', 'bin/emerge', 'bin/emerge-webrsync',
-		'bin/emirrordist', 'bin/portageq', 'bin/quickpkg',
+		'bin/emirrordist', 'bin/glsa-check', 'bin/portageq', 'bin/quickpkg',
 	],
 	'sbin': [
 		'bin/archive-conf', 'bin/dispatch-conf', 'bin/emaint', 'bin/env-update',