[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-27-gcbe0d3f
Mahyuddin Susanto
udienz at ubuntu.com
Fri Mar 11 08:01:40 UTC 2011
The following commit has been merged in the master branch:
commit cbe0d3ffe4663fc3f8b8125f8e1a0f8901cbc2dd
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date: Fri Mar 11 14:54:43 2011 +0700
Fixing lintian warning
Signed-off-by: Mahyuddin Susanto <udienz at ubuntu.com>
diff --git a/debian/changelog b/debian/changelog
index 0702175..cd38f75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,42 @@
proftpd-dfsg (1.3.3d-5) unstable; urgency=low
+ [ Francesco Paolo Lovergine <frankie at debian.org> ]
* Annotated CVE IDs in debian/changelog for recent vulnerabilities fixed.
-
- -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 05 Mar 2011 15:17:42 +0100
+
+ [ Mahyuddin Susanto <udienz at ubuntu.com> ]
+ * Add DEP-3 header in patches:
+ - debian/patches/mod_cap
+ - debian/patches/ftpstats
+ - debian/patches/series
+ - debian/patches/xferstats.holger-preiss
+ - debian/patches/CVE-2011-1137
+ - debian/patches/odbc
+ - debian/patches/silent
+ - debian/patches/mod_sql_mysql.c
+ - debian/patches/ftpasswd.cracklib.location
+ - debian/patches/autotools
+ - debian/patches/prxs
+ - debian/patches/mod_vroot
+ - debian/patches/quotatab_modules
+ - debian/patches/mod_wrap_noparanoid
+ - debian/patches/change_pam_name
+ * debian/copyright: Rewriting as per DEP-5 machine readable.
+ * Fix typo in 1.3.3d-4 changelog.
+ * debian/ftpasswd.8
+ - Remove white space
+ - Using hypen instead of minus sign in manual page.
+ * debian/patches/use_hypen_in_manpage.patch: Do not use minus sign in manual
+ page.
+ * Use set -e instead of passed -e to the shell on the #! line in the body of
+ script
+ - proftpd-basic.config
+ - proftpd-basic.postrm
+ - proftpd-basic.preinst
+ * Override lintian to trivial error checking
+ - debian/proftpd-basic.lintian-overrides
+ - debian/proftpd-dev.lintian-overrides
+
+ -- Mahyuddin Susanto <udienz at ubuntu.com> Fri, 11 Mar 2011 14:33:29 +0700
proftpd-dfsg (1.3.3d-4) unstable; urgency=high
@@ -14,7 +48,7 @@ proftpd-dfsg (1.3.3d-4) unstable; urgency=high
* [PATCH] silent remove excessive verbosity at startup about conf.d
directory parsing.
* Updated debian/NEWS file with information about new conf.d directory.
- * Now configuration file name can be overriden at run-time.
+ * Now configuration file name can be overridden at run-time.
(closes: #613527)
* Now uses Breaks instead of Conflicts against pre-squeeze proftpd package.
* [SECURITY,PATCH] CVE-2011-1137: mod_sftp behaves badly when receiving
diff --git a/debian/copyright b/debian/copyright
index 4f6d5df..e4a2537 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,114 +1,94 @@
-This package was debianized by Johnie Ingram (johnie at debian.org)
-Mon, 2 Jun 1997 12:43:52 -0400, two minutes after its first public release.
-Since 2001 maintained on best effort basis by
-Francesco Paolo Lovergine <frankie at debian.org>
-
-The canonical location is:
- ftp://ftp.proftpd.org/distrib/source/
-
-Authors: The ProFTPD Project team i.e.
- TJ Saunders
- John Morrissey
- Habeeb J. Dihu
- Johnie Ingram
- James Dogopoulos
- and other past and present contributors.
-
-Copyright:
-
-The core code is made available under the terms of the GPL2+:
-
- * ProFTPD - FTP server daemon
- * Copyright (c) 1997, 1998 Public Flood Software
- * Copyright (c) 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
- * Copyright (c) 2001-2008 The ProFTPD Project team
- * Copyright (c) 2001-2008 TJ Saunders <tj at castaglia.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Dihu
- * and other respective copyright holders give permission to link this program
- * with OpenSSL, and distribute the resulting executable, without including
- * the source code for OpenSSL in the source distribution.
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
-
-This package includes xferlog.5 and the xferstats program from
-wu-ftpd-academ, as modified by Holger Preiss (TU Dresden):
-
- Copyright (c) 1994 Washington University in Saint Louis.
- All rights reserved.
-
- This product includes software developed by Washington University
- in Saint Louis and its contributors.
-
- Copyright (c) 1980, 1985, 1988, 1989, 1990 The Regents of the
- University of California. All rights reserved.
-
- This product includes software developed by the University of
- California, Berkeley and its contributors.
-
- THIS SOFTWARE IS PROVIDED BY WASHINGTON UNIVERSITY AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASHINGTON
- UNIVERSITY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-
-Modifications for Debian are copyright (C) 1997-2000 Johnie Ingram,
-copyright (C) 2001-2009 Francesco Paolo Lovergine,
-and also released under the terms of the GPL -- version 2, or any
-later version.
-
-mod_tls.c is distributed under the following terms (BSD license):
-
- * AUTH/TLS module for ProFTPD, based on the mod_sample.c file.
- *
- * Copyright (c) 2000 - 2002 Peter 'Luna' Runestig <peter at runestig.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifi-
- * cation, are permitted provided that the following conditions are met:
- *
- * o Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * o Redistributions in binary form must reproduce the above copyright no-
- * tice, this list of conditions and the following disclaimer in the do-
- * cumentation and/or other materials provided with the distribution.
- *
- * o The names of the contributors may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LI-
- * ABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUEN-
- * TIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEV-
- * ER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABI-
- * LITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: ProFTPD
+Upstream-Contact: The ProFTPD Project team, TJ Saunders <tj at castaglia.org>
+Source: http://www.proftpd.org/
+
+Files: *
+Copyright: 1997-1998, Public Flood Software
+ 1999-2000, MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
+ 2001-2008, The ProFTPD Project team
+ 2001-2008, TJ Saunders <tj at castaglia.org>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ .
+Comment: As a special exemption, Public Flood Software/MacGyver aka Habeeb J. Dihu
+ and other respective copyright holders give permission to link this program
+ with OpenSSL, and distribute the resulting executable, without including
+ the source code for OpenSSL in the source distribution.
+
+Files: src/xferlog*, include/xferlog.h, contrib/xferstats.holger-preiss
+Copyright: 1999-2000, WU-FTPD Development Group
+ 1998, Holger Preiss (TU Dresden)
+License: Academic
+ Copyright (c) 1994 Washington University in Saint Louis.
+ All rights reserved.
+ .
+ This product includes software developed by Washington University
+ in Saint Louis and its contributors.
+ .
+ Copyright (c) 1980, 1985, 1988, 1989, 1990 The Regents of the
+ University of California. All rights reserved.
+ .
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+ .
+ THIS SOFTWARE IS PROVIDED BY WASHINGTON UNIVERSITY AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASHINGTON
+ UNIVERSITY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+Files: contrib/mod_tls.c
+Copyright: 2000-2002, Peter 'Luna' Runestig <peter at runestig.com>
+ 2002-2010 TJ Saunders <tj at castaglia.org>
+License: BSD
+ Redistribution and use in source and binary forms, with or without modifi-
+ cation, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright no-
+ tice, this list of conditions and the following disclaimer in the do-
+ cumentation and/or other materials provided with the distribution.
+ * The names of the contributors may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LI-
+ ABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUEN-
+ TIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEV-
+ ER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABI-
+ LITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 1997-2000, Johnie Ingram <johnie at debian.org>
+ 2001-2002, Ivo Timmermans <ivo at debian.org>
+ 2002-2003, Paul Martin <pm at debian.org>
+ 2003-2011, Francesco Paolo Lovergine <frankie at debian.org>
+License: GPL-2+
diff --git a/debian/ftpasswd.8 b/debian/ftpasswd.8
index b59018f..09a29c5 100644
--- a/debian/ftpasswd.8
+++ b/debian/ftpasswd.8
@@ -20,52 +20,52 @@
ftpasswd \- manipulates ProFTPD authentication files
.SH SYNOPSIS
.TP 8
-\fBftpasswd\fR \fB--help\fR|\fB-h\fR|\fB--version\fR
+\fBftpasswd\fR \fB\-\-help\fR|\fB-h\fR|\fB\-\-version\fR
.TP 8
-\fBftpasswd\fR \fB--hash\fR [ \fB--des\fR|\fB--md5\fR ] [ \fB--stdin\fR ] [ \fB--use-cracklib\fR[=path] ]
+\fBftpasswd\fR \fB\-\-hash\fR [ \fB\-\-des\fR|\fB\-\-md5\fR ] [ \fB\-\-stdin\fR ] [ \fB\-\-use\-cracklib\fR[=path] ]
.TP 8
-\fBftpasswd\fR \fB--passwd\fR [ \fB-F\fR|\fB--force\fR ] [ \fB--file=\fRfilename ] [\fB--gecos=\fRstring ]
-.br
-[ \fB--gid=\fRgid ] [ \fB--des\fR | \fB--md5\fR ] [ \fB--not-system-password\fR ]
+\fBftpasswd\fR \fB\-\-passwd\fR [ \fB-F\fR|\fB\-\-force\fR ] [ \fB\-\-file=\fRfilename ] [\fB\-\-gecos=\fRstring ]
.br
-[ \fB--stdin\fR ] [ \fB--use-cracklib\fR[=path] ] \fB--home=\fRpath
-.br \fB--name=\fRusername \fB--shell=\fRshellpath \fB--uid=\fRuid
+[ \fB\-\-gid=\fRgid ] [ \fB\-\-des\fR | \fB\-\-md5\fR ] [ \fB\-\-not\-system\-password\fR ]
+.br
+[ \fB\-\-stdin\fR ] [ \fB\-\-use\-cracklib\fR[=path] ] \fB\-\-home=\fRpath
+.br \fB\-\-name=\fRusername \fB\-\-shell=\fRshellpath \fB\-\-uid=\fRuid
.TP 8
-\fBftpasswd\fR \fB--group\fR [ \fB-F\fR|\fB--force\fR ] [ \fB--enable-group-passwd\fR ]
+\fBftpasswd\fR \fB\-\-group\fR [ \fB-F\fR|\fB\-\-force\fR ] [ \fB\-\-enable\-group\-passwd\fR ]
.br
-[ \fB--file=\fRfilename ] [ \fB-m\fR|\fB--member\fR ] [ \fB--des\fR|\fB--md5\fR ]
+[ \fB\-\-file=\fRfilename ] [ \fB\-m\fR|\fB\-\-member\fR ] [ \fB\-\-des\fR|\fB\-\-md5\fR ]
.br
-[ \fB--stdin\fR ] [ \fB--use-cracklib\fR[=path] ] \fB--gid=\fRgid
-.br \fB--name=\fRgroupname
+[ \fB\-\-stdin\fR ] [ \fB\-\-use\-cracklib\fR[=path] ] \fB\-\-gid=\fRgid
+.br \fB\-\-name=\fRgroupname
.TP 8
-\fBftpasswd\fR \fB--passwd\fR \fB--change-password\fR \fB--name\fR=username
+\fBftpasswd\fR \fB\-\-passwd\fR \fB\-\-change\-password\fR \fB\-\-name\fR=username
.br
.PP
.SH DESCRIPTION
.P
ftpasswd is a Perl script which can be used to manipulate
-the password and group files suitable for use with
+the password and group files suitable for use with
ProFTPD AuthUserFile and AuthGroupFile configuration directives.
The idea is somewhat similar to Apache's htpasswd program.
.P
-Required options are --passwd, --group, or --hash.
+Required options are \-\-passwd, \-\-group, or \-\-hash.
These specify whether ftpasswd is to
operate on a passwd(5) format file, on a group(5) format file, or simply
to generate a password hash, respectively.
.P
-If used with --passwd, ftpasswd creates a file in the passwd(5) format,
+If used with \-\-passwd, ftpasswd creates a file in the passwd(5) format,
suitable for use with proftpd's AuthUserFile configuration directive.
You will be prompted for the password to use of the user, which will be
encrypted, and written out as the encrypted string.
-By default, using --passwd will write output to "./ftpd.passwd",
+By default, using \-\-passwd will write output to "./ftpd.passwd",
.P
-If used with --hash, ftpasswd generates a hash of a password, as would
+If used with \-\-hash, ftpasswd generates a hash of a password, as would
appear in an AuthUserFile. The hash is written to standard out.
This hash is suitable for use with proftpd's UserPassword directive.
.P
-If used with --group, ftpasswd creates a file in the group(5) format,
+If used with \-\-group, ftpasswd creates a file in the group(5) format,
suitable for use with proftpd's AuthGroupFile configuration directive.
-By default, using --group will write output to "./ftpd.group".
+By default, using \-\-group will write output to "./ftpd.group".
.SH OPTIONS
.P
@@ -74,19 +74,19 @@ By default, using --group will write output to "./ftpd.group".
If the password or group file be used already exists, delete it and write a new one.
.TP
.BR \-\-file= filename
-Write output to specified file (password or group files),
-rather than default one.
+Write output to specified file (password or group files),
+rather than default one.
.TP
.BR \-\-gecos= string
Descriptive string for the given user (usually the user's full name).
.TP
.BR \-\-gid= gid
Set primary group ID for this user (optional, will default to
-given
-.BR --uid
-value if absent) when
+given
+.BR \-\-uid
+value if absent) when
.BR
---passwd
+\-\-passwd
is specified.
.TP
.BR \-\-uid= uid
@@ -103,52 +103,52 @@ Use the DES or MD5 algorithm for encrypting passwords.
The latter is the default.
.TP
.BR \-\-name= username ,\ \-\-name= groupname
-Name of the user account or group (required).
+Name of the user account or group (required).
If the name does not exist in the specified output-file, an entry will be created
for it. Otherwise, the given fields will be updated.
.TP
.BR \-\-shell= path
-Shell for the user (required). Recommended:
+Shell for the user (required). Recommended:
.I /bin/false
.TP
-.BR \-\-change-password
+.BR \-\-change-password
Update only the password field for a user. This option
-requires that the
-.BR --name
+requires that the
+.BR \-\-name
option be used, but no others.
This also double-checks the given password against the
user's current password in the existing passwd file, and
requests that a new password be given if the entered password
is the same as the current password.
.TP
-.BR --not-system-password
+.BR \-\-not\-system\-password
Double-checks the given password against the system password
for the user, and requests that a new password be given if
the entered password is the same as the system password. This
helps to enforce different passwords for different types of
access.
.TP
-.BR --stdin
+.BR \-\-stdin
Read the password directly from standard in rather than
prompting for it. This is useful for writing scripts that
automate use of ftpasswd.
.TP
-.BR --use-cracklib\fR[ =path \fR]
+.BR \-\-use\-cracklib\fR[ =path \fR]
Causes ftpasswd to use Alec Muffet's cracklib routines in
order to determine and prevent the use of bad or weak
passwords. The optional path to this option specifies
-the path to the dictionary files to use -- default path
-is
+the path to the dictionary files to use \-\- default path
+is
.IR /usr/lib/cracklib_dict .
This requires the Perl Crypt::Cracklib module to be installed on your system.
.TP
-.BR --enable-group-passwd
+.BR \-\-enable\-group\-passwd
Prompt for a group password. This is disabled by default,
as group passwords are not usually a good idea at all.
.TP
.BR \-m \ username ,\ \-\-member= username
user to be a member of the group. This argument may be used
-This argument may be used multiple times to specify the full list
+This argument may be used multiple times to specify the full list
of users to be members of this group.
.SH BUGS
@@ -160,14 +160,15 @@ This program has been written by TJ Saunders <tj at castaglia.org>
as a contributed software for ProFTPD.
.P
.SH "SEE ALSO"
-.BR proftpd (8),
-.BR passwd (5),
+.BR proftpd (8),
+.BR passwd (5),
.BR group (5),
-.BR ftpusers (8),
+.BR ftpusers (8),
.BR ftpstats (8),
.BR proftpd.conf (5)
.SH CREDITS
This manual page was written by
-Francesco Paolo Lovergine <frankie at debian.org>
+Francesco Paolo Lovergine <frankie at debian.org>.
+Last update Thu Mar 10 16:45:27 UTC 2011 by Mahyuddin Susanto <udienz at ubuntu.com>
for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/ftpstats.8 b/debian/ftpstats.8
index fb17e03..725bb2f 100644
--- a/debian/ftpstats.8
+++ b/debian/ftpstats.8
@@ -65,19 +65,19 @@ Report only on traffic from
.IR domain
.
This option leads to problems with the local domain: e.g. test.com is
-encountered under test and not recognized under com, -D com will give you only
-stats about com excluding test.com! Use -A com for correct results.
+encountered under test and not recognized under com, \-D com will give you only
+stats about com excluding test.com! Use \-A com for correct results.
.TP
.BR \-A "address"
Report only on traffic from addresses whose end matches
.IR address
-. e.g. -A test.domain.com will report on address ending with test.domain.com
+e.g. \-A test.domain.com will report on address ending with test.domain.com
.TP
.BR \-l "depth"
Depth of path detail for sections
.TP
.BR \-s "section"
-Section to report on. e.g. -s /pub will report only on paths under /pub
+Section to report on. e.g. \-s /pub will report only on paths under /pub
.SH BUGS
No known bugs at this time.
If you discover any bugs, please report at http://bugs.proftpd.org/
diff --git a/debian/patches/CVE-2011-1137 b/debian/patches/CVE-2011-1137
index 23bb029..27f096f 100644
--- a/debian/patches/CVE-2011-1137
+++ b/debian/patches/CVE-2011-1137
@@ -1,3 +1,8 @@
+Description: mod_sftp behaves badly when receiving badly formed SSH messages.
+Author: TJ Saunders <tj at castaglia.org>
+Bug: http://bugs.proftpd.org/show_bug.cgi?id=3586
+Bug-Debian: http://bugs.debian.org/616179
+
Index: proftpd-dfsg/contrib/mod_sftp/mod_sftp.c
===================================================================
--- proftpd-dfsg.orig/contrib/mod_sftp/mod_sftp.c 2011-02-10 20:32:57.000000000 +0100
diff --git a/debian/patches/autotools b/debian/patches/autotools
index 07a124a..d88b7a1 100644
--- a/debian/patches/autotools
+++ b/debian/patches/autotools
@@ -1,3 +1,7 @@
+Description: Do not touch config.h.in and stamp-h.in
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/Makefile.in
===================================================================
--- proftpd-dfsg.orig/Makefile.in 2011-02-07 18:08:50.000000000 +0100
diff --git a/debian/patches/change_pam_name b/debian/patches/change_pam_name
index 181b90f..38ecb0b 100644
--- a/debian/patches/change_pam_name
+++ b/debian/patches/change_pam_name
@@ -1,3 +1,7 @@
+Description: Change pam name ftp -> proftpd
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/modules/mod_auth_pam.c
===================================================================
--- proftpd-dfsg.orig/modules/mod_auth_pam.c 2011-02-07 18:12:28.000000000 +0100
diff --git a/debian/patches/ftpasswd.cracklib.location b/debian/patches/ftpasswd.cracklib.location
index 4c0ef4e..31d2eca 100644
--- a/debian/patches/ftpasswd.cracklib.location
+++ b/debian/patches/ftpasswd.cracklib.location
@@ -1,3 +1,9 @@
+Description: Change the default location of the cracklib dictionaries
+ to match their Debian location
+Author: Paul Martin <pm at debian.org>
+Bug-Debian: http://bugs.debian.org/159365
+Forwarded: not needed
+
Index: proftpd-dfsg/contrib/ftpasswd
===================================================================
--- proftpd-dfsg.orig/contrib/ftpasswd 2011-02-08 13:30:16.000000000 +0100
diff --git a/debian/patches/ftpstats b/debian/patches/ftpstats
index 754f40e..617e0f3 100644
--- a/debian/patches/ftpstats
+++ b/debian/patches/ftpstats
@@ -1,3 +1,8 @@
+Description: Fixes default xferlog pathname in ftpstats
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+Bug-Debian: http://bugs.debian.org/378826
+
Index: proftpd-dfsg/contrib/xferstats.holger-preiss
===================================================================
--- proftpd-dfsg.orig/contrib/xferstats.holger-preiss 2011-02-08 13:29:20.000000000 +0100
diff --git a/debian/patches/mod_cap b/debian/patches/mod_cap
index 2c69bc0..cbc986b 100644
--- a/debian/patches/mod_cap
+++ b/debian/patches/mod_cap
@@ -1,3 +1,10 @@
+Description: Removed obsolete embedded sys/capability.h header
+ inclusion in mod_cap.c modules. Also it avoids building of the obsolete
+ embedded libpcap.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+Bug-Debian: http://bugs.debian.org/479893
+
Index: proftpd-dfsg/lib/libcap/Makefile
===================================================================
--- proftpd-dfsg.orig/lib/libcap/Makefile 2011-02-07 17:47:01.000000000 +0100
diff --git a/debian/patches/mod_sql_mysql.c b/debian/patches/mod_sql_mysql.c
index dae1ae8..6382400 100644
--- a/debian/patches/mod_sql_mysql.c
+++ b/debian/patches/mod_sql_mysql.c
@@ -1,3 +1,7 @@
+Description: Use mysql/mysql.h instead of mysql.h
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/contrib/mod_sql_mysql.c
===================================================================
--- proftpd-dfsg.orig/contrib/mod_sql_mysql.c 2011-02-07 17:47:07.000000000 +0100
diff --git a/debian/patches/mod_vroot b/debian/patches/mod_vroot
index 7d9eb20..01fa81e 100644
--- a/debian/patches/mod_vroot
+++ b/debian/patches/mod_vroot
@@ -1,3 +1,7 @@
+Description: Adding mod_vroot module
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/contrib/mod_vroot.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/mod_wrap_noparanoid b/debian/patches/mod_wrap_noparanoid
index 3d1ad18..1dd422f 100644
--- a/debian/patches/mod_wrap_noparanoid
+++ b/debian/patches/mod_wrap_noparanoid
@@ -1,3 +1,8 @@
+Description: avoid builtin paranoid checking in libwrap.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+Bug-Debian: http://bugs.debian.org/366397
+
Index: proftpd-dfsg/contrib/mod_wrap.c
===================================================================
--- proftpd-dfsg.orig/contrib/mod_wrap.c 2011-02-07 17:47:07.000000000 +0100
diff --git a/debian/patches/odbc b/debian/patches/odbc
index 79a3e96..d30fefe 100644
--- a/debian/patches/odbc
+++ b/debian/patches/odbc
@@ -1,3 +1,8 @@
+Description: Manage automagically unixodbc library linking
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+Bug-Debian: http://bugs.debian.org/366397
+
Index: proftpd-dfsg/contrib/mod_sql_odbc.c
===================================================================
--- proftpd-dfsg.orig/contrib/mod_sql_odbc.c 2011-02-07 17:47:07.000000000 +0100
diff --git a/debian/patches/prxs b/debian/patches/prxs
index f77184f..ebc38fc 100644
--- a/debian/patches/prxs
+++ b/debian/patches/prxs
@@ -1,3 +1,8 @@
+Description: fixed to avoid using the shell to call libtool, which
+ prevents prxs working correctly with any shell.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/src/prxs.in
===================================================================
--- proftpd-dfsg.orig/src/prxs.in 2011-02-15 12:16:15.000000000 +0100
diff --git a/debian/patches/quotatab_modules b/debian/patches/quotatab_modules
index 7db8d9d..8ed9add 100644
--- a/debian/patches/quotatab_modules
+++ b/debian/patches/quotatab_modules
@@ -1,3 +1,7 @@
+Description: Add mod_quotatab module
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/README.mod_quotatab
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
index 9f8e3e5..5731575 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ mod_vroot
prxs
silent
CVE-2011-1137
+use_hypen_in_manpage.patch
diff --git a/debian/patches/silent b/debian/patches/silent
index 4f2275a..8317eb4 100644
--- a/debian/patches/silent
+++ b/debian/patches/silent
@@ -1,3 +1,8 @@
+Description: silent remove excessive verbosity at startup about conf.d
+ directory parsing.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/src/dirtree.c
===================================================================
--- proftpd-dfsg.orig/src/dirtree.c 2011-02-15 13:31:17.000000000 +0100
diff --git a/debian/patches/use_hypen_in_manpage.patch b/debian/patches/use_hypen_in_manpage.patch
new file mode 100644
index 0000000..218fefb
--- /dev/null
+++ b/debian/patches/use_hypen_in_manpage.patch
@@ -0,0 +1,22 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: proftpd-dfsg/utils/ftpshut.8.in
+===================================================================
+--- proftpd-dfsg.orig/utils/ftpshut.8.in 2011-03-11 13:58:00.929381734 +0700
++++ proftpd-dfsg/utils/ftpshut.8.in 2011-03-11 13:57:56.229411963 +0700
+@@ -49,12 +49,12 @@
+ .TP
+ .B -l min
+ Specifies the number of minutes before shutdown that new ftp access will
+-be disabled. If the -l option is not specified, a default of 10 minutes
++be disabled. If the \-l option is not specified, a default of 10 minutes
+ (or immediately, if less than 10 minutes remains until shutdown) is used.
+ .TP
+ .B -d min
+ Specifies the number of minutes before shutdown that existing ftp
+-connections will be disconnected. If the -d option is not specified,
++connections will be disconnected. If the \-d option is not specified,
+ a default of 5 minutes (or immediately, if less than 5 minutes remains
+ until shutdown) is used.
+ .TP
diff --git a/debian/patches/xferstats.holger-preiss b/debian/patches/xferstats.holger-preiss
index a589cbe..be8b78e 100644
--- a/debian/patches/xferstats.holger-preiss
+++ b/debian/patches/xferstats.holger-preiss
@@ -1,3 +1,7 @@
+Description: Fixing output diplay ot xferstats
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Forwarded: not needed
+
Index: proftpd-dfsg/contrib/xferstats.holger-preiss
===================================================================
--- proftpd-dfsg.orig/contrib/xferstats.holger-preiss 2011-02-08 13:28:11.000000000 +0100
diff --git a/debian/proftpd-basic.config b/debian/proftpd-basic.config
index c77bfa1..9e3b174 100644
--- a/debian/proftpd-basic.config
+++ b/debian/proftpd-basic.config
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
# Source debconf library.
. /usr/share/debconf/confmodule
diff --git a/debian/proftpd-basic.lintian-overrides b/debian/proftpd-basic.lintian-overrides
new file mode 100644
index 0000000..f82bec7
--- /dev/null
+++ b/debian/proftpd-basic.lintian-overrides
@@ -0,0 +1,7 @@
+proftpd-basic: syntax-error-in-debian-news-file line 6 "badly formatted trailer line"
+proftpd-basic: syntax-error-in-debian-news-file line 8 "found start of entry where expected more change data or trailer"
+proftpd-basic: binary-without-manpage usr/sbin/ftpquota
+proftpd-basic: binary-without-manpage usr/sbin/in.proftpd
+proftpd-basic: binary-without-manpage usr/sbin/proftpd-gencert
+proftpd-basic: shlib-calls-exit usr/lib/proftpd/mod_rewrite.so
+proftpd-basic: shlib-calls-exit usr/lib/proftpd/mod_sftp_pam.so
diff --git a/debian/proftpd-basic.postrm b/debian/proftpd-basic.postrm
index 242fdbf..1abf5ba 100644
--- a/debian/proftpd-basic.postrm
+++ b/debian/proftpd-basic.postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
if [ "$1" = "disappear" -o "$1" = "remove" ]
then
diff --git a/debian/proftpd-basic.preinst b/debian/proftpd-basic.preinst
index 02403a7..efaa702 100644
--- a/debian/proftpd-basic.preinst
+++ b/debian/proftpd-basic.preinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
# summary of how this script can be called:
# * <new-preinst> `install'
diff --git a/debian/proftpd-dev.lintian-overrides b/debian/proftpd-dev.lintian-overrides
new file mode 100644
index 0000000..48e48c3
--- /dev/null
+++ b/debian/proftpd-dev.lintian-overrides
@@ -0,0 +1 @@
+proftpd-basic: binary-without-manpage usr/bin/prxs
--
ProFTPD core package
More information about the Pkg-proftpd-maintainers
mailing list