updated patch and added patch for openssl 0.9.8 issue

Package-Manager: portage-2.1.1_rc1-r4

3 files changed, 153 insertions, 60 deletions

diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7
index 211d52a3fca3..3fa349452892 100644
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r7
@@ -1,2 +1,6 @@
 MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
+RMD160 198dc321fab5dde37465880d41bbab29f39c3c4b proftpd-1.2.10.tar.bz2 920337
+SHA256 5607d70b8cae3a99e60dcbc4a8286f6de2e10d765136d97834fafd75783c0b25 proftpd-1.2.10.tar.bz2 920337
 MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
+RMD160 ef99f3b1e6cf4d4461ab7463bf65dc5ef8e21697 proftpd-mod-shaper-0.5.5.tar.gz 18090
+SHA256 eb079bf98ef382086b952977cac1a84c2add9d7add4f8b989c7bd67d8ab61696 proftpd-mod-shaper-0.5.5.tar.gz 18090
diff --git a/net-ftp/proftpd/files/mod_sql_mysql.diff b/net-ftp/proftpd/files/mod_sql_mysql.diff
index decc24d47d73..473feeb9b344 100644
--- a/net-ftp/proftpd/files/mod_sql_mysql.diff
+++ b/net-ftp/proftpd/files/mod_sql_mysql.diff
@@ -1,60 +1,128 @@
---- /var/tmp/portage/proftpd-1.3.0_rc5/work/proftpd-1.3.0rc5/contrib/mod_sql_mysql.c	2005-06-27 22:41:14.000000000 +0200
-+++ /contrib/mod_sql_mysql.c	2006-04-18 04:00:14.000000000 +0200
-@@ -158,7 +158,8 @@
-   char *pass;
-   char *db;
-   char *port;
--
-+  char *unix_socket;
-+  
-   MYSQL *mysql;
- 
- };
-@@ -431,7 +432,7 @@
-   mysql_options(conn->mysql, MYSQL_READ_DEFAULT_GROUP, "client");
- 
-   if (!mysql_real_connect(conn->mysql, conn->host, conn->user, conn->pass,
--      conn->db, (int) strtol(conn->port, (char **) NULL, 10), NULL,
-+      conn->db, (int) strtol(conn->port, (char **) NULL, 10), conn->unix_socket,
-       CLIENT_INTERACTIVE)) {
- 
-     /* If it didn't work, return an error. */
-@@ -575,6 +576,7 @@
-   char *db = NULL;
-   char *host = NULL;
-   char *port = NULL;
-+  char *unix_socket = NULL;
- 
-   char *havehost = NULL;
-   char *haveport = NULL;
-@@ -630,6 +632,20 @@
-   conn->db   = pstrdup(conn_pool, db);
-   conn->port = pstrdup(conn_pool, port);
- 
-+  /* if host is a unix socket perse it, otherwise default it. 
-+   * from dovecot 1.0 beta 7 driver-mysql.c
-+   */ 
-+ 
-+  if (*conn->host == '/') {
-+    unix_socket = conn->host;
-+    host = NULL;
-+    conn->host = pstrdup(conn_pool, host);
-+  } else {
-+    unix_socket = NULL;
-+  }
-+  
-+  conn->unix_socket = pstrdup(conn_pool, unix_socket);
-+
-   /* insert the new conn_info into the connection hash */
-   if (!(entry = _sql_add_connection(conn_pool, name, (void *) conn))) {
-     sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection");
-@@ -650,8 +666,8 @@
-   sql_log(DEBUG_INFO, " host: '%s'", conn->host);
-   sql_log(DEBUG_INFO, "   db: '%s'", conn->db);
-   sql_log(DEBUG_INFO, " port: '%s'", conn->port);
-+  sql_log(DEBUG_INFO, "unix_socket: '%s'", conn->unix_socket);
-   sql_log(DEBUG_INFO, "  ttl: '%d'", entry->ttl);
--
-   sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection");
-   return HANDLED(cmd);
- }
+Index: contrib/mod_sql_mysql.c

+===================================================================

+RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql_mysql.c,v

+retrieving revision 1.40

+diff -u -r1.40 mod_sql_mysql.c

+--- contrib/mod_sql_mysql.c	21 Apr 2006 01:59:45 -0000	1.40

++++ contrib/mod_sql_mysql.c	26 May 2006 18:37:14 -0000

+@@ -128,7 +128,7 @@

+  * Internal define used for debug and logging.  All backends are encouraged

+  * to use the same format.

+  */

+-#define MOD_SQL_MYSQL_VERSION		"mod_sql_mysql/4.05"

++#define MOD_SQL_MYSQL_VERSION		"mod_sql_mysql/4.0.7"

+ 

+ #define _MYSQL_PORT "3306"

+ 

+@@ -158,6 +158,7 @@

+   char *pass;

+   char *db;

+   char *port;

++  char *unix_sock;

+ 

+   MYSQL *mysql;

+ 

+@@ -431,8 +432,8 @@

+   mysql_options(conn->mysql, MYSQL_READ_DEFAULT_GROUP, "client");

+ 

+   if (!mysql_real_connect(conn->mysql, conn->host, conn->user, conn->pass,

+-      conn->db, (int) strtol(conn->port, (char **) NULL, 10), NULL,

+-      CLIENT_INTERACTIVE)) {

++      conn->db, (int) strtol(conn->port, (char **) NULL, 10),

++      conn->unix_sock, CLIENT_INTERACTIVE)) {

+ 

+     /* If it didn't work, return an error. */

+     sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_open");

+@@ -567,8 +568,7 @@

+  *  a number or ttl is negative, the connection will be assumed to have no

+  *  associated timer.

+  */

+-MODRET cmd_defineconnection(cmd_rec *cmd)

+-{

++MODRET cmd_defineconnection(cmd_rec *cmd) {

+   char *info = NULL;

+   char *name = NULL;

+ 

+@@ -586,12 +586,14 @@

+ 

+   _sql_check_cmd(cmd, "cmd_defineconnection");

+ 

+-  if ((cmd->argc < 4) || (cmd->argc > 5) || (!cmd->argv[0])) {

++  if (cmd->argc < 4 ||

++      cmd->argc > 5 ||

++      !cmd->argv[0]) {

+     sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection");

+     return ERROR_MSG(cmd, MOD_SQL_MYSQL_VERSION, "badly formed request");

+   }

+ 

+-  conn = (db_conn_t *) palloc(conn_pool, sizeof(db_conn_t));

++  conn = (db_conn_t *) pcalloc(conn_pool, sizeof(db_conn_t));

+ 

+   name = pstrdup(conn_pool, cmd->argv[0]);

+   conn->user = pstrdup(conn_pool, cmd->argv[1]);

+@@ -615,6 +617,7 @@

+   if (haveport) {

+     port = haveport + 1;

+     *haveport = '\0';

++

+   } else {

+     port = _MYSQL_PORT;

+   }

+@@ -622,16 +625,28 @@

+   if (havehost) {

+     host = havehost + 1;

+     *havehost = '\0';

++

+   } else {

+     host = "localhost";

+   }

+ 

+-  conn->host = pstrdup(conn_pool, host);

++  /* Hack to support ability to configure path to Unix domain socket

++   * for MySQL: if the host string starts with a '/', assume it's

++   * a path to the Unix domain socket to use.

++   */

++  if (*host == '/') {

++    conn->unix_sock = pstrdup(conn_pool, host);

++

++  } else {

++    conn->host = pstrdup(conn_pool, host);

++  }

++

+   conn->db   = pstrdup(conn_pool, db);

+   conn->port = pstrdup(conn_pool, port);

+ 

+-  /* insert the new conn_info into the connection hash */

+-  if (!(entry = _sql_add_connection(conn_pool, name, (void *) conn))) {

++  /* Insert the new conn_info into the connection hash */

++  entry = _sql_add_connection(conn_pool, name, (void *) conn);

++  if (!entry) {

+     sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection");

+     return ERROR_MSG(cmd, MOD_SQL_MYSQL_VERSION,

+       "named connection already exists");

+@@ -645,12 +660,19 @@

+   entry->timer = 0;

+   entry->connections = 0;

+ 

+-  sql_log(DEBUG_INFO, " name: '%s'", entry->name);

+-  sql_log(DEBUG_INFO, " user: '%s'", conn->user);

+-  sql_log(DEBUG_INFO, " host: '%s'", conn->host);

+-  sql_log(DEBUG_INFO, "   db: '%s'", conn->db);

+-  sql_log(DEBUG_INFO, " port: '%s'", conn->port);

+-  sql_log(DEBUG_INFO, "  ttl: '%d'", entry->ttl);

++  sql_log(DEBUG_INFO, "  name: '%s'", entry->name);

++  sql_log(DEBUG_INFO, "  user: '%s'", conn->user);

++

++  if (conn->host) {

++    sql_log(DEBUG_INFO, "  host: '%s'", conn->host);

++

++  } else if (conn->unix_sock) {

++    sql_log(DEBUG_INFO, "socket: '%s'", conn->unix_sock);

++  }

++

++  sql_log(DEBUG_INFO, "    db: '%s'", conn->db);

++  sql_log(DEBUG_INFO, "  port: '%s'", conn->port);

++  sql_log(DEBUG_INFO, "   ttl: '%d'", entry->ttl);

+ 

+   sql_log(DEBUG_FUNC, "%s", "exiting \tmysql cmd_defineconnection");

+   return HANDLED(cmd);

diff --git a/net-ftp/proftpd/files/openssl-0.9.8.patch b/net-ftp/proftpd/files/openssl-0.9.8.patch
new file mode 100644
index 000000000000..7601d4b26a4d
--- /dev/null
+++ b/net-ftp/proftpd/files/openssl-0.9.8.patch
@@ -0,0 +1,21 @@
+Index: contrib/mod_tls.c
+===================================================================
+RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
+retrieving revision 1.77
+retrieving revision 1.78
+diff -u -r1.77 -r1.78
+--- contrib/mod_tls.c   14 Jun 2005 01:23:44 -0000      1.77
++++ contrib/mod_tls.c   18 Jun 2005 21:05:34 -0000      1.78
+@@ -568,7 +568,12 @@
+     }
+   }
+
++#if OPENSSL_VERSION_NUMBER < 0x00908001
+   PEMerr(PEM_F_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD);
++#else
++  PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD);
++#endif
++
+   pr_memscrub(buf, buflen);
+   return -1;
+ }