mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-29 23:48:39 +00:00
ncftp: Upgrade to 3.2.6
Fix build with hardening flags Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
parent
6b0fb999ac
commit
9688df7ce9
32
meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch
Normal file
32
meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
This patch is needed to avoid double definitions of functions
|
||||||
|
especially when building with security flags turned on. The double
|
||||||
|
definitions causes the sed.sh script in configure to fail since it
|
||||||
|
starts to spit out double outputs e.g.
|
||||||
|
|
||||||
|
wi_cv_gethostname_size_t size_t size_t
|
||||||
|
|
||||||
|
which then caused almost all subsequent compile time tests to fail since
|
||||||
|
this gets into confdefs.h file
|
||||||
|
|
||||||
|
removing this include causes only one definitions to be emitted into
|
||||||
|
the genrated protos.h file and thus avoiding the above failure.
|
||||||
|
|
||||||
|
Other solution would to fix sed.sh to ignore double definitions
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-of-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
|
||||||
|
Index: ncftp-3.2.6/configure
|
||||||
|
===================================================================
|
||||||
|
--- ncftp-3.2.6.orig/configure
|
||||||
|
+++ ncftp-3.2.6/configure
|
||||||
|
@@ -7859,7 +7859,6 @@ chmod 755 "$wi_tmpdir/prpp.pl"
|
||||||
|
cat << 'EOF' > "$wi_tmpdir/unistd.c"
|
||||||
|
#include <confdefs.h>
|
||||||
|
|
||||||
|
-#include <unistd.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
@ -2,21 +2,29 @@ DESCRIPTION = "A sophisticated console ftp client"
|
|||||||
HOMEPAGE = "http://ncftp.com/"
|
HOMEPAGE = "http://ncftp.com/"
|
||||||
SECTION = "net"
|
SECTION = "net"
|
||||||
LICENSE = "ClArtistic"
|
LICENSE = "ClArtistic"
|
||||||
LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9de76faeaedc4f908082e3f8142715f4"
|
LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9c2390809f71465aa7ff76e03dc14d91"
|
||||||
DEPENDS = "ncurses"
|
DEPENDS = "ncurses"
|
||||||
|
|
||||||
SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.orig.tar.gz \
|
SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \
|
||||||
file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
|
file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \
|
||||||
|
file://unistd.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "685e45f60ac11c89442c572c28af4228"
|
SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f"
|
||||||
SRC_URI[sha256sum] = "ac111b71112382853b2835c42ebe7bd59acb7f85dd00d44b2c19fbd074a436c4"
|
SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"
|
||||||
|
|
||||||
inherit autotools-brokensep pkgconfig
|
inherit autotools-brokensep pkgconfig
|
||||||
|
|
||||||
|
CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall"
|
||||||
|
|
||||||
PACKAGECONFIG ??= ""
|
PACKAGECONFIG ??= ""
|
||||||
PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,,"
|
PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,,"
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--disable-precomp"
|
||||||
|
TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}"
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
|
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
|
||||||
|
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
|
||||||
oe_runconf
|
oe_runconf
|
||||||
}
|
}
|
||||||
do_install () {
|
do_install () {
|
||||||
Loading…
x
Reference in New Issue
Block a user