Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 61 insertions, 115 deletions

diff --git a/templates/man1/flock.1.pot b/templates/man1/flock.1.pot
index cebecd3a..4de7c2f4 100644
--- a/templates/man1/flock.1.pot
+++ b/templates/man1/flock.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-08-27 16:57+0200\n"
+"POT-Creation-Date: 2024-03-29 09:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "FLOCK"
 msgstr ""
@@ -35,58 +35,58 @@ msgid "util-linux 2.38.1"
 msgstr ""
 
 #. type: TH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "User Commands"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "flock - manage locks from shell scripts"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<flock> [options] I<file>|I<directory> I<command> [I<arguments>]"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<flock> [options] I<file>|I<directory> B<-c> I<command>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<flock> [options] I<number>"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "This utility manages B<flock>(2) locks from within shell scripts or from the "
 "command line."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The first and second of the above forms wrap the lock around the execution "
 "of a I<command>, in a manner similar to B<su>(1) or B<newgrp>(1). They lock "
@@ -96,35 +96,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The third form uses an open file by its file descriptor I<number>. See the "
 "examples below for how that can be used."
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-c>, B<--command> I<command>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "Pass a single I<command>, without arguments, to the shell with B<-c>."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-E>, B<--conflict-exit-code> I<number>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The exit status used when the B<-n> option is in use, and the conflicting "
 "lock exists, or the B<-w> option is in use, and the timeout is reached. The "
@@ -132,12 +132,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-F>, B<--no-fork>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Do not fork before executing I<command>. Upon execution the flock process is "
 "replaced by I<command> which continues to hold the lock. This option is "
@@ -146,35 +146,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-e>, B<-x>, B<--exclusive>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Obtain an exclusive lock, sometimes called a write lock. This is the default."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-n>, B<--nb>, B<--nonblock>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Fail rather than wait if the lock cannot be immediately acquired. See the B<-"
 "E> option for the exit status used."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-o>, B<--close>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Close the file descriptor on which the lock is held before executing "
 "I<command>. This is useful if I<command> spawns a child process which should "
@@ -182,22 +182,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-s>, B<--shared>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "Obtain a shared lock, sometimes called a read lock."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-u>, B<--unlock>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Drop a lock. This is usually not required, since a lock is automatically "
 "dropped when the file is closed. However, it may be required in special "
@@ -206,12 +206,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-w>, B<--wait>, B<--timeout> I<seconds>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Fail if the lock cannot be acquired within I<seconds>. Decimal fractional "
 "values are allowed. See the B<-E> option for the exit status used. The zero "
@@ -219,29 +219,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Report how long it took to acquire the lock, or why the lock could not be "
 "obtained."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-h>, B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "Display help text and exit."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<-V>, B<--version>"
 msgstr ""
 
@@ -251,13 +251,13 @@ msgid "Print version and exit."
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The command uses E<lt>sysexits.hE<gt> exit status values for everything, "
 "except when using either of the options B<-n> or B<-w> which report a "
@@ -267,25 +267,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "When using the I<command> variant, and executing the child worked, then the "
 "exit status is that of the child command."
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "NOTES"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<flock> does not detect deadlock. See B<flock>(2) for details."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Some file systems (e. g. NFS and CIFS) have a limited implementation of "
 "B<flock>(2) and flock may always fail. For details see B<flock>(2), "
@@ -294,18 +294,18 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "Note that \"shellE<gt> \" in examples is a command line prompt."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "shell1E<gt> flock /tmp -c cat; shell2E<gt> flock -w .007 /tmp -c echo; /bin/"
 "echo $?"
@@ -318,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "shell1E<gt> flock -s /tmp -c cat; shell2E<gt> flock -s -w .007 /tmp -c "
 "echo; /bin/echo $?"
@@ -332,26 +332,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "shellE<gt> flock -x local-lock-file echo \\(aqa b c\\(aq"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Grab the exclusive lock \"local-lock-file\" before running echo with \\(aqa "
 "b c\\(aq."
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "(; flock -n 9 || exit 1; # ... commands executed under lock ...; ) 9E<gt>/"
 "var/lock/mylockfile"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The form is convenient inside shell scripts. The mode used to open the file "
 "doesn\\(cqt matter to B<flock>; using I<E<gt>> or I<E<gt>E<gt>> allows the "
@@ -380,7 +380,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "shellE<gt> exec 4E<lt>E<gt>/var/lock/mylockfile; shellE<gt> flock -n 4"
 msgstr ""
 
@@ -393,19 +393,19 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "AUTHORS"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "Copyright © 2003-2006 H. Peter Anvin. This is free software; see the source "
 "for copying conditions. There is NO warranty; not even for MERCHANTABILITY "
@@ -413,90 +413,36 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "B<flock>(2)"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "REPORTING BUGS"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid "For bug reports, use the issue tracker at"
 msgstr ""
 
 #. type: SH
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 #, no-wrap
 msgid "AVAILABILITY"
 msgstr ""
 
 #. type: Plain text
-#: debian-bookworm opensuse-leap-15-6
+#: debian-bookworm
 msgid ""
 "The B<flock> command is part of the util-linux package which can be "
 "downloaded from"
 msgstr ""
-
-#. type: TH
-#: opensuse-leap-15-6
-#, no-wrap
-msgid "2022-02-14"
-msgstr ""
-
-#. type: TH
-#: opensuse-leap-15-6
-#, no-wrap
-msgid "util-linux 2.37.4"
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "Display version information and exit."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "Set exclusive lock to directory /tmp and the second command will fail."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid ""
-"Set shared lock to directory /tmp and the second command will not fail. "
-"Notice that attempting to get exclusive lock with second command would fail."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid "[ ${FLOCKER} != $0 ] && exec env FLOCKER=\"$0 flock -en $0 $0 $@ ||"
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid ""
-"This is useful boilerplate code for shell scripts. Put it at the top of the "
-"shell script you want to lock and it\\(cqll automatically lock itself on the "
-"first run. If the env var B<$FLOCKER> is not set to the shell script that is "
-"being run, then execute B<flock> and grab an exclusive non-blocking lock "
-"(using the script itself as the lock file) before re-execing itself with the "
-"right arguments. It also sets the FLOCKER env var to the right value so it "
-"doesn\\(cqt run again."
-msgstr ""
-
-#. type: Plain text
-#: opensuse-leap-15-6
-msgid ""
-"This form is convenient for locking a file without spawning a subprocess. "
-"The shell opens the lock file for reading and writing as file descriptor 4, "
-"then flock is used to lock the descriptor."
-msgstr ""