rpms/proftpd/F-11 .cvsignore, 1.14, 1.15 proftpd.conf, 1.10, 1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.48, 1.49 sources, 1.14, 1.15
Paul Howarth
pghmcfc at fedoraproject.org
Wed Aug 19 15:41:06 UTC 2009
- Previous message: rpms/proftpd/F-10 .cvsignore, 1.13, 1.14 proftpd.conf, 1.10, 1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.45, 1.46 sources, 1.13, 1.14
- Next message: rpms/proftpd/devel .cvsignore, 1.14, 1.15 proftpd.conf, 1.10, 1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.51, 1.52 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pghmcfc
Update of /cvs/pkgs/rpms/proftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18023/F-11
Modified Files:
.cvsignore proftpd.conf proftpd.pam proftpd.spec sources
Log Message:
Use mod_vroot to work around PAM/chroot issues (#477120, #506735)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 3 Aug 2009 12:46:16 -0000 1.14
+++ .cvsignore 19 Aug 2009 15:41:06 -0000 1.15
@@ -1 +1,2 @@
proftpd-1.3.2a.tar.bz2
+proftpd-mod-vroot-0.8.5.tar.gz
Index: proftpd.conf
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- proftpd.conf 3 Aug 2009 12:46:16 -0000 1.10
+++ proftpd.conf 19 Aug 2009 15:41:06 -0000 1.11
@@ -11,7 +11,11 @@ ServerAdmin root at localhost
DefaultServer on
# Cause every FTP user except adm to be chrooted into their home directory
+# Aliasing /etc/security/pam_env.conf into the chroot allows pam_env to
+# work at session-end time (http://bugzilla.redhat.com/477120)
+VRootEngine on
DefaultRoot ~ !adm
+VRootAlias etc/security/pam_env.conf /etc/security/pam_env.conf
# Use pam to authenticate (default) and be authoritative
AuthPAMConfig proftpd
Index: proftpd.pam
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.pam,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- proftpd.pam 6 Jan 2009 10:08:09 -0000 1.3
+++ proftpd.pam 19 Aug 2009 15:41:06 -0000 1.4
@@ -4,6 +4,5 @@ auth required pam_listfile.so item
auth required pam_shells.so
auth include system-auth
account include system-auth
-# Comment the following line if you are having PAM issues with chrooted users
session include system-auth
session required pam_loginuid.so
Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/proftpd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- proftpd.spec 3 Aug 2009 12:46:16 -0000 1.48
+++ proftpd.spec 19 Aug 2009 15:41:06 -0000 1.49
@@ -7,7 +7,7 @@
%endif
#global prever rc3
-%global rpmrel 2
+%global rpmrel 3
Summary: Flexible, stable and highly-configurable FTP server
Name: proftpd
@@ -26,6 +26,7 @@ Source6: proftpd.pam
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
Patch0: proftpd-1.3.2rc3-nostrip.patch
Patch1: proftpd-1.3.2a-defines.patch
Patch2: proftpd-1.3.2-parallel-build.patch
@@ -77,7 +78,10 @@ Module to add PostgreSQL support to the
%prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever} -a 10
+
+# Copy mod_vroot source into place
+%{__cp} -p mod_vroot/mod_vroot.c contrib/
# Don't strip binaries - needed for useful debuginfo
%patch0 -p1 -b .nostrip
@@ -143,7 +147,7 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2
--enable-shadow \
--with-libraries="%{_libdir}/mysql" \
--with-includes="%{_includedir}/mysql" \
- --with-modules=mod_readme:mod_auth_pam:mod_tls \
+ --with-modules=mod_readme:mod_auth_pam:mod_tls:mod_vroot \
--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
%{__make} %{?_smp_mflags}
@@ -274,6 +278,9 @@ fi
%changelog
+* 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)
+
* Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
- Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 3 Aug 2009 12:46:16 -0000 1.14
+++ sources 19 Aug 2009 15:41:06 -0000 1.15
@@ -1 +1,2 @@
ad3cbb5db30c5ae39e09b308892392b3 proftpd-1.3.2a.tar.bz2
+139fc328c43a9afbe290ec787713096b proftpd-mod-vroot-0.8.5.tar.gz
- Previous message: rpms/proftpd/F-10 .cvsignore, 1.13, 1.14 proftpd.conf, 1.10, 1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.45, 1.46 sources, 1.13, 1.14
- Next message: rpms/proftpd/devel .cvsignore, 1.14, 1.15 proftpd.conf, 1.10, 1.11 proftpd.pam, 1.3, 1.4 proftpd.spec, 1.51, 1.52 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list