Attachment #192484 for bug #227491

View | Details | Raw Unified | Return to bug 227491
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-2 / +1 lines)
3		3
4	PORTNAME= vsftpd-ext	4	PORTNAME= vsftpd-ext
5	PORTVERSION= ${UPSTREAMVERSION}.${EXTVERSION}	5	PORTVERSION= ${UPSTREAMVERSION}.${EXTVERSION}
6	PORTREVISION= 2
7	CATEGORIES= ftp ipv6	6	CATEGORIES= ftp ipv6
8	MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/	7	MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
9	PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}	8	PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}
Lines 14-20 Link Here
14		13
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16		15
17	UPSTREAMVERSION=3.0.2	16	UPSTREAMVERSION=3.0.3
18	EXTVERSION= 1	17	EXTVERSION= 1
19		18
20	USES= alias gmake tar:tgz	19	USES= alias gmake tar:tgz

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (vsFTPd-3.0.2-ext1.tgz) = c276f25e5525dc1b104bde8c437a5a9c0cb0efed16056519214d1b9d71497c7d	1	TIMESTAMP = 1523611798
2	SIZE (vsFTPd-3.0.2-ext1.tgz) = 227801	2	SHA256 (vsFTPd-3.0.3-ext1.tgz) = 9d0e83657d51b58a91c1d138375e10ed03555fc061f357b15e37dc89de71b593
		3	SIZE (vsFTPd-3.0.3-ext1.tgz) = 230764

Line 0 Link Here

(-)files/patch-sysstr.c (+11 lines)
	1	--- sysstr.c.orig 2012-01-03 09:51:23 UTC
	2	+++ sysstr.c
	3	@@ -74,7 +74,7 @@ str_chdir(const struct mystr* p_str)
	4	int
	5	str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)
	6	{
	7	- enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown;
	8	+ enum EVSFSysUtilOpenMode open_mode = (enum EVSFSysUtilOpenMode) kVSFSysStrOpenUnknown;
	9	switch (mode)
	10	{
	11	case kVSFSysStrOpenReadOnly:




--- utility.c.orig	2012-10-26 20:05:38 UTC
+++ utility.c
@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
 void
 bug(const char* p_text)
 {
+  static int inside_bug = 0;
+  if (inside_bug)
+    vsf_sysutil_exit(1);
+  inside_bug++;
   /* Rats. Try and write the reason to the network for diagnostics */
   vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
   (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);




--- utility.c.orig	2012-09-23 00:14:36 UTC
+++ utility.c
@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
 void
 bug(const char* p_text)
 {
+  static int inside_bug = 0;
+  if (inside_bug)
+    vsf_sysutil_exit(1);
+  inside_bug++;
   /* Rats. Try and write the reason to the network for diagnostics */
   vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
   (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);

Return to bug 227491

Lines 1-13 Link Here

(-)files/patch-utility (-13 lines)
1	--- utility.c.orig 2012-10-26 20:05:38 UTC
2	+++ utility.c
3	@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
4	void
5	bug(const char* p_text)
6	{
7	+ static int inside_bug = 0;
8	+ if (inside_bug)
9	+ vsf_sysutil_exit(1);
10	+ inside_bug++;
11	/* Rats. Try and write the reason to the network for diagnostics */
12	vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
13	(void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);

Line 0 Link Here

(-)files/patch-utility.c (+13 lines)
	1	--- utility.c.orig 2012-09-23 00:14:36 UTC
	2	+++ utility.c
	3	@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
	4	void
	5	bug(const char* p_text)
	6	{
	7	+ static int inside_bug = 0;
	8	+ if (inside_bug)
	9	+ vsf_sysutil_exit(1);
	10	+ inside_bug++;
	11	/* Rats. Try and write the reason to the network for diagnostics */
	12	vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
	13	(void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);