Hello community, here is the log from the commit of package vsftpd checked in at Thu Apr 20 17:58:38 CEST 2006. -------- --- vsftpd/vsftpd.changes 2006-02-16 12:28:54.000000000 +0100 +++ STABLE/vsftpd/vsftpd.changes 2006-04-20 16:21:44.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 20 16:21:14 CEST 2006 - hvogel@suse.de + +- add support for DMAPI filesystems [#167632] + +------------------------------------------------------------------- +Wed Apr 19 11:13:47 CEST 2006 - hvogel@suse.de + +- rename xinetd config from vsftpd to vsftp to avoid name clashes + in chkconfig [#165745] + +------------------------------------------------------------------- New: ---- vsftpd-2.0.4-dmapi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vsftpd.spec ++++++ --- /var/tmp/diff_new_pack.RQSy30/_old 2006-04-20 17:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.RQSy30/_new 2006-04-20 17:56:22.000000000 +0200 @@ -13,7 +13,7 @@ Name: vsftpd BuildRequires: libcap-devel openssl-devel pam-devel Version: 2.0.4 -Release: 5 +Release: 14 Summary: Very Secure FTP Daemon - Written from Scratch License: GPL Group: Productivity/Networking/Ftp/Servers @@ -29,6 +29,7 @@ Patch3: %name-%version-xinetd.diff Patch4: %name-%version-retval.patch Patch5: %name-%version-enable-ssl.patch +Patch6: %name-%version-dmapi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ftp-server PreReq: %insserv_prereq @@ -58,6 +59,7 @@ %patch3 -p1 %patch4 %patch5 +%patch6 %build rm -f dummyinc/sys/capability.h @@ -69,7 +71,7 @@ cp %SOURCE4 . install -D -m 755 %name $RPM_BUILD_ROOT/usr/sbin/%name install -D -m 600 %name.conf $RPM_BUILD_ROOT/etc/%name.conf -install -D -m 600 xinetd.d/%name $RPM_BUILD_ROOT/etc/xinetd.d/%name +install -D -m 600 xinetd.d/%name $RPM_BUILD_ROOT/etc/xinetd.d/vsftp install -D -m 644 $RPM_SOURCE_DIR/%name.pam $RPM_BUILD_ROOT/etc/pam.d/%name install -D -m 644 $RPM_SOURCE_DIR/%name.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/%name install -D -m 644 %name.conf.5 $RPM_BUILD_ROOT/%_mandir/man5/%name.conf.5 @@ -77,6 +79,11 @@ install -D -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/%name ln -sf ../../etc/init.d/%name $RPM_BUILD_ROOT/%_prefix/sbin/rc%name +%post +if [ -f /etc/xinetd.d/vsftpd ]; then + mv /etc/xinetd.d/vsftpd /etc/xinetd.d/vsftp +fi + %preun %stop_on_removal %name @@ -93,7 +100,7 @@ /usr/sbin/rc%name /etc/init.d/%name %dir /usr/share/empty -%config(noreplace) /etc/xinetd.d/%name +%config(noreplace) /etc/xinetd.d/vsftp %config(noreplace) /etc/%name.conf %config /etc/pam.d/%name %config(noreplace) /etc/logrotate.d/%name @@ -104,6 +111,11 @@ %doc README.SUSE %changelog -n vsftpd +* Thu Apr 20 2006 - hvogel@suse.de +- add support for DMAPI filesystems [#167632] +* Wed Apr 19 2006 - hvogel@suse.de +- rename xinetd config from vsftpd to vsftp to avoid name clashes + in chkconfig [#165745] * Thu Feb 16 2006 - hvogel@suse.de - enable ssl for real [#151453] * Mon Feb 06 2006 - hvogel@suse.de ++++++ vsftpd-2.0.4-dmapi.patch ++++++ --- postlogin.c.orig 2006-04-10 10:21:47.000000000 -0500 +++ postlogin.c 2006-04-19 07:59:04.101922824 -0500 @@ -659,6 +659,8 @@ vsf_cmdio_write(p_sess, FTP_FILEFAIL, "Failed to open file."); goto file_close_out; } + vsf_sysutil_deactivate_noblock(opened_file); + /* Optionally, we'll be paranoid and only serve publicly readable stuff */ if (p_sess->is_anonymous && tunable_anon_world_readable_only && !vsf_sysutil_statbuf_is_readable_other(s_p_statbuf)) @@ -942,6 +944,7 @@ static void handle_upload_common(struct vsf_session* p_sess, int is_append, int is_unique) { + static struct vsf_sysutil_statbuf* s_p_statbuf; static struct mystr s_filename; struct mystr* p_filename; struct vsf_transfer_ret trans_ret; @@ -987,6 +990,11 @@ { new_file_fd = str_create_append(p_filename); } + if (new_file_fd >= 0) { + vsf_sysutil_fstat(new_file_fd, &s_p_statbuf); + if (vsf_sysutil_statbuf_is_regfile(s_p_statbuf)) + vsf_sysutil_deactivate_noblock(new_file_fd); + } } if (vsf_sysutil_retval_is_error(new_file_fd)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...