Ubuntu
vsftpd package

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

  1. Lucid (10.04)
  2. lucid-201002122353
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/vsftpd/lucid-201002122353
Merge into: lp:ubuntu/lucid/vsftpd
Diff against target: 207 lines (+188/-0) (has conflicts)
2 files modified
debian/changelog (+72/-0)
debian/vsftpd.init.OTHER (+116/-0)
Text conflict in debian/changelog
Contents conflict in debian/vsftpd.init
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/vsftpd/lucid-201002122353
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/vsftpd now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/vsftpd/lucid-201002122353. A merge should be performed if necessary.

Reply

Unmerged revisions

21. By Chuck Short

* 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.

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-01-22 13:13:02 +0000
3+++ debian/changelog 2010-02-12 23:57:14 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 vsftpd (2.2.2-3ubuntu4) lucid; urgency=low
7
8 * debian/vsftpd.upstart: Fix up upstart script. Thanks to Paul Elliott.
9@@ -86,6 +87,77 @@
10
11 -- Chuck Short <zulcss@ubuntu.com> Wed, 21 Oct 2009 22:23:37 +0100
12
13+=======
14+vsftpd (2.2.2-3ubuntu1) lucid; urgency=low
15+
16+ * Merged from debian testing::
17+ - Use LSB functions in the init script.
18+ - Use snakeoil SSL certificates and key.
19+ - Add update-inetd dependency.
20+ - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8.
21+ (LP: #364958)
22+
23+ -- Chuck Short <zulcss@ubuntu.com> Tue, 05 Jan 2010 10:01:25 -0500
24+
25+vsftpd (2.2.2-3) unstable; urgency=low
26+
27+ * Moving chroot creation out of the start sequence (Closes: #472329).
28+
29+ -- Daniel Baumann <daniel@debian.org> Fri, 04 Dec 2009 08:37:13 +0100
30+
31+vsftpd (2.2.2-2) unstable; urgency=low
32+
33+ * Exiting 0 when we refuse to start vsftpd because it's disabled in
34+ the configuration (Closes: #557182).
35+ * Conditionally build against libpcap2 whetever we are on linux or not
36+ (Closes: #557153).
37+ * Renumbering patches.
38+
39+ -- Daniel Baumann <daniel@debian.org> Sun, 22 Nov 2009 17:32:24 +0100
40+
41+vsftpd (2.2.2-1) unstable; urgency=low
42+
43+ * Correcting typo in status section of the init script (Closes:
44+ #556260).
45+ * Merging upstream version 2.2.2.
46+
47+ -- Daniel Baumann <daniel@debian.org> Thu, 19 Nov 2009 21:44:28 +0100
48+
49+vsftpd (2.2.2~pre1-1) unstable; urgency=low
50+
51+ * Applying patch from Todd A. Jacobs <tjacobs@codegnome.org> to give
52+ proper return values in initscript (Closes: #555517.
53+ * Cleaning up init script (intentations, variables, bashisms, etc.).
54+ * Merging upstream version 2.2.2~pre1.
55+
56+ -- Daniel Baumann <daniel@debian.org> Sat, 14 Nov 2009 18:21:08 +0100
57+
58+vsftpd (2.2.1-1) unstable; urgency=low
59+
60+ * Correcting wrong vcs-browser field.
61+ * Replacing some Germanisms from the German debconf translations.
62+ * Setting last-translator for German debconf templates to me, no
63+ intention do deal with debian-l10n-german in the future anymore.
64+ * Fixing whitespace typo in output of status message in initscript.
65+ * Merging upstream version 2.2.1.
66+ * Wrapping patch headers to 80 chars.
67+ * Replacing unused-libs.patch with much simpler libs.patch.
68+ * Rediffing config.patch.
69+
70+ -- Daniel Baumann <daniel@debian.org> Fri, 06 Nov 2009 13:40:19 +0100
71+
72+vsftpd (2.2.0-4ubuntu1) lucid; urgency=low
73+
74+ * Merge from debian unstable, remaining changes:
75+ - Use LSB functions in the init script.
76+ - Use snakeoil SSL certificates and key.
77+ - Add update-inetd dependency.
78+ - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8.
79+ (LP: #364958)
80+
81+ -- Chuck Short <zulcss@ubuntu.com> Wed, 21 Oct 2009 22:23:37 +0100
82+
83+>>>>>>> MERGE-SOURCE
84 vsftpd (2.2.0-4) unstable; urgency=low
85
86 * Adding patch from Michael Stapelberg <michael@stapelberg.de> to
87
88=== added file 'debian/vsftpd.init.OTHER'
89--- debian/vsftpd.init.OTHER 1970-01-01 00:00:00 +0000
90+++ debian/vsftpd.init.OTHER 2010-02-12 23:57:14 +0000
91@@ -0,0 +1,116 @@
92+#!/bin/sh
93+
94+### BEGIN INIT INFO
95+# Provides: vsftpd
96+# Required-Start: $remote_fs $syslog
97+# Required-Stop: $remote_fs $syslog
98+# Default-Start: 2 3 4 5
99+# Default-Stop: 0 1 6
100+# Short-Description: Very secure FTP server
101+### END INIT INFO
102+
103+set -e
104+
105+DAEMON="/usr/sbin/vsftpd"
106+NAME="vsftpd"
107+PATH="/sbin:/bin:/usr/sbin:/usr/bin"
108+LOGFILE="/var/log/vsftpd.log"
109+CHROOT="/var/run/vsftpd/empty"
110+
111+test -x "${DAEMON}" || exit 0
112+
113+if [ ! -e "${LOGFILE}" ]
114+then
115+ touch "${LOGFILE}"
116+ chmod 640 "${LOGFILE}"
117+ chown root:adm "${LOGFILE}"
118+fi
119+
120+if [ ! -d "${CHROOT}" ]
121+then
122+ mkdir -p "${CHROOT}"
123+fi
124+
125+Check_standalone_mode ()
126+{
127+ # Return 1 if vsftpd.conf doesn't have listen=yes or listen_ipv6=yes
128+ # (mandatory for standalone operation).
129+
130+ CONFFILE="/etc/vsftpd.conf"
131+
132+ if [ -e "${CONFFILE}" ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}"
133+ then
134+ echo "${CONFFILE}: listen disabled - service will not start"
135+ return 1
136+ fi
137+}
138+
139+case "${1}" in
140+ start)
141+ Check_standalone_mode || exit 0
142+ echo -n "Starting FTP server: "
143+
144+ start-stop-daemon --start --background -m --oknodo --pidfile /var/run/vsftpd/vsftpd.pid --exec ${DAEMON}
145+
146+ echo "${NAME}."
147+ ;;
148+
149+ stop)
150+ echo -n "Stopping FTP server: "
151+
152+ start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --oknodo --exec ${DAEMON}
153+ rm -f /var/run/vsftpd/vsftpd.pid
154+
155+ echo "${NAME}."
156+
157+ ;;
158+
159+ restart)
160+ echo -n "Stopping FTP server: "
161+
162+ start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --oknodo --exec ${DAEMON}
163+ rm -f /var/run/vsftpd/vsftpd.pid
164+
165+ echo "${NAME}."
166+ Check_standalone_mode || exit 0
167+ echo -n "Starting FTP server: "
168+
169+ start-stop-daemon --start --background -m --pidfile /var/run/vsftpd/vsftpd.pid --exec ${DAEMON}
170+
171+ echo "${NAME}."
172+ ;;
173+
174+ reload|force-reload)
175+ echo "Reloading FTP server configuration: "
176+
177+ start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --signal 1 --exec $DAEMON
178+
179+ echo "${NAME}."
180+ ;;
181+
182+ status)
183+ PID="$(cat /var/run/vsftpd/vsftpd.pid 2>/dev/null)" || true
184+
185+ if [ ! -f /var/run/vsftpd/vsftpd.pid ] || [ -z "${PID}" ]
186+ then
187+ echo "${NAME} is not running"
188+ exit 3
189+ fi
190+
191+ if ps "${PID}" >/dev/null 2>&1
192+ then
193+ echo "${NAME} is running"
194+ exit 0
195+ else
196+ echo "${NAME} is not running"
197+ exit 1
198+ fi
199+ ;;
200+
201+ *)
202+ echo "Usage: /etc/init.d/${NAME} {start|stop|restart|reload|status}"
203+ exit 1
204+ ;;
205+esac
206+
207+exit 0

Subscribers

People subscribed via source and target branches

to all changes: