From 263bbaf3ba785b4001a9bf9a149ad945dd248bb3 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 6 Jan 2020 05:54:54 -0800 Subject: lftp: upgrade 4.8.4 -> 4.9.0 fix-gcc-6-conflicts-signbit.patch Removed since they are included in 4.9.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../lftp/files/fix-gcc-6-conflicts-signbit.patch | 44 ---------------------- .../recipes-connectivity/lftp/lftp_4.8.4.bb | 33 ---------------- .../recipes-connectivity/lftp/lftp_4.9.0.bb | 31 +++++++++++++++ 3 files changed, 31 insertions(+), 77 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch delete mode 100644 meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb create mode 100644 meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb diff --git a/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch b/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch deleted file mode 100644 index 952232b7a7..0000000000 --- a/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 -+++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 -@@ -21,7 +21,7 @@ - - #include - #include --#include -+#include - #include - - #include "NetAccess.h" ---- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 -+++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 -@@ -18,7 +18,7 @@ - */ - - #include --#include -+#include - #include - #include "Speedometer.h" - #include "misc.h" ---- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 -+++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include "FileCopy.h" - #include "url.h" ---- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 -+++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb deleted file mode 100644 index bf793d91d3..0000000000 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.8.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "LFTP is a sophisticated file transfer program with \ - command line interface. It supports FTP, HTTP, \ - FISH, SFTP, HTTPS and FTPS protocols" -HOMEPAGE = "http://lftp.yar.ru/" -SECTION = "console/network" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2 \ - file://fix-gcc-6-conflicts-signbit.patch \ - " -SRC_URI[md5sum] = "a56b5047dbfda052df4c1dfd197aa092" -SRC_URI[sha256sum] = "a853edbd075b008c315679c7882b6dcc6821ed2365d2ed843a412acd3d40da0e" - -inherit autotools gettext pkgconfig - -acpaths = "-I ./m4" - -EXTRA_OECONF += "--with-modules --disable-rpath" - -PACKAGECONFIG ??= "openssl zlib gnutls readline expat" -PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" -PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_INCDIR}/.., --without-zlib, zlib" -PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" -PACKAGECONFIG[readline] = "--with-readline=${STAGING_INCDIR}/.. --with-readline-inc=${STAGING_INCDIR} --with-readline-lib=-lreadline, --with-readline=no, readline" -PACKAGECONFIG[expat] = "--with-expat=${STAGING_INCDIR}/.. --with-expat-inc=${STAGING_INCDIR} --with-expat-lib=-lexpat, , expat" - -do_install_append() { - rm -rf ${D}${libdir}/charset.alias -} -FILES_${PN} += "${datadir}/icons/hicolor" -FILES_${PN}-dbg += "${libdir}/lftp/${PV}/.debug" -RDEPENDS_${PN} = "perl bash readline" diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb new file mode 100644 index 0000000000..ef047f7a3c --- /dev/null +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.9.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "LFTP is a sophisticated file transfer program with \ + command line interface. It supports FTP, HTTP, \ + FISH, SFTP, HTTPS and FTPS protocols" +HOMEPAGE = "http://lftp.yar.ru/" +SECTION = "console/network" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" +SRC_URI[md5sum] = "b05817a2c26463618271730d0f677edb" +SRC_URI[sha256sum] = "309e7e91a7c020625715e85c1726b1e7524da22518683fbe051ac13116dedeac" + +inherit autotools gettext pkgconfig + +acpaths = "-I ./m4" + +EXTRA_OECONF += "--with-modules --disable-rpath" + +PACKAGECONFIG ??= "openssl zlib gnutls readline expat" +PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" +PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_INCDIR}/.., --without-zlib, zlib" +PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" +PACKAGECONFIG[readline] = "--with-readline=${STAGING_INCDIR}/.. --with-readline-inc=${STAGING_INCDIR} --with-readline-lib=-lreadline, --with-readline=no, readline" +PACKAGECONFIG[expat] = "--with-expat=${STAGING_INCDIR}/.. --with-expat-inc=${STAGING_INCDIR} --with-expat-lib=-lexpat, , expat" + +do_install_append() { + rm -rf ${D}${libdir}/charset.alias +} +FILES_${PN} += "${datadir}/icons/hicolor" +FILES_${PN}-dbg += "${libdir}/lftp/${PV}/.debug" +RDEPENDS_${PN} = "perl bash readline" -- cgit 1.2.3-korg