head	1.4;
access;
symbols
	RELEASE_5_4_0:1.3
	RELEASE_4_11_0:1.3
	RELEASE_5_3_0:1.3;
locks; strict;
comment	@# @;


1.4
date	2005.07.18.20.54.41;	author pav;	state dead;
branches;
next	1.3;

1.3
date	2004.08.07.19.22.52;	author krion;	state Exp;
branches;
next	1.2;

1.2
date	2004.03.02.23.23.55;	author pav;	state dead;
branches;
next	1.1;

1.1
date	2004.01.11.23.03.43;	author krion;	state Exp;
branches;
next	;


desc
@@


1.4
log
@- Update to 1.1.0

PR:		ports/83633
Submitted by:	Nick Leuta <skynick@@mail.sc.ru> (maintainer)
@
text
@diff -urN bsdftpd-ssl.ORI/ftp/ftp.c bsdftpd-ssl/ftp/ftp.c
--- ftp/ftp.c	Sun Jul  4 22:00:32 2004
+++ ftp/ftp.c	Fri Aug  6 22:13:06 2004
@@@@ -1544,6 +1544,7 @@@@
 			prt[1] &= 0xff;
 			error = 0;
 epsv_done:
+			;
 		} else
 			error = 1;
 
@@@@ -1867,6 +1868,7 @@@@
 
 			    return NULL;
 			default:
+			    ;
 			}
 
 			X509_free(x509_ssl_con);
@@@@ -1982,6 +1984,7 @@@@
 
 		    return NULL;
 		default:
+		    ;
 		}
 
 		X509_free(x509_ssl_con);
diff -urN bsdftpd-ssl.ORI/ftp/util.c bsdftpd-ssl/ftp/util.c
--- ftp/util.c	Mon May 31 02:24:47 2004
+++ ftp/util.c	Fri Aug  6 21:59:59 2004
@@@@ -987,6 +987,7 @@@@
 		ssl_log_msgn(bio_err,"Reason: Certificate revoked");
 		break;
 	    default:
+		;
 	    }
 
 	    warnx("TLS/SSL connection to server failed");
diff -urN bsdftpd-ssl.ORI/ftpd/ftpd.c bsdftpd-ssl/ftpd/ftpd.c
--- ftpd/ftpd.c	Thu Jul  8 02:35:54 2004
+++ ftpd/ftpd.c	Fri Aug  6 21:46:26 2004
@@@@ -2262,6 +2262,7 @@@@
 			SSL_get_shutdown(ssl_data_con);
 			break;
 		    default:
+			;
 		    }
 		}
 		SSL_free(ssl_data_con);
@@@@ -2385,6 +2386,7 @@@@
 			SSL_get_shutdown(ssl_data_con);
 			break;
 		    default:
+			;
 		    }
 		}
 		SSL_free(ssl_data_con);
@@@@ -2636,6 +2638,7 @@@@
 
 			    return NULL;
 			default:
+			    ;
 			}
 
 			X509_free(x509_ssl_con);
@@@@ -2797,6 +2800,7 @@@@
 
 		    return NULL;
 		default:
+		    ;
 		}
 
 		X509_free(x509_ssl_con);
@@@@ -4100,6 +4104,7 @@@@
 					    SSL_get_shutdown(ssl_data_con);
 					    break;
 					default:
+					    ;
 					}
 				    }
 				    SSL_free(ssl_data_con);
@@@@ -4214,6 +4219,7 @@@@
 			    SSL_get_shutdown(ssl_data_con);
 			    break;
 			default:
+			    ;
 			}
 		    }
 		    SSL_free(ssl_data_con);
@


1.3
log
@Fix build with gcc-3.4

PR:		ports/70131
Submitted by:	maintainer
@
text
@@


1.2
log
@- Update to 1.0.1

PR:		ports/63650
Submitted by:	Nick Leuta <skynick@@mail.sc.ru> (maintainer)
@
text
@d1 78
a78 39
--- ftpd/Makefile.FreeBSD.ORI	Wed Oct  8 00:59:49 2003
+++ ftpd/Makefile.FreeBSD	Mon Jan 12 00:33:53 2004
@@@@ -44,7 +44,7 @@@@
 CFLAGS+=-Wall
 ## Feature flags
 CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING
-CFLAGS+=-DUSE_SENDFILE
+#CFLAGS+=-DUSE_SENDFILE
 #CFLAGS+=-DINET6
 
 YFLAGS=
--- ftpd/ftpd.c.ORI	Mon Nov 10 11:42:45 2003
+++ ftpd/ftpd.c	Mon Jan 12 00:36:04 2004
@@@@ -2810,6 +2810,17 @@@@
 				goto oldway;
 			} else
 #endif /* USE_SSL */
+/* workaround for the problem described in
+ * http://bsdftpd-ssl.sc.ru/news/bfa_20040112.txt */
+#if __FreeBSD__ >= 5
+#	if __FreeBSD_version >= 502000
+#		define USE_SENDFILE = 1
+#	endif
+#else 
+#	if __FreeBSD_version > 490000
+#		define USE_SENDFILE = 1
+#	endif
+#endif /* __FreeBSD__ */
 #ifdef USE_SENDFILE
 			while (err != -1 && filesize > 0) {
 #ifdef LINUX /* Linux port */
@@@@ -2834,7 +2845,7 @@@@
 
 				if (err == -1) {
 #ifndef LINUX /* BSD source */
-					if (errno == EAGAIN) {
+					if (errno == EAGAIN || errno == EINTR) {
 					    err = 0;
 					    continue;
d80 10
@


1.1
log
@- Data transfere may be aborted now with the next message,
  because the EINTR error isn't handled: "426 Data connection:
  Interrupted system call".

PR:		61221
Submitted by:	maintainer
@
text
@@

