Attachment #159860 for bug #200791




MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME=	vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION}
EXTRACT_SUFX=	.tgz

MAINTAINER=	xjflyttp@gmail.com
COMMENT=	FTP daemon that aims to be "very secure". Extended build

BROKEN_FreeBSD_9_i386=	does not link

LICENSE=	GPLv2

UPSTREAMVERSION=3.0.2
EXTVERSION=	1

USES=		alias gmake tar:tgz
WRKSRC=		${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
ALL_TARGET=	vsftpd



.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
.if exists(/usr/bin/clang)
CC=		clang
.else
BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
CC=		clang33
.if ${ARCH} == i386
BROKEN=		does not build on 9.x i386
.endif
.endif


.for i in EXAMPLE SECURITY
	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/
	${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/
.endfor
.endif


Lines 1-6 Link Here

(-)files/patch-utility (-3 / +3 lines)
1	--- utility.c.orig Fri Jul 2 18:26:30 2004	1	--- utility.c.orig 2012-10-26 20:05:38 UTC
2	+++ utility.c Mon Oct 10 01:19:02 2005	2	+++ utility.c
3	@@ -33,6 +33,10 @@	3	@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
4	void	4	void
5	bug(const char* p_text)	5	bug(const char* p_text)
6	{	6	{




#!/bin/sh
# $FreeBSD: /tmp/pcvs/ports/ftp/vsftpd-ext/pkg-deinstall,v 1.1 2009-06-16 03:53:39 pgollucci Exp $
#

if [ "$2" != "POST-DEINSTALL" ]; then
    exit 0
fi

USER=ftp

if pw usershow "${USER}" 2>/dev/null 1>&2; then
        echo "To delete FTP user permanently, use 'pw userdel ${USER}'"
        echo "Don't do this if you're using FreeBSD's anonymous FTP server"
fi

exit 0




#!/bin/sh
# $FreeBSD: /tmp/pcvs/ports/ftp/vsftpd-ext/pkg-install,v 1.1 2009-06-16 03:53:39 pgollucci Exp $
#

if [ "$2" != "PRE-INSTALL" ]; then
    exit 0
fi

if ! pw groupshow operator >/dev/null; then
	if pw groupadd operator 5; then
		echo "Added group operator for vsftpd"
	else
		echo "Failed to add group operator as gid 5" >&2
		exit 1
	fi
fi

if ! pw usershow ftp >/dev/null; then
	if pw useradd ftp -g operator -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous Ftp"; then
		echo "Added user ftp for vsftpd"
	else
		echo "Failed to add user ftp as gid 14" >&2
		exit 1
	fi
fi

# uid=14(ftp) gid=5(operator) groups=5(operator)
view="$(id ftp)"
view="${view%% *}"
if test "${view}" = "uid=14(ftp)"; then
	exit 0
fi

echo "User ftp should have uid 14"; >&2
exit 1
# eof

Return to bug 200791

Lines 8-26 Link Here

(-)Makefile (-8 / +5 lines)
8	MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/	8	MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
9	PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}	9	PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}
10	DISTNAME= vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION}	10	DISTNAME= vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION}
11	EXTRACT_SUFX= .tgz
12		11
13	MAINTAINER= xjflyttp@gmail.com	12	MAINTAINER= xjflyttp@gmail.com
14	COMMENT= FTP daemon that aims to be "very secure". Extended build	13	COMMENT= FTP daemon that aims to be "very secure". Extended build
15		14
16	BROKEN_FreeBSD_9_i386= does not link
17
18	LICENSE= GPLv2	15	LICENSE= GPLv2
19		16
20	UPSTREAMVERSION=3.0.2	17	UPSTREAMVERSION=3.0.2
21	EXTVERSION= 1	18	EXTVERSION= 1
22		19
23	USES= alias gmake	20	USES= alias gmake tar:tgz
24	WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}	21	WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
25	ALL_TARGET= vsftpd	22	ALL_TARGET= vsftpd
26		23
Lines 41-51 Link Here
41		38
42	.include <bsd.port.options.mk>	39	.include <bsd.port.options.mk>
43		40
44	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 902001	41	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
		42	.if exists(/usr/bin/clang)
		43	CC= clang
		44	.else
45	BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33	45	BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33
46	CC= clang33	46	CC= clang33
47	.if ${ARCH} == i386
48	BROKEN= does not build on 9.x i386
49	.endif	47	.endif
50	.endif	48	.endif
51		49
Lines 115-121 Link Here
115	.for i in EXAMPLE SECURITY	113	.for i in EXAMPLE SECURITY
116	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}	114	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
117	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/	115	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/
118	${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/
119	.endfor	116	.endfor
120	.endif	117	.endif
121		118

Lines 1-16 Link Here

(-)pkg-deinstall (-16 lines)
1	#!/bin/sh
2	# $FreeBSD: /tmp/pcvs/ports/ftp/vsftpd-ext/pkg-deinstall,v 1.1 2009-06-16 03:53:39 pgollucci Exp $
3	#
4
5	if [ "$2" != "POST-DEINSTALL" ]; then
6	exit 0
7	fi
8
9	USER=ftp
10
11	if pw usershow "${USER}" 2>/dev/null 1>&2; then
12	echo "To delete FTP user permanently, use 'pw userdel ${USER}'"
13	echo "Don't do this if you're using FreeBSD's anonymous FTP server"
14	fi
15
16	exit 0

Lines 1-36 Link Here

(-)pkg-install (-36 lines)
1	#!/bin/sh
2	# $FreeBSD: /tmp/pcvs/ports/ftp/vsftpd-ext/pkg-install,v 1.1 2009-06-16 03:53:39 pgollucci Exp $
3	#
4
5	if [ "$2" != "PRE-INSTALL" ]; then
6	exit 0
7	fi
8
9	if ! pw groupshow operator >/dev/null; then
10	if pw groupadd operator 5; then
11	echo "Added group operator for vsftpd"
12	else
13	echo "Failed to add group operator as gid 5" >&2
14	exit 1
15	fi
16	fi
17
18	if ! pw usershow ftp >/dev/null; then
19	if pw useradd ftp -g operator -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous Ftp"; then
20	echo "Added user ftp for vsftpd"
21	else
22	echo "Failed to add user ftp as gid 14" >&2
23	exit 1
24	fi
25	fi
26
27	# uid=14(ftp) gid=5(operator) groups=5(operator)
28	view="$(id ftp)"
29	view="${view%% *}"
30	if test "${view}" = "uid=14(ftp)"; then
31	exit 0
32	fi
33
34	echo "User ftp should have uid 14"; >&2
35	exit 1
36	# eof