rpms/proftpd/FC-5 proftpd-1.3.0-ctrls-restart.patch, NONE, 1.1 proftpd.conf, 1.5, 1.6 proftpd.spec, 1.14, 1.15
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Jun 19 10:43:18 UTC 2006
Author: thias
Update of /cvs/extras/rpms/proftpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27919/FC-5
Modified Files:
proftpd.conf proftpd.spec
Added Files:
proftpd-1.3.0-ctrls-restart.patch
Log Message:
Include fix for bug #195884.
proftpd-1.3.0-ctrls-restart.patch:
--- NEW FILE proftpd-1.3.0-ctrls-restart.patch ---
Index: modules/mod_ctrls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/modules/mod_ctrls.c,v
retrieving revision 1.30
diff -u -r1.30 mod_ctrls.c
--- modules/mod_ctrls.c 11 Nov 2005 21:05:32 -0000 1.30
+++ modules/mod_ctrls.c 23 May 2006 17:31:51 -0000
@@ -3,7 +3,7 @@
* server, as well as several utility functions for other Controls
* modules
*
- * Copyright (c) 2000-2005 TJ Saunders
+ * Copyright (c) 2000-2006 TJ Saunders
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
#include "privs.h"
#include "mod_ctrls.h"
-#define MOD_CTRLS_VERSION "mod_ctrls/0.9.3"
+#define MOD_CTRLS_VERSION "mod_ctrls/0.9.4"
/* Master daemon in standalone mode? (from src/main.c) */
extern unsigned char is_master;
@@ -518,7 +518,7 @@
} else if (res == PR_LOG_WRITABLE_DIR) {
pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION
": unable to open ControlsLog '%s': "
- "containing directory is world writeable", ctrls_logname);
+ "containing directory is world writable", ctrls_logname);
} else if (res == PR_LOG_SYMLINK) {
pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION
@@ -1476,7 +1476,7 @@
if (res == -2)
CONF_ERROR(cmd, pstrcat(cmd->tmp_pool,
- "unable to log to a world-writeable directory", NULL));
+ "unable to log to a world-writable directory", NULL));
}
return HANDLED(cmd);
@@ -1506,10 +1506,12 @@
CONF_ERROR(cmd, "must be an absolute path");
/* Close the socket. */
- pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s'",
- ctrls_sock_file);
- close(ctrls_sockfd);
- ctrls_sockfd = -1;
+ if (ctrls_sockfd >= 0) {
+ pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s' (%d)",
+ ctrls_sock_file, ctrls_sockfd);
+ close(ctrls_sockfd);
+ ctrls_sockfd = -1;
+ }
/* Change the path. */
if (strcmp(cmd->argv[1], ctrls_sock_file) != 0)
@@ -1608,9 +1610,28 @@
PRIVS_ROOT
ctrls_sockfd = ctrls_listen(ctrls_sock_file);
PRIVS_RELINQUISH
- if (ctrls_sockfd < 0)
+ if (ctrls_sockfd < 0) {
pr_log_pri(PR_LOG_NOTICE, "notice: unable to listen to local socket: %s",
strerror(errno));
+
+ } else {
+ /* Ensure that the listen socket used is not one of the major three
+ * (stdin, stdout, or stderr).
+ */
+ if (ctrls_sockfd < 3) {
+ if (dup2(ctrls_sockfd, 3) < 0) {
+ pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION
+ ": error duplicating listen socket: %s", strerror(errno));
+ (void) close(ctrls_sockfd);
+ ctrls_sockfd = -1;
+
+ } else {
+ (void) close(ctrls_sockfd);
+ ctrls_sockfd = 3;
+ }
+ }
+ }
+
}
static void ctrls_restart_ev(const void *event_data, void *user_data) {
@@ -1633,10 +1654,11 @@
cl_list = NULL;
cl_listlen = 0;
- pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s'",
- ctrls_sock_file);
+ pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s' (%d)",
+ ctrls_sock_file, ctrls_sockfd);
close(ctrls_sockfd);
ctrls_sockfd = -1;
+
ctrls_closelog();
/* Clear the existing pool */
Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- proftpd.conf 1 Aug 2005 15:17:49 -0000 1.5
+++ proftpd.conf 19 Jun 2006 10:43:18 -0000 1.6
@@ -77,14 +77,22 @@
# Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html
#TLSEngine on
#TLSRequired on
-#TLSRSACertificateFile /usr/share/ssl/certs/proftpd.pem
-#TLSRSACertificateKeyFile /usr/share/ssl/certs/proftpd.pem
+#TLSRSACertificateFile /etc/pki/tls/certs/proftpd.pem
+#TLSRSACertificateKeyFile /etc/pki/tls/certs/proftpd.pem
#TLSCipherSuite ALL:!ADH:!DES
#TLSOptions NoCertRequest
#TLSVerifyClient off
##TLSRenegotiate ctrl 3600 data 512000 required off timeout 300
#TLSLog /var/log/proftpd/tls.log
+# SQL authentication Dynamic Shared Object (DSO) loading
+# See README.DSO and howto/DSO.html for more details.
+#<IfModule mod_dso.c>
+# LoadModule mod_sql.c
+# LoadModule mod_sql_mysql.c
+# LoadModule mod_sql_postgres.c
+#</IfModule>
+
# A basic anonymous configuration, with an upload directory.
#<Anonymous ~ftp>
# User ftp
Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- proftpd.spec 2 May 2006 15:47:53 -0000 1.14
+++ proftpd.spec 19 Jun 2006 10:43:18 -0000 1.15
@@ -1,7 +1,7 @@
Summary: Flexible, stable and highly-configurable FTP server
Name: proftpd
Version: 1.3.0
-Release: 2%{?dist}
+Release: 4%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://www.proftpd.org/
@@ -13,6 +13,7 @@
Source5: welcome.msg
Source6: proftpd.pam
Patch0: proftpd-1.3.0-rpath.patch
+Patch1: proftpd-1.3.0-ctrls-restart.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: pam >= 0.59
Requires(post): /sbin/chkconfig
@@ -64,6 +65,7 @@
%prep
%setup
%patch0 -p1 -b .rpath
+%patch1 -p0 -b .ctrls-restart
%build
@@ -179,6 +181,13 @@
%changelog
+* Mon Jun 19 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-4
+- Include ctrls restart patch, see #195884 (patch from proftpd.org #2792).
+
+* Wed May 10 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-3
+- Add commented section about DSO loading to the default proftpd.conf.
+- Update TLS cert paths in the default proftpd.conf to /etc/pki/tls.
+
* Fri Apr 28 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-2
- Mark pam.d and logrotate.d config files as noreplace.
- Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary
More information about the fedora-extras-commits
mailing list