Revbump to fix various bugs.

(Portage version: 2.1.2_pre1)

3 files changed, 116 insertions, 1 deletions

diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2 b/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2
new file mode 100644
index 000000000000..396fb437e240
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2
@@ -0,0 +1,15 @@
+MD5 da279361d5a34b37ce1f64d3830c4c17 mod_clamav_new.c 7399
+RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb mod_clamav_new.c 7399
+SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1 mod_clamav_new.c 7399
+MD5 098551feed28f069ef01e77af88d55dc mod_clamav_new.html 4645
+RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 mod_clamav_new.html 4645
+SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e mod_clamav_new.html 4645
+MD5 fae47d01b52e035eb6b7190e74c17722 proftpd-1.3.0.tar.bz2 1386086
+RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec proftpd-1.3.0.tar.bz2 1386086
+SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe proftpd-1.3.0.tar.bz2 1386086
+MD5 a81c3ed2d45f7c938416a970fd559703 proftpd-mod-shaper-0.5.6.tar.gz 18099
+RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 proftpd-mod-shaper-0.5.6.tar.gz 18099
+SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827 proftpd-mod-shaper-0.5.6.tar.gz 18099
+MD5 bafd6c9ecfdf352641465b866be12f27 proftpd-mod-vroot-0.7.1.tar.gz 5613
+RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 proftpd-mod-vroot-0.7.1.tar.gz 5613
+SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 proftpd-mod-vroot-0.7.1.tar.gz 5613
diff --git a/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch b/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch
new file mode 100644
index 000000000000..17bd69b17749
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch
@@ -0,0 +1,99 @@
+--- 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 */
diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
index d543ded32bba..47b2ef651776 100644
--- a/net-ftp/proftpd/files/proftpd.rc6
+++ b/net-ftp/proftpd/files/proftpd.rc6
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.10 2006/09/23 18:17:38 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.11 2006/09/23 19:07:05 chtekk Exp $
 
 depend() {
 	need net
+	use dns
 }
 
 checkconfig() {