[proftpd] Add proftpd-utils subpackage for support tools

[Paul Howarth]

commit 2c3bccaa9813a4c84e73967935e6b3c18ced6e6a
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Jan 16 16:09:57 2012 +0000

    Add proftpd-utils subpackage for support tools
    
    - Add proftpd-utils subpackage for support tools, which means the
      main package no longer requires perl

 proftpd.conf |    9 ++++++---
 proftpd.spec |   52 ++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 17 deletions(-)
---
diff --git a/proftpd.conf b/proftpd.conf
index 1510571..e6e64f9 100644
--- a/proftpd.conf
+++ b/proftpd.conf
@@ -187,9 +187,6 @@ LogFormat			auth	"%v [%P] %h %t \"%r\" %s"
 # Using this module rather than the kernel's chroot() system call works
 # around issues with PAM and chroot (http://bugzilla.redhat.com/506735)
 LoadModule mod_vroot.c
-<IfModule mod_vroot.c>
-  VRootEngine			on
-</IfModule>
 #
 # Provide a flexible way of specifying that certain configuration directives
 # only apply to certain sessions, based on credentials such as connection
@@ -197,6 +194,12 @@ LoadModule mod_vroot.c
 # (http://www.proftpd.org/docs/contrib/mod_ifsession.html)
 #   LoadModule mod_ifsession.c
 
+# Enable mod_vroot by default for better compatibility with PAM
+# (http://bugzilla.redhat.com/506735)
+<IfModule mod_vroot.c>
+  VRootEngine			on
+</IfModule>
+
 # TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
 <IfDefine TLS>
   TLSEngine			on
diff --git a/proftpd.spec b/proftpd.spec
index 93ca11d..e0c584e 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -41,7 +41,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 2
+%global rpmrel 3
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -168,6 +168,22 @@ Requires:	%{name} = %{version}-%{release}
 %description postgresql
 Module to add PostgreSQL support to the ProFTPD FTP server.
 
+%package utils
+Summary:	ProFTPD - Additional utilities
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description utils
+This package contains additional utilities for monitoring and configuring the
+ProFTPD server:
+
+* ftpasswd: generate passwd(5) files for use with AuthUserFile
+* ftpcount: show the current number of connections per server/virtualhost
+* ftpmail: monitor transfer log and send email when files uploaded
+* ftpquota: manipulate quota tables
+* ftptop: show the current status of FTP sessions
+* ftpwho: show the current process information for each FTP session
+
 %prep
 %setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11 -a 13
 
@@ -384,7 +400,7 @@ fi
 %doc README.DSO README.modules README.IPv6 README.PAM
 %doc README.capabilities README.classes README.controls README.facl
 %doc contrib/README.contrib contrib/README.ratio
-%doc doc/* sample-configurations/ contrib/xferstats.holger-preiss
+%doc doc/* sample-configurations/
 %dir %{_localstatedir}/ftp/
 %dir %{_localstatedir}/ftp/pub/
 %dir %{rundir}/proftpd/
@@ -405,23 +421,11 @@ fi
 %if 0%{?rundir_tmpfs:1}
 %{_sysconfdir}/tmpfiles.d/proftpd.conf
 %endif
-%{_bindir}/ftpasswd
-%{_bindir}/ftpcount
 %{_bindir}/ftpdctl
-%{_bindir}/ftpmail
-%{_bindir}/ftpquota
-%{_bindir}/ftptop
-%{_bindir}/ftpwho
 %{_sbindir}/ftpscrub
 %{_sbindir}/ftpshut
 %{_sbindir}/in.proftpd
 %{_sbindir}/proftpd
-%{_mandir}/man1/ftpasswd.1*
-%{_mandir}/man1/ftpcount.1*
-%{_mandir}/man1/ftpmail.1*
-%{_mandir}/man1/ftpquota.1*
-%{_mandir}/man1/ftptop.1*
-%{_mandir}/man1/ftpwho.1*
 %{_mandir}/man5/xferlog.5*
 %{_mandir}/man8/ftpdctl.8*
 %{_mandir}/man8/ftpscrub.8*
@@ -485,7 +489,27 @@ fi
 %defattr(-,root,root,-)
 %{_libexecdir}/proftpd/mod_sql_postgres.so
 
+%files utils
+%defattr(-,root,root,-)
+%doc contrib/xferstats.holger-preiss
+%{_bindir}/ftpasswd
+%{_bindir}/ftpcount
+%{_bindir}/ftpmail
+%{_bindir}/ftpquota
+%{_bindir}/ftptop
+%{_bindir}/ftpwho
+%{_mandir}/man1/ftpasswd.1*
+%{_mandir}/man1/ftpcount.1*
+%{_mandir}/man1/ftpmail.1*
+%{_mandir}/man1/ftpquota.1*
+%{_mandir}/man1/ftptop.1*
+%{_mandir}/man1/ftpwho.1*
+
 %changelog
+* Mon Jan 16 2012 Paul Howarth <paul at city-fan.org> 1.3.4a-3
+- Add -utils subpackage for support tools, which means the main package
+  no longer requires perl
+
 * Tue Jan 10 2012 Paul Howarth <paul at city-fan.org> 1.3.4a-2
 - Make mod_vroot a DSO, loaded by default (#772354)
 - VRootAlias for /etc/security/pam_env.conf is redundant, so remove it