- Remove cyrillic-fix-netio.c (handled by CODECONV)

- Bump portrevision

PR:		ports/122355
Submitted by:	Alex Keda <admin@lissyara.su>

6 files changed, 4 insertions, 374 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index ce72f9182cbf..149f226246c7 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -82,7 +82,6 @@ OPTIONS=	IPV6 "Use IPv6" off \
 		QUOTATAB_RADIUS "include mod_quotatab_radius" off \
 		BAN "Include mod_ban (Requires CTRLS)" off \
 		NLS "Use nls (builds mod_lang)" off \
-		CYRFIX "Patch to fix cyrillic encoding" off \
 		CLAMAV "Include mod_clamav" off \
 		DIGEST "Include mod_digest" off \
 		COMB "Include mod_comb (multistream upload)" off \
@@ -161,10 +160,6 @@ USE_GETTEXT=yes
 PROFTPD_LIBS+=	-lintl -L${LOCALBASE}/lib
 .endif
 
-.if defined (WITH_CYRFIX)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-cyrillic-fix-netio.c
-.endif
-
 #allow user to override
 MODULES?=	mod_ratio:mod_readme:mod_rewrite:mod_wrap2:mod_ifsession
 
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/extra-patch-mod-codeconv b/ftp/proftpd-devel/files/extra-patch-mod-codeconv
index 47e01995a83e..7eca71fea9f4 100644
--- a/ftp/proftpd-devel/files/extra-patch-mod-codeconv
+++ b/ftp/proftpd-devel/files/extra-patch-mod-codeconv
@@ -233,137 +233,7 @@ diff -r -u -P modules/mod_codeconv.c modules/mod_codeconv.c
 +	codeconv_sess_init
 +
 +};
-diff -r -u -P modules/mod_df.c modules/mod_df.c
---- modules/mod_df.c	1970-01-01 03:00:00.000000000 +0300
-+++ modules/mod_df.c	2008-03-24 02:55:39.000000000 +0300
-@@ -0,0 +1,127 @@
-+/*
-+ * ProFTPD: mod_df -- ¥Ç¥£¥¹¥¯¶õ¤­ÍÆÎÌÄÌÃΥ⥸¥å¡¼¥ë
-+ *
-+ * Copyright (c) 2002 by TSUJIKAWA Tohru <tsujikawa@tsg.ne.jp>
-+ *
-+ * 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
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
-+ *
-+ */
-+
-+ /*
-+   **** for Linux only ****
-+
-+   CWD/CDUP ¥³¥Þ¥ó¥É¤Î¥ê¥¶¥ë¥È¤ÇÅö³º¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Î¥Ç¥£¥¹¥¯¶õ¤­ÍÆÎ̤òÄÌÃΤ¹¤ë¥â¥¸¥å¡¼¥ë¤Ç¤¹¡£
-+
-+   statfs() ¤Î»ÅÍ;塤64bit ÍѤ˥³¥ó¥Ñ¥¤¥ë¤·¤Ê¤¤¾ì¹ç¤Ï 2TB °Ê¾å¤Î¥Ç¥£¥¹¥¯¤Î»þ¤Ë
-+   Àµ¾ï¤ÊÃͤòÊÖ¤µ¤Ê¤¤¤³¤È¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡£
-+
-+ */
-+
-+
-+#include	"conf.h"
-+#include	<sys/vfs.h>
-+
-+
-+//
-+// ½é´ü²½
-+//
-+static int df_init(void)
-+{
-+	return 0;
-+}
-+
-+static int df_sess_init(void)
-+{
-+	return 0;
-+}
-+
-+
-+//
-+// module handler
-+//
-+MODRET df_post_cwd(cmd_rec* cmd)
-+{
-+	char	buf[PATH_MAX+1];
-+	struct statfs	sfs;
-+
-+	if (getcwd(buf, sizeof(buf)) && statfs(buf, &sfs) == 0) {
-+		long long	f = (long long)sfs.f_bavail * (long long)sfs.f_bsize;
-+		if (f >= ((long long)1 << 10)*1000000000L) {
-+			sprintf(buf, "Disk free space at this directory is %lld,%03lld,%03lld MB.",
-+					(f >> 20)/1000000, (f >> 20)/1000%1000, (f >> 20)%1000);
-+		} else if (f >= ((long long)1 << 10)*1000000) {
-+			sprintf(buf, "Disk free space at this directory is %lld,%03lld,%03lld KB.",
-+					(f >> 10)/1000000, (f >> 10)/1000%1000, (f >> 10)%1000);
-+		} else if (f >= ((long long)1 << 10)*1000) {
-+			sprintf(buf, "DISK FREE SPACE AT THIS DIRECTORY IS ONLY %lld,%03lld KB.", (f >> 10)/1000, (f >> 10)%1000);
-+		} else if (f >= 1000) {
-+			sprintf(buf, "DISK FREE SPACE AT THIS DIRECTORY IS ONLY %lld,%03lld Bytes.", f/1000, f%1000);
-+		} else {
-+			sprintf(buf, "DISK FREE SPACE AT THIS DIRECTORY IS ONLY %lld Bytes.", f);
-+		}
-+		pr_response_send_raw("250-%s", buf);
-+	}
-+	return HANDLED(cmd);
-+}
-+
-+
-+//
-+// module ÍÑ directive
-+//
-+static conftable df_conftab[] = {
-+	{ NULL }						// directive ¤Ï¥µ¥Ý¡¼¥È¤·¤Ê¤¤
-+};
-+
-+
-+//
-+// trap ¤¹¤ë¥³¥Þ¥ó¥É°ìÍ÷
-+//
-+static cmdtable df_cmdtab[] = {
-+	{ POST_CMD,		C_CWD,	G_NONE, df_post_cwd,	FALSE, FALSE },
-+	{ POST_CMD,		C_CDUP,	G_NONE, df_post_cwd,	FALSE, FALSE },
-+	{ 0,			NULL }
-+};
-+
-+
-+//
-+// module ¾ðÊó
-+//
-+module df_module = {
-+
-+	/* Always NULL */
-+	NULL, NULL,
-+
-+	/* Module API version (2.0) */
-+	0x20,
-+
-+	/* Module name */
-+	"df",
-+
-+	/* Module configuration directive handlers */
-+	df_conftab,
-+
-+	/* Module command handlers */
-+	df_cmdtab,
-+
-+	/* Module authentication handlers (none in this case) */
-+	NULL,
-+
-+	/* Module initialization */
-+	df_init,
-+
-+	/* Session initialization */
-+	df_sess_init
-+
-+};
+
 diff -r -u -P modules/mod_ls.c modules/mod_ls.c
 --- modules/mod_ls.c	2007-09-28 04:53:59.000000000 +0400
 +++ modules/mod_ls.c	2008-03-24 02:55:39.000000000 +0300
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index ce72f9182cbf..149f226246c7 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -82,7 +82,6 @@ OPTIONS=	IPV6 "Use IPv6" off \
 		QUOTATAB_RADIUS "include mod_quotatab_radius" off \
 		BAN "Include mod_ban (Requires CTRLS)" off \
 		NLS "Use nls (builds mod_lang)" off \
-		CYRFIX "Patch to fix cyrillic encoding" off \
 		CLAMAV "Include mod_clamav" off \
 		DIGEST "Include mod_digest" off \
 		COMB "Include mod_comb (multistream upload)" off \
@@ -161,10 +160,6 @@ USE_GETTEXT=yes
 PROFTPD_LIBS+=	-lintl -L${LOCALBASE}/lib
 .endif
 
-.if defined (WITH_CYRFIX)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-cyrillic-fix-netio.c
-.endif
-
 #allow user to override
 MODULES?=	mod_ratio:mod_readme:mod_rewrite:mod_wrap2:mod_ifsession
 
diff --git a/ftp/proftpd/files/extra-patch-cyrillic-fix-netio.c b/ftp/proftpd/files/extra-patch-cyrillic-fix-netio.c
deleted file mode 100644
index 58f6f3d57056..000000000000
--- a/ftp/proftpd/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/files/extra-patch-mod-codeconv b/ftp/proftpd/files/extra-patch-mod-codeconv
index 47e01995a83e..7eca71fea9f4 100644
--- a/ftp/proftpd/files/extra-patch-mod-codeconv
+++ b/ftp/proftpd/files/extra-patch-mod-codeconv
@@ -233,137 +233,7 @@ diff -r -u -P modules/mod_codeconv.c modules/mod_codeconv.c
 +	codeconv_sess_init
 +
 +};
-diff -r -u -P modules/mod_df.c modules/mod_df.c
---- modules/mod_df.c	1970-01-01 03:00:00.000000000 +0300
-+++ modules/mod_df.c	2008-03-24 02:55:39.000000000 +0300
-@@ -0,0 +1,127 @@
-+/*
-+ * ProFTPD: mod_df -- ¥Ç¥£¥¹¥¯¶õ¤­ÍÆÎÌÄÌÃΥ⥸¥å¡¼¥ë
-+ *
-+ * Copyright (c) 2002 by TSUJIKAWA Tohru <tsujikawa@tsg.ne.jp>
-+ *
-+ * 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
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
-+ *
-+ */
-+
-+ /*
-+   **** for Linux only ****
-+
-+   CWD/CDUP ¥³¥Þ¥ó¥É¤Î¥ê¥¶¥ë¥È¤ÇÅö³º¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Î¥Ç¥£¥¹¥¯¶õ¤­ÍÆÎ̤òÄÌÃΤ¹¤ë¥â¥¸¥å¡¼¥ë¤Ç¤¹¡£
-+
-+   statfs() ¤Î»ÅÍ;塤64bit ÍѤ˥³¥ó¥Ñ¥¤¥ë¤·¤Ê¤¤¾ì¹ç¤Ï 2TB °Ê¾å¤Î¥Ç¥£¥¹¥¯¤Î»þ¤Ë
-+   Àµ¾ï¤ÊÃͤòÊÖ¤µ¤Ê¤¤¤³¤È¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡£
-+
-+ */
-+
-+
-+#include	"conf.h"
-+#include	<sys/vfs.h>
-+
-+
-+//
-+// ½é´ü²½
-+//
-+static int df_init(void)
-+{
-+	return 0;
-+}
-+
-+static int df_sess_init(void)
-+{
-+	return 0;
-+}
-+
-+
-+//
-+// module handler
-+//
-+MODRET df_post_cwd(cmd_rec* cmd)
-+{
-+	char	buf[PATH_MAX+1];
-+	struct statfs	sfs;
-+
-+	if (getcwd(buf, sizeof(buf)) && statfs(buf, &sfs) == 0) {
-+		long long	f = (long long)sfs.f_bavail * (long long)sfs.f_bsize;
-+		if (f >= ((long long)1 << 10)*1000000000L) {
-+			sprintf(buf, "Disk free space at this directory is %lld,%03lld,%03lld MB.",
-+					(f >> 20)/1000000, (f >> 20)/1000%1000, (f >> 20)%1000);
-+		} else if (f >= ((long long)1 << 10)*1000000) {
-+			sprintf(buf, "Disk free space at this directory is %lld,%03lld,%03lld KB.",
-+					(f >> 10)/1000000, (f >> 10)/1000%1000, (f >> 10)%1000);
-+		} else if (f >= ((long long)1 << 10)*1000) {
-+			sprintf(buf, "DISK FREE SPACE AT THIS DIRECTORY IS ONLY %lld,%03lld KB.", (f >> 10)/1000, (f >> 10)%1000);
-+		} else if (f >= 1000) {
-+			sprintf(buf, "DISK FREE SPACE AT THIS DIRECTORY IS ONLY %lld,%03lld Bytes.", f/1000, f%1000);
-+		} else {
-+			sprintf(buf, "DISK FREE SPACE AT THIS DIRECTORY IS ONLY %lld Bytes.", f);
-+		}
-+		pr_response_send_raw("250-%s", buf);
-+	}
-+	return HANDLED(cmd);
-+}
-+
-+
-+//
-+// module ÍÑ directive
-+//
-+static conftable df_conftab[] = {
-+	{ NULL }						// directive ¤Ï¥µ¥Ý¡¼¥È¤·¤Ê¤¤
-+};
-+
-+
-+//
-+// trap ¤¹¤ë¥³¥Þ¥ó¥É°ìÍ÷
-+//
-+static cmdtable df_cmdtab[] = {
-+	{ POST_CMD,		C_CWD,	G_NONE, df_post_cwd,	FALSE, FALSE },
-+	{ POST_CMD,		C_CDUP,	G_NONE, df_post_cwd,	FALSE, FALSE },
-+	{ 0,			NULL }
-+};
-+
-+
-+//
-+// module ¾ðÊó
-+//
-+module df_module = {
-+
-+	/* Always NULL */
-+	NULL, NULL,
-+
-+	/* Module API version (2.0) */
-+	0x20,
-+
-+	/* Module name */
-+	"df",
-+
-+	/* Module configuration directive handlers */
-+	df_conftab,
-+
-+	/* Module command handlers */
-+	df_cmdtab,
-+
-+	/* Module authentication handlers (none in this case) */
-+	NULL,
-+
-+	/* Module initialization */
-+	df_init,
-+
-+	/* Session initialization */
-+	df_sess_init
-+
-+};
+
 diff -r -u -P modules/mod_ls.c modules/mod_ls.c
 --- modules/mod_ls.c	2007-09-28 04:53:59.000000000 +0400
 +++ modules/mod_ls.c	2008-03-24 02:55:39.000000000 +0300