From 1b3b4c65b3fdfce13bf843f1940cde5981cda205 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 14 Jan 2022 09:39:40 +0800 Subject: tnftp: upgrade 20151004 -> 20210827 * License-Update: Update copyright years * Drop tnftp-autotools.patch as the issue had been fixed upstream Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../tnftp/tnftp/tnftp-autotools.patch | 42 ---------------------- .../recipes-support/tnftp/tnftp_20151004.bb | 39 -------------------- .../recipes-support/tnftp/tnftp_20210827.bb | 38 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 81 deletions(-) delete mode 100644 meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch delete mode 100644 meta-networking/recipes-support/tnftp/tnftp_20151004.bb create mode 100644 meta-networking/recipes-support/tnftp/tnftp_20210827.bb diff --git a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch deleted file mode 100644 index 1bda576bc2..0000000000 --- a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch +++ /dev/null @@ -1,42 +0,0 @@ -[PATCH] Update configure.ac and Makefile.am to resolve warnings/errors - -Upstream-Status: Pending - -Signed-off-by: Roy Li ---- - configure.ac | 2 ++ - libnetbsd/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a96d2ab..b3b3069 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,11 @@ AH_TEMPLATE([WITH_SSL], - # - # Checks for programs. - # -+AM_PROG_AR() - AC_PROG_CC() - AC_PROG_AWK() - AC_PROG_LIBTOOL() -+AM_PROG_CC_C_O() - - # - # Checks for tool features. -diff --git a/libnetbsd/Makefile.am b/libnetbsd/Makefile.am -index 3e5c3ce..39bb12d 100644 ---- a/libnetbsd/Makefile.am -+++ b/libnetbsd/Makefile.am -@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la - libnetbsd_la_SOURCES = - - --CPPFLAGS = \ -+AM_CPPFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -I$(top_builddir) --- -1.7.10.4 - diff --git a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-networking/recipes-support/tnftp/tnftp_20151004.bb deleted file mode 100644 index 8e03f1bdb9..0000000000 --- a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Enhanced NetBSD ftp client" -DESCRIPTION = "tnftp (formerly known as lukemftp) is a port of the NetBSD FTP client \ -to other systems. It offers many enhancements over the traditional \ -BSD FTP client, including command-line editing, command-line fetches \ -of FTP and HTTP URLs (including via proxies), command-line uploads of \ -FTP URLs, context-sensitive word completion, dynamic progress bar, \ -IPv6 support, modification time preservation, paging of local and \ -remote files, passive mode support (with fallback to active mode), \ -SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ -throttling." - -SECTION = "net" -LICENSE = "BSD-4-Clause" - -DEPENDS = "ncurses" - -SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ - file://tnftp-autotools.patch \ -" - -inherit autotools update-alternatives pkgconfig - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE:${PN} = "ftp" -ALTERNATIVE_LINK_NAME_${PN} = "${bindir}/ftp" -ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" - -FILES:${PN} = "${bindir}/tnftp" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" -SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" -SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" - -PACKAGECONFIG ?= "openssl \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -" -PACKAGECONFIG[openssl] = "--enable-ssl, --disable-ssl --with-ssl=no, openssl" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-networking/recipes-support/tnftp/tnftp_20210827.bb b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb new file mode 100644 index 0000000000..111a63d297 --- /dev/null +++ b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb @@ -0,0 +1,38 @@ +SUMMARY = "Enhanced NetBSD ftp client" +DESCRIPTION = "tnftp (formerly known as lukemftp) is a port of the NetBSD FTP client \ +to other systems. It offers many enhancements over the traditional \ +BSD FTP client, including command-line editing, command-line fetches \ +of FTP and HTTP URLs (including via proxies), command-line uploads of \ +FTP URLs, context-sensitive word completion, dynamic progress bar, \ +IPv6 support, modification time preservation, paging of local and \ +remote files, passive mode support (with fallback to active mode), \ +SOCKS support, TIS FWTK gate-ftp server support, and transfer rate \ +throttling." + +SECTION = "net" +LICENSE = "BSD-4-Clause" + +DEPENDS = "ncurses" + +SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ +" + +inherit autotools update-alternatives pkgconfig + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN} = "ftp" +ALTERNATIVE_LINK_NAME_${PN} = "${bindir}/ftp" +ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" + +FILES:${PN} = "${bindir}/tnftp" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b4248c6fb8ecff27f256ba97b25f1a21" +SRC_URI[md5sum] = "fdb6dd1b53dca79148c395b77c6dba5a" +SRC_URI[sha256sum] = "101901e90b656c223ec8106370dd0d783fb63d26aa6f0b2a75f40e86a9f06ea2" + +PACKAGECONFIG ?= "openssl \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ +" +PACKAGECONFIG[openssl] = "--enable-ssl, --disable-ssl --with-ssl=no, openssl" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -- cgit v1.2.3-54-g00ecf