diff --git a/.cvsignore b/.cvsignore index 56174c2..99c220d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lftp-4.0.8.tar.lzma +lftp-4.0.9.tar.lzma diff --git a/lftp-4.0.5-manconf.patch b/lftp-4.0.5-manconf.patch deleted file mode 100644 index a7cb1f7..0000000 --- a/lftp-4.0.5-manconf.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff -up lftp-4.0.5/doc/lftp.conf.5.manconf lftp-4.0.5/doc/lftp.conf.5 ---- lftp-4.0.5/doc/lftp.conf.5.manconf 2010-04-01 14:22:54.105929171 +0200 -+++ lftp-4.0.5/doc/lftp.conf.5 2010-04-01 14:22:54.105929171 +0200 -@@ -0,0 +1,11 @@ -+.TH LFTP.CONF 5 -+.SH NAME -+lftp.conf \- the global configuration file for lftp -+ -+.SH "DESCRIPTION" -+the /etc/lftp.conf configuration file changes the default behavior of lftp and affects the settings for all users. User-specific options should be set in either the ~/.lftprc or ~/.lftp/rc file. These configuration files are read when lftp starts up and the parameters defined therein take affect at that time. -+ -+In addition to lftp's configuration options, aliases and 'set' commands can be defined in any of these configuration files. Refer to the Command and Settings sections of the lftp man page for more details. -+ -+.SH SEE ALSO -+.BR lftp (1) -diff -up lftp-4.0.5/doc/Makefile.am.manconf lftp-4.0.5/doc/Makefile.am ---- lftp-4.0.5/doc/Makefile.am.manconf 2005-12-31 07:53:12.000000000 +0100 -+++ lftp-4.0.5/doc/Makefile.am 2010-04-01 14:36:26.101664247 +0200 -@@ -1,4 +1,4 @@ --man_MANS = lftp.1 lftpget.1 -+man_MANS = lftp.1 lftpget.1 lftp.conf.5 - EXTRA_DIST = $(man_MANS) - - lftp.ps: lftp.1 -diff -up lftp-4.0.5/doc/Makefile.in.manconf lftp-4.0.5/doc/Makefile.in ---- lftp-4.0.5/doc/Makefile.in.manconf 2009-12-21 17:27:01.000000000 +0100 -+++ lftp-4.0.5/doc/Makefile.in 2010-04-01 14:35:49.162730211 +0200 -@@ -129,7 +129,8 @@ CONFIG_CLEAN_FILES = - SOURCES = - DIST_SOURCES = - man1dir = $(mandir)/man1 --am__installdirs = "$(DESTDIR)$(man1dir)" -+man5dir = $(mandir)/man5 -+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" - NROFF = nroff - MANS = $(man_MANS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -883,7 +884,8 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --man_MANS = lftp.1 lftpget.1 -+man1_MANS = lftp.1 lftpget.1 -+man5_MANS = lftp.conf.5 - EXTRA_DIST = $(man_MANS) - all: all-am - -@@ -968,6 +970,51 @@ uninstall-man1: - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done -+install-man5: $(man5_MANS) $(man_MANS) -+ @$(NORMAL_INSTALL) -+ test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" -+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ -+ case "$$i" in \ -+ *.5*) list="$$list $$i" ;; \ -+ esac; \ -+ done; \ -+ for i in $$list; do \ -+ if test -f $$i; then file=$$i; \ -+ else file=$(srcdir)/$$i; fi; \ -+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 5*) ;; \ -+ *) ext='5' ;; \ -+ esac; \ -+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ -+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ -+ done -+uninstall-man5: -+ @$(NORMAL_UNINSTALL) -+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ -+ case "$$i" in \ -+ *.5*) list="$$list $$i" ;; \ -+ esac; \ -+ done; \ -+ for i in $$list; do \ -+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 5*) ;; \ -+ *) ext='5' ;; \ -+ esac; \ -+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ -+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -+ echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ -+ rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ -+ done - tags: TAGS - TAGS: - -@@ -1008,6 +1055,9 @@ installdirs: - for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -+ for dir in "$(DESTDIR)$(man5dir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -1060,7 +1110,7 @@ install-html: install-html-am - - install-info: install-info-am - --install-man: install-man1 -+install-man: install-man1 install-man5 - - install-pdf: install-pdf-am - -@@ -1086,7 +1136,7 @@ ps-am: - - uninstall-am: uninstall-man - --uninstall-man: uninstall-man1 -+uninstall-man: uninstall-man1 uninstall-man5 - - .MAKE: install-am install-strip - -@@ -1095,12 +1145,12 @@ uninstall-man: uninstall-man1 - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-man1 \ -+ install-info install-info-am install-man install-man1 install-man5 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-man uninstall-man1 -+ uninstall uninstall-am uninstall-man uninstall-man1 uninstall-man5 - - - lftp.ps: lftp.1 diff --git a/lftp-4.0.9-date_fmt.patch b/lftp-4.0.9-date_fmt.patch new file mode 100644 index 0000000..dff27f1 --- /dev/null +++ b/lftp-4.0.9-date_fmt.patch @@ -0,0 +1,30 @@ +diff -up lftp-4.0.9/src/Http.cc.date_fmt lftp-4.0.9/src/Http.cc +--- lftp-4.0.9/src/Http.cc.date_fmt 2009-07-17 14:52:26.000000000 +0200 ++++ lftp-4.0.9/src/Http.cc 2010-06-30 08:07:00.818994525 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include "Http.h" +@@ -562,16 +563,10 @@ void Http::SendRequest(const char *conne + (long long)((limit==FILE_END || limit>entity_size ? entity_size : limit)-1), + (long long)entity_size); + } +- if(entity_date!=NO_DATE) ++ if(entity_date!=NO_DATE && entity_date>0L && entity_datetm_wday],t->tm_mday,month_names[t->tm_mon], +- t->tm_year+1900,t->tm_hour,t->tm_min,t->tm_sec); ++ strftime(d, sizeof(d), "%a, %d %b %H:%M:%S %Y GMT", gmtime(&entity_date)); + Send("Last-Modified: %s\r\n",d); + } + break; diff --git a/lftp.spec b/lftp.spec index d01d522..0b95b33 100644 --- a/lftp.spec +++ b/lftp.spec @@ -1,6 +1,6 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 4.0.8 +Version: 4.0.9 Release: 1%{?dist} License: GPLv3+ Group: Applications/Internet @@ -9,7 +9,7 @@ URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext -Patch1: lftp-4.0.5-manconf.patch +Patch1: lftp-4.0.9-date_fmt.patch %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -29,7 +29,7 @@ Utility scripts for use with lftp. %prep %setup -q -%patch1 -p1 -b .manconf +%patch1 -p1 -b .date_fmt #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure sed -i.norpath -e \ @@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 30 2010 Jiri Skala - 4.0.9-1 +- fixes #600218 - formatting corrupted date +- updated to latest version + * Fri Jun 11 2010 Jiri Skala - 4.0.8-1 - fixes #602836 - CVE-2010-2251 lftp: multiple HTTP client download filename vulnerability - updated to latest version diff --git a/sources b/sources index 85e4f6f..d7674ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8900b3481b1f8e2be7f01e6acfedbae lftp-4.0.8.tar.lzma +b3d584d12fd04037916882b1a00f2f92 lftp-4.0.9.tar.lzma