From 79e70eb1afed764d432cea8ccddf21b65c4b0e3140c259081cd57dbd343f01c2 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 25 Feb 2011 10:57:21 +0000 Subject: [PATCH 01/12] Updating link to change in openSUSE:Factory/vsftpd revision 24.0 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=0a68bc0bf78b50dd791a9d607fad70d1 --- vsftpd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vsftpd.spec b/vsftpd.spec index 30ff59d..8164d26 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -1,7 +1,7 @@ # -# spec file for package vsftpd (Version 2.3.2) +# spec file for package vsftpd # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 3f0e2115fcdfd87aac4fd7441fa0896161a632eaa90aac9aea23ed98db87c334 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Thu, 22 Sep 2011 11:33:04 +0000 Subject: [PATCH 02/12] - change the url and service file to the new location at security.appspot.com/vsftpd OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=20 --- _service | 9 ++++----- vsftpd.changes | 8 ++++++++ vsftpd.logrotate | 2 +- vsftpd.spec | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/_service b/_service index ad7e75e..9dfeaa2 100644 --- a/_service +++ b/_service @@ -1,13 +1,12 @@ - - ftp - vsftpd.beasts.org - /users/cevans/vsftpd-2.3.4.tar.gz + https + security.appspot.com + /downloads/vsftpd-2.3.4.tar.gz _service:download_url:vsftpd-2.3.4.tar.gz sha256 b466edf96437afa2b2bea6981d4ab8b0204b83ca0a2ac94bef6b62b42cc71a5a - + \ No newline at end of file diff --git a/vsftpd.changes b/vsftpd.changes index 6d4813a..9ea0ef7 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 22 11:17:04 UTC 2011 - mvyskocil@suse.cz + +- fix bnc#713588 - bogus logrotate config for vsftpd + call /sbin/killproc -HUP /usr/sbin/vsftpd like init script +- change the url and service file to the new location at + security.appspot.com/vsftpd + ------------------------------------------------------------------- Fri Feb 25 01:37:38 UTC 2011 - crrodriguez@opensuse.org diff --git a/vsftpd.logrotate b/vsftpd.logrotate index 323db6c..789a6b5 100644 --- a/vsftpd.logrotate +++ b/vsftpd.logrotate @@ -9,6 +9,6 @@ create 600 root root sharedscripts postrotate - killall -HUP vsftpd + /sbin/killproc -HUP /usr/sbin/vsftpd endscript } diff --git a/vsftpd.spec b/vsftpd.spec index 8164d26..71d2b7f 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -30,7 +30,7 @@ Release: 1 Summary: Very Secure FTP Daemon - Written from Scratch License: GPLv2+ Group: Productivity/Networking/Ftp/Servers -Url: http://vsftpd.beasts.org +Url: https://security.appspot.com/vsftpd.html Source: %name-%version.tar.gz Source1: %name.pam Source2: %name.logrotate From cbab1585aca5d7b225e474f2f78db6960e524d4428fc0987039fc81de43cf246 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 22 Sep 2011 12:48:07 +0000 Subject: [PATCH 03/12] Accepting request 84442 from network baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/84442 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=27 --- _service:download_url:vsftpd-2.3.4.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 _service:download_url:vsftpd-2.3.4.tar.gz diff --git a/_service:download_url:vsftpd-2.3.4.tar.gz b/_service:download_url:vsftpd-2.3.4.tar.gz deleted file mode 100644 index 818245f..0000000 --- a/_service:download_url:vsftpd-2.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b466edf96437afa2b2bea6981d4ab8b0204b83ca0a2ac94bef6b62b42cc71a5a -size 187043 From 20f58e7e8a59cfd32e2be4488e47920218a173654b988fc6f48bdf9db60a1365 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 11 Oct 2011 10:14:47 +0000 Subject: [PATCH 04/12] trigger service run OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=28 --- _service:download_url:vsftpd-2.3.4.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 _service:download_url:vsftpd-2.3.4.tar.gz diff --git a/_service:download_url:vsftpd-2.3.4.tar.gz b/_service:download_url:vsftpd-2.3.4.tar.gz new file mode 100644 index 0000000..818245f --- /dev/null +++ b/_service:download_url:vsftpd-2.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b466edf96437afa2b2bea6981d4ab8b0204b83ca0a2ac94bef6b62b42cc71a5a +size 187043 From e1b264f17e9d72d6bcd15a29f958504b505a280c5ae6f1d5d4bae2e8145f5c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 27 Nov 2011 20:24:40 +0000 Subject: [PATCH 05/12] Accepting request 93775 from home:elvigia:branches:network - fis copy/paste error in previous change - Add systemd unit OBS-URL: https://build.opensuse.org/request/show/93775 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=29 --- _service:download_url:vsftpd-2.3.4.tar.gz | 3 --- vsftpd.changes | 10 ++++++++++ vsftpd.service | 10 ++++++++++ vsftpd.spec | 3 +++ 4 files changed, 23 insertions(+), 3 deletions(-) delete mode 100644 _service:download_url:vsftpd-2.3.4.tar.gz create mode 100644 vsftpd.service diff --git a/_service:download_url:vsftpd-2.3.4.tar.gz b/_service:download_url:vsftpd-2.3.4.tar.gz deleted file mode 100644 index 818245f..0000000 --- a/_service:download_url:vsftpd-2.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b466edf96437afa2b2bea6981d4ab8b0204b83ca0a2ac94bef6b62b42cc71a5a -size 187043 diff --git a/vsftpd.changes b/vsftpd.changes index 9ea0ef7..35516f6 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Nov 26 16:31:20 UTC 2011 - crrodriguez@opensuse.org + +- fis copy/paste error in previous change + +------------------------------------------------------------------- +Fri Nov 25 22:14:14 UTC 2011 - crrodriguez@opensuse.org + +- Add systemd unit + ------------------------------------------------------------------- Thu Sep 22 11:17:04 UTC 2011 - mvyskocil@suse.cz diff --git a/vsftpd.service b/vsftpd.service new file mode 100644 index 0000000..070459f --- /dev/null +++ b/vsftpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Vsftpd ftp daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/vsftpd /etc/vsftpd.conf + +[Install] +WantedBy=multi-user.target diff --git a/vsftpd.spec b/vsftpd.spec index 71d2b7f..1251b05 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -38,6 +38,7 @@ Source3: %name.init Source4: README.SUSE Source5: %name.xml Source6: %name.firewall +Source7: vsftpd.service Patch1: %name-2.0.4-lib64.diff Patch3: %name-2.0.4-xinetd.diff Patch4: %name-2.0.4-enable-ssl.patch @@ -94,6 +95,7 @@ install -d $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/ install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +install -D -m 0644 %SOURCE7 %{buildroot}/lib/systemd/system/vsftpd.service %pre /usr/sbin/useradd -r -o -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || : @@ -113,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +/lib/systemd/system/vsftpd.service /usr/sbin/%name /usr/sbin/rc%name %config /etc/init.d/%name From 9b2771a5876b771a9a7034652693b0cb9928cef15d4139d74f1e5eca8c7411c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 25 Dec 2011 22:14:07 +0000 Subject: [PATCH 06/12] Accepting request 98058 from home:AndreasStieger:branches:network - update to upstream 2.3.5: - convert .changes file to unicode - refresh vsftpd-2.0.4-conf.diff to vsftpd-2.3.5-conf.patch - name patches explicitly without macro as per recommendations - remove INSTALL file from binary package - update license to GPL-2.0+ - mark /etc/sysconfig/SuSEfirewall2/services/vsftpd as config file OBS-URL: https://build.opensuse.org/request/show/98058 OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=30 --- _service | 12 -------- ...2.0.4-conf.diff => vsftpd-2.3.5-conf.patch | 11 +++++-- vsftpd-2.3.5.tar.bz2 | 3 ++ vsftpd.changes | 29 +++++++++++++++++-- vsftpd.spec | 26 ++++++++--------- 5 files changed, 50 insertions(+), 31 deletions(-) delete mode 100644 _service rename vsftpd-2.0.4-conf.diff => vsftpd-2.3.5-conf.patch (95%) create mode 100644 vsftpd-2.3.5.tar.bz2 diff --git a/_service b/_service deleted file mode 100644 index 9dfeaa2..0000000 --- a/_service +++ /dev/null @@ -1,12 +0,0 @@ - - - https - security.appspot.com - /downloads/vsftpd-2.3.4.tar.gz - - - _service:download_url:vsftpd-2.3.4.tar.gz - sha256 - b466edf96437afa2b2bea6981d4ab8b0204b83ca0a2ac94bef6b62b42cc71a5a - - \ No newline at end of file diff --git a/vsftpd-2.0.4-conf.diff b/vsftpd-2.3.5-conf.patch similarity index 95% rename from vsftpd-2.0.4-conf.diff rename to vsftpd-2.3.5-conf.patch index 7e88d03..453f2f8 100644 --- a/vsftpd-2.0.4-conf.diff +++ b/vsftpd-2.3.5-conf.patch @@ -1,5 +1,7 @@ ---- vsftpd.conf.orig -+++ vsftpd.conf +Index: vsftpd.conf +=================================================================== +--- vsftpd.conf.orig 2011-12-17 18:24:40.000000000 +0000 ++++ vsftpd.conf 2011-12-23 17:16:43.000000000 +0000 @@ -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. @@ -172,7 +174,7 @@ # Enable this and the server will recognise asynchronous ABOR requests. Not # recommended for security (the code is non-trivial). Not enabling it, # however, may confuse older FTP clients. -@@ -77,38 +164,29 @@ connect_from_port_20=YES +@@ -77,41 +164,29 @@ connect_from_port_20=YES # predicted this attack and has always been safe, reporting the size of the # raw file. # ASCII mangling is a horrible feature of the protocol. @@ -192,6 +194,9 @@ -# You may specify an explicit list of local users to chroot() to their home -# directory. If chroot_local_user is YES, then this list becomes a list of -# users to NOT chroot(). +-# (Warning! chroot'ing can be very dangerous. If using chroot, make sure that +-# the user does not have write access to the top level directory within the +-# chroot) -#chroot_local_user=YES -#chroot_list_enable=YES -# (default follows) diff --git a/vsftpd-2.3.5.tar.bz2 b/vsftpd-2.3.5.tar.bz2 new file mode 100644 index 0000000..051b56b --- /dev/null +++ b/vsftpd-2.3.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a82e847f95249610a9851e4b9a8f63e349c366860fe8c88a25bf4b6a16c0e9b +size 138208 diff --git a/vsftpd.changes b/vsftpd.changes index 35516f6..a85bac4 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Dec 23 17:48:04 UTC 2011 - andreas.stieger@gmx.de + +- update to upstream 2.3.5: + * Try and force glibc to cache zoneinfo files in an attempt to work around + glibc parsing vulnerability. Thanks to Kingcope. + * Only report CHMOD in SITE HELP if it's enabled. Thanks to Martin Schwenke + . + * Some simple fixes and cleanups from Thorsten Brehm . + * Only advertise "AUTH SSL" if one of SSLv2, SSLv3 is enabled. Thanks to + steve willing . + * Handle connect() failures properly. Thanks to Takayuki Nagata + . + * Add stronger checks for the configuration error of running with a + writeable root directory inside a chroot(). This may bite people who + carelessly turned on chroot_local_user but such is life. +- convert .changes file to unicode +- refresh vsftpd-2.0.4-conf.diff to vsftpd-2.3.5-conf.patch +- name patches explicitly without macro as per recommendations +- remove INSTALL file from binary package +- update license to GPL-2.0+ +- mark /etc/sysconfig/SuSEfirewall2/services/vsftpd as config file + ------------------------------------------------------------------- Sat Nov 26 16:31:20 UTC 2011 - crrodriguez@opensuse.org @@ -493,9 +516,9 @@ Mon Jul 28 15:55:40 CEST 2003 - mmj@suse.de Fri May 30 12:48:45 CEST 2003 - mmj@suse.de - Update to vsftpd-1.2.0 including: - · IPv6 support, so drop our patch - · Many bugfixes and tunings - · Build fixes + · IPv6 support, so drop our patch + · Many bugfixes and tunings + · Build fixes ------------------------------------------------------------------- Thu Mar 6 16:34:30 CET 2003 - mmj@suse.de diff --git a/vsftpd.spec b/vsftpd.spec index 1251b05..f33031a 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -25,13 +25,13 @@ BuildRequires: libcap %else BuildRequires: libcap-devel %endif -Version: 2.3.4 +Version: 2.3.5 Release: 1 Summary: Very Secure FTP Daemon - Written from Scratch -License: GPLv2+ +License: GPL-2.0+ Group: Productivity/Networking/Ftp/Servers Url: https://security.appspot.com/vsftpd.html -Source: %name-%version.tar.gz +Source: %name-%version.tar.bz2 Source1: %name.pam Source2: %name.logrotate Source3: %name.init @@ -39,14 +39,14 @@ Source4: README.SUSE Source5: %name.xml Source6: %name.firewall Source7: vsftpd.service -Patch1: %name-2.0.4-lib64.diff -Patch3: %name-2.0.4-xinetd.diff -Patch4: %name-2.0.4-enable-ssl.patch -Patch5: %name-2.0.4-dmapi.patch -Patch6: %name-2.0.5-vuser.patch -Patch7: %name-2.0.5-enable-debuginfo.patch -Patch8: %name-2.0.5-utf8-log-names.patch -Patch9: %name-2.0.4-conf.diff +Patch1: vsftpd-2.0.4-lib64.diff +Patch3: vsftpd-2.0.4-xinetd.diff +Patch4: vsftpd-2.0.4-enable-ssl.patch +Patch5: vsftpd-2.0.4-dmapi.patch +Patch6: vsftpd-2.0.5-vuser.patch +Patch7: vsftpd-2.0.5-enable-debuginfo.patch +Patch8: vsftpd-2.0.5-utf8-log-names.patch +Patch9: vsftpd-2.3.5-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ftp-server PreReq: %insserv_prereq /usr/sbin/useradd @@ -127,9 +127,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/logrotate.d/%name %_mandir/man5/%name.conf.* %_mandir/man8/%name.* -%doc INSTALL BUGS AUDIT Changelog LICENSE README README.security +%doc BUGS AUDIT Changelog LICENSE README README.security %doc REWARD SPEED TODO SECURITY TUNING SIZE FAQ EXAMPLE COPYING %doc README.SUSE -%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %changelog From e020b9f862877044a826c2ffb26e83c72ccd680b962412fdc25297b91e55d09b Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 15 Feb 2012 16:42:34 +0000 Subject: [PATCH 07/12] - use the original tarball, because the bz2 repacking madness disables gpg --verify OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=31 --- vsftpd-2.3.5.tar.bz2 | 3 --- vsftpd-2.3.5.tar.gz | 3 +++ vsftpd.changes | 6 ++++++ vsftpd.spec | 12 +++++------- 4 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 vsftpd-2.3.5.tar.bz2 create mode 100644 vsftpd-2.3.5.tar.gz diff --git a/vsftpd-2.3.5.tar.bz2 b/vsftpd-2.3.5.tar.bz2 deleted file mode 100644 index 051b56b..0000000 --- a/vsftpd-2.3.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a82e847f95249610a9851e4b9a8f63e349c366860fe8c88a25bf4b6a16c0e9b -size 138208 diff --git a/vsftpd-2.3.5.tar.gz b/vsftpd-2.3.5.tar.gz new file mode 100644 index 0000000..9b1c6e8 --- /dev/null +++ b/vsftpd-2.3.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1 +size 187691 diff --git a/vsftpd.changes b/vsftpd.changes index a85bac4..ecba095 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 15 16:41:15 UTC 2012 - mvyskocil@suse.cz + +- use the original tarball, because the bz2 repacking madness disables + gpg --verify + ------------------------------------------------------------------- Fri Dec 23 17:48:04 UTC 2011 - andreas.stieger@gmx.de diff --git a/vsftpd.spec b/vsftpd.spec index f33031a..84fc971 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -1,7 +1,7 @@ # # spec file for package vsftpd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,23 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: vsftpd -BuildRequires: openssl-devel pam-devel +BuildRequires: openssl-devel +BuildRequires: pam-devel %if 0%{?suse_version} < 1001 BuildRequires: libcap %else BuildRequires: libcap-devel %endif Version: 2.3.5 -Release: 1 +Release: 0 Summary: Very Secure FTP Daemon - Written from Scratch License: GPL-2.0+ Group: Productivity/Networking/Ftp/Servers Url: https://security.appspot.com/vsftpd.html -Source: %name-%version.tar.bz2 +Source: %name-%version.tar.gz Source1: %name.pam Source2: %name.logrotate Source3: %name.init From 468d05d65accb2c4ea4b4937f22d08178126df6278df59e9fb5470cdf3fb1346 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 15 Feb 2012 16:43:49 +0000 Subject: [PATCH 08/12] OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=32 --- vsftpd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vsftpd.spec b/vsftpd.spec index 84fc971..1b7198f 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vsftpd BuildRequires: openssl-devel BuildRequires: pam-devel From e5b3faff0ad285f7b7d1769b7edce030940a9d808d1afc401f11844c9e250bc1 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 15 Feb 2012 16:46:06 +0000 Subject: [PATCH 09/12] =?UTF-8?q?-=20revert=20a=20part=20oc=20changes=20ut?= =?UTF-8?q?f=20converting=20=20=20=CB=87=20IPv6=20support,=20so=20drop=20o?= =?UTF-8?q?ur=20patch=20=20=20=CB=87=20Many=20bugfixes=20and=20tunings=20?= =?UTF-8?q?=20=20=CB=87=20Build=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=33 --- vsftpd.changes | 7 ++++--- vsftpd.spec | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vsftpd.changes b/vsftpd.changes index ecba095..6d0ba95 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -3,6 +3,7 @@ Wed Feb 15 16:41:15 UTC 2012 - mvyskocil@suse.cz - use the original tarball, because the bz2 repacking madness disables gpg --verify +- revert a part oc changes utf converting ------------------------------------------------------------------- Fri Dec 23 17:48:04 UTC 2011 - andreas.stieger@gmx.de @@ -522,9 +523,9 @@ Mon Jul 28 15:55:40 CEST 2003 - mmj@suse.de Fri May 30 12:48:45 CEST 2003 - mmj@suse.de - Update to vsftpd-1.2.0 including: - · IPv6 support, so drop our patch - · Many bugfixes and tunings - · Build fixes + ˇ IPv6 support, so drop our patch + ˇ Many bugfixes and tunings + ˇ Build fixes ------------------------------------------------------------------- Thu Mar 6 16:34:30 CET 2003 - mmj@suse.de diff --git a/vsftpd.spec b/vsftpd.spec index 1b7198f..84fc971 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: vsftpd BuildRequires: openssl-devel BuildRequires: pam-devel From f9dd88708eec59db622c005345a4ec6c4a151287313d6affec78c3e56e696e62 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 21 Feb 2012 10:52:18 +0000 Subject: [PATCH 10/12] - follow Systemd Packaging guidelines http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=34 --- vsftpd.changes | 6 ++++++ vsftpd.spec | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/vsftpd.changes b/vsftpd.changes index 6d0ba95..75c1f8e 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 21 10:51:51 UTC 2012 - mvyskocil@suse.cz + +- follow Systemd Packaging guidelines + http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines + ------------------------------------------------------------------- Wed Feb 15 16:41:15 UTC 2012 - mvyskocil@suse.cz diff --git a/vsftpd.spec b/vsftpd.spec index 84fc971..996ac44 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vsftpd BuildRequires: openssl-devel BuildRequires: pam-devel @@ -23,6 +24,9 @@ BuildRequires: libcap %else BuildRequires: libcap-devel %endif +%if 0%{?suse_version} > 1140 +BuildRequires: systemd +%endif Version: 2.3.5 Release: 0 Summary: Very Secure FTP Daemon - Written from Scratch @@ -48,6 +52,7 @@ Patch9: vsftpd-2.3.5-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ftp-server PreReq: %insserv_prereq /usr/sbin/useradd +%{?systemd_requires} Requires: logrotate %description @@ -93,20 +98,34 @@ install -d $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/ install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} -install -D -m 0644 %SOURCE7 %{buildroot}/lib/systemd/system/vsftpd.service +%if 0%{?suse_version} > 1140 +install -D -m 0644 %SOURCE7 %{buildroot}/%{name}.service +%endif %pre /usr/sbin/useradd -r -o -g nogroup -s /bin/false -c "Secure FTP User" -d /var/lib/empty ftpsecure 2> /dev/null || : +%if 0%{?suse_version} > 1140 +%service_add_pre %{name}.service +%endif %preun %stop_on_removal %name +%if 0%{?suse_version} > 1140 +%service_del_preun %{name}.service +%endif %post %{fillup_and_insserv -f %{name}} +%if 0%{?suse_version} > 1140 +%service_add_post %{name}.service +%endif %postun %insserv_cleanup %restart_on_update %name +%if 0%{?suse_version} > 1140 +%service_del_postun %{name}.service +%endif %clean rm -rf $RPM_BUILD_ROOT From a3f253c076e29340dcc74361d11a17798e1da9dcc85852eae738512a830b77cd Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 21 Feb 2012 11:09:27 +0000 Subject: [PATCH 11/12] add forgotten vsftpd.service OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=35 --- vsftpd.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vsftpd.spec b/vsftpd.spec index 996ac44..54323e8 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: vsftpd BuildRequires: openssl-devel BuildRequires: pam-devel @@ -99,7 +98,7 @@ install -D -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_datadir/omc/svcinfo.d/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %if 0%{?suse_version} > 1140 -install -D -m 0644 %SOURCE7 %{buildroot}/%{name}.service +install -D -m 0644 %SOURCE7 %{buildroot}/%{_unitdir}/%{name}.service %endif %pre @@ -132,7 +131,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/lib/systemd/system/vsftpd.service +%if 0%{?suse_version} > 1140 +%{_unitdir}/%{name}.service +%endif /usr/sbin/%name /usr/sbin/rc%name %config /etc/init.d/%name From b0fe1b3a112630027f8158d9bb71aeeb290dd88883e3d1cb63d78879e723ff7d Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 21 Feb 2012 11:17:29 +0000 Subject: [PATCH 12/12] - add $local_fs and $remote_fs to init script OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=36 --- vsftpd.changes | 1 + vsftpd.init | 4 ++-- vsftpd.spec | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vsftpd.changes b/vsftpd.changes index 75c1f8e..ba6a623 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -3,6 +3,7 @@ Tue Feb 21 10:51:51 UTC 2012 - mvyskocil@suse.cz - follow Systemd Packaging guidelines http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines +- add $local_fs and $remote_fs to init script ------------------------------------------------------------------- Wed Feb 15 16:41:15 UTC 2012 - mvyskocil@suse.cz diff --git a/vsftpd.init b/vsftpd.init index 0ff72c2..7c25dca 100644 --- a/vsftpd.init +++ b/vsftpd.init @@ -24,8 +24,8 @@ # ### BEGIN INIT INFO # Provides: ftpd -# Required-Start: $syslog network-remotefs -# Required-Stop: $syslog network-remotefs +# Required-Start: $local_fs $remote_fs $syslog network-remotefs +# Required-Stop: $local_fs $remote_fs $syslog network-remotefs # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Description: very secure ftp daemon diff --git a/vsftpd.spec b/vsftpd.spec index 54323e8..f70e18a 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vsftpd BuildRequires: openssl-devel BuildRequires: pam-devel