* [Buildroot] [PATCH 1/1] package/tftpd: bump to latest git commit
@ 2024-07-21 10:24 Fabrice Fontaine
2024-07-21 16:32 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2024-07-21 10:24 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
- Update hash of tftpd.c (changes not related to license)
- --include=$(@D)/autoconf/m4 and --disable-tcpwrappers must be passed
since
https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/commit/?id=fefaa2cc5c2ae1537fccbb552496787130feeeaa
- This bump will also fix the following musl build failure raised since
latest bump in ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb:
In file included from tftpsubs.h:41,
from tftpsubs.c:34:
/home/autobuild/autobuild/instance-9/output-1/build/tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0/config.h:209:13: error: conflicting types for 'socklen_t'; have 'int'
209 | typedef int socklen_t;
| ^~~~~~~~~
Fixes: ee2b57e0c98acf1d02cf66a38c9ec82bd69bcbeb
- http://autobuild.buildroot.org/results/4b5320013d8ab50499a459d64a71e0b71814fb2f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/tftpd/tftpd.hash | 4 ++--
package/tftpd/tftpd.mk | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/tftpd/tftpd.hash b/package/tftpd/tftpd.hash
index 3fab9dba07..5a4e87f689 100644
--- a/package/tftpd/tftpd.hash
+++ b/package/tftpd/tftpd.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 9bdb3e2ab2b68e4d8cd057d102395c362baf07c7b052f1d5e40e5190afecc15e tftpd-e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0-git4.tar.gz
+sha256 452b2d630f884d80a7c4c324aa8248470224048ffb9473e3490460658b8ebea4 tftpd-2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1-git4.tar.gz
# Hash for license file
-sha256 5936d0764cb6e8f2f5ce8a11c249d81037b5f275f5983e8538ee4fbe57195369 tftpd/tftpd.c
+sha256 9c46847a03d4cf290616a173d526b9bbdfcaf6846cbc01f361989b4e61f2d72e tftpd/tftpd.c
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 81b67f82ce..73ac7006a4 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -4,10 +4,10 @@
#
################################################################################
-TFTPD_VERSION = e52af4207a6e09a1ba21f61d6f85d8b2b1e6efc0
+TFTPD_VERSION = 2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1
TFTPD_SITE = https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git
TFTPD_SITE_METHOD = git
-TFTPD_CONF_OPTS = --without-tcpwrappers
+TFTPD_CONF_OPTS = --disable-tcpwrappers
TFTPD_LICENSE = BSD-4-Clause
TFTPD_LICENSE_FILES = tftpd/tftpd.c
TFTPD_CPE_ID_VENDOR = tftpd-hpa_project
@@ -15,6 +15,7 @@ TFTPD_CPE_ID_PRODUCT = tftpd-hpa
TFTPD_SELINUX_MODULES = tftp
# From git
TFTPD_AUTORECONF = YES
+TFTPD_AUTORECONF_OPTS = --include=$(@D)/autoconf/m4
define TFTPD_INSTALL_TARGET_CMDS
$(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 1/1] package/tftpd: bump to latest git commit
@ 2021-07-18 21:55 Fabrice Fontaine
2021-07-31 10:18 ` Thomas Petazzoni
2021-08-07 16:16 ` Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2021-07-18 21:55 UTC (permalink / raw)
To: buildroot
- Update indention in hash file (two spaces)
- This will fix a static build failure with gcc-10 thanks to
https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/commit/?id=18ac1e26f756dd47fef33f5f706b0ec8fa696216
Fixes:
- http://autobuild.buildroot.org/results/913e8b75422c8beba60df5ea2e2c9e431364566e
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/tftpd/tftpd.hash | 6 +++---
package/tftpd/tftpd.mk | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/package/tftpd/tftpd.hash b/package/tftpd/tftpd.hash
index c876b2edc2..3cccb0f20e 100644
--- a/package/tftpd/tftpd.hash
+++ b/package/tftpd/tftpd.hash
@@ -1,5 +1,5 @@
-# From https://www.kernel.org/pub/software/network/tftp/tftp-hpa/sha256sums.asc
-sha256 afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b tftp-hpa-5.2.tar.xz
+# Locally calculated
+sha256 c86520c30dab0b6bcbae021ab26d2ac63227696596d37a9b02aa3e56ec5c2e77 tftpd-b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7-br1.tar.gz
# Hash for license file
-sha256 5efef82650b8ece733e37790fc70f05e426c9e1ef9640d4ebcb04867bd3f5e28 tftpd/tftpd.c
+sha256 67754ebd8f265571d3226ac97e521b1bd6fd8a61363ecd4ab7806a6f90efab92 tftpd/tftpd.c
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 494e963d64..ffd52ce0d0 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -4,14 +4,15 @@
#
################################################################################
-TFTPD_VERSION = 5.2
-TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
-TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
+TFTPD_VERSION = b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7
+TFTPD_SITE = git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git
TFTPD_CONF_OPTS = --without-tcpwrappers
TFTPD_LICENSE = BSD-4-Clause
TFTPD_LICENSE_FILES = tftpd/tftpd.c
TFTPD_CPE_ID_VENDOR = tftpd-hpa_project
TFTPD_CPE_ID_PRODUCT = tftpd-hpa
+# From git
+TFTPD_AUTORECONF = YES
define TFTPD_INSTALL_TARGET_CMDS
$(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/tftpd: bump to latest git commit
2021-07-18 21:55 Fabrice Fontaine
@ 2021-07-31 10:18 ` Thomas Petazzoni
2021-08-07 16:16 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2021-07-31 10:18 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
On Sun, 18 Jul 2021 23:55:16 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> - Update indention in hash file (two spaces)
> - This will fix a static build failure with gcc-10 thanks to
> https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/commit/?id=18ac1e26f756dd47fef33f5f706b0ec8fa696216
>
> Fixes:
> - http://autobuild.buildroot.org/results/913e8b75422c8beba60df5ea2e2c9e431364566e
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/tftpd/tftpd.hash | 6 +++---
> package/tftpd/tftpd.mk | 7 ++++---
> 2 files changed, 7 insertions(+), 6 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/tftpd: bump to latest git commit
2021-07-18 21:55 Fabrice Fontaine
2021-07-31 10:18 ` Thomas Petazzoni
@ 2021-08-07 16:16 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2021-08-07 16:16 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> - Update indention in hash file (two spaces)
> - This will fix a static build failure with gcc-10 thanks to
> https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git/commit/?id=18ac1e26f756dd47fef33f5f706b0ec8fa696216
> Fixes:
> - http://autobuild.buildroot.org/results/913e8b75422c8beba60df5ea2e2c9e431364566e
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2021.02.x and 2021.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-21 16:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-21 10:24 [Buildroot] [PATCH 1/1] package/tftpd: bump to latest git commit Fabrice Fontaine
2024-07-21 16:32 ` Thomas Petazzoni via buildroot
-- strict thread matches above, loose matches on Subject: below --
2021-07-18 21:55 Fabrice Fontaine
2021-07-31 10:18 ` Thomas Petazzoni
2021-08-07 16:16 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox