summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-09-28 22:02:02 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-09-28 22:02:02 +0000
commitcd28733beca45df472db11d1c8f8523269f8a952 (patch)
tree43843dc0de1f23bbdbba7bfe6f1c285b3e25bfff /net-ftp/pure-ftpd
parentStable on hppa wrt security #145510 (diff)
downloadgentoo-2-cd28733beca45df472db11d1c8f8523269f8a952.tar.gz
gentoo-2-cd28733beca45df472db11d1c8f8523269f8a952.tar.bz2
gentoo-2-cd28733beca45df472db11d1c8f8523269f8a952.zip
Update conf.d, fixes bug #149403.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'net-ftp/pure-ftpd')
-rw-r--r--net-ftp/pure-ftpd/ChangeLog5
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd.conf_d6
2 files changed, 7 insertions, 4 deletions
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 1cb8ca38d9ce..b1591224699f 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-ftp/pure-ftpd
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.58 2006/09/23 23:15:22 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.59 2006/09/28 22:02:02 chtekk Exp $
+
+ 28 Sep 2006; Luca Longinotti <chtekk@gentoo.org> files/pure-ftpd.conf_d:
+ Update conf.d, fixes bug #149403.
23 Sep 2006; Luca Longinotti <chtekk@gentoo.org> Manifest:
Fix Manifest.
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
index af445062df61..bd06bf65950f 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
@@ -46,14 +46,14 @@ AUTH="-l unix"
## Set the charset of the filesystem.
# CHARCONV="--fscharset <charset>"
-## Misc. Others ##
-MISC_OTHER="-A -x -j -R -B -Z"
-
## If you want to process each file uploaded through Pure-FTPd, enter the name
## of the script that should process the files below.
## man pure-uploadscript to learn more about how to write this script.
# UPLOADSCRIPT="/path/to/uploadscript"
+## Misc. Others ##
+MISC_OTHER="-A -x -j -R -Z"
+
#
# Use these inside $MISC_OTHER
# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README"