Attachment #40496 for bug #63650

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

Lines 6-13 Link Here

(-)bsdftpd-ssl/Makefile (-4 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= bsdftpd-ssl	8	PORTNAME= bsdftpd-ssl
9	PORTVERSION= 1.0.0	9	PORTVERSION= 1.0.1
10	PORTREVISION= 1	10	PORTREVISION= 0
11	CATEGORIES= ftp	11	CATEGORIES= ftp
12	MASTER_SITES= http://bsdftpd-ssl.sc.ru/files/bsdftpd-ssl/archive/1.0/src/	12	MASTER_SITES= http://bsdftpd-ssl.sc.ru/files/bsdftpd-ssl/archive/1.0/src/
13	DISTNAME= bsdftpd-ssl-${PORTVERSION}	13	DISTNAME= bsdftpd-ssl-${PORTVERSION}
Lines 26-35 Link Here
26	# Server part	26	# Server part
27	.if !defined(CLIENT_ONLY)	27	.if !defined(CLIENT_ONLY)
28	COMMENT= Secure FTP server with the TLS/SSL support	28	COMMENT= Secure FTP server with the TLS/SSL support
29	MAN5= ftpchroot.5	29	MAN5= ftpchroot.5 xferlog.5
30	MAN8= ftpd.8	30	MAN8= ftpd.8
31	MLINKS= ftpd.8 ftpd-ssl.8	31	MLINKS= ftpd.8 ftpd-ssl.8
32	PKGMESSAGE= ${FILESDIR}/pkg-message.server	32	PKGMESSAGE= ${WRKDIR}/pkg-message
		33	SED_ARG= 's\|%%PREFIX%%\|${PREFIX}\|g; s\|%%DOCSDIR%%\|${DOCSDIR}\|g'
33	.endif	34	.endif
34		35
35	MANCOMPRESSED= yes	36	MANCOMPRESSED= yes
Lines 56-61 Link Here
56	# Server part	57	# Server part
57	.if !defined(CLIENT_ONLY)	58	.if !defined(CLIENT_ONLY)
58	(cd ${WRKSRC}/ftpd && make) \|\| exit	59	(cd ${WRKSRC}/ftpd && make) \|\| exit
		60	@${SED} ${SED_ARG} ${FILESDIR}/pkg-message.server > \
		61	${WRKDIR}/pkg-message
59	.endif	62	.endif
60		63
61	do-install:	64	do-install:
Lines 66-71 Link Here
66	.if !defined(CLIENT_ONLY)	69	.if !defined(CLIENT_ONLY)
67	${INSTALL_PROGRAM} ${WRKSRC}/ftpd/ftpd ${PREFIX}/libexec/ftpd	70	${INSTALL_PROGRAM} ${WRKSRC}/ftpd/ftpd ${PREFIX}/libexec/ftpd
68	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${MANDIR}5/ftpchroot.5.gz	71	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${MANDIR}5/ftpchroot.5.gz
		72	${INSTALL_MAN} ${WRKSRC}/ftpd/xferlog.5.gz ${MANDIR}5/xferlog.5.gz
69	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${MANDIR}8/ftpd.8.gz	73	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${MANDIR}8/ftpd.8.gz
70	.endif	74	.endif
71		75
Lines 94-99 Link Here
94	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh	98	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh
95	.endif	99	.endif
96	.if !defined(CLIENT_ONLY)	100	.if !defined(CLIENT_ONLY)
		101	@${INSTALL_SCRIPT} ${FILESDIR}/bsdftpd-ssl.sh ${PREFIX}/etc/rc.d/bsdftpd-ssl.sh.sample
97	@${ECHO_CMD} "*******************************************************************************"	102	@${ECHO_CMD} "*******************************************************************************"
98	@${CAT} ${PKGMESSAGE}	103	@${CAT} ${PKGMESSAGE}
99	@${ECHO_CMD} "*******************************************************************************"	104	@${ECHO_CMD} "*******************************************************************************"

Line 1 Link Here

(-)bsdftpd-ssl/distinfo (-1 / +1 lines)
1	MD5 (bsdftpd-ssl-1.0.0.tar.gz) = 745befccb117d08aa0e37ea592dfb48c	1	MD5 (bsdftpd-ssl-1.0.1.tar.gz) = fe77f5a8631c01aa85f969355fba3b69




#!/bin/sh

if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
    echo "$0: Cannot determine the PREFIX" >&2
    exit 1
fi

case "$1" in
start)
	if [ -x ${PREFIX}/libexec/ftpd ]; then
		${PREFIX}/libexec/ftpd -D -l -p /var/run/ftpd.pid > /dev/null
		echo -n ' BSDftpd-ssl'
	fi
	;;
stop)
	if [ -r /var/run/ftpd.pid ]; then
		kill -TERM `cat /var/run/ftpd.pid`
		rm -f /var/run/ftpd.pid
		echo -n ' BSDftpd-ssl'
	fi
	;;
*)
	echo ""
	echo "Usage: `basename $0` { start | stop }"
	echo ""
	exit 1
	;;
esac

exit 0




--- 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;
 					}




=============================================================================
You will also need to read "Configuration" and "Supplement information" parts
of %%DOCSDIR%%/INSTALL file from the package documentation
for the subsequent configuration steps:
  1. Create the server certificate
  2. Edit PAM configuration
  3. Start the FTP server

If you want to run the FTP server in the daemon mode, you can copy the sample
start-up script %%PREFIX%%/etc/rc.d/bsdftpd-ssl.sh.sample to
%%PREFIX%%/etc/rc.d/bsdftpd-ssl.sh.

Please note: the manual page for the FTP server is available as ftpd-ssl(8).
=============================================================================

Lines 1-4 Link Here

(-)bsdftpd-ssl/pkg-plist (+1 lines)
1	bin/ftps	1	bin/ftps
		2	etc/rc.d/bsdftpd-ssl.sh.sample
2	libexec/ftpd	3	libexec/ftpd
3	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT	4	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
4	%%PORTDOCS%%%%DOCSDIR%%/README	5	%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 63650

Line 0 Link Here

(-)bsdftpd-ssl/files/bsdftpd-ssl.sh (+30 lines)
	1	#!/bin/sh
	2
	3	if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
	4	echo "$0: Cannot determine the PREFIX" >&2
	5	exit 1
	6	fi
	7
	8	case "$1" in
	9	start)
	10	if [ -x ${PREFIX}/libexec/ftpd ]; then
	11	${PREFIX}/libexec/ftpd -D -l -p /var/run/ftpd.pid > /dev/null
	12	echo -n ' BSDftpd-ssl'
	13	fi
	14	;;
	15	stop)
	16	if [ -r /var/run/ftpd.pid ]; then
	17	kill -TERM `cat /var/run/ftpd.pid`
	18	rm -f /var/run/ftpd.pid
	19	echo -n ' BSDftpd-ssl'
	20	fi
	21	;;
	22	*)
	23	echo ""
	24	echo "Usage: `basename $0` { start \| stop }"
	25	echo ""
	26	exit 1
	27	;;
	28	esac
	29
	30	exit 0

Lines 1-40 Link Here

(-)bsdftpd-ssl/files/patch-aa (-40 lines)
1	--- ftpd/Makefile.FreeBSD.ORI Wed Oct 8 00:59:49 2003
2	+++ ftpd/Makefile.FreeBSD Mon Jan 12 00:33:53 2004
3	@@ -44,7 +44,7 @@
4	CFLAGS+=-Wall
5	## Feature flags
6	CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING
7	-CFLAGS+=-DUSE_SENDFILE
8	+#CFLAGS+=-DUSE_SENDFILE
9	#CFLAGS+=-DINET6
10
11	YFLAGS=
12	--- ftpd/ftpd.c.ORI Mon Nov 10 11:42:45 2003
13	+++ ftpd/ftpd.c Mon Jan 12 00:36:04 2004
14	@@ -2810,6 +2810,17 @@
15	goto oldway;
16	} else
17	#endif /* USE_SSL */
18	+/* workaround for the problem described in
19	+ * http://bsdftpd-ssl.sc.ru/news/bfa_20040112.txt */
20	+#if __FreeBSD__ >= 5
21	+# if __FreeBSD_version >= 502000
22	+# define USE_SENDFILE = 1
23	+# endif
24	+#else
25	+# if __FreeBSD_version > 490000
26	+# define USE_SENDFILE = 1
27	+# endif
28	+#endif /* __FreeBSD__ */
29	#ifdef USE_SENDFILE
30	while (err != -1 && filesize > 0) {
31	#ifdef LINUX /* Linux port */
32	@@ -2834,7 +2845,7 @@
33
34	if (err == -1) {
35	#ifndef LINUX /* BSD source */
36	- if (errno == EAGAIN) {
37	+ if (errno == EAGAIN \|\| errno == EINTR) {
38	err = 0;
39	continue;
40	}

Lines 1-2 Link Here

(-)bsdftpd-ssl/files/pkg-message.server (-1 / +13 lines)
		1	=============================================================================
1	You will also need to read "Configuration" and "Supplement information" parts	2	You will also need to read "Configuration" and "Supplement information" parts
2	of INSTALL file from package documentation for subsequent configuration issues.	3	of %%DOCSDIR%%/INSTALL file from the package documentation
		4	for the subsequent configuration steps:
		5	1. Create the server certificate
		6	2. Edit PAM configuration
		7	3. Start the FTP server
		8
		9	If you want to run the FTP server in the daemon mode, you can copy the sample
		10	start-up script %%PREFIX%%/etc/rc.d/bsdftpd-ssl.sh.sample to
		11	%%PREFIX%%/etc/rc.d/bsdftpd-ssl.sh.
		12
		13	Please note: the manual page for the FTP server is available as ftpd-ssl(8).
		14	=============================================================================