Attachment #120704 for bug #163550

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




		README README.security README.ssl REFS REWARD \
		SIZE SPEED TODO TUNING

LDFLAGS+=	-lwrap

OPTIONS=	RC_NG		"install RC_NG script"		off \
		VSFTPD_SSL	"Include support for SSL"	off \
		PIDFILE		"unofficial support for pidfile"	off

	${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
		${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
	${REINPLACE_CMD} \
		-e '/^CC/s/=/?=/' \
		-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
		-e '/^LINK/s/=.*/=/' \
		${WRKSRC}/Makefile
	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
	${REINPLACE_CMD} -e \
		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
		${WRKSRC}/builddefs.h




		README README.security README.ssl REFS REWARD \
		SIZE SPEED TODO TUNING

LDFLAGS+=	-lwrap

OPTIONS=	RC_SCRIPT	"install RC_SCRIPT"		on \
		VSFTPD_SSL	"Include support for SSL"	off


	${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
		${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
	${REINPLACE_CMD} \
		-e '/^CC/s/=/?=/' \
		-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
		-e '/^LIBS/s|=.*|= `./vsf_findlibs.sh`|' \
		-e '/^LINK/s/=.*/=/' \
		${WRKSRC}/Makefile
	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
	${REINPLACE_CMD} -e \
		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
		${WRKSRC}/builddefs.h




--- ./Makefile.orig	2011-12-13 10:14:07.000000000 +0200
+++ ./Makefile	2011-12-13 10:15:30.000000000 +0200
@@ -3,9 +3,9 @@
 INSTALL	=       install
 IFLAGS  = -idirafter dummyinc
 #CFLAGS = -g
-CFLAGS	=       -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+CFLAGS	= -O2 -pipe -march=prescott -fno-strict-aliasing       -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
 
-LIBS	=       -lcap -ldl -lcrypt    -lpam    -lwrap -lnsl    -lssl -lcrypto
+LIBS=	-lpam
 #                                     |        |               + VSF_BUILD_SSL
 #                                     |        + VSF_BUILD_TCPWRAPPERS
 #                                     + VSF_BUILD_PAM

Return to bug 163550

Lines 23-30 DOCFILES= AUDIT BENCHMARKS BUGS Changelo Link Here

(-)ftp/vsftpd/Makefile (-5 / +4 lines)
23	README README.security README.ssl REFS REWARD \	23	README README.security README.ssl REFS REWARD \
24	SIZE SPEED TODO TUNING	24	SIZE SPEED TODO TUNING
25		25
26	LDFLAGS+= -lwrap
27
28	OPTIONS= RC_NG "install RC_NG script" off \	26	OPTIONS= RC_NG "install RC_NG script" off \
29	VSFTPD_SSL "Include support for SSL" off \	27	VSFTPD_SSL "Include support for SSL" off \
30	PIDFILE "unofficial support for pidfile" off	28	PIDFILE "unofficial support for pidfile" off
Lines 50-59 do-configure: Link Here
50	${REINPLACE_CMD} -e "s\|/etc/vsftpd.conf\|${PREFIX}/etc/vsftpd.conf\|" \	48	${REINPLACE_CMD} -e "s\|/etc/vsftpd.conf\|${PREFIX}/etc/vsftpd.conf\|" \
51	${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf	49	${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
52	${REINPLACE_CMD} \	50	${REINPLACE_CMD} \
53	-e "s\|^CC = gcc\|CC = ${CC}\|" \	51	-e '/^CC/s/=/?=/' \
54	-e "s\|^CFLAGS =\|CFLAGS = ${CFLAGS}\|" \	52	-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
55	-e "s\| -Wl,-s\| -Wl,-s ${LDFLAGS}\|" \	53	-e '/^LINK/s/=.*/=/' \
56	${WRKSRC}/Makefile	54	${WRKSRC}/Makefile
		55	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
57	${REINPLACE_CMD} -e \	56	${REINPLACE_CMD} -e \
58	"s\|#undef VSF_BUILD_TCPWRAPPERS\|#define VSF_BUILD_TCPWRAPPERS 1\|" \	57	"s\|#undef VSF_BUILD_TCPWRAPPERS\|#define VSF_BUILD_TCPWRAPPERS 1\|" \
59	${WRKSRC}/builddefs.h	58	${WRKSRC}/builddefs.h

Lines 28-35 DOCFILES= AUDIT BENCHMARKS BUGS Changelo Link Here

(-)ftp/vsftpd-ext/Makefile (-5 / +5 lines)
28	README README.security README.ssl REFS REWARD \	28	README README.security README.ssl REFS REWARD \
29	SIZE SPEED TODO TUNING	29	SIZE SPEED TODO TUNING
30		30
31	LDFLAGS+= -lwrap
32
33	OPTIONS= RC_SCRIPT "install RC_SCRIPT" on \	31	OPTIONS= RC_SCRIPT "install RC_SCRIPT" on \
34	VSFTPD_SSL "Include support for SSL" off	32	VSFTPD_SSL "Include support for SSL" off
35		33
Lines 53-62 do-configure: Link Here
53	${REINPLACE_CMD} -e "s\|/etc/vsftpd.conf\|${PREFIX}/etc/vsftpd.conf\|" \	51	${REINPLACE_CMD} -e "s\|/etc/vsftpd.conf\|${PREFIX}/etc/vsftpd.conf\|" \
54	${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf	52	${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
55	${REINPLACE_CMD} \	53	${REINPLACE_CMD} \
56	-e "s\|^CC = gcc\|CC = ${CC}\|" \	54	-e '/^CC/s/=/?=/' \
57	-e "s\|^CFLAGS =\|CFLAGS = ${CFLAGS}\|" \	55	-e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \
58	-e "s\| -Wl,-s\| -Wl,-s ${LDFLAGS}\|" \	56	-e '/^LIBS/s\|=.*\|= `./vsf_findlibs.sh`\|' \
		57	-e '/^LINK/s/=.*/=/' \
59	${WRKSRC}/Makefile	58	${WRKSRC}/Makefile
		59	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
60	${REINPLACE_CMD} -e \	60	${REINPLACE_CMD} -e \
61	"s\|#undef VSF_BUILD_TCPWRAPPERS\|#define VSF_BUILD_TCPWRAPPERS 1\|" \	61	"s\|#undef VSF_BUILD_TCPWRAPPERS\|#define VSF_BUILD_TCPWRAPPERS 1\|" \
62	${WRKSRC}/builddefs.h	62	${WRKSRC}/builddefs.h

Removed Link Here

(-)ftp/vsftpd-ext/files/patch-Makefile (-14 lines)
1	--- ./Makefile.orig 2011-12-13 10:14:07.000000000 +0200
2	+++ ./Makefile 2011-12-13 10:15:30.000000000 +0200
3	@@ -3,9 +3,9 @@
4	INSTALL = install
5	IFLAGS = -idirafter dummyinc
6	#CFLAGS = -g
7	-CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
8	+CFLAGS = -O2 -pipe -march=prescott -fno-strict-aliasing -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
9
10	-LIBS = -lcap -ldl -lcrypt -lpam -lwrap -lnsl -lssl -lcrypto
11	+LIBS= -lpam
12	# \| \| + VSF_BUILD_SSL
13	# \| + VSF_BUILD_TCPWRAPPERS
14	# + VSF_BUILD_PAM