« back to all changes in this revision
Viewing changes to sysstr.c
- Committer: Package Import Robot
- Date: 2012-01-23 09:16:04 UTC
- mfrom: (2.3.15 sid)
- Revision ID: package-import@ubuntu.com-20120123091604-b3fwc36wtjp9n5wz
[ Ubuntu Merge-o-Matic ]
* Merge from Debian testing. Remaining changes:
+ Use snakeoil SSL certificates and key.
+ debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart.
+ Add apport hook (LP: #513978):
- debian/vsftpd.apport: Added.
- debian/control: Build-depends on dh-apport.
- debian/rules: Add --with apport.
+ debian/vsftpd.postinst: Check that group exists first,
then the user, then trying adding the user to the group. (LP: #629234)
+ Add debian/watch file.
+ debian/patches/09-disable-anonymous.patch: Disable anonymous login by default.
(LP: #528860)
* Merge from Debian testing. Remaining changes:
+ Use snakeoil SSL certificates and key.
+ debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart.
+ Add apport hook (LP: #513978):
- debian/vsftpd.apport: Added.
- debian/control: Build-depends on dh-apport.
- debian/rules: Add --with apport.
+ debian/vsftpd.postinst: Check that group exists first,
then the user, then trying adding the user to the group. (LP: #629234)
+ Add debian/watch file.
+ debian/patches/09-disable-anonymous.patch: Disable anonymous login by default.
(LP: #528860)
- files added:
- debian/po/id.po
- files modified:
- .pc/02-config.patch/vsftpd.conf
added
removed
sysstr.c
