!8 [sync] PR-6: Update manpage to match source code for map file
From: @openeuler-sync-bot Reviewed-by: @seuzw Signed-off-by: @seuzw
This commit is contained in:
commit
19842cc744
@ -0,0 +1,42 @@
|
||||
From 02d176ba1813dba11c6c0ebdf7e68a0dbfc69464 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Baumann <mail@daniel-baumann.ch>
|
||||
Date: Thu, 31 Jul 2014 16:29:42 +0930
|
||||
Subject: [PATCH] Update manpage to match source code for map file
|
||||
|
||||
The manpage had --mapfile but the code had --map-file.
|
||||
|
||||
Closes: #606267 in the Debian BTS
|
||||
|
||||
Reported-by: Jim Paris <jim@jtan.com>
|
||||
Signed-off-by: Ron Ledd <ron@debian.org>
|
||||
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
|
||||
|
||||
---
|
||||
tftpd/tftpd.8.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tftpd/tftpd.8.in b/tftpd/tftpd.8.in
|
||||
index b7bc396..e708c53 100644
|
||||
--- a/tftpd/tftpd.8.in
|
||||
+++ b/tftpd/tftpd.8.in
|
||||
@@ -238,7 +238,7 @@ option, but crash with an error if they actually get the option
|
||||
accepted by the server.
|
||||
.SH "FILENAME REMAPPING"
|
||||
The
|
||||
-.B \-\-mapfile
|
||||
+.B \-\-map-file
|
||||
option specifies a file which contains filename remapping rules. Each
|
||||
non-comment line (comments begin with hash marks,
|
||||
.BR # )
|
||||
@@ -390,7 +390,7 @@ flag is used to set up a chroot() environment for the server to run in
|
||||
once a connection has been set up.
|
||||
.PP
|
||||
Finally, the filename remapping
|
||||
-.RB ( \-\-mapfile
|
||||
+.RB ( \-\-map-file
|
||||
flag) support can be used to provide a limited amount of additional
|
||||
access control.
|
||||
.SH "CONFORMING TO"
|
||||
--
|
||||
2.23.0
|
||||
|
||||
10
tftp.spec
10
tftp.spec
@ -1,6 +1,6 @@
|
||||
Name: tftp
|
||||
Version: 5.2
|
||||
Release: 30
|
||||
Release: 31
|
||||
Summary: The client for the Trivial File Transfer Protocol (TFTP)
|
||||
License: BSD
|
||||
Group: Applications/Internet
|
||||
@ -20,6 +20,8 @@ Patch0009: tftp-doc.patch
|
||||
Patch0010: tftp-enhanced-logging.patch
|
||||
Patch0011: tftp-hpa-5.2-gcc10.patch
|
||||
|
||||
Patch6001: backport-Update-manpage-to-match-source-code-for-map-file.patch
|
||||
|
||||
BuildRequires: readline-devel autoconf systemd-units
|
||||
BuildRequires: gcc
|
||||
|
||||
@ -86,6 +88,12 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 18 2022 chengyechun <chengyechun1@huawei.com> - 5.2-31
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:Update manpage to match source code for map file
|
||||
|
||||
* Fri Jul 30 2021 gaihuiying <gaihuiying1@huawei.com> - 5.2-30
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user