lp:~ubuntu-branches/ubuntu/lucid/vsftpd/lucid-201002122353

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/lucid/vsftpd

No reviews requested

Diff: 207 lines (+188/-0) (has conflicts)

2 files modified

debian/changelog (+72/-0)
debian/vsftpd.init.OTHER (+116/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

21. By Chuck Short on 2010-01-05

* Merged from debian testing::
  - Use LSB functions in the init script.
  - Use snakeoil SSL certificates and key.
  - Add update-inetd dependency.
  - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8.
    (LP: #364958)
* Moving chroot creation out of the start sequence (Closes: #472329).
* Exiting 0 when we refuse to start vsftpd because it's disabled in
  the configuration (Closes: #557182).
* Conditionally build against libpcap2 whetever we are on linux or not
  (Closes: #557153).
* Renumbering patches.
* Correcting typo in status section of the init script (Closes:
  #556260).
* Merging upstream version 2.2.2.
* Applying patch from Todd A. Jacobs <email address hidden> to give
  proper return values in initscript (Closes: #555517.
* Cleaning up init script (intentations, variables, bashisms, etc.).
* Merging upstream version 2.2.2~pre1.
* Correcting wrong vcs-browser field.
* Replacing some Germanisms from the German debconf translations.
* Setting last-translator for German debconf templates to me, no
  intention do deal with debian-l10n-german in the future anymore.
* Fixing whitespace typo in output of status message in initscript.
* Merging upstream version 2.2.1.
* Wrapping patch headers to 80 chars.
* Replacing unused-libs.patch with much simpler libs.patch.
* Rediffing config.patch.

20. By Chuck Short on 2009-10-21

* Merge from debian unstable, remaining changes:
  - Use LSB functions in the init script.
  - Use snakeoil SSL certificates and key.
  - Add update-inetd dependency.
  - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8.
    (LP: #364958)

19. By Chuck Short on 2009-08-14

* Merge from debian unstable, remaining changes:
  - Use LSB functions in the init script.
  - Use snakeoil SSL certificates and key.
  - Do not create rc.d stop symlinks.
  - Add update-inetd dependency.
  - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8.
   (LP: #364958)

18. By Chuck Short on 2009-08-11

debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8
(LP: #364958).

17. By Chuck Short on 2009-07-20

* Merge from debian unstable, remaining changes:
  - Use LSB functions in the init script.
  - Use snakeoil SSL certificates and key.
  - Do not create rc.d stop symlinks
  - Add update-inetd dependency.

16. By Adrien Cunin on 2009-06-15

* Merge from Debian unstable. Remaining changes:
   - Use LSB functions in the init script
   - Use snakeoil SSL certificate and key
   - Do not create rc.d stop symlinks
   - Add update-inetd dependency

15. By Adrien Cunin on 2009-05-08

* Merge from Debian unstable. Remaining changes:
   - Use LSB functions in the init script
   - Use snakeoil SSL certificate and key
   - Do not create rc.d stop symlinks
   - Add update-inetd dependency
* Dropped postinst change removing rc.d stop symlinks, was only useful for
  edgy and hardy upgrades
* This upload includes changes closing a few bugs:
   - New upstream release (LP: #333478)
   - Call adduser with --quiet in postinst (LP: #272084)
   - Extend username length limit (LP: #343738)

14. By Adrien Cunin on 2008-09-16

* New upstream release
   - Fixes SSL shutdown bug (LP: #254905)

13. By Nicolas Valcarcel on 2008-08-12

* Removed update-rc.d "multiuser" option and updated init info (LP: #254273)
 http://lists.ubuntu.com/archives/ubuntu-devel-announce/2008-June/000430.html
* Added Homepage field on debian/control
* Upgrade standards to 3.8.0

12. By Mathias Gug on 2008-05-09

* Merge from debian unstable, remaining changes:
  - lsb init script
  - use snakeoil ssl certs
  - add update-inetd dependency
  - Modify Maintainer value to match DebianMaintainerField spec.
* Dropped:
  - remove stop links from rc0 and rc6: pre-hardy upgrades.