Sun Feb 3 17:54:43 UTC 2008

Author: thias

Update of /cvs/extras/rpms/proftpd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6790

Modified Files:
	.cvsignore proftpd-xinetd proftpd.conf proftpd.init 
	proftpd.spec sources 
Added Files:
	proftpd-1.3.1-find-umode_t.patch 
	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 the 1.3.1 update from devel and F-8 to EL-5 (just keep older PAM file).


proftpd-1.3.1-find-umode_t.patch:

--- NEW FILE proftpd-1.3.1-find-umode_t.patch ---
--- proftpd-1.3.1/configure.in	2007-05-22 21:54:09.000000000 +0100
+++ proftpd-1.3.1/configure.in	2007-12-10 15:33:27.000000000 +0000
@@ -1067,6 +1067,7 @@
 AC_CHECK_HEADERS(regex.h)
 AC_CHECK_HEADER(syslog.h,have_syslog_h="yes",)
 AC_CHECK_HEADERS(curses.h ncurses.h)
+AC_CHECK_HEADERS(signal.h)
 
 dnl Check for the presence of the tzname, timezone, and daylight global
 dnl variables.
--- proftpd-1.3.1/configure	2007-05-22 22:01:32.000000000 +0100
+++ proftpd-1.3.1/configure	2007-12-10 16:07:30.000000000 +0000
@@ -26922,6 +26922,155 @@
 done
 
 
+for ac_header in signal.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists.  ##
+## ------------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
 echo "$as_me:$LINENO: checking for tzname global variable" >&5
 echo $ECHO_N "checking for tzname global variable... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
@@ -30643,6 +30792,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+#if HAVE_SIGNAL_H
+#include <signal.h>
+#endif
 int
 main ()
 {
--- proftpd-1.3.1/include/conf.h	2007-01-18 02:48:32.000000000 +0000
+++ proftpd-1.3.1/include/conf.h	2007-12-10 15:34:29.000000000 +0000
@@ -71,6 +71,10 @@
 # include <unistd.h>
 #endif
 
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+
 #ifdef HAVE_LIMITS_H
 # include <limits.h>
 #endif


--- 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Nov 2006 17:53:07 -0000	1.9
+++ .cvsignore	3 Feb 2008 17:54:06 -0000	1.10
@@ -1 +1 @@
-proftpd-1.3.0a.tar.bz2
+proftpd-1.3.1.tar.bz2


Index: proftpd-xinetd
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/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	3 Feb 2008 17:54:06 -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/EL-5/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	3 Feb 2008 17:54:06 -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/EL-5/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	3 Feb 2008 17:54:06 -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/EL-5/proftpd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- proftpd.spec	12 Aug 2007 14:03:43 -0000	1.28
+++ proftpd.spec	3 Feb 2008 17:54:06 -0000	1.29
@@ -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: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -10,14 +10,11 @@
 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
+Patch0: proftpd-1.3.1-find-umode_t.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,12 +65,7 @@
 
 %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
+%patch0 -p1 -b .find-umode_t
 
 
 %build
@@ -87,6 +79,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 +106,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 +158,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 +174,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 +193,29 @@
 
 
 %changelog
+* Mon Dec 17 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-3
+- Rebuild for new openssl, patch from Paul Howarth.
+
+* 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).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Nov 2006 17:53:07 -0000	1.9
+++ sources	3 Feb 2008 17:54:06 -0000	1.10
@@ -1 +1 @@
-cc2e99f38a810982f91d5cbe1f4091f0  proftpd-1.3.0a.tar.bz2
+175958df8de92d5209b7b1e2e23a5a28  proftpd-1.3.1.tar.bz2


--- 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 ---


