Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at 2011-10-25 16:07:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lftp (Old) and /work/SRC/openSUSE:Factory/.lftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lftp", Maintainer is "pu...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lftp/lftp.changes 2011-10-13 16:26:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes 2011-10-25 16:07:20.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Oct 21 11:31:52 UTC 2011 - pascal.ble...@opensuse.org + +- update to lftp-4.3.3: + - new setting ftp:use-tvfs (yes, no, auto) + - improved ftp path handling for servers without TVFS feature + - improved closure matching, now *.EXT matches URLs ending with ".EXT" + - updated man page + - updated translations + - fixed mirror target directory naming + +- merge with server:ftp/lftp: + - add vi command support + - fix build on SLE_11 and SLE_10 + - add .desktop file + +------------------------------------------------------------------- Old: ---- lftp-4.3.2.tar.xz lftp-compat-mode.patch lftp-wrapper.patch New: ---- lftp-4.3.3.tar.bz2 lftp-autoconf-req.patch lftp-compat-addfiles.patch lftp-completion.patch lftp-rpmlintrc lftp-vi.1.1.tar.gz lftp-wrapper+edit+compat-modify.patch lftp.desktop lftp.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.iPJRPg/_old 2011-10-25 16:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.iPJRPg/_new 2011-10-25 16:07:22.000000000 +0200 @@ -15,31 +15,47 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild +%if %suse_version >= 1100 +%define with_gnutls 1 +%else +%define with_openssl 1 +%endif Name: lftp -Version: 4.3.2 -Release: 1 -License: GPLv2+ -Summary: Command Line File Transfer Program -Url: http://lftp.yar.ru/ +Version: 4.3.3 +Release: 0 +%define vi_version 1.1 +License: GNU General Public License version 2 or later (GPL v2 or later) Group: Productivity/Networking/Ftp/Clients -Source: %{name}-%{version}.tar.xz -Patch2: lftp-wrapper.patch -Patch3: lftp-compat-mode.patch -BuildRequires: gcc-c++ +Url: http://lftp.yar.ru/ +Summary: LFTP Command Line File Transfer Program +Source: http://ftp.yars.free.net/pub/source/lftp/lftp-%{version}.tar.bz2 +Source1: lftp.desktop +Source2: http://michael.stapelberg.de/lftp_vi/lftp-vi.%{vi_version}.tar.gz +Source3: lftp.png +Source99: lftp-rpmlintrc +Patch1: lftp-compat-addfiles.patch +Patch2: lftp-wrapper+edit+compat-modify.patch +Patch4: lftp-autoconf-req.patch +Patch6: http://michael.stapelberg.de/lftp_vi/lftp-completion.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gcc-c++ gnutls-devel libstdc++-devel openssl-devel readline-devel update-alternatives +BuildRequires: autoconf automake gzip libtool make ncurses-devel pkgconfig tar update-desktop-files +%if %{?with_gnutls:1}0 BuildRequires: gnutls-devel -BuildRequires: libstdc++-devel +%endif +%if %{?with_openssl:1}0 BuildRequires: openssl-devel -BuildRequires: pkg-config -BuildRequires: readline-devel -BuildRequires: update-alternatives -BuildRequires: xz -PreReq: coreutils -PreReq: update-alternatives -Provides: nkitb:/usr/bin/ftp -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif +Obsoletes: lftp-beta < %{version} +Provides: lftp-beta = %{version}-%{release} Conflicts: ftp +Provides: nkitb:/usr/bin/ftp +PreReq: update-alternatives +PreReq: /bin/rm +Requires: /usr/bin/less %description LFTP is a reliable shell-like command line FTP client. It can retry @@ -52,61 +68,126 @@ supports the HTTP protocol. Other features include IPV6 support, context sensitive completion, output redirection to files or to pipe, FTP and HTTP proxy support, transfer rate throttling for each -connection and for all connections in sum, job queuing, job execution +connection and for all connections in sum, job queueing, job execution at specified times, opie and skey support in the FTP protocol, SSL for HTTP and FTP, and FXP transfers. %prep %setup -q -%patch2 -%patch3 +pushd src +%__tar xzf "%{SOURCE2}" +popd +%patch1 +%patch2 -p1 +%patch4 +pushd src +%patch6 +popd #src + +# replace AC_CHECK_FUNCS_ONCE with AC_CHECK_FUNCS on SLE 9+10 +# as they're not supported by the autotools environment there: +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1020 +%__sed -i ' +s|AC_CHECK_FUNCS_ONCE|AC_CHECK_FUNCS|g +; +s|AC_CHECK_HEADERS_ONCE|AC_CHECK_HEADERS|g +; +s|AC_CHECK_DECLS_ONCE|AC_CHECK_DECLS|g +' m4/*.m4 +%endif %build -touch AUTHORS -autoreconf -fi -CFLAGS="-DUSE_VARARGS -DPREFER_STDARG %{optflags} -fstack-protector" \ -CXXFLAGS="-DUSE_VARARGS -DPREFER_STDARG %{optflags} -fstack-protector" \ +aclocal -I m4 +automake + +%if 0%{?suse_version:1} && %suse_version >= 1010 +CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags} -fstack-protector" +%else +CFLAGS="-DUSE_VARARGS -DPREFER_STDARGS %{optflags}" +%endif +CFLAGS="$CFLAGS" \ +CXXFLAGS="$CFLAGS" \ LDFLAGS=' ' \ %configure \ - --with-modules -make %{?_smp_mflags} + --with-modules \ +%if %{?with_gnutls:1}0 + --with-gnutls --without-openssl \ +%endif +%if %{?with_openssl:1}0 + --with-openssl --without-gnutls \ +%endif + --with-modules \ + --with-debug \ + --without-profiling \ + --enable-largefile \ + --with-pager=/usr/bin/less \ + --with-libresolv + +%__make %{?jobs:-j%jobs} \ + STRIP=touch %install -%make_install -touch %{buildroot}%{_bindir}/ftp -chmod +x %{buildroot}%{_bindir}/ftp +%makeinstall STRIP=touch + +touch "%{buildroot}%{_bindir}/ftp" +%__chmod 0755 "%{buildroot}%{_bindir}/ftp" + # We don't package the .la files -rm -f %{buildroot}%{_libdir}/{lftp/*/,}*.la -%find_lang %{name} +%__rm -f "%{buildroot}/%{_libdir}"/{lftp/*/,}*.la + +%__install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" +%__install -D -m 0644 "%{SOURCE3}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" +%suse_update_desktop_file "%{name}" Network FileTransfer + +%find_lang "%{name}" %post /sbin/ldconfig -test -L %{_bindir}/ftp || rm -f %{_bindir}/ftp -update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/lftp_wrapper 5 \ - --slave %{_mandir}/man1/ftp.1.gz ftp.1 %{_mandir}/man1/lftp.1.gz -update-alternatives --auto ftp +test -L "%{_bindir}/ftp" || %__rm -f "%{_bindir}/ftp" +/usr/sbin/update-alternatives --install "%{_bindir}/ftp" ftp "%{_bindir}/lftp_wrapper" 5 \ + --slave "%{_mandir}/man1/ftp.1%{ext_man}" ftp.1 "%{_mandir}/man1/lftp.1%{ext_man}" +/usr/sbin/update-alternatives --auto ftp %postun -p /sbin/ldconfig %preun if [ $1 -eq 0 ]; then - update-alternatives --remove ftp %{_bindir}/lftp_wrapper + /usr/sbin/update-alternatives --remove ftp "%{_bindir}/lftp_wrapper" fi -%files -f %{name}.lang +%files -f "lftp.lang" %defattr(-,root,root) %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO lftp.lsm %config %{_sysconfdir}/lftp.conf -%{_bindir}/* +%{_bindir}/lftp +%{_bindir}/lftpget +%{_bindir}/lftp_wrapper %ghost %{_bindir}/ftp -%{_mandir}/man*/* %{_datadir}/lftp %dir %{_libdir}/lftp %dir %{_libdir}/lftp/%{version} -%{_libdir}/lftp/*/*.so -%{_libdir}/liblftp-* +%{_libdir}/lftp/%{version}/cmd-edit.so +%{_libdir}/lftp/%{version}/cmd-mirror.so +%{_libdir}/lftp/%{version}/cmd-sleep.so +%{_libdir}/lftp/%{version}/cmd-torrent.so +%{_libdir}/lftp/%{version}/compat-mode.so +%{_libdir}/lftp/%{version}/liblftp-network.so +%{_libdir}/lftp/%{version}/liblftp-pty.so +%{_libdir}/lftp/%{version}/proto-file.so +%{_libdir}/lftp/%{version}/proto-fish.so +%{_libdir}/lftp/%{version}/proto-ftp.so +%{_libdir}/lftp/%{version}/proto-http.so +%{_libdir}/lftp/%{version}/proto-sftp.so +%{_libdir}/liblftp-*.so +%{_libdir}/liblftp-*.so.* +%doc %{_mandir}/man1/lftp.1%{ext_man} +%doc %{_mandir}/man1/lftpget.1%{ext_man} +%doc %{_mandir}/man5/lftp.conf.5%{ext_man} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%ghost %{_bindir}/ftp %clean -rm -rf %{buildroot} +%{?buildroot:%__rm -rf "%{buildroot}"} %changelog ++++++ lftp-4.3.2.tar.xz -> lftp-4.3.3.tar.bz2 ++++++ ++++ 320174 lines of diff (skipped) ++++++ lftp-autoconf-req.patch ++++++ --- configure.ac.orig 2007-10-06 18:12:28.000000000 +0200 +++ configure.ac 2007-10-06 18:12:41.000000000 +0200 @@ -2 +2 @@ -AC_PREREQ([2.60]) +AC_PREREQ([2.59]) ++++++ lftp-compat-addfiles.patch ++++++ ++++ 1452 lines (skipped) ++++++ lftp-completion.patch ++++++ *** complete.cc.O 2006-11-04 18:04:15.000000000 +0100 --- complete.cc 2006-11-04 18:33:31.000000000 +0100 *************** *** 478,483 **** --- 478,486 ---- w=skip_word(w); } + if (!strcmp(buf, "edit")) + return REMOTE_FILE; + if(!strcmp(buf,"get") || !strcmp(buf,"pget") || !strcmp(buf,"get1")) ++++++ lftp-rpmlintrc ++++++ addFilter("W: obsolete-suse-version-check.*") addFilter("W: shlib-policy-missing-suffix") addFilter("devel-file-in-non-devel-package .* /usr/lib.*/liblftp-.*.so") ++++++ lftp-wrapper+edit+compat-modify.patch ++++++ diff -aur lftp-4.3.0.orig/src/CmdExec.cc lftp-4.3.0/src/CmdExec.cc --- lftp-4.3.0.orig/src/CmdExec.cc 2011-06-16 11:33:55.000000000 +0200 +++ lftp-4.3.0/src/CmdExec.cc 2011-06-25 11:14:02.408001075 +0200 @@ -1169,6 +1169,38 @@ 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); +} + const char *CmdExec::CmdByIndex(int i) { if(dyn_cmd_table) diff -aur lftp-4.3.0.orig/src/CmdExec.h lftp-4.3.0/src/CmdExec.h --- lftp-4.3.0.orig/src/CmdExec.h 2011-06-16 11:34:02.000000000 +0200 +++ lftp-4.3.0/src/CmdExec.h 2011-06-25 11:14:21.822001078 +0200 @@ -228,6 +228,9 @@ 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); + Job *builtin_lcd(); Job *builtin_cd(); Job *builtin_open(); diff -aur lftp-4.3.0.orig/src/CopyJob.cc lftp-4.3.0/src/CopyJob.cc --- lftp-4.3.0.orig/src/CopyJob.cc 2011-04-29 06:58:27.000000000 +0200 +++ lftp-4.3.0/src/CopyJob.cc 2011-06-25 11:15:01.447001079 +0200 @@ -21,6 +21,7 @@ /* $Id: CopyJob.cc,v 1.48 2011/04/29 04:58:27 lav Exp $ */ #include <config.h> +#include <unistd.h> #include "CopyJob.h" #include "ArgV.h" #include "plural.h" @@ -253,7 +254,7 @@ xstring& CopyJobEnv::FormatFinalWithPrefix(xstring& s,const char *p) { - if(no_status) + if(no_status || !isatty(1)) return s; if(count==errors) return s; diff -aur lftp-4.3.0.orig/src/Makefile.am lftp-4.3.0/src/Makefile.am --- lftp-4.3.0.orig/src/Makefile.am 2011-06-16 12:15:45.000000000 +0200 +++ lftp-4.3.0/src/Makefile.am 2011-06-25 11:16:18.269001078 +0200 @@ -1,7 +1,7 @@ localedir = $(datadir)/locale 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 noinst_SCRIPTS = ftpget @@ -9,6 +9,7 @@ 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 +lftp_wrapper_SOURCES = lftp-wrapper.c noinst_PROGRAMS = example1 example2 example1-cmd noinst_LTLIBRARIES = example-module1.la @@ -19,7 +20,7 @@ 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 -JOB_MODULES = cmd-mirror.la cmd-sleep.la cmd-torrent.la +JOB_MODULES = cmd-mirror.la cmd-sleep.la cmd-torrent.la cmd-edit.la compat-mode.la if WITH_MODULES pkgverlib_LTLIBRARIES = $(TASK_MODULES) $(JOB_MODULES) else @@ -37,6 +38,8 @@ cmd_mirror_la_SOURCES = MirrorJob.cc MirrorJob.h cmd_sleep_la_SOURCES = SleepJob.cc SleepJob.h cmd_torrent_la_SOURCES= Torrent.cc Torrent.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\ @@ -55,6 +58,8 @@ cmd_mirror_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) cmd_sleep_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) cmd_torrent_la_LDFLAGS= -module -avoid-version -rpath $(pkgverlibdir) +cmd_edit_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) +compat_mode_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) liblftp_pty_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) $(OPENSSL_LDFLAGS) liblftp_network_la_LIBADD = $(SOCKSLIBS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(GNULIB) @@ -99,6 +104,9 @@ lftp_LDADD = liblftp-jobs.la $(READLINE) lftp_DEPENDENCIES = liblftp-jobs.la $(READLINE_DEPEND) +lftp_wrapper_LDADD = $(GNULIB) +lftp_wrapper_DEPENDENCIES = + example1_LDADD = liblftp-tasks.la example1_cmd_LDADD = liblftp-jobs.la example2_LDADD = liblftp-tasks.la ++++++ lftp.desktop ++++++ [Desktop Entry] Comment=Sophisticated file transfer shell Encoding=UTF-8 Exec=lftp GenericName=lftp shell Icon=lftp Name=lftp StartupNotify=false Terminal=true Type=Application Categories= -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
