diff options
Diffstat (limited to 'ftp/proftpd-devel/files')
-rw-r--r-- | ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c | 50 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-ah | 10 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in | 11 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-doc::Configuration.html | 18 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-module::mod_auth_pam.c | 11 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-sample-configurations_basic.conf | 79 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-src-auth.c | 43 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/patch-src_proftpd.8.in | 15 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/proftpd.sh.in | 43 |
9 files changed, 0 insertions, 280 deletions
diff --git a/ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c b/ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c deleted file mode 100644 index 58f6f3d57056..000000000000 --- a/ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c +++ /dev/null @@ -1,50 +0,0 @@ ---- ./src/netio.c.orig Sun Oct 10 00:46:22 2004 -+++ ./src/netio.c Thu Oct 12 15:17:22 2006 -@@ -901,47 +901,6 @@ - cp = *pbuf->current++; - pbuf->remaining++; - -- switch (mode) { -- case IAC: -- switch (cp) { -- case WILL: -- case WONT: -- case DO: -- case DONT: -- mode = cp; -- continue; -- -- case IAC: -- mode = 0; -- break; -- -- default: -- /* Ignore */ -- mode = 0; -- continue; -- } -- break; -- -- case WILL: -- case WONT: -- pr_netio_printf(out_nstrm, "%c%c%c", IAC, DONT, cp); -- mode = 0; -- continue; -- -- case DO: -- case DONT: -- pr_netio_printf(out_nstrm, "%c%c%c", IAC, WONT, cp); -- mode = 0; -- continue; -- -- default: -- if (cp == IAC) { -- mode = cp; -- continue; -- } -- break; -- } -- - *bp++ = cp; - buflen--; - } diff --git a/ftp/proftpd-devel/files/patch-ah b/ftp/proftpd-devel/files/patch-ah deleted file mode 100644 index b534609737fc..000000000000 --- a/ftp/proftpd-devel/files/patch-ah +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/mod_auth_unix.c.orig 2006-06-29 09:16:23.000000000 -0800 -+++ modules/mod_auth_unix.c 2007-10-05 16:23:46.000000000 -0800 -@@ -57,6 +57,7 @@ - #endif /* HAVE_HPSECURITY_H or HPUX10 or HPUX11 */ - - #if defined(HAVE_PROT_H) || defined(COMSEC) -+# include <krb.h> - # include <prot.h> - #endif - diff --git a/ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in b/ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in deleted file mode 100644 index db1914062dd4..000000000000 --- a/ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/mod_wrap2/Makefile.in.orig 2007-01-08 19:16:11.000000000 -0900 -+++ contrib/mod_wrap2/Makefile.in 2007-10-05 14:02:38.000000000 -0800 -@@ -13,7 +13,7 @@ - MODULE_NAME=mod_wrap2 - - # Necessary redefinitions --INCLUDES=-I. -I../.. -I../../include -+INCLUDES=-I. -I../.. -I../../include -I/usr/local/include - CPPFLAGS= -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES) - LDFLAGS=-L../../lib - diff --git a/ftp/proftpd-devel/files/patch-doc::Configuration.html b/ftp/proftpd-devel/files/patch-doc::Configuration.html deleted file mode 100644 index 400699d4f8f1..000000000000 --- a/ftp/proftpd-devel/files/patch-doc::Configuration.html +++ /dev/null @@ -1,18 +0,0 @@ ---- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003 -+++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003 -@@ -4226,7 +4226,7 @@ - ></DT - ><DD - ><P -->ftp</P -+>ftpd</P - ></DD - ><DT - ><PRE -@@ -32252,4 +32252,4 @@ - ></DIV - ></BODY - ></HTML --> -\ No newline at end of file -+> diff --git a/ftp/proftpd-devel/files/patch-module::mod_auth_pam.c b/ftp/proftpd-devel/files/patch-module::mod_auth_pam.c deleted file mode 100644 index 6092c58f6d26..000000000000 --- a/ftp/proftpd-devel/files/patch-module::mod_auth_pam.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/mod_auth_pam.c.orig Thu Jan 2 13:25:20 2003 -+++ ./modules/mod_auth_pam.c Sat Mar 15 11:35:00 2003 -@@ -57,7 +57,7 @@ - #endif /* HAVE_PAM_PAM_APPL_H */ - - static pam_handle_t * pamh = NULL; --static char * pamconfig = "ftp"; -+static char * pamconfig = "ftpd"; - static char * pam_user = NULL; - static char * pam_pass = NULL; - static size_t pam_user_len = 0; diff --git a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf deleted file mode 100644 index 90ccbf9aff48..000000000000 --- a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf +++ /dev/null @@ -1,79 +0,0 @@ ---- sample-configurations/basic.conf.orig 2007-03-09 10:01:30.000000000 -0900 -+++ sample-configurations/basic.conf 2007-07-05 09:29:42.000000000 -0800 -@@ -1,3 +1,7 @@ -+# -+# For more informations about Proftpd configuration -+# look at : http://www.proftpd.org/ -+# - # This is a basic ProFTPD configuration file (rename it to - # 'proftpd.conf' for actual use. It establishes a single server - # and a single anonymous login. It assumes that you have a user/group -@@ -6,6 +10,7 @@ - ServerName "ProFTPD Default Installation" - ServerType standalone - DefaultServer on -+ScoreboardFile /var/run/proftpd.scoreboard - - # Port 21 is the standard FTP port. - Port 21 -@@ -22,6 +27,8 @@ - # (such as xinetd). - MaxInstances 30 - -+CommandBufferSize 512 -+ - # Set the user and group under which the server will run. - User nobody - Group nogroup -@@ -40,23 +47,31 @@ - - # A basic anonymous configuration, no upload directories. If you do not - # want anonymous users, simply delete this entire <Anonymous> section. --<Anonymous ~ftp> -- User ftp -- Group ftp -- -- # We want clients to be able to login with "anonymous" as well as "ftp" -- UserAlias anonymous ftp -- -- # Limit the maximum number of anonymous logins -- MaxClients 10 -- -- # We want 'welcome.msg' displayed at login, and '.message' displayed -- # in each newly chdired directory. -- DisplayLogin welcome.msg -- DisplayChdir .message -- -- # Limit WRITE everywhere in the anonymous chroot -- <Limit WRITE> -- DenyAll -- </Limit> --</Anonymous> -+ -+######################################################################### -+# # -+# Uncomment lines with only one # to allow basic anonymous access # -+# # -+######################################################################### -+ -+#<Anonymous ~ftp> -+# User ftp -+# Group ftp -+ -+ ### We want clients to be able to login with "anonymous" as well as "ftp" -+ # UserAlias anonymous ftp -+ -+ ### Limit the maximum number of anonymous logins -+ # MaxClients 10 -+ -+ ### We want 'welcome.msg' displayed at login, and '.message' displayed -+ ### in each newly chdired directory. -+ # DisplayLogin welcome.msg -+ # DisplayFirstChdir .message -+ -+ ### Limit WRITE everywhere in the anonymous chroot -+ # <Limit WRITE> -+ # DenyAll -+ # </Limit> -+#</Anonymous> -+ diff --git a/ftp/proftpd-devel/files/patch-src-auth.c b/ftp/proftpd-devel/files/patch-src-auth.c deleted file mode 100644 index 61386a883e9f..000000000000 --- a/ftp/proftpd-devel/files/patch-src-auth.c +++ /dev/null @@ -1,43 +0,0 @@ -ndex: src/auth.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/src/auth.c,v -retrieving revision 1.52 -diff -u -r1.52 auth.c ---- src/auth.c 5 Oct 2007 17:04:13 -0000 1.52 -+++ src/auth.c 8 Oct 2007 18:44:21 -0000 -@@ -503,6 +503,17 @@ - return res; - } - -+ if (MODRET_ISERROR(mr)) { -+ res = MODRET_ERROR(mr); -+ -+ if (cmd->tmp_pool) { -+ destroy_pool(cmd->tmp_pool); -+ cmd->tmp_pool = NULL; -+ } -+ -+ return res; -+ } -+ - m = NULL; - } - -@@ -566,6 +577,17 @@ - return res; - } - -+ if (MODRET_ISERROR(mr)) { -+ res = MODRET_ERROR(mr); -+ -+ if (cmd->tmp_pool) { -+ destroy_pool(cmd->tmp_pool); -+ cmd->tmp_pool = NULL; -+ } -+ -+ return res; -+ } -+ - m = NULL; - } - diff --git a/ftp/proftpd-devel/files/patch-src_proftpd.8.in b/ftp/proftpd-devel/files/patch-src_proftpd.8.in deleted file mode 100644 index 9578f30ec3b3..000000000000 --- a/ftp/proftpd-devel/files/patch-src_proftpd.8.in +++ /dev/null @@ -1,15 +0,0 @@ ---- src/proftpd.8.in.orig Sat Sep 18 07:40:30 2004 -+++ src/proftpd.8.in Thu Nov 3 15:35:56 2005 -@@ -22,6 +22,12 @@ - connection to the FTP service is made, or alternatively it can be run as a - standalone daemon. - .PP -+.br -+Each successful and failed ftp(1) session is logged using syslog with a -+facility of LOG_FTP. Note: LOG_FTP messages are not displayed -+by syslogd(8) by default, and may have to be enabled in syslogd(8)'s -+configuration file. -+.PP - When - .B proftpd - is run in standalone mode and it receives a SIGHUP then it will reread its diff --git a/ftp/proftpd-devel/files/proftpd.sh.in b/ftp/proftpd-devel/files/proftpd.sh.in deleted file mode 100644 index 5e72d10cfb88..000000000000 --- a/ftp/proftpd-devel/files/proftpd.sh.in +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: proftpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable proftpd: -# -#proftpd_enable="YES" -# -# See proftpd(8) for flags -# - -. %%RC_SUBR%% - -name=proftpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/proftpd -pidfile=/var/run/proftpd.pid -required_files=%%PREFIX%%/etc/proftpd.conf - -stop_postcmd=stop_postcmd - -stop_postcmd() -{ - rm -f $pidfile -} - -# set defaults - -proftpd_enable=${proftpd_enable:-"NO"} -proftpd_flags=${proftpd_flags:-""} - -extra_commands="reload" - -load_rc_config $name -run_rc_command "$1" |