Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at 2013-10-08 16:27:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lftp (Old) and /work/SRC/openSUSE:Factory/.lftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lftp" Changes: -------- --- /work/SRC/openSUSE:Factory/lftp/lftp.changes 2013-03-19 12:19:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes 2013-10-08 16:27:48.000000000 +0200 @@ -1,0 +2,33 @@ +Mon Oct 7 16:13:53 CEST 2013 - [email protected] + +- Update to latest stable 4.4.9: + * implemented support for mirror -L in sftp. + * pass all 3 std file descriptors when attaching to lftp instance. + * ftp: added a workaround for incorrectly formatted multiline replies. + * sftp: added a workaround for RouterOS v6. + * fixed mirror --no-empty-dirs to skip directories with no included files. + * fixed segfault when there is no TERM environment variable. + * fixed torrent for meta-info files with % in their names. + * fixed compilation when IPV6_V6ONLY is not defined. + * fixed compilation with older zlib. + * fixed FD_CLOEXEC flag on cwd and transfer_log. + * fixed MLSD parsing for semicolons in file names. + * new translation: Ukrainian (thanks to Yuri Chornoivan). + * man page updated. + + For the other changes since 4.4.0 see the file NEWS in the + package documentation. +- Change source url as the old one isn't valid anymore. +- Use the xz packed tarbal because of size. +- Adapted patches: + ftp-wrapper+edit+compat-modify.patch + lftp-stdio.h.patch +- Add lftp-config_h.patch that includes config.h where needed + to get the gnulib macros defined. + +------------------------------------------------------------------- +Tue Jul 9 07:42:44 UTC 2013 - [email protected] + +- Override broken configure checks + +------------------------------------------------------------------- Old: ---- lftp-4.4.0.tar.bz2 New: ---- lftp-4.4.9.tar.xz lftp-config_h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.gpwuu5/_old 2013-10-08 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.gpwuu5/_new 2013-10-08 16:27:50.000000000 +0200 @@ -24,14 +24,14 @@ %endif Name: lftp -Version: 4.4.0 +Version: 4.4.9 Release: 0 %define vi_version 1.1 Url: http://lftp.yar.ru/ Summary: LFTP Command Line File Transfer Program License: GPL-2.0+ Group: Productivity/Networking/Ftp/Clients -Source: http://ftp.yars.free.net/pub/source/lftp/lftp-%{version}.tar.bz2 +Source: ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/lftp-%{version}.tar.xz Source1: lftp.desktop Source2: http://michael.stapelberg.de/lftp_vi/lftp-vi.%{vi_version}.tar.gz Source3: lftp.png @@ -43,6 +43,8 @@ Patch7: lftp-stdio.h.patch # PATCH-FEATURE-OPENSUSE lftp-ca-bundle-path.patch [email protected] -- Use /etc/ssl/ca-bundle.pem as root CA store. Patch8: lftp-ca-bundle-path.patch +# PATCH-FIX-UPSTREAM -- Include config.h where needed. +Patch9: lftp-config_h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -93,13 +95,14 @@ %__tar xzf "%{SOURCE2}" popd %patch1 -%patch2 -p1 +%patch2 %patch4 pushd src %patch6 popd #src %patch7 -p1 %patch8 -p1 +%patch9 -p1 # replace AC_CHECK_FUNCS_ONCE with AC_CHECK_FUNCS on SLE 9+10 # as they're not supported by the autotools environment there: @@ -114,8 +117,7 @@ %endif %build -aclocal -I m4 -automake +autoreconf -fi %if 0%{?suse_version:1} && %suse_version >= 1010 CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags} -fstack-protector" @@ -126,6 +128,8 @@ CXXFLAGS="$CFLAGS" \ LDFLAGS=' ' \ %configure \ + gl_cv_func_printf_directive_n=yes \ + gl_cv_func_printf_infinite_long_double=yes \ --with-modules \ %if %{?with_gnutls:1}0 --with-gnutls --without-openssl \ ++++++ lftp-config_h.patch ++++++ From: Philipp Thomas <[email protected]> Date: 2013-10-08 13:07:08+02:00 Subject: Include config.h where necessary config.h is needed to get the gnulib macros defined. --- src/lftp-wrapper.c | 1 + 1 file changed, 1 insertion(+) Index: lftp-4.4.9/src/lftp-wrapper.c =================================================================== --- lftp-4.4.9.orig/src/lftp-wrapper.c 2013-10-08 13:03:33.977184313 +0200 +++ lftp-4.4.9/src/lftp-wrapper.c 2013-10-08 13:04:08.797367882 +0200 @@ -19,6 +19,7 @@ * * ***************************************************************************/ +#include <config.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> ++++++ lftp-stdio.h.patch ++++++ --- /var/tmp/diff_new_pack.gpwuu5/_old 2013-10-08 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.gpwuu5/_new 2013-10-08 16:27:50.000000000 +0200 @@ -1,8 +1,12 @@ -Index: lftp-4.3.7/lib/stdio.in.h +--- + lib/stdio.in.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: lftp-4.4.9/lib/stdio.in.h =================================================================== ---- lftp-4.3.7.orig/lib/stdio.in.h -+++ lftp-4.3.7/lib/stdio.in.h -@@ -703,7 +703,7 @@ _GL_WARN_ON_USE (getline, "getline is un +--- lftp-4.4.9.orig/lib/stdio.in.h 2013-05-17 11:39:30.000000000 +0200 ++++ lftp-4.4.9/lib/stdio.in.h 2013-10-07 16:23:02.265573679 +0200 +@@ -709,7 +709,7 @@ _GL_WARN_ON_USE (getline, "getline is un so any use of gets warrants an unconditional warning; besides, C11 removed it. */ #undef gets ++++++ lftp-wrapper+edit+compat-modify.patch ++++++ --- /var/tmp/diff_new_pack.gpwuu5/_old 2013-10-08 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.gpwuu5/_new 2013-10-08 16:27:50.000000000 +0200 @@ -5,76 +5,76 @@ src/Makefile.am | 12 ++++++++++-- 4 files changed, 47 insertions(+), 3 deletions(-) -Index: lftp-4.4.0/src/CmdExec.cc +Index: src/CmdExec.cc =================================================================== ---- lftp-4.4.0.orig/src/CmdExec.cc -+++ lftp-4.4.0/src/CmdExec.cc -@@ -1197,6 +1197,38 @@ void CmdExec::ChangeSession(FileAccess * +--- src/CmdExec.cc.orig 2013-04-12 10:26:09.000000000 +0200 ++++ src/CmdExec.cc 2013-10-07 16:20:54.281577956 +0200 +@@ -1225,6 +1225,38 @@ void CmdExec::ChangeSession(FileAccess * ConnectionSlot::Set(slot,session); } -+void CmdExec::RegisterCompatCommand(const char *name,cmd_creator_t creator,const char *short_desc,const char *long_desc) -+{ -+ if(dyn_cmd_table==0) -+ { -+ int count=0; -+ for(const cmd_rec *c=static_cmd_table; c->name; c++) -+ count++; -+ dyn_cmd_table.nset(static_cmd_table,count); -+ } -+ for(int i=0; i<dyn_cmd_table.count(); i++) -+ { -+ cmd_rec *const c=&dyn_cmd_table[i]; -+ if(!strcmp(c->name,name)) -+ { -+ char *lftp_name=(char*)malloc(5+strlen(name)+1); -+ char *short_d = NULL; -+ -+ if (c->short_desc) { -+ short_d = (char*)malloc(5+strlen(c->short_desc)+1); -+ sprintf(short_d, "lftp-%s", c->short_desc); -+ c->short_desc = short_d; -+ } -+ -+ sprintf(lftp_name, "lftp-%s", name); -+ c->name = lftp_name; -+ return; -+ } -+ } -+ cmd_rec new_entry={name,creator,short_desc,long_desc}; -+ dyn_cmd_table.append(new_entry); ++void CmdExec::RegisterCompatCommand(const char *name,cmd_creator_t creator,const char *short_desc,const char *long_desc) ++{ ++ if(dyn_cmd_table==0) ++ { ++ int count=0; ++ for(const cmd_rec *c=static_cmd_table; c->name; c++) ++ count++; ++ dyn_cmd_table.nset(static_cmd_table,count); ++ } ++ for(int i=0; i<dyn_cmd_table.count(); i++) ++ { ++ cmd_rec *const c=&dyn_cmd_table[i]; ++ if(!strcmp(c->name,name)) ++ { ++ char *lftp_name=(char*)malloc(5+strlen(name)+1); ++ char *short_d = NULL; ++ ++ if (c->short_desc) { ++ short_d = (char*)malloc(5+strlen(c->short_desc)+1); ++ sprintf(short_d, "lftp-%s", c->short_desc); ++ c->short_desc = short_d; ++ } ++ ++ sprintf(lftp_name, "lftp-%s", name); ++ c->name = lftp_name; ++ return; ++ } ++ } ++ cmd_rec new_entry={name,creator,short_desc,long_desc}; ++ dyn_cmd_table.append(new_entry); +} + const char *CmdExec::CmdByIndex(int i) { if(dyn_cmd_table) -Index: lftp-4.4.0/src/CmdExec.h +Index: src/CmdExec.h =================================================================== ---- lftp-4.4.0.orig/src/CmdExec.h -+++ lftp-4.4.0/src/CmdExec.h -@@ -231,6 +231,9 @@ public: +--- src/CmdExec.h.orig 2013-03-19 13:48:18.000000000 +0100 ++++ src/CmdExec.h 2013-10-07 16:21:22.657911764 +0200 +@@ -237,6 +237,9 @@ public: static void RegisterCommand(const char *name,cmd_creator_t creator, const char *short_name=0,const char *long_name=0); -+ static void RegisterCompatCommand(const char *name,cmd_creator_t creator, -+ const char *short_name=0,const char *long_name=0); ++ static void RegisterCompatCommand(const char *name,cmd_creator_t creator, ++ const char *short_name=0,const char *long_name=0); + Job *builtin_lcd(); Job *builtin_cd(); Job *builtin_open(); -Index: lftp-4.4.0/src/CopyJob.cc +Index: src/CopyJob.cc =================================================================== ---- lftp-4.4.0.orig/src/CopyJob.cc -+++ lftp-4.4.0/src/CopyJob.cc -@@ -20,6 +20,7 @@ - /* $Id: CopyJob.cc,v 1.48 2011/04/29 04:58:27 lav Exp $ */ +--- src/CopyJob.cc.orig 2013-03-19 13:49:02.000000000 +0100 ++++ src/CopyJob.cc 2013-10-07 16:14:44.709259516 +0200 +@@ -18,6 +18,7 @@ + */ #include <config.h> +#include <unistd.h> #include "CopyJob.h" #include "ArgV.h" #include "plural.h" -@@ -252,7 +253,7 @@ void CopyJobEnv::SetCopier(FileCopy *c,c +@@ -250,7 +251,7 @@ void CopyJobEnv::SetCopier(FileCopy *c,c xstring& CopyJobEnv::FormatFinalWithPrefix(xstring& s,const char *p) { @@ -83,20 +83,19 @@ return s; if(count==errors) return s; -Index: lftp-4.4.0/src/Makefile.am +Index: src/Makefile.am =================================================================== ---- lftp-4.4.0.orig/src/Makefile.am -+++ lftp-4.4.0/src/Makefile.am -@@ -1,7 +1,7 @@ - localedir = $(datadir)/locale +--- src/Makefile.am.orig 2013-05-28 07:42:43.000000000 +0200 ++++ src/Makefile.am 2013-10-07 16:21:53.681183489 +0200 +@@ -1,6 +1,6 @@ pkgverlibdir = $(pkglibdir)/$(VERSION) -bin_PROGRAMS = lftp +bin_PROGRAMS = lftp lftp_wrapper bin_SCRIPTS = lftpget - pkgdata_SCRIPTS = import-ncftp import-netscape verify-file convert-mozilla-cookies + pkgdata_SCRIPTS = import-ncftp import-netscape verify-file convert-mozilla-cookies xdg-move noinst_SCRIPTS = ftpget -@@ -9,6 +9,7 @@ noinst_SCRIPTS = ftpget +@@ -8,6 +8,7 @@ noinst_SCRIPTS = ftpget EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS) lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h attach.cc attach.h @@ -104,7 +103,7 @@ noinst_PROGRAMS = example1 example2 example1-cmd noinst_LTLIBRARIES = example-module1.la -@@ -19,7 +20,7 @@ example_module1_la_SOURCES = example-mod +@@ -18,7 +19,7 @@ example_module1_la_SOURCES = example-mod example_module1_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la @@ -113,12 +112,12 @@ if WITH_MODULES pkgverlib_LTLIBRARIES = $(TASK_MODULES) $(JOB_MODULES) else -@@ -37,6 +38,8 @@ proto_sftp_la_SOURCES = SFtp.cc SFtp.h - cmd_mirror_la_SOURCES = MirrorJob.cc MirrorJob.h +@@ -37,6 +38,8 @@ cmd_mirror_la_SOURCES = MirrorJob.cc Mir cmd_sleep_la_SOURCES = SleepJob.cc SleepJob.h - cmd_torrent_la_SOURCES= Torrent.cc Torrent.h DHT.cc DHT.h Bencode.cc Bencode.h -+cmd_edit_la_SOURCES = cmd-edit.cc -+compat_mode_la_SOURCES = CompatMode.cc CompatMode.h + cmd_torrent_la_SOURCES= Torrent.cc Torrent.h TorrentTracker.cc TorrentTracker.h\ + DHT.cc DHT.h Bencode.cc Bencode.h ++cmd_edit_la_SOURCES = cmd-edit.cc ++compat_mode_la_SOURCES= CompatMode.cc CompatMode.h liblftp_pty_la_SOURCES = PtyShell.cc PtyShell.h lftp_pty.c lftp_pty.h liblftp_network_la_SOURCES = NetAccess.cc NetAccess.h Resolver.cc Resolver.h\ lftp_ssl.cc lftp_ssl.h buffer_ssl.cc buffer_ssl.h RateLimit.cc RateLimit.h\ @@ -135,8 +134,8 @@ lftp_LDADD = liblftp-jobs.la $(READLINE) lftp_DEPENDENCIES = liblftp-jobs.la $(READLINE_DEPEND) -+lftp_wrapper_LDADD = $(GNULIB) -+lftp_wrapper_DEPENDENCIES = ++lftp_wrapper_LDADD = $(GNULIB) ++lftp_wrapper_DEPENDENCIES = + example1_LDADD = liblftp-tasks.la example1_cmd_LDADD = liblftp-jobs.la -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
