From 9525ae325be506fd91f6b6cee540740a2679b2b8 Mon Sep 17 00:00:00 2001 From: Gustavo Felisberto Date: Thu, 7 Sep 2006 09:05:33 +0000 Subject: [PATCH] fixed ^M in patch Package-Manager: portage-2.1.1_rc1-r5 --- net-ftp/proftpd/ChangeLog | 6 +- net-ftp/proftpd/Manifest | 22 +- net-ftp/proftpd/files/mod_sql_mysql.diff | 256 +++++++++++------------ 3 files changed, 144 insertions(+), 140 deletions(-) diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 4a4ad8693f51..8a818078abe0 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/proftpd # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.112 2006/09/06 14:35:22 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.113 2006/09/07 09:05:33 humpback Exp $ + + 07 Sep 2006; Gustavo Felisberto ; + files/mod_sql_mysql.diff: + Fixed format on patch. Should solve issue with <=sys-devel/patch-2.5.9 06 Sep 2006; Gustavo Felisberto ; +files/openssl-0.9.8.patch, files/mod_sql_mysql.diff, diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index d6c01be1475a..088a12170157 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -17,10 +17,10 @@ AUX gcc4-mod_quotatab_sql.patch 472 RMD160 0f430cf7b13523ac4a6d742e2bc733b825552 MD5 cf9d29cb128107c4f6a803176613125d files/gcc4-mod_quotatab_sql.patch 472 RMD160 0f430cf7b13523ac4a6d742e2bc733b825552578 files/gcc4-mod_quotatab_sql.patch 472 SHA256 07c74456e8951c4248e4893f0469fae5b163623685ad74039bbaade52a1d50d1 files/gcc4-mod_quotatab_sql.patch 472 -AUX mod_sql_mysql.diff 4229 RMD160 70dff48c84dcdf6bec93d867ecbb59d07e5a75ea SHA1 3684c1abd3ce4ed56a6a76f512a684f46ba8ff71 SHA256 7a045d51f6c6091a3c9b99209cf750f682049865ba67180be64fe2e01bd01129 -MD5 52036d3dd4e3df7d0342f78a2febad82 files/mod_sql_mysql.diff 4229 -RMD160 70dff48c84dcdf6bec93d867ecbb59d07e5a75ea files/mod_sql_mysql.diff 4229 -SHA256 7a045d51f6c6091a3c9b99209cf750f682049865ba67180be64fe2e01bd01129 files/mod_sql_mysql.diff 4229 +AUX mod_sql_mysql.diff 4101 RMD160 e865cf38629b023f83a26db4b5db597c0a57c946 SHA1 f8598cf9c166d7f631829192b8ce056e7bfd71f2 SHA256 01875eb931a7aaa97d585e34ce8b90e882eaea04bd08cfb2b264b4fbf0964aa2 +MD5 e4b0f779fd34bb8e3f5d77e8aec6120b files/mod_sql_mysql.diff 4101 +RMD160 e865cf38629b023f83a26db4b5db597c0a57c946 files/mod_sql_mysql.diff 4101 +SHA256 01875eb931a7aaa97d585e34ce8b90e882eaea04bd08cfb2b264b4fbf0964aa2 files/mod_sql_mysql.diff 4101 AUX mod_sql_postgres.c.patch 275 RMD160 adfe41f6ba60eaf8b40e0a59dd9b3113dd43ec83 SHA1 6c89533dfdf0b8a258b44c941d41b8a399aa2648 SHA256 e5cb4bc7ef72e4972a8c024e5e93fc4b1dfc0d215ec3bde3c3094b1f00c330cd MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275 RMD160 adfe41f6ba60eaf8b40e0a59dd9b3113dd43ec83 files/mod_sql_postgres.c.patch 275 @@ -76,10 +76,10 @@ EBUILD proftpd-1.3.0-r1.ebuild 5407 RMD160 c08a32489051a6efc44ff7fa4590a421bd5e0 MD5 c209be89cf7903b203ba1313fc1e849c proftpd-1.3.0-r1.ebuild 5407 RMD160 c08a32489051a6efc44ff7fa4590a421bd5e0e43 proftpd-1.3.0-r1.ebuild 5407 SHA256 78932612b20b891b057058951c58e2e6a19590aad24fbc9db74c789b50ed5156 proftpd-1.3.0-r1.ebuild 5407 -MISC ChangeLog 18044 RMD160 a5c45f7ff6c51096d1b0476f6e2c775d8a791c24 SHA1 0fd967b739aae219adccf0c36c2101fa779f8443 SHA256 bb015ae8708056482014bc3f042c37ea53e2e4633c7ee2ad54af26f7c3e6cd2c -MD5 df53b85bb4b5041185f4890d8d70df7a ChangeLog 18044 -RMD160 a5c45f7ff6c51096d1b0476f6e2c775d8a791c24 ChangeLog 18044 -SHA256 bb015ae8708056482014bc3f042c37ea53e2e4633c7ee2ad54af26f7c3e6cd2c ChangeLog 18044 +MISC ChangeLog 18203 RMD160 d2855c94689fffd4d8b50578789f4ecdd2abcd67 SHA1 a094b35e51a7953c4eea0e573d748418fb628b9a SHA256 297308f5398a37fb5a67af60398d92b19530bf0615ccd3c145535d3d16bb9121 +MD5 2358443f295c056544dd4091d0249e63 ChangeLog 18203 +RMD160 d2855c94689fffd4d8b50578789f4ecdd2abcd67 ChangeLog 18203 +SHA256 297308f5398a37fb5a67af60398d92b19530bf0615ccd3c145535d3d16bb9121 ChangeLog 18203 MISC metadata.xml 401 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 SHA1 4de99423d6ea2dc602310a18e89e6f889aafe972 SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f MD5 5c73abc1fe44fb1d866736316d2c89ac metadata.xml 401 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 metadata.xml 401 @@ -93,7 +93,7 @@ SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE/ty18zY1VwezZiERAhkKAKCM08R8AoIkauUieryhEmI/n5iulACglC4Q -63o04tpL2caaOQNp6uSbbMM= -=Bfrr +iD8DBQFE/+Eh8zY1VwezZiERAlD3AJ9whc6BQb/YUlOJGa4B5gap+kRwAQCfdBkC +4ydxyBumzVFeln/FN8Q04VQ= +=QZUM -----END PGP SIGNATURE----- diff --git a/net-ftp/proftpd/files/mod_sql_mysql.diff b/net-ftp/proftpd/files/mod_sql_mysql.diff index 473feeb9b344..be382c6835d2 100644 --- a/net-ftp/proftpd/files/mod_sql_mysql.diff +++ b/net-ftp/proftpd/files/mod_sql_mysql.diff @@ -1,128 +1,128 @@ -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); +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); -- 2.26.2