rpms/proftpd/devel .cvsignore, 1.15, 1.16 proftpd.conf, 1.11, 1.12 proftpd.spec, 1.53, 1.54 sources, 1.15, 1.16
Paul Howarth
pghmcfc at fedoraproject.org
Wed Sep 2 09:44:31 UTC 2009
- Previous message (by thread): rpms/kde-l10n/devel sources,1.31,1.32
- Next message (by thread): rpms/proftpd/EL-4 .cvsignore, 1.10, 1.11 proftpd.conf, 1.10, 1.11 proftpd.spec, 1.14, 1.15 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pghmcfc
Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13959
Modified Files:
.cvsignore proftpd.conf proftpd.spec sources
Log Message:
New DSO module: mod_exec (#520214)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore 19 Aug 2009 15:41:06 -0000 1.15
+++ .cvsignore 2 Sep 2009 09:44:31 -0000 1.16
@@ -1,2 +1,3 @@
proftpd-1.3.2a.tar.bz2
proftpd-mod-vroot-0.8.5.tar.gz
+proftpd-mod-exec-0.9.6.tar.gz
Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- proftpd.conf 19 Aug 2009 15:41:06 -0000 1.11
+++ proftpd.conf 2 Sep 2009 09:44:31 -0000 1.12
@@ -91,6 +91,11 @@ LogFormat auth "%v [%P] %h %t \"%r\" %
# (http://www.proftpd.org/docs/contrib/mod_ctrls_admin.html)
# LoadModule mod_ctrls_admin.c
#
+# Execute external programs or scripts at various points in the process
+# of handling FTP commands
+# (http://www.castaglia.org/proftpd/modules/mod_exec.html)
+# LoadModule mod_exec.c
+#
# Support for POSIX ACLs
# (http://www.proftpd.org/docs/modules/mod_facl.html)
# LoadModule mod_facl.c
@@ -138,7 +143,6 @@ LogFormat auth "%v [%P] %h %t \"%r\" %
# TLS (http://www.castaglia.org/proftpd/modules/mod_tls.html)
<IfDefine TLS>
- LoadModule mod_tls.c
TLSEngine on
TLSRequired on
TLSRSACertificateFile @PKIDIR@/certs/proftpd.pem
Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- proftpd.spec 21 Aug 2009 15:29:55 -0000 1.53
+++ proftpd.spec 2 Sep 2009 09:44:31 -0000 1.54
@@ -7,12 +7,12 @@
%endif
#global prever rc3
-%global rpmrel 3
+%global rpmrel 4
Summary: Flexible, stable and highly-configurable FTP server
Name: proftpd
Version: 1.3.2a
-Release: %{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}.1
+Release: %{?prever:0.}%{rpmrel}%{?prever:.%{prever}}%{?dist}
License: GPLv2+
Group: System Environment/Daemons
URL: http://www.proftpd.org/
@@ -27,6 +27,7 @@ Source7: proftpd-mod_quotatab_ldap.ldif
Source8: proftpd-mod_quotatab_ldap.schema
Source9: proftpd.sysconfig
Source10: http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.8.5.tar.gz
+Source11: http://www.castaglia.org/proftpd/modules/proftpd-mod-exec-0.9.6.tar.gz
Patch0: proftpd-1.3.2rc3-nostrip.patch
Patch1: proftpd-1.3.2a-defines.patch
Patch2: proftpd-1.3.2-parallel-build.patch
@@ -78,10 +79,15 @@ Module to add PostgreSQL support to the
%prep
-%setup -q -n %{name}-%{version}%{?prever} -a 10
+%setup -q -n %{name}-%{version}%{?prever} -a 10 -a 11
-# Copy mod_vroot source into place
+# Copy mod_vroot source and documentation into place
%{__cp} -p mod_vroot/mod_vroot.c contrib/
+%{__cp} -p mod_vroot/mod_vroot.html doc/contrib/
+
+# Copy mod_exec source and documentation into place
+%{__cp} -p mod_exec/mod_exec.c contrib/
+%{__cp} -p mod_exec/mod_exec.html doc/contrib/
# Don't strip binaries - needed for useful debuginfo
%patch0 -p1 -b .nostrip
@@ -132,7 +138,7 @@ done
SMOD1=mod_sql:mod_sql_mysql:mod_sql_postgres
SMOD2=mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_radius:mod_quotatab_sql
SMOD3=mod_ldap:mod_ban:mod_wrap:mod_ctrls_admin:mod_facl:mod_load
-SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc
+SMOD4=mod_radius:mod_ratio:mod_rewrite:mod_site_misc:mod_exec
SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2_sql
%configure \
@@ -241,6 +247,7 @@ fi
%dir %{_libexecdir}/proftpd/
%{_libexecdir}/proftpd/mod_ban.so
%{_libexecdir}/proftpd/mod_ctrls_admin.so
+%{_libexecdir}/proftpd/mod_exec.so
%{_libexecdir}/proftpd/mod_facl.so
%{_libexecdir}/proftpd/mod_ifsession.so
%{_libexecdir}/proftpd/mod_load.so
@@ -278,8 +285,11 @@ fi
%changelog
+* Wed Sep 2 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-4
+- New DSO module: mod_exec (#520214)
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.2a-3.1
-- rebuilt with new openssl
+- Rebuilt with new openssl
* Wed Aug 19 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-3
- Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources 19 Aug 2009 15:41:07 -0000 1.15
+++ sources 2 Sep 2009 09:44:31 -0000 1.16
@@ -1,2 +1,3 @@
ad3cbb5db30c5ae39e09b308892392b3 proftpd-1.3.2a.tar.bz2
139fc328c43a9afbe290ec787713096b proftpd-mod-vroot-0.8.5.tar.gz
+dfcaf605f116c29d7b4771a9b02f509b proftpd-mod-exec-0.9.6.tar.gz
- Previous message (by thread): rpms/kde-l10n/devel sources,1.31,1.32
- Next message (by thread): rpms/proftpd/EL-4 .cvsignore, 1.10, 1.11 proftpd.conf, 1.10, 1.11 proftpd.spec, 1.14, 1.15 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list