Explorar o código

package/tftpd: bump to latest git commit

Fixes the following error when compiled against GCC 14.x:

tftp.c: In function ‘tftp_sendfile’:
tftp.c:88:5: error: implicit declaration of function ‘bsd_signal’; did
you mean ‘ssignal’? [-Wimplicit-function-declaration]
   88 |     bsd_signal(SIGALRM, timer);
      |     ^~~~~~~~~~
      |     ssignal
tftp.c:88:5: warning: nested extern declaration of ‘bsd_signal’ [-Wnested-externs]
main.c: In function ‘main’:
main.c:308:5: error: implicit declaration of function ‘bsd_signal’;
did you mean ‘ssignal’? [-Wimplicit-function-declaration]
  308 |     bsd_signal(SIGINT, intr);
      |     ^~~~~~~~~~
      |     ssignal
main.c:308:5: warning: nested extern declaration of ‘bsd_signal’ [-Wnested-externs]

Remove an upstreamed patch.

tftpd/tftpd.c has changed, hence, change its checksum.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yegor Yefremov hai 1 ano
pai
achega
3918d46a26

+ 0 - 1
.checkpackageignore

@@ -1458,7 +1458,6 @@ package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch lib_patch.Up
 package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch lib_patch.Upstream
 package/tcf-agent/S55tcf-agent Shellcheck lib_sysv.Variables
 package/tcl/0001-Disable-tcl-compatibility-layers.patch lib_patch.Upstream
-package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch lib_patch.Upstream
 package/tftpd/S80tftpd-hpa Shellcheck lib_sysv.Indent lib_sysv.Variables
 package/ti-gfx/0001-newclkapi.patch lib_patch.Upstream
 package/ti-gfx/0002-fix-build-omaplfb-linux.patch lib_patch.Upstream

+ 0 - 29
package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch

@@ -1,29 +0,0 @@
-From 6f994166d8571961a08479736ae86c5baa2bb47f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Fri, 7 Aug 2020 12:07:45 +0200
-Subject: [PATCH] Use "extern" qualifier to fix gcc 10.x build
-
-Patch from
-https://src.fedoraproject.org/rpms/tftp/raw/master/f/tftp-hpa-5.2-gcc10.patch.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- tftp/tftp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tftp/tftp.c b/tftp/tftp.c
-index d15da22..d067f96 100644
---- a/tftp/tftp.c
-+++ b/tftp/tftp.c
-@@ -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 *);
--- 
-2.26.2
-

+ 2 - 2
package/tftpd/tftpd.hash

@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  0eb23ceca54eac3648ca4254a4664241483ddc6bef36958e1cf23bc994d15863  tftpd-b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7-git4.tar.gz
+sha256  9bdb3e2ab2b68e4d8cd057d102395c362baf07c7b052f1d5e40e5190afecc15e  tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0-git4.tar.gz
 
 # Hash for license file
-sha256  67754ebd8f265571d3226ac97e521b1bd6fd8a61363ecd4ab7806a6f90efab92  tftpd/tftpd.c
+sha256  5936d0764cb6e8f2f5ce8a11c249d81037b5f275f5983e8538ee4fbe57195369  tftpd/tftpd.c

+ 1 - 1
package/tftpd/tftpd.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TFTPD_VERSION = b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7
+TFTPD_VERSION = e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0
 TFTPD_SITE = https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git
 TFTPD_SITE_METHOD = git
 TFTPD_CONF_OPTS = --without-tcpwrappers