diff options
| author | dinoex <dinoex@FreeBSD.org> | 2005-10-13 05:08:13 +0000 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2005-10-13 05:08:13 +0000 |
| commit | 7044f478bbc59f2dd31ae73114ca552efcde2ba8 (patch) | |
| tree | 379c4c79bd415e6f481f9b5e5da72e9fb66669fd | |
| parent | 84bccc1bf81bb6e35654ce39aa229552b19741af (diff) | |
| download | FreeBSD-ports-7044f478bbc59f2dd31ae73114ca552efcde2ba8.zip FreeBSD-ports-7044f478bbc59f2dd31ae73114ca552efcde2ba8.tar.gz | |
- prevent endless loop on config errors
- extend USE_RC_SUBR
PR: 87174, 87354
Submitted by: Pavel Gubin, Wesley Shields
| -rw-r--r-- | ftp/vsftpd/Makefile | 13 | ||||
| -rw-r--r-- | ftp/vsftpd/files/patch-utility | 13 | ||||
| -rw-r--r-- | ftp/vsftpd/files/vsftpd.sh.in (renamed from ftp/vsftpd/files/vsftpd.sh) | 0 | ||||
| -rw-r--r-- | ftp/vsftpd/pkg-plist | 1 |
4 files changed, 15 insertions, 12 deletions
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile index f13d12a..55a662b 100644 --- a/ftp/vsftpd/Makefile +++ b/ftp/vsftpd/Makefile @@ -7,6 +7,7 @@ PORTNAME= vsftpd PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= ftp ipv6 MASTER_SITES= ftp://vsftpd.beasts.org/users/cevans/ PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2} @@ -30,10 +31,7 @@ OPTIONS= RC_NG "install RC_NG script" off \ .include <bsd.port.pre.mk> .if defined(WITH_RC_NG) -USE_RC_SUBR= yes -PLIST_SUB+= RC_NG="" -.else -PLIST_SUB+= RC_NG="@comment " +USE_RC_SUBR= vsftpd.sh .endif .if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL) @@ -46,10 +44,6 @@ MAKE_ENV+= LDFLAGS="${LDFLAGS}" .endif do-configure: -.if defined(WITH_RC_NG) - @${SED} -e 's,%%RC_SUBR%%,${RC_SUBR},g' -e 's,%%PREFIX%%,${PREFIX},g' \ - ${FILESDIR}/${PORTNAME}.sh >${WRKDIR}/${PORTNAME}.sh -.endif ${REINPLACE_CMD} -e "s=/etc/vsftpd.conf=${PREFIX}/etc/vsftpd.conf=" \ ${WRKSRC}/defs.h ${REINPLACE_CMD} \ @@ -97,8 +91,5 @@ do-install: ${CHMOD} -R -L a+rX,go-w ${DOCSDIR}/${i}/ .endfor .endif -.if defined(WITH_RC_NG) - @${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d/${PORTNAME}.sh -.endif .include <bsd.port.post.mk> diff --git a/ftp/vsftpd/files/patch-utility b/ftp/vsftpd/files/patch-utility new file mode 100644 index 0000000..95b1070 --- /dev/null +++ b/ftp/vsftpd/files/patch-utility @@ -0,0 +1,13 @@ +--- utility.c.orig Fri Jul 2 18:26:30 2004 ++++ utility.c Mon Oct 10 01:19:02 2005 +@@ -33,6 +33,10 @@ + 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); diff --git a/ftp/vsftpd/files/vsftpd.sh b/ftp/vsftpd/files/vsftpd.sh.in index 6f86dea..6f86dea 100644 --- a/ftp/vsftpd/files/vsftpd.sh +++ b/ftp/vsftpd/files/vsftpd.sh.in diff --git a/ftp/vsftpd/pkg-plist b/ftp/vsftpd/pkg-plist index 27ccc69..9460fe2 100644 --- a/ftp/vsftpd/pkg-plist +++ b/ftp/vsftpd/pkg-plist @@ -4,7 +4,6 @@ libexec/vsftpd etc/vsftpd.conf.dist @exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi @exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi -%%RC_NG%%etc/rc.d/vsftpd.sh @unexec rmdir /var/ftp 2>/dev/null || true @dirrm share/vsftpd/empty @dirrm share/vsftpd |
