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

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 69ff137949c98d0a566aaeb00d3a553a8be5755a
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 15 13:32:57 2011 +0100

    Added silent patch to remove verbose logging at startup.

diff --git a/debian/changelog b/debian/changelog
index 91e3ed9..b3b4922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ proftpd-dfsg (1.3.3d-4) unstable; urgency=low
     configurations being loaded after system ones in separate files.
   * Added README.Debian for proftpd-dev to explain how to build add-on
     modules.
+  * [PATCH] silent remove excessive verbosity at startup about conf.d
+    directory parsing.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 12:45:20 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:31:52 +0100
 
 proftpd-dfsg (1.3.3d-3) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 0ceaeb9..9a513d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ mod_cap
 odbc
 mod_vroot
 prxs
+silent
diff --git a/debian/patches/silent b/debian/patches/silent
new file mode 100644
index 0000000..4f2275a
--- /dev/null
+++ b/debian/patches/silent
@@ -0,0 +1,14 @@
+Index: proftpd-dfsg/src/dirtree.c
+===================================================================
+--- proftpd-dfsg.orig/src/dirtree.c	2011-02-15 13:31:17.000000000 +0100
++++ proftpd-dfsg/src/dirtree.c	2011-02-15 13:31:22.000000000 +0100
+@@ -2970,9 +2970,6 @@
+       }
+     }
+ 
+-    pr_log_pri(PR_LOG_INFO, "processing configuration directory '%s'",
+-      dup_path);
+-
+     dirh = pr_fsio_opendir(dup_path);
+     if (!dirh) {
+       pr_log_pri(PR_LOG_ERR,

-- 
ProFTPD core package