gentoo resync : 05.12.2021

3 files changed, 92 insertions, 1 deletions

diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
index 3d35e1bf9b16..e5007a49d4b6 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,4 +1,5 @@
+AUX physlock-13-Improved-commandline-help.patch 2581 BLAKE2B 8f3db26a986af4f3ae84ef0c7621e96afffd5b9eadf991e4b845b09421d70bb82ecf12af01962914943a383ac2be767718e53f2db249d1dd6f5cdd4803c19277 SHA512 5da0a2955eb271e189690d95ba07862a867bf0c38b4934a655e34e1034e4613723de90128c9d2387fa5dfbb34f7c46ef98dc3b9b3e11e9e4e180f38fef0cbd62
 AUX physlock-13-Set-PAM_TTY.patch 2092 BLAKE2B e45111cd8c52234dda1ccc94403bfb8d11033681ed5d8460f0096776125d0aeddd1e369972a048f21f8777878a9919c0d7e65a4afdf17d73300198277cd1095d SHA512 1875b2318bf601ceb22c12ed1a36c2521604de6795a0925158ad7d5a7b4d4c20519bfc534a1d116634f926c4c6289aa3b1112ee4b63ec3870df5787b73908c0d
 DIST physlock-13.tar.gz 14123 BLAKE2B a43f151c1660c38bd028f80742637a51d5108e6769161c88fb269ac03c827e49bd20e521b8face6aa6a71a8ab65ddf8662e81e8251b74c13388070ed04d4e13b SHA512 85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c
-EBUILD physlock-13-r2.ebuild 877 BLAKE2B 277da86ba9f60e9cb34e8db56f32b6fa1b2457f3e0f9e20fc8701933d910e9202eacecce6a350876a163c439ddcbfad313cce8fbad281faebaeff47e2b7cf5df SHA512 ba74451596593913fe2c13c3bc4693acafe10c2fe875f9fbea1d415a53645b044d49ea92ea1d7431949f5b6269983e1c0f2048d6753608518d02cfdec77bb8d9
+EBUILD physlock-13-r3.ebuild 933 BLAKE2B 772019ad9836d88491354b9ee656bc7b1ad83baf853bf65e7f07e1512a5635fd6e33f6bcadd9c282c4f9f6e2c81d16e004a35b461720e86e8b092c66e1da3c96 SHA512 691f21e787d0dd3b7b7b8f253cdeae410952b5333fbc743acc0b9a603e974f08497ef0e8cd34067f4a20702ea9cdd570d41e8f18111b23997b33c845d8561ab1
 MISC metadata.xml 981 BLAKE2B e5dc78945499f68b27b3f5ccaccb28f1a60c64b535367779b1c29a0c307ce05d232f1242882aa484001c160699f918480c6aa933166bc3c7e878c46c6f013907 SHA512 9356f9a896d944dc1595ce3fffaf974ae8ffc144ee65ccc7e86ab56eedeba29e7a732956aade68500b496f4efdf5bd00efb4e5d32521636081885d7ff2ec0d73
diff --git a/app-misc/physlock/files/physlock-13-Improved-commandline-help.patch b/app-misc/physlock/files/physlock-13-Improved-commandline-help.patch
new file mode 100644
index 000000000000..680575410e4e
--- /dev/null
+++ b/app-misc/physlock/files/physlock-13-Improved-commandline-help.patch
@@ -0,0 +1,89 @@
+From e6c69762f5f555fa17659e3440d8392b6a47bbc6 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Mon, 8 Nov 2021 18:44:25 -0600
+Subject: [PATCH] Improved commandline help
+
+Output the descriptions of the commandline options in -h.
+
+Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+---
+ options.c  | 25 +++++++++++++++++--------
+ physlock.1 |  2 +-
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/options.c b/options.c
+index 6ec3634..ed21262 100644
+--- a/options.c
++++ b/options.c
+@@ -28,7 +28,16 @@ static options_t _options;
+ const options_t *options = (const options_t*) &_options;
+ 
+ void print_usage() {
+-	printf("usage: physlock [-dhLlmsv] [-p MSG]\n");
++	printf("Usage: physlock [-dhlLmsv] [-p MSG]\n");
++	printf("Lock all consoles / virtual terminals.\n\n");
++	printf("  -d        Fork and detach physlock before prompting for authentication.\n");
++	printf("  -h        Print brief usage information to standard output and exit.\n");
++	printf("  -l        Only lock console switching and exit.\n");
++	printf("  -L        Only enable (unlock) console switching and exit.\n");
++	printf("  -m        Mute kernel messages on console while physlock is running.\n");
++	printf("  -p MSG    Display MSG before the password prompt.\n");
++	printf("  -s        Disable SysRq mechanism while physlock is running.\n");
++	printf("  -v        Print version information to standard output and exit.\n");
+ }
+ 
+ void print_version() {
+@@ -46,23 +55,20 @@ void parse_options(int argc, char **argv) {
+ 	_options.lock_switch = -1;
+ 	_options.mute_kernel_messages = 0;
+ 
+-	while ((opt = getopt(argc, argv, "dhLlmp:sv")) != -1) {
++	while ((opt = getopt(argc, argv, "dhlLmp:sv")) != -1) {
+ 		switch (opt) {
+-			case '?':
+-				print_usage();
+-				exit(1);
+ 			case 'd':
+ 				_options.detach = 1;
+ 				break;
+ 			case 'h':
+ 				print_usage();
+ 				exit(0);
+-			case 'L':
+-				_options.lock_switch = 0;
+-				break;
+ 			case 'l':
+ 				_options.lock_switch = 1;
+ 				break;
++			case 'L':
++				_options.lock_switch = 0;
++				break;
+ 			case 'm':
+ 				_options.mute_kernel_messages = 1;
+ 				break;
+@@ -75,6 +81,9 @@ void parse_options(int argc, char **argv) {
+ 			case 'v':
+ 				print_version();
+ 				exit(0);
++			case '?':
++				print_usage();
++				exit(1);
+ 		}
+ 	}
+ }
+diff --git a/physlock.1 b/physlock.1
+index 32e8547..6243214 100644
+--- a/physlock.1
++++ b/physlock.1
+@@ -3,7 +3,7 @@
+ physlock \- lock all consoles / virtual terminals
+ .SH SYNOPSIS
+ .B physlock
+-.RB [ \-dhLlmsv ]
++.RB [ \-dhlLmsv ]
+ .RB [ \-p
+ .IR MSG ]
+ .SH DESCRIPTION
+-- 
+2.32.0
+
diff --git a/app-misc/physlock/physlock-13-r2.ebuild b/app-misc/physlock/physlock-13-r3.ebuild
index 0ae63dfa9ec5..907a87cae44a 100644
--- a/app-misc/physlock/physlock-13-r2.ebuild
+++ b/app-misc/physlock/physlock-13-r3.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-13-Set-PAM_TTY.patch"
+	"${FILESDIR}/${PN}-13-Improved-commandline-help.patch"
 )
 
 pkg_setup() {