rpms/proftpd/F-7 proftpd-mod_quotatab_ldap.ldif, NONE, 1.1 proftpd-mod_quotatab_ldap.schema, NONE, 1.1 proftpd-welcome.msg, NONE, 1.1 proftpd-xinetd, 1.3, 1.4 proftpd.conf, 1.7, 1.8 proftpd.init, 1.5, 1.6 proftpd.spec, 1.30, 1.31 proftpd-1.3.0-cmdbufsize.patch, 1.2, NONE proftpd-1.3.0-ctrls-restart.patch, 1.1, NONE proftpd-1.3.0-mod_tls.patch, 1.1, NONE proftpd-1.3.0-rpath.patch, 1.1, NONE proftpd-1.3.0a-ctrls-bug2867.patch, 1.1, NONE proftpd-1.3.0a-open.patch, 1.1, NONE welcome.msg, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Oct 22 14:35:04 UTC 2007
Author: thias
Update of /cvs/extras/rpms/proftpd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27419
Modified Files:
proftpd-xinetd proftpd.conf proftpd.init proftpd.spec
Added Files:
proftpd-mod_quotatab_ldap.ldif
proftpd-mod_quotatab_ldap.schema proftpd-welcome.msg
Removed Files:
proftpd-1.3.0-cmdbufsize.patch
proftpd-1.3.0-ctrls-restart.patch proftpd-1.3.0-mod_tls.patch
proftpd-1.3.0-rpath.patch proftpd-1.3.0a-ctrls-bug2867.patch
proftpd-1.3.0a-open.patch welcome.msg
Log Message:
Backport all changes from F-8/devel. Should fix #237533.
--- NEW FILE proftpd-mod_quotatab_ldap.ldif ---
#
################################################################################
#
dn: cn=schema
#
################################################################################
#
attributeTypes: (
1.3.6.1.4.1.17852.2.1.2.1.1
NAME 'ftpQuota'
DESC 'Quota definition for proftpd mod_quotatab_ldap'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255}
)
#
################################################################################
#
objectClasses: (
1.3.6.1.4.1.17852.2.1.2.2.1
NAME 'proFTPDQuota'
DESC 'Quota object for proftpd mod_quotatab_ldap'
SUP top
AUXILIARY
MAY ( ftpQuota )
)
#
################################################################################
#
--- NEW FILE proftpd-mod_quotatab_ldap.schema ---
attributetype ( 1.3.6.1.4.1.17852.2.1.2.1.1 NAME 'ftpQuota'
DESC 'Quota definition for proftpd mod_quotatab_ldap'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} )
objectclass ( 1.3.6.1.4.1.17852.2.1.2.2.1 NAME 'proFTPDQuota' SUP top AUXILIARY
DESC 'Quota object for proftpd mod_quotatab_ldap'
MAY ( ftpQuota ) )
--- NEW FILE proftpd-welcome.msg ---
*** Welcome to this anonymous ftp server! ***
You are user %N out of a maximum of %M authorized anonymous logins.
The current time here is %T.
If you experience any problems here, contact : %E
Index: proftpd-xinetd
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-7/proftpd-xinetd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- proftpd-xinetd 9 Nov 2004 02:50:04 -0000 1.3
+++ proftpd-xinetd 22 Oct 2007 14:34:30 -0000 1.4
@@ -1,5 +1,4 @@
# default: off
-# $Id$
# description: The ProFTPD FTP server serves FTP connections. It uses \
# normal, unencrypted usernames and passwords for authentication.
service ftp
Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-7/proftpd.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- proftpd.conf 3 Jul 2006 17:29:18 -0000 1.7
+++ proftpd.conf 22 Oct 2007 14:34:30 -0000 1.8
@@ -1,5 +1,4 @@
# This is the ProFTPD configuration file
-# $Id$
ServerName "ProFTPD server"
ServerIdent on "FTP Server ready."
Index: proftpd.init
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-7/proftpd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- proftpd.init 21 Apr 2006 17:05:11 -0000 1.5
+++ proftpd.init 22 Oct 2007 14:34:30 -0000 1.6
@@ -1,11 +1,10 @@
#!/bin/sh
-# $Id$
#
# proftpd This shell script takes care of starting and stopping
# proftpd.
#
# chkconfig: - 80 30
-# description: ProFTPD is an enhanced FTP server with a focus towards \
+# description: ProFTPd is an enhanced FTP server with a focus towards \
# simplicity, security, and ease of configuration. \
# It features a very Apache-like configuration syntax, \
# and a highly customizable server infrastructure, \
@@ -15,6 +14,19 @@
# config: /etc/proftp.conf
# pidfile: /var/run/proftpd.pid
+### BEGIN INIT INFO
+# Provides: proftpd ftpserver
+# Required-Start: $local_fs $network $named $remote_fs
+# Required-Stop: $local_fs $network $named $remote_fs
+# Short-Description: ProFTPd FTP Server
+# Description: ProFTPd is an enhanced FTP server with a focus towards
+# simplicity, security, and ease of configuration.
+# It features a very Apache-like configuration syntax,
+# and a highly customizable server infrastructure,
+# including support for multiple 'virtual' FTP servers,
+# anonymous FTP, and permission-based directory visibility.
+### END INIT INFO
+
# Source function library.
. /etc/rc.d/init.d/functions
@@ -62,21 +74,21 @@
stop
start
;;
- condrestart)
+ try-restart|condrestart)
if [ -f /var/lock/subsys/proftpd ]; then
stop
start
fi
;;
- reload)
+ reload|force-reload)
echo -n $"Re-reading $prog configuration: "
killproc proftpd -HUP
RETVAL=$?
echo
;;
*)
- echo "Usage: $prog {start|stop|restart|reload|condrestart|status}"
- exit 1
+ echo "Usage: $prog {start|stop|restart|try-restart|reload|status}"
+ exit 2
esac
exit $RETVAL
Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/F-7/proftpd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- proftpd.spec 12 Aug 2007 14:03:48 -0000 1.30
+++ proftpd.spec 22 Oct 2007 14:34:30 -0000 1.31
@@ -1,7 +1,7 @@
Summary: Flexible, stable and highly-configurable FTP server
Name: proftpd
-Version: 1.3.0a
-Release: 8%{?dist}
+Version: 1.3.1
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Daemons
URL: http://www.proftpd.org/
@@ -10,14 +10,10 @@
Source2: proftpd.init
Source3: proftpd-xinetd
Source4: proftpd.logrotate
-Source5: welcome.msg
+Source5: proftpd-welcome.msg
Source6: proftpd.pam
-Patch0: proftpd-1.3.0-rpath.patch
-Patch1: proftpd-1.3.0-ctrls-restart.patch
-Patch2: proftpd-1.3.0-cmdbufsize.patch
-Patch3: proftpd-1.3.0-mod_tls.patch
-Patch4: proftpd-1.3.0a-ctrls-bug2867.patch
-Patch5: proftpd-1.3.0a-open.patch
+Source7: proftpd-mod_quotatab_ldap.ldif
+Source8: proftpd-mod_quotatab_ldap.schema
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: pam >= 0.59
Requires(post): /sbin/chkconfig
@@ -68,12 +64,6 @@
%prep
%setup -q
-%patch0 -p1 -b .rpath
-%patch1 -p0 -b .ctrls-restart
-%patch2 -p1 -b .cmdbufsize
-%patch3 -p0 -b .mod_tls
-%patch4 -p0 -b .ctrls-bug2867
-%patch5 -p1 -b .open
%build
@@ -87,6 +77,7 @@
--enable-facl \
--enable-dso \
--enable-ipv6 \
+ --enable-openssl \
--with-libraries="%{_libdir}/mysql" \
--with-includes="%{_includedir}/mysql" \
--with-modules=mod_readme:mod_auth_pam:mod_tls \
@@ -113,6 +104,8 @@
%{buildroot}%{_sysconfdir}/logrotate.d/proftpd
%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 0644 %{SOURCE7} 70proftpd-quota.ldif
+%{__install} -D -p -m 0644 %{SOURCE8} proftpd-quota.schema
%{__mkdir_p} %{buildroot}/var/ftp/uploads
%{__mkdir_p} %{buildroot}/var/ftp/pub
%{__mkdir_p} %{buildroot}/var/log/proftpd
@@ -163,6 +156,7 @@
%{_sysconfdir}/rc.d/init.d/proftpd
%{_mandir}/man?/*
%{_bindir}/*
+%exclude %{_includedir}/proftpd/
%dir %{_libexecdir}/proftpd/
%{_libexecdir}/proftpd/mod_quotatab.so
%{_libexecdir}/proftpd/mod_quotatab_file.so
@@ -178,6 +172,7 @@
%files ldap
%defattr(-,root,root,-)
+%doc 70proftpd-quota.ldif proftpd-quota.schema
%dir %{_libexecdir}/proftpd/
%{_libexecdir}/proftpd/mod_ldap.so
%{_libexecdir}/proftpd/mod_quotatab_ldap.so
@@ -196,6 +191,26 @@
%changelog
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-2
+- Include openldap schema file for quota support (Fran Taylor, #291891).
+- Include FDS compatible LDIF file for quota support (converted).
+- Prefix source welcome.msg for consistency.
+
+* Tue Oct 9 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-1
+- Update to 1.3.1 final.
+- Remove all patches (upstream).
+
+* Sun Aug 19 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-0.2.rc3
+- Update to 1.3.1rc3 (the only version to fix #237533 aka CVE-2007-2165).
+- Remove all patches, none are useful anymore.
+- Patch sstrncpy.c for config.h not being included (reported upstream #2964).
+- Patch mod_sql_mysql.c to fix a typo (already fixed in CVS upstream).
+- Exclude new headers, at least until some first 3rd party module shows up.
+- Clean up old leftover CVS strings from our extra files.
+- LSB-ize the init script (#247033).
+- Explicitly pass --enable-openssl since configure tells us "(default=no)".
+- Include patch to fix open calls on F8.
+
* Sun Aug 12 2007 Matthias Saou <http://freshrpms.net/> 1.3.0a-8
- Fix logrotate entry to silence error when proftpd isn't running (#246392).
--- proftpd-1.3.0-cmdbufsize.patch DELETED ---
--- proftpd-1.3.0-ctrls-restart.patch DELETED ---
--- proftpd-1.3.0-mod_tls.patch DELETED ---
--- proftpd-1.3.0-rpath.patch DELETED ---
--- proftpd-1.3.0a-ctrls-bug2867.patch DELETED ---
--- proftpd-1.3.0a-open.patch DELETED ---
--- welcome.msg DELETED ---
More information about the fedora-extras-commits
mailing list