Hello community, here is the log from the commit of package lftp checked in at Tue Apr 18 02:00:37 CEST 2006. -------- --- lftp/lftp.changes 2006-04-08 00:29:20.000000000 +0200 +++ STABLE/lftp/lftp.changes 2006-04-16 22:37:52.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 14 23:29:35 CEST 2006 - pnemec@suse.cz + +- decreased priority of alternative system [#162595] +- another fix for lftp wrapper [#164726] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.StvsmY/_old 2006-04-18 02:00:02.000000000 +0200 +++ /var/tmp/diff_new_pack.StvsmY/_new 2006-04-18 02:00:02.000000000 +0200 @@ -26,7 +26,7 @@ URL: http://lftp.yar.ru/ Autoreqprov: on Version: 3.4.0 -Release: 17 +Release: 19 Summary: LFTP Command Line File Transfer Program Source: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-nostrip.diff @@ -90,7 +90,7 @@ %post test -L ${RPM_BUILD_ROOT}%{_bindir}/ftp || rm -f ${RPM_BUILD_ROOT}%{_bindir}/ftp -update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/lftp_wrapper 20 \ +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 @@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -n lftp +* Fri Apr 14 2006 - pnemec@suse.cz +- decreased priority of alternative system [#162595] +- another fix for lftp wrapper [#164726] * Fri Apr 07 2006 - pnemec@suse.cz - fixed lftp_wrapper [#162595] * Mon Mar 20 2006 - postadal@suse.cz ++++++ lftp-compat-mode.patch ++++++ --- /var/tmp/diff_new_pack.StvsmY/_old 2006-04-18 02:00:03.000000000 +0200 +++ /var/tmp/diff_new_pack.StvsmY/_new 2006-04-18 02:00:03.000000000 +0200 @@ -384,3 +384,43 @@ proto_ftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la $(EXPAT_LIBS) proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la +--- src/lftp_wrapper.c ++++ src/lftp_wrapper.c +@@ -507,17 +507,6 @@ + char *buf_url = NULL; + int is = haveFile(buf2); + +-/** if (ftp_port == NULL) +- snprintf(open, 100, +- (anonymous +- || isWithUsername(buf2) ? LFTP_OPEN : +- LFTP_COMPAT_MODE_OPEN)); +- else +- snprintf(open, 100, "%s -p %s", +- (anonymous +- || isWithUsername(buf2) ? LFTP_OPEN : +- LFTP_COMPAT_MODE_OPEN), ftp_port);**/ +- + int ishtml,isftp,isfile,ishost,isuser; //flags for url + int tmp_port; + ishtml=isHTML(buf2); +@@ -569,8 +558,7 @@ + buf_url = get_url(buf2); + tmp_port= isPortInUrl(buf2);/* no need to test error message, it is done in get_url() */ + if(tmp_port)ftp_port_i=tmp_port; +- snprintf(open, 100,(anonymous || isuser || (isftp && !ishost) ? LFTP_OPEN : +- LFTP_COMPAT_MODE_OPEN)); ++ snprintf(open, 100,LFTP_OPEN); + snprintf(buf, BUFSIZE, "%s %s:%d; %s %s", + open, buf_url, ftp_port_i, get, + buf_file); +@@ -591,9 +579,6 @@ + } + } + +- /*if (!strncmp +- (buf2, ANONYMOUS_PREFIX, strlen(ANONYMOUS_PREFIX))) +- anonymous_offset = strlen(ANONYMOUS_PREFIX);*/ + snprintf(open, 100,(anonymous || isuser) ? LFTP_OPEN : + LFTP_COMPAT_MODE_OPEN); + buf_file = get_file(buf2); /* directory */ ++++++ lftp-wrapper.patch ++++++ ++++ 876 lines (skipped) ++++ between lftp/lftp-wrapper.patch ++++ and STABLE/lftp/lftp-wrapper.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...