[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-37-g1ae66f4

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 1ae66f4ddac9cb98969b64efdadc4d7fb83281cd
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 23 13:06:33 2011 +0100

    Added UseLastlog support

diff --git a/debian/changelog b/debian/changelog
index 2aac975..e38af52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,8 +53,10 @@ proftpd-dfsg (1.3.4~rc1+20110317-1) unstable; urgency=low
   * [SECURITY,PATCH] 3624 This patch fixes the issue by causing mod_tls 
     to clear the buffers of any data received from the client, once the SSL/TLS 
     handshake has succeeded.
+  * Now lastlog logging is enabled at building time to allow UseLastlog on/off 
+    use in configuration. Thanks TerminX.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 23 Mar 2011 09:56:33 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 23 Mar 2011 13:04:35 +0100
 
 proftpd-dfsg (1.3.3d-4) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index 4b8aa6b..1cdcaf6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/var/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --with-modules=mod_readme \
-	     --enable-ipv6 --enable-nls 
+	     --enable-ipv6 --enable-nls --with-lastlog=/var/log/lastlog
 #	     --enable-devel=stacktrace 
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
diff --git a/debian/templates/proftpd.conf b/debian/templates/proftpd.conf
index c51caee..d4497e1 100644
--- a/debian/templates/proftpd.conf
+++ b/debian/templates/proftpd.conf
@@ -89,6 +89,9 @@ AllowOverwrite			on
 TransferLog /var/log/proftpd/xferlog
 SystemLog   /var/log/proftpd/proftpd.log
 
+# Logging onto /var/log/lastlog is enabled but set to off by default
+#UseLastlog on
+
 # In order to keep log file dates consistent after chroot, use timezone info
 # from /etc/localtime.  If this is not set, and proftpd is configured to
 # chroot (e.g. DefaultRoot or <Anonymous>), it will use the non-daylight

-- 
ProFTPD core package