| Message ID | 20240721102430.980514-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/tftpd: bump to latest git commit | expand |
On Sun, 21 Jul 2024 12:24:30 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > - 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(-) Applied to master, thanks. Thomas
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
- 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(-)