[oe-commits] org.oe.dev ncftp: update to 3.2.0
hrw commit
openembedded-commits at lists.openembedded.org
Mon Dec 18 21:33:37 UTC 2006
ncftp: update to 3.2.0
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 2f2a2ab7f110b606173127f13dfef4ff6e40b3b8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2f2a2ab7f110b606173127f13dfef4ff6e40b3b8
Files:
1
packages/ncftp/ncftp_3.1.7.bb
packages/ncftp/ncftp_3.1.8.bb
packages/ncftp/ncftp_3.1.9.bb
packages/ncftp/ncftp/fixes.patch
packages/ncftp/ncftp/make.patch
packages/ncftp/ncftp_3.2.0.bb
packages/apr/apr-util_0.9.12.bb
site/ix86-common
Diffs:
#
# mt diff -rcbd4bc263f66474fe1d9795e739f06c4c7b77656 -r2f2a2ab7f110b606173127f13dfef4ff6e40b3b8
#
#
#
# delete "packages/ncftp/ncftp_3.1.7.bb"
#
# delete "packages/ncftp/ncftp_3.1.8.bb"
#
# delete "packages/ncftp/ncftp_3.1.9.bb"
#
# add_file "packages/ncftp/ncftp/fixes.patch"
# content [10bc3f2bff7a10695d6a3d07474f67139812477e]
#
# add_file "packages/ncftp/ncftp/make.patch"
# content [cd3e201be186380116a5b167ac4eda5e0112b526]
#
# add_file "packages/ncftp/ncftp_3.2.0.bb"
# content [2bd8fb86aafc1850609517df7c6c7f50cc25672b]
#
# patch "packages/apr/apr-util_0.9.12.bb"
# from [0006802b8343b3dda8bc1875cf3be21687b39f01]
# to [ee98130f05da6eb912c618efdbdaa753b48c1c81]
#
# patch "site/ix86-common"
# from [d4d05f3d9146ec33099bc131d13a979b6d0ad4cc]
# to [5d9e4292882cbf0f94d5a0c60ab27754854d6e37]
#
============================================================
--- packages/ncftp/ncftp/fixes.patch 10bc3f2bff7a10695d6a3d07474f67139812477e
+++ packages/ncftp/ncftp/fixes.patch 10bc3f2bff7a10695d6a3d07474f67139812477e
@@ -0,0 +1,22 @@
+Index: ncftp-3.2.0/ncftp/cmds.c
+===================================================================
+--- ncftp-3.2.0.orig/ncftp/cmds.c 2006-12-18 22:21:34.000000000 +0100
++++ ncftp-3.2.0/ncftp/cmds.c 2006-12-18 22:23:55.000000000 +0100
+@@ -945,7 +945,7 @@
+ --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 @@
+ (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;
============================================================
--- packages/ncftp/ncftp/make.patch cd3e201be186380116a5b167ac4eda5e0112b526
+++ packages/ncftp/ncftp/make.patch cd3e201be186380116a5b167ac4eda5e0112b526
@@ -0,0 +1,39 @@
+Index: ncftp-3.2.0/Strn/Makefile.in
+===================================================================
+--- ncftp-3.2.0.orig/Strn/Makefile.in 2006-12-18 22:11:48.000000000 +0100
++++ ncftp-3.2.0/Strn/Makefile.in 2006-12-18 22:12:48.000000000 +0100
+@@ -42,7 +42,7 @@
+ static: $(LIB)
+
+ $(LIB): $(OBJS)
+- @CCDV@@AR@ r $(LIB) $(OBJS)
++ @CCDV@$(AR) r $(LIB) $(OBJS)
+ - at chmod 644 "$(LIB)"
+ - at RANLIB@ "$(LIB)"
+ - at echo "$(VER)" > Strn.version
+Index: ncftp-3.2.0/sio/Makefile.in
+===================================================================
+--- ncftp-3.2.0.orig/sio/Makefile.in 2006-12-18 22:15:39.000000000 +0100
++++ ncftp-3.2.0/sio/Makefile.in 2006-12-18 22:15:56.000000000 +0100
+@@ -51,7 +51,7 @@
+
+ $(LIB): $(OBJS)
+ -@/bin/rm -f $(LIB)
+- @CCDV@@AR@ r $(LIB) $(OBJS)
++ @CCDV@$(AR) r $(LIB) $(OBJS)
+ - at RANLIB@ $(LIB)
+ - at echo $(VER) > sio.version
+ - at chmod a+r $(LIB) sio.h usio.h
+Index: ncftp-3.2.0/libncftp/Makefile.in
+===================================================================
+--- ncftp-3.2.0.orig/libncftp/Makefile.in 2006-12-18 22:16:42.000000000 +0100
++++ ncftp-3.2.0/libncftp/Makefile.in 2006-12-18 22:16:56.000000000 +0100
+@@ -49,7 +49,7 @@
+
+ $(LIB): $(OBJS)
+ -@/bin/rm -f $(LIB)
+- @CCDV@@AR@ r $(LIB) $(OBJS)
++ @CCDV@$(AR) r $(LIB) $(OBJS)
+ - at chmod 644 $(LIB)
+ -@@RANLIB@ $(LIB)
+ @/bin/ls -l $(LIB)
============================================================
--- packages/ncftp/ncftp_3.2.0.bb 2bd8fb86aafc1850609517df7c6c7f50cc25672b
+++ packages/ncftp/ncftp_3.2.0.bb 2bd8fb86aafc1850609517df7c6c7f50cc25672b
@@ -0,0 +1,24 @@
+DESCRIPTION = "A sophisticated console ftp client"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "ClarifiedArtistic"
+
+SRC_URI = "ftp://ftp.ncftp.com/ncftp/ncftp-${PV}-src.tar.bz2 \
+ file://acinclude.m4 \
+ file://make.patch;patch=1 \
+ file://fixes.patch;patch=1"
+
+inherit autotools
+
+do_configure_prepend () {
+ install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4
+}
+
+INHIBIT_AUTO_STAGE = "1"
+
+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
+}
============================================================
--- packages/apr/apr-util_0.9.12.bb 0006802b8343b3dda8bc1875cf3be21687b39f01
+++ packages/apr/apr-util_0.9.12.bb ee98130f05da6eb912c618efdbdaa753b48c1c81
@@ -9,7 +9,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar
file://gen_uri_delims.patch;patch=1 \
file://uri_delims.h"
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
inherit autotools lib_package binconfig
============================================================
--- site/ix86-common d4d05f3d9146ec33099bc131d13a979b6d0ad4cc
+++ site/ix86-common 5d9e4292882cbf0f94d5a0c60ab27754854d6e37
@@ -127,7 +127,7 @@ glib_cv_rtldglobal_broken=${glib_cv_rtld
glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=yes}
# glib-2.0
-glib_cv_stack_grows=${glib_cv_stack_grows=no}
+glib_cv_stack_grows=no
utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
More information about the Openembedded-commits
mailing list