[proftpd/el5/master: 63/64] Merge branch 'master' into el4
Paul Howarth
pghmcfc at fedoraproject.org
Wed Nov 3 11:19:45 UTC 2010
commit 65fdc2480407a24704ce5954e6d2f0d27a5ace5e
Merge: 51b5f5c b826951
Author: Paul Howarth <paul at city-fan.org>
Date: Wed Nov 3 10:16:20 2010 +0000
Merge branch 'master' into el4
Conflicts:
.gitignore
proftpd.conf
proftpd.spec
sources
This is a version update but it does fix a number of security issues
and I consider the minor upheaval of the version update to be a lesser
evil than the possibililty of getting backported security fixes wrong.
.gitignore | 6 +-
proftpd-1.3.2-parallel-build.patch | 20 --------
proftpd-1.3.2a-mlsd.patch | 21 --------
proftpd.conf | 36 +++++++++++++-
proftpd.init | 2 +-
proftpd.spec | 90 +++++++++++++++++++++++++----------
sources | 4 +-
7 files changed, 103 insertions(+), 76 deletions(-)
---
diff --cc proftpd.conf
index ae04adb,3bf6127..f391cfb
--- a/proftpd.conf
+++ b/proftpd.conf
@@@ -100,6 -104,11 +104,11 @@@ LogFormat auth "%v [%P] %h %t \"%r\"
# (http://www.proftpd.org/docs/modules/mod_facl.html)
# LoadModule mod_facl.c
#
+ # Support for using the GeoIP library to look up geographical information on
-# the connecting client and usng that to set access controls for the server
++# the connecting client and using that to set access controls for the server
+ # (http://www.castaglia.org/proftpd/modules/mod_geoip.html)
+ # LoadModule mod_geoip.c
+ #
# Configure server availability based on system load
# (http://www.proftpd.org/docs/contrib/mod_load.html)
# LoadModule mod_load.c
More information about the scm-commits
mailing list