diff options
author | 2006-09-23 18:17:51 +0000 | |
---|---|---|
committer | 2006-09-23 18:17:51 +0000 | |
commit | 305798f758d954dcfe97ac2fa7120a6e32862837 (patch) | |
tree | ea9a49c847debfc9172a0c6b054b3fe91e704a51 /net-ftp/proftpd/files | |
parent | Cleanup proftpd. (diff) | |
download | gentoo-2-305798f758d954dcfe97ac2fa7120a6e32862837.tar.gz gentoo-2-305798f758d954dcfe97ac2fa7120a6e32862837.tar.bz2 gentoo-2-305798f758d954dcfe97ac2fa7120a6e32862837.zip |
Cleanup proftpd.
(Portage version: 2.1.2_pre1)
(Unsigned Manifest commit)
Diffstat (limited to 'net-ftp/proftpd/files')
-rw-r--r-- | net-ftp/proftpd/files/1.2.9_rc3-reversedns.diff | 48 | ||||
-rw-r--r-- | net-ftp/proftpd/files/ftp.pamd | 17 | ||||
-rw-r--r-- | net-ftp/proftpd/files/ftp.pamd-include | 16 | ||||
-rw-r--r-- | net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch | 12 | ||||
-rw-r--r-- | net-ftp/proftpd/files/mod_sql_mysql.diff | 128 | ||||
-rw-r--r-- | net-ftp/proftpd/files/mod_sql_postgres.c.patch | 11 | ||||
-rw-r--r-- | net-ftp/proftpd/files/openssl-0.9.8.patch | 21 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-1.2.9-makefile.patch | 15 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-1.2.9-privescal-fix.patch | 20 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-ftpshut.patch | 24 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-sqlshowinfo.patch | 38 | ||||
-rwxr-xr-x | net-ftp/proftpd/files/proftpd.rc6-r2 | 29 |
12 files changed, 0 insertions, 379 deletions
diff --git a/net-ftp/proftpd/files/1.2.9_rc3-reversedns.diff b/net-ftp/proftpd/files/1.2.9_rc3-reversedns.diff deleted file mode 100644 index aa7ede335202..000000000000 --- a/net-ftp/proftpd/files/1.2.9_rc3-reversedns.diff +++ /dev/null @@ -1,48 +0,0 @@ -Index: include/netaddr.h -=================================================================== -RCS file: /cvsroot/proftp/proftpd/include/netaddr.h,v -retrieving revision 1.13 -diff -u -r1.13 netaddr.h ---- include/netaddr.h 11 Oct 2003 16:57:24 -0000 1.13 -+++ include/netaddr.h 17 Oct 2003 14:14:36 -0000 -@@ -160,7 +160,8 @@ - int pr_netaddr_loopback(const pr_netaddr_t *); - - /* Returns TRUE if the given pr_netaddr_t is of the AF_INET6 family and -- * contains an IPv4-mapped IPv6 address; otherwise FALSE is returned. -+ * contains an IPv4-mapped IPv6 address; otherwise FALSE is returned. A -+ * return value of -1 is used to indicate an error. - */ - int pr_netaddr_is_v4mappedv6(const pr_netaddr_t *); - -Index: modules/mod_core.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/modules/mod_core.c,v -retrieving revision 1.194 -diff -u -r1.194 mod_core.c ---- modules/mod_core.c 17 Oct 2003 13:19:54 -0000 1.194 -+++ modules/mod_core.c 17 Oct 2003 14:14:37 -0000 - * address if the remote client address is an IPv4-mapped IPv6 address. - */ - if (pr_netaddr_get_family(remote_addr) == AF_INET6 && -- !pr_netaddr_is_v4mappedv6(remote_addr)) { -+ pr_netaddr_is_v4mappedv6(remote_addr) != TRUE) { - log_pri(PR_LOG_WARNING, "Refused PORT %s (IPv4/IPv6 address mismatch)", - cmd->arg); - pr_response_add_err(R_500, "Illegal PORT command"); -Index: src/netaddr.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/src/netaddr.c,v -retrieving revision 1.32 -diff -u -r1.32 netaddr.c ---- src/netaddr.c 14 Oct 2003 18:22:16 -0000 1.32 -+++ src/netaddr.c 17 Oct 2003 14:14:37 -0000 -@@ -631,7 +631,7 @@ - void *inaddr = pr_netaddr_get_inaddr(na); - - #ifdef HAVE_GETHOSTBYNAME2 -- if (pr_netaddr_is_v4mappedv6(na)) { -+ if (pr_netaddr_is_v4mappedv6(na) == TRUE) { - family = AF_INET; - inaddr = get_v4inaddr(na); - } diff --git a/net-ftp/proftpd/files/ftp.pamd b/net-ftp/proftpd/files/ftp.pamd deleted file mode 100644 index 9f7b8c6489bb..000000000000 --- a/net-ftp/proftpd/files/ftp.pamd +++ /dev/null @@ -1,17 +0,0 @@ -#%PAM-1.0 - -auth required /lib/security/pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed -auth required /lib/security/pam_stack.so service=system-auth - -# If this is enabled, anonymous logins will fail because the 'ftp' user does -# not have a "valid" shell, as listed in /etc/shells. -# -# If you enable this, it is recommended that you do *not* give the 'ftp' -# user a real shell. Instead, give the 'ftp' user /bin/false for a shell and -# add /bin/false to /etc/shells. -#auth required /lib/security/pam_shells.so - -account required /lib/security/pam_stack.so service=system-auth - -session required /lib/security/pam_stack.so service=system-auth - diff --git a/net-ftp/proftpd/files/ftp.pamd-include b/net-ftp/proftpd/files/ftp.pamd-include deleted file mode 100644 index 15a6c0370e5f..000000000000 --- a/net-ftp/proftpd/files/ftp.pamd-include +++ /dev/null @@ -1,16 +0,0 @@ -#%PAM-1.0 - -# Disabled by default as it's a non-ported module for now -# auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed -auth include system-auth - -# If this is enabled, anonymous logins will fail because the 'ftp' user does -# not have a "valid" shell, as listed in /etc/shells. -# -# If you enable this, it is recommended that you do *not* give the 'ftp' -# user a real shell. Instead, give the 'ftp' user /bin/false for a shell and -# add /bin/false to /etc/shells. -# auth required pam_shells.so - -account include system-auth -session include system-auth diff --git a/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch b/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch deleted file mode 100644 index 8cfdd22a04ad..000000000000 --- a/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- proftpd-1.2.10/contrib/mod_quotatab_sql.c.orig 2006-09-04 11:21:09.000000000 +0000 -+++ proftpd-1.2.10/contrib/mod_quotatab_sql.c 2006-09-04 11:22:27.000000000 +0000 -@@ -684,8 +684,7 @@ - return NULL; - } - -- tab->tab_data = pcalloc(tab->tab_pool, sizeof(char)); -- ((char *) tab->tab_data) = pstrdup(tab->tab_pool, select_query); -+ tab->tab_data = (void *) pstrdup(tab->tab_pool, select_query); - } - - /* Set all the necessary function pointers. */ diff --git a/net-ftp/proftpd/files/mod_sql_mysql.diff b/net-ftp/proftpd/files/mod_sql_mysql.diff deleted file mode 100644 index be382c6835d2..000000000000 --- a/net-ftp/proftpd/files/mod_sql_mysql.diff +++ /dev/null @@ -1,128 +0,0 @@ -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/mod_sql_postgres.c.patch b/net-ftp/proftpd/files/mod_sql_postgres.c.patch deleted file mode 100644 index c6b5578db3be..000000000000 --- a/net-ftp/proftpd/files/mod_sql_postgres.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mod_sql_postgres.c 2001-11-30 18:34:16.000000000 +0100 -+++ patch 2002-06-28 00:19:15.000000000 +0200 -@@ -35,7 +35,7 @@ - - #define _POSTGRES_PORT "5432" - --#include <pgsql/libpq-fe.h> -+#include <postgresql/libpq-fe.h> - #include "conf.h" - #include "../contrib/mod_sql.h" - diff --git a/net-ftp/proftpd/files/openssl-0.9.8.patch b/net-ftp/proftpd/files/openssl-0.9.8.patch deleted file mode 100644 index 7601d4b26a4d..000000000000 --- a/net-ftp/proftpd/files/openssl-0.9.8.patch +++ /dev/null @@ -1,21 +0,0 @@ -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/files/proftpd-1.2.9-makefile.patch b/net-ftp/proftpd/files/proftpd-1.2.9-makefile.patch deleted file mode 100644 index 6fba7dbc4320..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.2.9-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig 2004-01-28 19:11:27.400918368 +0000 -+++ Makefile.in 2004-01-28 19:11:33.818942680 +0000 -@@ -58,10 +58,10 @@ - ftpshut$(EXEEXT): utils - $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) - --ftptop$(EXEEXT): utils -+ftptop$(EXEEXT): utils lib - $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) -lsupp - --ftpwho$(EXEEXT): utils -+ftpwho$(EXEEXT): utils lib - $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp - - diff --git a/net-ftp/proftpd/files/proftpd-1.2.9-privescal-fix.patch b/net-ftp/proftpd/files/proftpd-1.2.9-privescal-fix.patch deleted file mode 100644 index 76204e4ad0de..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.2.9-privescal-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- proftpd/src/dirtree.c 1 Nov 2003 07:11:07 -0000 1.125 -+++ proftpd/src/dirtree.c 4 Nov 2003 21:18:25 -0000 -@@ -1556,10 +1556,14 @@ - - if (cidr_mode) { - /* NOTE: encapsulation breakage note/IPv6 change needed here. */ --#if 0 -- if ((cli_addr->s_addr & htonl(cidr_mask)) == cidr_addr.s_addr) --#endif -+ -+ if (pr_netaddr_get_family(cli_addr) == AF_INET) { -+ struct in_addr *cli_in_addr = pr_netaddr_get_inaddr(cli_addr); -+ if ((cli_in_addr->s_addr & htonl(cidr_mask)) == cidr_addr.s_addr) { - return 1; -+ } -+ }; -+ - - } else { - pr_netaddr_t *acl_addr = NULL; diff --git a/net-ftp/proftpd/files/proftpd-ftpshut.patch b/net-ftp/proftpd/files/proftpd-ftpshut.patch deleted file mode 100644 index 17a57f938eca..000000000000 --- a/net-ftp/proftpd/files/proftpd-ftpshut.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/response.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/src/response.c,v -retrieving revision 1.4 -diff -u -r1.4 response.c ---- src/response.c 3 Jun 2003 16:25:23 -0000 1.4 -+++ src/response.c 27 Jun 2005 23:03:35 -0000 -@@ -1,6 +1,6 @@ - /* - * ProFTPD - FTP server daemon -- * Copyright (c) 2001, 2002, 2003 The ProFTPD Project team -+ * Copyright (c) 2001-2005 The ProFTPD Project team - * - * 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 -@@ -169,7 +169,7 @@ - buf[sizeof(buf) - 1] = '\0'; - sstrcat(buf, "\r\n", sizeof(buf)); - -- RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, buf, strlen(buf)) -+ RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, "%s", buf) - } - - void pr_response_send(const char *resp_numeric, const char *fmt, ...) { diff --git a/net-ftp/proftpd/files/proftpd-sqlshowinfo.patch b/net-ftp/proftpd/files/proftpd-sqlshowinfo.patch deleted file mode 100644 index 9bf501a3d2da..000000000000 --- a/net-ftp/proftpd/files/proftpd-sqlshowinfo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- /var/tmp/portage/proftpd-1.2.10-r7/work/proftpd-1.2.10/contrib/mod_sql.c 2004-08-03 01:44:31.000000000 +0100 -+++ contrib/mod_sql.c 2005-07-29 16:36:08.251407235 +0100 -@@ -2036,7 +2036,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add( c->argv[0], outs); -+ pr_response_add(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - -@@ -2110,7 +2110,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add( c->argv[0], outs); -+ pr_response_add(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - -@@ -2201,7 +2201,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add_err( c->argv[0], outs); -+ pr_response_add_err(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - -@@ -2275,7 +2275,7 @@ - *outsp++ = 0; - - /* add the response */ -- pr_response_add( c->argv[0], outs); -+ pr_response_add(c->argv[0], "%s", outs); - - } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL); - diff --git a/net-ftp/proftpd/files/proftpd.rc6-r2 b/net-ftp/proftpd/files/proftpd.rc6-r2 deleted file mode 100755 index 422e16e768ac..000000000000 --- a/net-ftp/proftpd/files/proftpd.rc6-r2 +++ /dev/null @@ -1,29 +0,0 @@ -#!/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-r2,v 1.1 2006/06/23 15:28:34 humpback Exp $ - -depend() { - need net -} - -checkconfig() { - if [ ! -e /etc/proftpd/proftpd.conf ] ; then - eerror "You need an /etc/proftpd/proftpd.conf file first" - eerror "There is a sample file in /etc/proftpd" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting proftpd" - start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/proftpd.pid --exec /usr/sbin/proftpd - eend $? -} - -stop() { - ebegin "Stopping proftpd" - start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/proftpd.pid - eend $? -} |