Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at 2016-08-18 10:21:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-14 12:23:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes 2016-08-18 10:21:32.000000000 +0200 @@ -1,0 +2,44 @@ +Mon Aug 8 21:22:40 UTC 2016 - asterios.dra...@gmail.com + +- lftp 4.7.3: + * mirror: don't add source directory base name to the target if + the source ends with a slash. + * mirror: fixed transfer count tracking in --scan-all-first mode. + * new setting file:use-fallocate. + * fixed "kill all" to remove queued commands. + * fixed xfer:log-file setting to a writable file in a protected + directory. + * fixed xfer:clobber to allow output to non-plain files. + * fixed mirror --Move to really keep source dir if it ends with a + slash. + From 4.7.2: + * ftp: fixed loss of 17th file from MLSD listing. + * new setting xfer:timeout. + * ssl: improved ssl performance for small read sizes. + * pget: allocate all needed disk space at once. + * http: new settings http:use-range and hftp:use-range. + * http: fixed setting http:authorization. + * http: resolve redirections when getting files information. + * http: include X-OC-MTime header in PUT requests for OwnCloud. + * mirror: changed --Move option to keep source dir if it ends + with a slash. + * mirror: fixed timestamp mirroring when the source site sends + redirections. + * mirror: don't report errors when the target does not support + chmod. + * torrent: discard cached data after validating. + * torrent: fixed a coredump on a file read error. + * torrent: fixed closing oldest cached FD. + * torrent/DHT: fixed our external IP voting. + * torrent/DHT: black-list nodes which change node_id often. + * torrent/DHT: black-list nodes which report many bad nodes. + * torrent/DHT: ignore nodes with our own ID. + * torrent/DHT: made node search more robust. + * torrent/DHT: mark new nodes as questionable. + * translations updated (zh_TW, ru). +- Added new build requirements libexpat-devel, libidn-devel and + zlib-devel. +- Fixes for update-alternatives usage. +- Rebased lftp-wrapper+edit+compat-modify.patch to apply cleanly. + +------------------------------------------------------------------- Old: ---- lftp-4.7.1.tar.xz lftp-4.7.1.tar.xz.asc New: ---- lftp-4.7.3.tar.xz lftp-4.7.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.5frXxt/_old 2016-08-18 10:21:33.000000000 +0200 +++ /var/tmp/diff_new_pack.5frXxt/_new 2016-08-18 10:21:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lftp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser <pascal.ble...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -19,13 +19,13 @@ %define vi_version 1.1 Name: lftp -Version: 4.7.1 +Version: 4.7.3 Release: 0 Summary: Command Line File Transfer Program License: GPL-2.0+ Group: Productivity/Networking/Ftp/Clients Url: http://lftp.yar.ru/ -Source: http://lftp.yar.ru/ftp/lftp-%{version}.tar.xz +Source: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz # Formely: http://michael.stapelberg.de/lftp_vi/ Source2: lftp-vi.%{vi_version}.tar.gz Source3: lftp.png @@ -45,6 +45,8 @@ BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: gzip +BuildRequires: libexpat-devel +BuildRequires: libidn-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: make @@ -55,8 +57,10 @@ BuildRequires: tar BuildRequires: update-alternatives BuildRequires: xz +BuildRequires: zlib-devel Requires: %{_bindir}/less Requires(post): update-alternatives +Requires(postun): update-alternatives Conflicts: ftp Obsoletes: lftp-beta < %{version} Provides: lftp-beta = %{version}-%{release} @@ -99,10 +103,10 @@ CXXFLAGS="$CFLAGS" \ LDFLAGS=' ' \ %configure \ + --disable-static \ --with-modules \ --without-gnutls \ --with-openssl \ - --with-modules \ --with-debug \ --without-profiling \ --enable-largefile \ @@ -115,9 +119,11 @@ make DESTDIR=%{buildroot} install STRIP=touch MKDIR_P="mkdir -p" mkdir -p %{buildroot}%{_sysconfdir}/alternatives +%if 0%{?suse_version} <= 1310 touch %{buildroot}%{_sysconfdir}/alternatives/ftp -ln -sf %{_sysconfdir}/alternatives/ftp %{buildroot}%{_bindir}/ftp touch %{buildroot}%{_sysconfdir}/alternatives/ftp.1.gz +%endif +ln -sf %{_sysconfdir}/alternatives/ftp %{buildroot}%{_bindir}/ftp ln -sf %{_sysconfdir}/alternatives/ftp.1.gz %{buildroot}%{_mandir}/man1/ftp.1.gz # We don't package the .la files @@ -132,12 +138,11 @@ update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/%{name}_wrapper 5 \ --slave %{_mandir}/man1/ftp.1.gz ftp.1 %{_mandir}/man1/%{name}.1.gz -update-alternatives --auto ftp -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig -%preun -if [ $1 -eq 0 ]; then +if [ "$1" = 0 ] ; then update-alternatives --remove ftp %{_bindir}/%{name}_wrapper fi ++++++ lftp-4.7.1.tar.xz -> lftp-4.7.3.tar.xz ++++++ ++++ 30997 lines of diff (skipped) ++++++ lftp-wrapper+edit+compat-modify.patch ++++++ --- /var/tmp/diff_new_pack.5frXxt/_old 2016-08-18 10:21:34.000000000 +0200 +++ /var/tmp/diff_new_pack.5frXxt/_new 2016-08-18 10:21:34.000000000 +0200 @@ -1,7 +1,8 @@ -diff -u src.orig/CmdExec.cc src/CmdExec.cc ---- src.orig/CmdExec.cc 2016-05-11 08:40:28.662250124 +0200 -+++ src/CmdExec.cc 2016-05-11 08:41:53.162253123 +0200 -@@ -1243,6 +1243,38 @@ +Index: src/CmdExec.cc +=================================================================== +--- src/CmdExec.cc.orig ++++ src/CmdExec.cc +@@ -1233,6 +1233,38 @@ void CmdExec::ChangeSession(FileAccess * ConnectionSlot::Set(slot,session); } @@ -40,10 +41,11 @@ const char *CmdExec::CmdByIndex(int i) { if(dyn_cmd_table) -diff -u src.orig/CmdExec.h src/CmdExec.h ---- src.orig/CmdExec.h 2016-05-11 08:40:28.658250124 +0200 -+++ src/CmdExec.h 2016-05-11 08:41:53.162253123 +0200 -@@ -238,6 +238,9 @@ +Index: src/CmdExec.h +=================================================================== +--- src/CmdExec.h.orig ++++ src/CmdExec.h +@@ -238,6 +238,9 @@ public: static void RegisterCommand(const char *name,cmd_creator_t creator, const char *short_name=0,const char *long_name=0); @@ -53,9 +55,10 @@ Job *builtin_lcd(); Job *builtin_cd(); Job *builtin_open(); -diff -u src.orig/CopyJob.cc src/CopyJob.cc ---- src.orig/CopyJob.cc 2016-05-11 08:40:28.662250124 +0200 -+++ src/CopyJob.cc 2016-05-11 08:41:53.166253123 +0200 +Index: src/CopyJob.cc +=================================================================== +--- src/CopyJob.cc.orig ++++ src/CopyJob.cc @@ -18,6 +18,7 @@ */ @@ -64,7 +67,7 @@ #include "CopyJob.h" #include "ArgV.h" #include "plural.h" -@@ -259,7 +260,7 @@ +@@ -259,7 +260,7 @@ void CopyJobEnv::SetCopier(FileCopy *c,c xstring& CopyJobEnv::FormatFinalWithPrefix(xstring& s,const char *p) { @@ -73,9 +76,10 @@ return s; if(count==errors) return s; -diff -u src.orig/Makefile.am src/Makefile.am ---- src.orig/Makefile.am 2016-05-11 08:40:28.658250124 +0200 -+++ src/Makefile.am 2016-05-11 08:49:55.306270234 +0200 +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig ++++ src/Makefile.am @@ -1,6 +1,6 @@ pkgverlibdir = $(pkglibdir)/$(VERSION) @@ -84,24 +88,19 @@ bin_SCRIPTS = lftpget pkgdata_SCRIPTS = import-ncftp import-netscape verify-file convert-mozilla-cookies xdg-move noinst_SCRIPTS = ftpget -@@ -8,6 +8,7 @@ +@@ -8,9 +8,10 @@ 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 +lftp_wrapper_SOURCES = lftp-wrapper.c - noinst_PROGRAMS = example1 example2 example1-cmd - noinst_LTLIBRARIES = example-module1.la -@@ -18,7 +19,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 -@@ -38,6 +39,8 @@ +@@ -30,6 +31,8 @@ cmd_mirror_la_SOURCES = MirrorJob.cc Mir cmd_sleep_la_SOURCES = SleepJob.cc SleepJob.h cmd_torrent_la_SOURCES= Torrent.cc Torrent.h TorrentTracker.cc TorrentTracker.h\ DHT.cc DHT.h Bencode.cc Bencode.h @@ -110,7 +109,7 @@ liblftp_pty_la_SOURCES = PtyShell.cc PtyShell.h lftp_pty.c lftp_pty.h SSH_Access.cc SSH_Access.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\ -@@ -57,6 +60,8 @@ +@@ -49,6 +52,8 @@ proto_sftp_la_LDFLAGS = -module -avoid-v 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) @@ -118,14 +117,14 @@ +compat_mode_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) liblftp_pty_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) liblftp_network_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS) $(OPENSSL_CPPFLAGS) $(LIBGNUTLS_CFLAGS) - liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) $(OPENSSL_LDFLAGS) $(ZLIB_LDFLAGS) -@@ -106,6 +111,9 @@ - lftp_LDADD = liblftp-jobs.la liblftp-tasks.la $(READLINE_LIBS) + liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) +@@ -98,6 +103,9 @@ lftp_LDFLAGS = -export-dynamic + lftp_LDADD = liblftp-jobs.la liblftp-tasks.la $(READLINE_LDFLAGS) $(READLINE_LIBS) lftp_DEPENDENCIES = liblftp-jobs.la +lftp_wrapper_LDADD = $(GNULIB) +lftp_wrapper_DEPENDENCIES = + - example1_LDADD = liblftp-tasks.la - example1_cmd_LDADD = liblftp-jobs.la liblftp-tasks.la - example2_LDADD = liblftp-tasks.la + CLEANFILES = *.la + + AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/trio
