Ubuntu
vsftpd package

Merge lp:~andreserl/ubuntu/maverick/vsftpd/sru1 into lp:ubuntu/maverick/vsftpd

  1. Maverick (10.10)
  2. sru1
  3. Merge into maverick
Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 30
Proposed branch: lp:~andreserl/ubuntu/maverick/vsftpd/sru1
Merge into: lp:ubuntu/maverick/vsftpd
Diff against target: 60 lines (+15/-4)
3 files modified
debian/changelog (+11/-0)
debian/vsftpd.postinst (+2/-2)
debian/vsftpd.upstart (+2/-2)
To merge this branch: bzr merge lp:~andreserl/ubuntu/maverick/vsftpd/sru1
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+51628@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-03 08:32:27 +0000
3+++ debian/changelog 2011-02-28 20:49:56 +0000
4@@ -1,3 +1,14 @@
5+vsftpd (2.3.0~pre2-4ubuntu2.1) maverick-proposed; urgency=low
6+
7+ * debian/vsftpd.upstart: Fix start of vsftpd even if not in standalone mode.
8+ Thanks to Stephane Chazelas (LP: #648202)
9+
10+ [ Serge Hallyn ]
11+ * debian/vsftpd.postinst: Use complete name match when checking for existing
12+ ftp user/group, to avoid install failure. (LP: #677764)
13+
14+ -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 28 Feb 2011 15:42:48 -0500
15+
16 vsftpd (2.3.0~pre2-4ubuntu2) maverick; urgency=low
17
18 * debian/vsftpd.postinst: Check that the group exists first, then
19
20=== modified file 'debian/vsftpd.postinst'
21--- debian/vsftpd.postinst 2010-09-03 08:32:27 +0000
22+++ debian/vsftpd.postinst 2011-02-28 20:49:56 +0000
23@@ -16,13 +16,13 @@
24
25 db_stop
26
27- if ! getent group | grep -q "^${_USERNAME}"
28+ if ! getent group | grep -q "^${_USERNAME}:"
29 then
30 addgroup --system --quiet ${_USERNAME}
31 else
32 echo "vsftpd group (${_USERNAME}) already exists, doing nothing."
33 fi
34- if ! getent passwd | grep -q "^${_USERNAME}"
35+ if ! getent passwd | grep -q "^${_USERNAME}:"
36 then
37 adduser --system --home ${_DIRECTORY} --no-create-home --quiet --gecos 'ftp daemon' --group ${_USERNAME}
38 else
39
40=== modified file 'debian/vsftpd.upstart'
41--- debian/vsftpd.upstart 2010-05-13 20:48:52 +0000
42+++ debian/vsftpd.upstart 2011-02-28 20:49:56 +0000
43@@ -15,7 +15,7 @@
44 # Return 1 if vsftpd.conf doesn't have listen yes or listen_ipv6=yes
45 CONFFILE="/etc/vsftpd.conf"
46
47- if [ -e "${CONFFILE}" ] && !egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
48+ if [ -e "${CONFFILE}" ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
49 then
50 echo "${CONFFILE}: listen disabled - service will not start"
51 return 1
52@@ -23,7 +23,7 @@
53 }
54 [ -d /var/run/vsftpd ] || install -m 755 -o root -g root -d /var/run/vsftpd
55 [ -d /var/run/vsftpd/empty ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty
56- check_standalone_mode || exit 0
57+ check_standalone_mode || stop
58 end script
59
60 exec /usr/sbin/vsftpd

Subscribers

People subscribed via source and target branches

to all changes: