public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/physlock/, app-misc/physlock/files/
@ 2017-08-17 20:17 Tim Harder
  0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2017-08-17 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a459f878243195d6abc7a67a4bc3327e2d36d8a0
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 20:15:48 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 20:15:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a459f878

app-misc/physlock: remove old

 app-misc/physlock/Manifest                         |  1 -
 .../physlock/files/physlock-0.4.4-makefile.patch   | 16 ---------------
 app-misc/physlock/physlock-0.4.5.ebuild            | 23 ----------------------
 3 files changed, 40 deletions(-)

diff --git a/app-misc/physlock/Manifest b/app-misc/physlock/Manifest
index 44006e29a92..c26217c5cab 100644
--- a/app-misc/physlock/Manifest
+++ b/app-misc/physlock/Manifest
@@ -1,3 +1,2 @@
-DIST physlock-0.4.5.tar.gz 12804 SHA256 5ddb42553142c5e2b8744d086bb8f5bf131a29fc58b8886e825b80e6a456961c SHA512 ab2e71bdc0004d97e3742cf8155602c036dafa22156147cc3cd4050c1665e54d4ca04ee8dc1f763e6369a5d6592524cbc8e10c56870905a1b13385640f4ec476 WHIRLPOOL e770cc9e4448c3407c12d51e1bb2d1fec5f74cdc5be4d6503fa89a297b3a40b7f5bb67466fbb641e2af249339aacdf2abb5de9ac145482c1b283604abbb51533
 DIST physlock-0.5.tar.gz 13547 SHA256 395873abe9bfb3879df796bd9d857be024c4ca01c5b6e83cfd3253647b558782 SHA512 0e22d2c1093556e2ca52da4ee36e53a7eebf9c2cf8e10592c95971aa3479c3ee1a31b9d71e52fca715a483f22740f6cf9a3c167fb61e4c6034a2ecf900fd5f9d WHIRLPOOL 4dbfea803043a691e16a515fede273a27360923808aa2d1c6bd281282bc24b24113cc39915ba2f90723dd15322ac930297605f7cc2c6b1fc51cb7794ee46796a
 DIST physlock-11.tar.gz 13791 SHA256 f03031a6f4c6a08d62098457834d04b8835082a76609059451397356a83d4442 SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938 WHIRLPOOL e74513bf5c60db1669dfa11496f98cd4100753ce1a9aa93c603235680adb3ff4b7f2bffff134e8f2f27534e1a5fffff15a4cd17627dd2761f6b67d3903a166f4

diff --git a/app-misc/physlock/files/physlock-0.4.4-makefile.patch b/app-misc/physlock/files/physlock-0.4.4-makefile.patch
deleted file mode 100644
index 4491e059667..00000000000
--- a/app-misc/physlock/files/physlock-0.4.4-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- physlock-0.4.4/Makefile
-+++ physlock-0.4.4/Makefile
-@@ -2,10 +2,10 @@
- 
- VERSION = 0.4.4
- 
--CC      = gcc
-+CC      ?= gcc
- PREFIX  = /usr/local
--CFLAGS  = -Wall -pedantic -DVERSION=\"$(VERSION)\"
--LDFLAGS =
-+CFLAGS  += -Wall -pedantic -DVERSION=\"$(VERSION)\"
-+LDFLAGS +=
- LIBS    = -lcrypt
- 
- SRC = auth.c main.c options.c util.c vt.c

diff --git a/app-misc/physlock/physlock-0.4.5.ebuild b/app-misc/physlock/physlock-0.4.5.ebuild
deleted file mode 100644
index 51420586acd..00000000000
--- a/app-misc/physlock/physlock-0.4.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="lightweight Linux console locking tool"
-HOMEPAGE="https://github.com/muennich/physlock"
-SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.4-makefile.patch
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/physlock/, app-misc/physlock/files/
@ 2021-11-22 14:03 Joonas Niilola
  0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2021-11-22 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     c2ad6666f04d4e5ff6cd4fd08d36711f5b83bb08
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Tue Nov  9 01:31:01 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 14:03:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ad6666

app-misc/physlock: Add patch to improve -h output

Previously -h only listed the options. Now -h prints a description taken
from the man page.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22870
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../physlock-13-Improved-commandline-help.patch    | 89 ++++++++++++++++++++++
 ...physlock-13-r2.ebuild => physlock-13-r3.ebuild} |  1 +
 2 files changed, 90 insertions(+)

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
similarity index 93%
rename from app-misc/physlock/physlock-13-r2.ebuild
rename to 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() {


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-22 14:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-22 14:03 [gentoo-commits] repo/gentoo:master commit in: app-misc/physlock/, app-misc/physlock/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2017-08-17 20:17 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox