Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
e45fcd4171
!9 update the info of patch
From: @chengyechun 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
2024-08-02 02:48:36 +00:00
chengyechun
ad05cfd384 update the info of patch 2024-08-02 02:00:34 +00:00
openeuler-ci-bot
19842cc744
!8 [sync] PR-6: Update manpage to match source code for map file
From: @openeuler-sync-bot 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2022-10-21 03:29:25 +00:00
chengyechun
40db72e3af Update manpage to match source code for map file
(cherry picked from commit 04eb2d192e8da3f0dea264c4d12a750d3cc4cd4a)
2022-10-20 19:26:53 +08:00
openeuler-ci-bot
c9038ce96b !5 fix build error with gcc 10
From: @eaglegai
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
2021-07-30 03:34:05 +00:00
eaglegai
faf0321da9 fix build error with gcc 10 2021-07-30 11:24:44 +08:00
openeuler-ci-bot
9476c9dbf1 !4 Add the compilation dependency of gcc.
From: @lijingyuan007
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
2021-05-27 21:27:04 +08:00
lijingyuan007
e7f0f6c075 Add the compilation dependency of gcc. 2021-05-27 10:54:48 +08:00
openeuler-ci-bot
de2b9ec711 !3 remove the fedora, redhat keyword
From: @haochenstar
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
2020-12-16 14:48:02 +08:00
haochenstar
7a562c169a remove fedora,redhat keyword 2020-12-15 20:45:06 +08:00
3 changed files with 92 additions and 2 deletions

View File

@ -0,0 +1,45 @@
From 3ee2b278091ac0c60e9077096afa2135708de5e4 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
Conflict:NA
Reference:https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/commit/?id=3ee2b278091ac0c60e9077096afa2135708de5e4
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 Lee <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

12
tftp-hpa-5.2-gcc10.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up tftp-hpa-5.2/tftp/tftp.c.gcc10 tftp-hpa-5.2/tftp/tftp.c
--- tftp-hpa-5.2/tftp/tftp.c.gcc10 2020-05-04 00:56:28.787896509 +0200
+++ tftp-hpa-5.2/tftp/tftp.c 2020-05-04 00:58:42.502901005 +0200
@@ -48,7 +48,7 @@ extern int maxtimeout;
#define PKTSIZE SEGSIZE+4
char ackbuf[PKTSIZE];
int timeout;
-sigjmp_buf toplevel;
+extern sigjmp_buf toplevel;
sigjmp_buf timeoutbuf;
static void nak(int, const char *);

View File

@ -1,6 +1,6 @@
Name: tftp
Version: 5.2
Release: 27
Release: 32
Summary: The client for the Trivial File Transfer Protocol (TFTP)
License: BSD
Group: Applications/Internet
@ -8,7 +8,6 @@ URL: http://www.kernel.org/pub/software/network/tftp/
Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-%{version}.tar.bz2
Source1: tftp.socket
Source2: tftp.service
#Acknowledge all patches from fedora or redhat.
Patch0000: tftp-0.40-remap.patch
Patch0002: tftp-hpa-0.39-tzfix.patch
Patch0003: tftp-0.42-tftpboot.patch
@ -19,8 +18,12 @@ Patch0007: tftp-hpa-0.49-stats.patch
Patch0008: tftp-hpa-5.2-pktinfo.patch
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
%description
TFTP which is the abbreviation of Trivial File Fransfer Protocol
@ -85,6 +88,36 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}
%changelog
* Fri Aug 02 2024 chengyechun <chengyechun1@huawei.com> - 5.2-32
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:update the info of patch
* 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
- SUG:NA
- DESC:fix build error with gcc 10
* Thu May 27 2021 lijingyuan <lijingyuan3@huawei.com> - 5.2-29
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Add the compilation dependency of gcc.
* Tue Dec 15 2020 xihaochen <xihaochen@huawei.com> - 5.2-28
- Type:requirement
- ID:NA
- SUG:NA
- DESC:remove sensitive words
* Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.2-27
- Type:bugfix
- ID:NA