Attachment 149661 Details for Bug 195239 – fix default vsftpd.conf path

[patch] fix default vsftpd.conf path

vsftpd-ext-3.0.2.1_2.diff (text/plain), 991 bytes, created by Xu Jing on 2014-11-21 08:19:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xu Jing

Created: 2014-11-21 08:19:56 UTC

Size: 991 bytes

patch

obsolete

>--- Makefile	2014-11-21 16:04:54.321175501 +0800
>+++ ../Makefile	2014-11-21 16:10:08.000000000 +0800
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	vsftpd-ext
> PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	ftp ipv6
> MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
> PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
>@@ -71,8 +71,10 @@
> 		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
> 		${WRKSRC}/builddefs.h
> .endif
>-	${REINPLACE_CMD} -e "s|\"vsftpd.conf\"|\"${PREFIX}/etc/vsftpd.conf\"|" \
>-		${WRKSRC}/defs.h
>+	${REINPLACE_CMD} -e \
>+		"s|#define VSF_CONFIG_PATH \"/etc/vsftpd/\"|#define VSF_CONFIG_PATH \"${PREFIX}/etc/\"|" \
>+		-e "s|#define VSF_CONFIG_PREFIX \"\"|#define VSF_CONFIG_PREFIX \"vsftpd.\"|" \
>+		${WRKSRC}/builddefs.h
> 	${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \
> 		${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5
> 	${REINPLACE_CMD} -e "s|/usr/share/empty|${PREFIX}/share/vsftpd/empty|" \

Actions: View | Diff

Attachments on bug 195239: 149661