summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Felisberto <humpback@gentoo.org>2006-09-06 14:35:22 +0000
committerGustavo Felisberto <humpback@gentoo.org>2006-09-06 14:35:22 +0000
commit79aff805ccf4fd7d3490fc0527841f38fd12003e (patch)
tree7f5a093f2f057bf2df6fb6201d06e5016387e643 /net-ftp
parentMarked ppc stable for bug #145033. (diff)
downloadhistorical-79aff805ccf4fd7d3490fc0527841f38fd12003e.tar.gz
historical-79aff805ccf4fd7d3490fc0527841f38fd12003e.tar.bz2
historical-79aff805ccf4fd7d3490fc0527841f38fd12003e.zip
updated patch and added patch for openssl 0.9.8 issue
Package-Manager: portage-2.1.1_rc1-r4
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/proftpd/ChangeLog8
-rw-r--r--net-ftp/proftpd/Manifest48
-rw-r--r--net-ftp/proftpd/files/digest-proftpd-1.2.10-r74
-rw-r--r--net-ftp/proftpd/files/mod_sql_mysql.diff188
-rw-r--r--net-ftp/proftpd/files/openssl-0.9.8.patch21
-rw-r--r--net-ftp/proftpd/proftpd-1.2.10-r7.ebuild5
6 files changed, 195 insertions, 79 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index b2c4a1432c38..4a4ad8693f51 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,12 @@
# 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.111 2006/09/06 12:42:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.112 2006/09/06 14:35:22 humpback Exp $
+
+ 06 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>;
+ +files/openssl-0.9.8.patch, files/mod_sql_mysql.diff,
+ proftpd-1.2.10-r7.ebuild:
+ Updated Unix socket patch for mysql auth in 1.3.0 (bug #111668). Added patch
+ to build 1.2.10 with openssl 0.9.8 (bug #146534).
06 Sep 2006; Markus Rothe <corsair@gentoo.org> proftpd-1.3.0-r1.ebuild:
Stable on ppc64; bug #146538
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index d8ae16319d62..d6c01be1475a 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 1.2.9_rc3-reversedns.diff 1974 RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a SHA1 55eaf2f9c230f309602a728acb7f5a794398aa9c SHA256 c6065fbe185cc0b1194d765a59161eec7ea0e2312885a7440e80279899848efd
MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a files/1.2.9_rc3-reversedns.diff 1974
@@ -14,14 +17,18 @@ 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 1902 RMD160 0a00efe985eb7026f5cab1a2b07804c064abece1 SHA1 1ad7502337e20251fe711f68281a04e152c2f6e6 SHA256 a1dee2545df1c00331c6c2ebd613a215a44c7f78f2f603b5c3371e80c29bc03f
-MD5 2524305e432b908452a334889e47e347 files/mod_sql_mysql.diff 1902
-RMD160 0a00efe985eb7026f5cab1a2b07804c064abece1 files/mod_sql_mysql.diff 1902
-SHA256 a1dee2545df1c00331c6c2ebd613a215a44c7f78f2f603b5c3371e80c29bc03f files/mod_sql_mysql.diff 1902
+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_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
SHA256 e5cb4bc7ef72e4972a8c024e5e93fc4b1dfc0d215ec3bde3c3094b1f00c330cd files/mod_sql_postgres.c.patch 275
+AUX openssl-0.9.8.patch 612 RMD160 066c9821e8452024cfdf4749289abfb0c28bff37 SHA1 9e02ffab52017f2e97efc7c817a7fd3ec66856e5 SHA256 f3997cd5be7a095116a888dd8fada2c519d84ddb1e07b0db43928e8963c84080
+MD5 0ff3251054f1ab76e4e9090397abbaf6 files/openssl-0.9.8.patch 612
+RMD160 066c9821e8452024cfdf4749289abfb0c28bff37 files/openssl-0.9.8.patch 612
+SHA256 f3997cd5be7a095116a888dd8fada2c519d84ddb1e07b0db43928e8963c84080 files/openssl-0.9.8.patch 612
AUX proftpd-1.2.9-makefile.patch 434 RMD160 576703b5b59c4b029817176aa63ed1d5c2608b97 SHA1 fc17de1c5752c57b5f13e843f4977058f272e987 SHA256 5260b76d589dbef8864e10e74ddad3c13119a4a5bc06dbbdc3393328ded0c649
MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
RMD160 576703b5b59c4b029817176aa63ed1d5c2608b97 files/proftpd-1.2.9-makefile.patch 434
@@ -56,30 +63,37 @@ RMD160 c5c829319e901f478fe58b920347cc1b8706a366 files/proftpd.xinetd 295
SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d files/proftpd.xinetd 295
DIST mod_clamav.c 6338 RMD160 0a642be8149ee118426bf04d04eca5b2250ea2b2 SHA1 721ab740ce960237b668585934c03cb5b6dc7ae7 SHA256 d3b7da4b145b355fe4d05f453d6803a7c6b0bf99af2aedbd65431ae6b98a4db7
DIST mod_clamav.html 4151 RMD160 8ada0d2126ff1977d9277e0f5a1464caaf5f7b62 SHA1 ef19409f04ea36007a81086f3f90028580d843be SHA256 4e6c3936ba307376561dd164c52964c14a83bcb23fd5801eaaab22be325370bc
-DIST proftpd-1.2.10.tar.bz2 920337
+DIST proftpd-1.2.10.tar.bz2 920337 RMD160 198dc321fab5dde37465880d41bbab29f39c3c4b SHA1 5e3a4d7ae65429a5e3c2934db4ed36a19f41eb0b SHA256 5607d70b8cae3a99e60dcbc4a8286f6de2e10d765136d97834fafd75783c0b25
DIST proftpd-1.3.0.tar.bz2 1386086 RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec SHA1 d117134035a3d8d130c5aa44d6b1788683a33410 SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe
-DIST proftpd-mod-shaper-0.5.5.tar.gz 18090
+DIST proftpd-mod-shaper-0.5.5.tar.gz 18090 RMD160 ef99f3b1e6cf4d4461ab7463bf65dc5ef8e21697 SHA1 667b59184aa08e6f5ad7a2edc3c949b8534cf5af SHA256 eb079bf98ef382086b952977cac1a84c2add9d7add4f8b989c7bd67d8ab61696
DIST proftpd-mod-shaper-0.5.6.tar.gz 18099 RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 SHA1 33af13cf95374e0118fd6fece63d5fa55779810a SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827
DIST proftpd-mod-vroot-0.7.1.tar.gz 5613 RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 SHA1 e773f850d5736ecede45304eca7b3ff339fdcd8c SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1
-EBUILD proftpd-1.2.10-r7.ebuild 4664 RMD160 1c5b47cabf4d0135fa26467557dfc96ec52a2f16 SHA1 2a7e9e16b28f2a4584486e79f1ad7dfa258bb5b1 SHA256 4678e7ef2b2e7e661f82f5d84d230fb87f56f110c1bc8e0f81d860993dc23b3a
-MD5 71b03d1903b7d93a9588bd4b3207905a proftpd-1.2.10-r7.ebuild 4664
-RMD160 1c5b47cabf4d0135fa26467557dfc96ec52a2f16 proftpd-1.2.10-r7.ebuild 4664
-SHA256 4678e7ef2b2e7e661f82f5d84d230fb87f56f110c1bc8e0f81d860993dc23b3a proftpd-1.2.10-r7.ebuild 4664
+EBUILD proftpd-1.2.10-r7.ebuild 4755 RMD160 5857608371ad746710db264b2ba7402780a0d9ef SHA1 04ccbb12595302169e866ec3434a0f53c183b15d SHA256 49e1087358cf7b8dcc24f54c33bb6a873df23dca951b3ad6e27252ba62d20059
+MD5 fff6a4f95b0c16243cded6929ef540bf proftpd-1.2.10-r7.ebuild 4755
+RMD160 5857608371ad746710db264b2ba7402780a0d9ef proftpd-1.2.10-r7.ebuild 4755
+SHA256 49e1087358cf7b8dcc24f54c33bb6a873df23dca951b3ad6e27252ba62d20059 proftpd-1.2.10-r7.ebuild 4755
EBUILD proftpd-1.3.0-r1.ebuild 5407 RMD160 c08a32489051a6efc44ff7fa4590a421bd5e0e43 SHA1 af248ada78d060f282ceb317ec91f37d75bf8f19 SHA256 78932612b20b891b057058951c58e2e6a19590aad24fbc9db74c789b50ed5156
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 17770 RMD160 b4cb437f1789307017bdf609fdf0226a26240b4b SHA1 b0b83882e2bdb5227046cb4d31b3d954090da937 SHA256 ce5d4dc49d00aae4e7ecb1cd55ad3e3b84d327f8426cddcc3464a248703e1c2c
-MD5 d6c002f2349e4c498b76790c40d1e4ae ChangeLog 17770
-RMD160 b4cb437f1789307017bdf609fdf0226a26240b4b ChangeLog 17770
-SHA256 ce5d4dc49d00aae4e7ecb1cd55ad3e3b84d327f8426cddcc3464a248703e1c2c ChangeLog 17770
+MISC ChangeLog 18044 RMD160 a5c45f7ff6c51096d1b0476f6e2c775d8a791c24 SHA1 0fd967b739aae219adccf0c36c2101fa779f8443 SHA256 bb015ae8708056482014bc3f042c37ea53e2e4633c7ee2ad54af26f7c3e6cd2c
+MD5 df53b85bb4b5041185f4890d8d70df7a ChangeLog 18044
+RMD160 a5c45f7ff6c51096d1b0476f6e2c775d8a791c24 ChangeLog 18044
+SHA256 bb015ae8708056482014bc3f042c37ea53e2e4633c7ee2ad54af26f7c3e6cd2c ChangeLog 18044
MISC metadata.xml 401 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 SHA1 4de99423d6ea2dc602310a18e89e6f889aafe972 SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f
MD5 5c73abc1fe44fb1d866736316d2c89ac metadata.xml 401
RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 metadata.xml 401
SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f metadata.xml 401
-MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r7 142
-RMD160 0ca845195d9659ea72d00d5755ffce659a7df751 files/digest-proftpd-1.2.10-r7 142
-SHA256 f85d284ae51d8763204788be6fc821d9daa429876f141cee641cf2cdcdf312c4 files/digest-proftpd-1.2.10-r7 142
+MD5 d8ff66c411bfd99d5551438fd5b2736a files/digest-proftpd-1.2.10-r7 518
+RMD160 ec25a22bf78ee25df0c5168defeb6fe6db6cf179 files/digest-proftpd-1.2.10-r7 518
+SHA256 ea87bf530416e83405291521ef6268680a3b6a93cb982098e22e2ba9ebdac203 files/digest-proftpd-1.2.10-r7 518
MD5 35995cbe20ae79ce7bfe3c607082f42d files/digest-proftpd-1.3.0-r1 1214
RMD160 a3b3282020c26af5c1725d10c26e98bcccda3d36 files/digest-proftpd-1.3.0-r1 1214
SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/digest-proftpd-1.3.0-r1 1214
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE/ty18zY1VwezZiERAhkKAKCM08R8AoIkauUieryhEmI/n5iulACglC4Q
+63o04tpL2caaOQNp6uSbbMM=
+=Bfrr
+-----END PGP SIGNATURE-----
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;
+ }
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
index 555fcd7246e9..3398dc2de699 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.9 2006/09/04 23:50:32 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.10 2006/09/06 14:35:22 humpback Exp $
inherit flag-o-matic eutils
@@ -46,6 +46,9 @@ src_unpack() {
# Fix gcc4 compile error, bug #145940
epatch "${FILESDIR}/gcc4-mod_quotatab_sql.patch"
+
+ #Fix openssl 0.9.8 compile error, bug #146534
+ epatch "${FILESDIR}/openssl-0.9.8.patch"
}
src_compile() {