From 55a2a44d4c991143d1c201a5818b0d5780ee51e1bbbad6c857cb3075f19fc13a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 13 Aug 2010 00:40:10 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vsftpd revision 20.0 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=2007039d4c13dfac4779f954e34b8476 --- vsftpd-2.0.4-conf.diff | 4 ++-- vsftpd-2.0.4-dmapi.patch | 6 +++--- vsftpd-2.0.4-enable-ssl.patch | 4 ++-- vsftpd-2.0.4-lib64.diff | 6 +++--- vsftpd-2.0.4-xinetd.diff | 6 +++--- vsftpd-2.0.5-enable-debuginfo.patch | 4 ++-- vsftpd-2.0.5-utf8-log-names.patch | 12 ++++++------ vsftpd-2.0.5-vuser.patch | 4 ++-- vsftpd-2.2.2.tar.bz2 | 3 --- vsftpd-2.3.0.tar.bz2 | 3 +++ vsftpd.changes | 20 ++++++++++++++++++++ vsftpd.spec | 18 +++++++++++------- 12 files changed, 57 insertions(+), 33 deletions(-) delete mode 100644 vsftpd-2.2.2.tar.bz2 create mode 100644 vsftpd-2.3.0.tar.bz2 diff --git a/vsftpd-2.0.4-conf.diff b/vsftpd-2.0.4-conf.diff index 942dca6..5816f30 100644 --- a/vsftpd-2.0.4-conf.diff +++ b/vsftpd-2.0.4-conf.diff @@ -1,7 +1,7 @@ Index: vsftpd.conf =================================================================== ---- vsftpd.conf.orig -+++ vsftpd.conf +--- vsftpd.conf.orig 2009-10-19 04:04:23.000000000 +0200 ++++ vsftpd.conf 2010-08-10 06:51:08.357391000 +0200 @@ -4,23 +4,89 @@ # loosens things up a bit, to make the ftp daemon more usable. # Please see vsftpd.conf.5 for all compiled in defaults. diff --git a/vsftpd-2.0.4-dmapi.patch b/vsftpd-2.0.4-dmapi.patch index 5f730dd..c90d5b3 100644 --- a/vsftpd-2.0.4-dmapi.patch +++ b/vsftpd-2.0.4-dmapi.patch @@ -1,8 +1,8 @@ Index: postlogin.c =================================================================== ---- postlogin.c.orig -+++ postlogin.c -@@ -1015,6 +1015,11 @@ handle_upload_common(struct vsf_session* +--- postlogin.c.orig 2010-03-26 05:01:06.000000000 +0100 ++++ postlogin.c 2010-08-10 06:51:06.796475000 +0200 +@@ -1036,6 +1036,11 @@ handle_upload_common(struct vsf_session* { do_truncate = 1; } diff --git a/vsftpd-2.0.4-enable-ssl.patch b/vsftpd-2.0.4-enable-ssl.patch index 2b087c2..6076d75 100644 --- a/vsftpd-2.0.4-enable-ssl.patch +++ b/vsftpd-2.0.4-enable-ssl.patch @@ -1,7 +1,7 @@ Index: builddefs.h =================================================================== ---- builddefs.h.orig -+++ builddefs.h +--- builddefs.h.orig 2010-08-06 02:50:31.000000000 +0200 ++++ builddefs.h 2010-08-10 06:51:06.520558000 +0200 @@ -3,7 +3,7 @@ #undef VSF_BUILD_TCPWRAPPERS diff --git a/vsftpd-2.0.4-lib64.diff b/vsftpd-2.0.4-lib64.diff index aabc081..35f0e08 100644 --- a/vsftpd-2.0.4-lib64.diff +++ b/vsftpd-2.0.4-lib64.diff @@ -1,7 +1,7 @@ -Index: vsftpd-2.2.2/vsf_findlibs.sh +Index: vsf_findlibs.sh =================================================================== ---- vsftpd-2.2.2.orig/vsf_findlibs.sh -+++ vsftpd-2.2.2/vsf_findlibs.sh +--- vsf_findlibs.sh.orig 2009-10-19 04:05:21.000000000 +0200 ++++ vsf_findlibs.sh 2010-08-10 06:51:05.899564000 +0200 @@ -14,6 +14,7 @@ fi # crypt library. if find_func pam_start sysdeputil.o; then diff --git a/vsftpd-2.0.4-xinetd.diff b/vsftpd-2.0.4-xinetd.diff index f4185b9..d6266fc 100644 --- a/vsftpd-2.0.4-xinetd.diff +++ b/vsftpd-2.0.4-xinetd.diff @@ -1,7 +1,7 @@ -Index: vsftpd-2.2.2/xinetd.d/vsftpd +Index: xinetd.d/vsftpd =================================================================== ---- vsftpd-2.2.2.orig/xinetd.d/vsftpd -+++ vsftpd-2.2.2/xinetd.d/vsftpd +--- xinetd.d/vsftpd.orig 2008-02-02 02:30:40.000000000 +0100 ++++ xinetd.d/vsftpd 2010-08-10 06:51:06.236565000 +0200 @@ -1,18 +1,23 @@ -# default: on +# default: off diff --git a/vsftpd-2.0.5-enable-debuginfo.patch b/vsftpd-2.0.5-enable-debuginfo.patch index dce7734..03ebaa1 100644 --- a/vsftpd-2.0.5-enable-debuginfo.patch +++ b/vsftpd-2.0.5-enable-debuginfo.patch @@ -1,7 +1,7 @@ Index: Makefile =================================================================== ---- Makefile.orig -+++ Makefile +--- Makefile.orig 2009-05-22 21:44:52.000000000 +0200 ++++ Makefile 2010-08-10 06:51:07.756405000 +0200 @@ -6,7 +6,7 @@ IFLAGS = -idirafter dummyinc CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion diff --git a/vsftpd-2.0.5-utf8-log-names.patch b/vsftpd-2.0.5-utf8-log-names.patch index 90571cf..db01da9 100644 --- a/vsftpd-2.0.5-utf8-log-names.patch +++ b/vsftpd-2.0.5-utf8-log-names.patch @@ -1,7 +1,7 @@ -Index: vsftpd-2.2.2/str.c +Index: str.c =================================================================== ---- vsftpd-2.2.2.orig/str.c -+++ vsftpd-2.2.2/str.c +--- str.c.orig 2008-12-17 06:54:16.000000000 +0100 ++++ str.c 2010-08-10 06:51:08.032395000 +0200 @@ -27,6 +27,24 @@ static int str_equal_internal(const char const char* p_buf2, unsigned int buf2_len); @@ -91,10 +91,10 @@ Index: vsftpd-2.2.2/str.c } } } -Index: vsftpd-2.2.2/str.h +Index: str.h =================================================================== ---- vsftpd-2.2.2.orig/str.h -+++ vsftpd-2.2.2/str.h +--- str.h.orig 2008-12-17 06:53:23.000000000 +0100 ++++ str.h 2010-08-10 06:51:08.037398000 +0200 @@ -36,6 +36,7 @@ void str_free(struct mystr* p_str); void str_trunc(struct mystr* p_str, unsigned int trunc_len); void str_reserve(struct mystr* p_str, unsigned int res_len); diff --git a/vsftpd-2.0.5-vuser.patch b/vsftpd-2.0.5-vuser.patch index 5e0e52a..16da30d 100644 --- a/vsftpd-2.0.5-vuser.patch +++ b/vsftpd-2.0.5-vuser.patch @@ -1,7 +1,7 @@ Index: EXAMPLE/VIRTUAL_USERS/vsftpd.pam =================================================================== ---- EXAMPLE/VIRTUAL_USERS/vsftpd.pam.orig -+++ EXAMPLE/VIRTUAL_USERS/vsftpd.pam +--- EXAMPLE/VIRTUAL_USERS/vsftpd.pam.orig 2008-02-02 02:30:40.000000000 +0100 ++++ EXAMPLE/VIRTUAL_USERS/vsftpd.pam 2010-08-10 06:51:07.074476000 +0200 @@ -1,2 +1,2 @@ -auth required /lib/security/pam_userdb.so db=/etc/vsftpd_login -account required /lib/security/pam_userdb.so db=/etc/vsftpd_login diff --git a/vsftpd-2.2.2.tar.bz2 b/vsftpd-2.2.2.tar.bz2 deleted file mode 100644 index 25d6e44..0000000 --- a/vsftpd-2.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c126a431dd907e1302335491c7e8a5b8f3ccf05c54bbb0fca4ca8b911f572c58 -size 136506 diff --git a/vsftpd-2.3.0.tar.bz2 b/vsftpd-2.3.0.tar.bz2 new file mode 100644 index 0000000..377ac83 --- /dev/null +++ b/vsftpd-2.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9316001e420ffb27087dd8c8b79fa6980f8085a0cf4018c8fe018c8ef63410 +size 137555 diff --git a/vsftpd.changes b/vsftpd.changes index 7921f37..c9c4c37 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Aug 10 04:55:16 UTC 2010 - cristian.rodriguez@opensuse.org + +- Update to 2.3.0 +- Add extremely simply HTTP support. It's very experimental, ignorant of HTTP +protocol and headers, and likely has all sorts of other issues. The use case +it might satisfy is if you need to serve simple static unathenticated content +with large levels of paranoia. +- Fix port_promiscuous breakage. +- Minor FAQ update. +- Use a larger address space limit if using text_userdb_names=YES +- Always use CLONE_NEWNET if possible when in HTTP mode. +- Change REST + STOR so that it's possible to overwrite part of file without +truncating it. +- Boot the session if we see a USER where encryption was required. May prevent +the transmission of plaintext passwords by buggy clients. +- Fix failure to transmit a large ASCII file over SSL, if it contains \n -> \r\n +fixups. + + ------------------------------------------------------------------- Tue May 25 13:05:30 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/vsftpd.spec b/vsftpd.spec index 1422e24..d97d074 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -1,5 +1,5 @@ # -# spec file for package vsftpd (Version 2.2.2) +# spec file for package vsftpd (Version 2.3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,8 @@ BuildRequires: libcap %else BuildRequires: libcap-devel %endif -Version: 2.2.2 -Release: 2 +Version: 2.3.0 +Release: 1 Summary: Very Secure FTP Daemon - Written from Scratch License: GPLv2+ Group: Productivity/Networking/Ftp/Servers @@ -49,6 +49,7 @@ Patch9: %name-2.0.4-conf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ftp-server PreReq: %insserv_prereq /usr/sbin/useradd +Requires: logrotate %description Vsftpd is an FTP server, or daemon. The "vs" stands for Very Secure. @@ -63,13 +64,13 @@ tests. %prep %setup -q -%patch1 -p1 -%patch3 -p1 +%patch1 +%patch3 %patch4 %patch5 %patch6 %patch7 -%patch8 -p1 +%patch8 %patch9 %build @@ -100,6 +101,9 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se %preun %stop_on_removal %name +%post +%{fillup_and_insserv -f %{name}} + %postun %insserv_cleanup %restart_on_update %name @@ -111,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) /usr/sbin/%name /usr/sbin/rc%name -/etc/init.d/%name +%config /etc/init.d/%name %_datadir/omc/svcinfo.d/vsftpd.xml %dir /usr/share/empty %config(noreplace) /etc/xinetd.d/%name