Re: [meta-networking][PATCH] ncftp : add new recipe

[Joe MacDonald <Joe_MacDonald@mentor.com>]

[-- Attachment #1: Type: text/plain, Size: 6900 bytes --]

[[oe] [meta-networking][PATCH] ncftp : add new recipe] On 14.11.28 (Fri 17:53) Li xin wrote:

> ncftp is a sophisticated console ftp client.
> 
> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> ---
>  ...ix-error-expected-before-PRINTF_LONG_LONG.patch |   35 +
>  .../ncftp/Fix-errors-AR-Command-not-found.patch    |   54 +
>  .../recipes-daemons/ncftp/ncftp/acinclude.m4       | 4950 ++++++++++++++++++++
>  .../recipes-daemons/ncftp/ncftp_3.2.0.bb           |   24 +
>  4 files changed, 5063 insertions(+)
>  create mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/Fix-error-expected-before-PRINTF_LONG_LONG.patch
>  create mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/Fix-errors-AR-Command-not-found.patch
>  create mode 100644 meta-networking/recipes-daemons/ncftp/ncftp/acinclude.m4
>  create mode 100644 meta-networking/recipes-daemons/ncftp/ncftp_3.2.0.bb
> 
> diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/Fix-error-expected-before-PRINTF_LONG_LONG.patch b/meta-networking/recipes-daemons/ncftp/ncftp/Fix-error-expected-before-PRINTF_LONG_LONG.patch
> new file mode 100644
> index 0000000..43f7a6b
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/ncftp/ncftp/Fix-error-expected-before-PRINTF_LONG_LONG.patch
> @@ -0,0 +1,35 @@
> +From e56135c48f418a1036f05c2432872650e4942c54 Mon Sep 17 00:00:00 2001
> +From: Li xin <lixin.fnst@cn.fujitsu.com>
> +Date: Fri, 28 Nov 2014 09:21:17 +0900
> +Subject: [PATCH 2/2] Fix error: expected ')' before 'PRINTF_LONG_LONG'
> +
> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>

Upstream-status, please.  Also, any idea why PRINTF_LONG_LONG is
undefined in this context?  Seems odd.

> +---
> + ncftp/cmds.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/ncftp/cmds.c b/ncftp/cmds.c
> +index 1f491ac..259e660 100644
> +--- a/ncftp/cmds.c
> ++++ b/ncftp/cmds.c
> +@@ -945,7 +945,7 @@ EditCmd(const int argc, char **const argv, const CommandPtr cmdp, const ArgvInfo
> + 			--n;
> + 			memset(&st, 0, sizeof(st));
> + 		}
> +-		(void) sprintf(modstr, "%u " PRINTF_LONG_LONG, (unsigned int) st.st_mtime, (longest_int) st.st_size);
> ++		(void) sprintf(modstr, "%u %ld" , (unsigned int) st.st_mtime, (longest_int) st.st_size);
> + 		if (AddLine(&modstrs, modstr) == NULL) {
> + 			DisposeLineListContents(&modstrs);
> + 			DisposeLineListContents(&rfiles);
> +@@ -1006,7 +1006,7 @@ EditCmd(const int argc, char **const argv, const CommandPtr cmdp, const ArgvInfo
> + 			(void) fprintf(stdout, "\n");
> + 			continue;
> + 		}
> +-		(void) sprintf(modstr, "%u " PRINTF_LONG_LONG, (unsigned int) st.st_mtime, (longest_int) st.st_size);
> ++		(void) sprintf(modstr, "%u %ld" , (unsigned int) st.st_mtime, (longest_int) st.st_size);
> + 		if (strcmp(modstr, mlp->line) == 0) {
> + 			Trace(-1, "No changes made to \"%s\".\n", rpath);
> + 			continue;
> +-- 
> +1.8.4.2
> +
> diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/Fix-errors-AR-Command-not-found.patch b/meta-networking/recipes-daemons/ncftp/ncftp/Fix-errors-AR-Command-not-found.patch
> new file mode 100644
> index 0000000..c5f6b91
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/ncftp/ncftp/Fix-errors-AR-Command-not-found.patch
> @@ -0,0 +1,54 @@
> +From b09b891058d7a28b97be72f75e8b6866394b0615 Mon Sep 17 00:00:00 2001
> +From: Li xin <lixin.fnst@cn.fujitsu.com>
> +Date: Fri, 28 Nov 2014 09:17:28 +0900
> +Subject: [PATCH 1/2] Fix errors "AR@: Command not found"
> +
> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>

Also need an upstream-status on this, but that one appears self-evident
so no further explanation is necessary.

> +---
> + Strn/Makefile.in     | 2 +-
> + libncftp/Makefile.in | 2 +-
> + sio/Makefile.in      | 2 +-
> + 3 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/Strn/Makefile.in b/Strn/Makefile.in
> +index ffe6806..e3c91fc 100644
> +--- a/Strn/Makefile.in
> ++++ b/Strn/Makefile.in
> +@@ -42,7 +42,7 @@ all: static
> + static: $(LIB)
> + 
> + $(LIB): $(OBJS)
> +-	@CCDV@@AR@ r $(LIB) $(OBJS)
> ++	@CCDV@$(AR) r $(LIB) $(OBJS)
> + 	-@chmod 644 "$(LIB)"
> + 	-@RANLIB@ "$(LIB)"
> + 	-@echo "$(VER)" > Strn.version
> +diff --git a/libncftp/Makefile.in b/libncftp/Makefile.in
> +index 7fda7b6..e3da73d 100644
> +--- a/libncftp/Makefile.in
> ++++ b/libncftp/Makefile.in
> +@@ -49,7 +49,7 @@ all: $(LIBSET)
> + 
> + $(LIB): $(OBJS)
> + 	-@/bin/rm -f $(LIB)
> +-	@CCDV@@AR@ r $(LIB) $(OBJS)
> ++	@CCDV@$(AR) r $(LIB) $(OBJS)
> + 	-@chmod 644 $(LIB)
> + 	-@@RANLIB@ $(LIB)
> + 	@/bin/ls -l $(LIB)
> +diff --git a/sio/Makefile.in b/sio/Makefile.in
> +index ff91508..f7d651d 100644
> +--- a/sio/Makefile.in
> ++++ b/sio/Makefile.in
> +@@ -51,7 +51,7 @@ all: $(LIB)
> + 
> + $(LIB): $(OBJS)
> + 	-@/bin/rm -f $(LIB)
> +-	@CCDV@@AR@ r $(LIB) $(OBJS)
> ++	@CCDV@$(AR) r $(LIB) $(OBJS)
> + 	-@RANLIB@ $(LIB)
> + 	-@echo $(VER) > sio.version
> + 	-@chmod a+r $(LIB) sio.h usio.h
> +-- 
> +1.8.4.2
> +

> diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/acinclude.m4 b/meta-networking/recipes-daemons/ncftp/ncftp/acinclude.m4
> new file mode 100644
> index 0000000..e7d4bd0
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/ncftp/ncftp/acinclude.m4

Wow, is this really necessary?  To include the whole m4 file?

Remainder deleted.

> diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.0.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.0.bb
> new file mode 100644
> index 0000000..dd49478
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.0.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "A sophisticated console ftp client"
> +SECTION = "console/network"
> +PRIORITY = "optional"
> +LICENSE = "ClArtistic"
> +LIC_FILES_CHKSUM = "file://ncftp/cmds.c;beginline=3;endline=4;md5=9de76faeaedc4f908082e3f8142715f4"
> +
> +SRC_URI = "ftp://ftp.ncftp.com/ncftp/older_versions/ncftp-${PV}-src.tar.bz2 \
                                        ^-----+------^
Why this? ------------------------------------+

I'd much rather see a 3.2.5 recipe.

-J.

> +    file://acinclude.m4 \
> +    file://Fix-errors-AR-Command-not-found.patch \
> +    file://Fix-error-expected-before-PRINTF_LONG_LONG.patch"
> +
> +inherit autotools-brokensep
> +
> +do_configure_prepend () {
> +    install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4
> +}
> +do_install () {
> +    install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
> +    oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
> +        'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
> +        install
> +}
> +SRC_URI[md5sum] = "384b7f01d725c89ccd30692628b3ac1b"
> +SRC_URI[sha256sum] = "2ebc7b51af96cb0fa8b703c7cb995bfb46ccf5312e335270d0420e260544c376"
> -- 
> 1.8.4.2
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]