mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- update to 3.0.0

Browse Source
This commit is contained in:
Dirk Meyer 2012-05-24 18:35:20 +00:00
parent f8f1a0d9a0
commit 072ff68021
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=297352
3 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ftp/vsftpd/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= vsftpd
PORTVERSION= 2.3.5
PORTVERSION= 3.0.0
CATEGORIES= ftp ipv6
MASTER_SITES= https://security.appspot.com/downloads/
PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2}
@ -24,8 +24,8 @@ DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
README README.security README.ssl REFS REWARD \
SIZE SPEED TODO TUNING
OPTIONS= VSFTPD_SSL "Include support for SSL" off \
PIDFILE "unofficial support for pidfile" off
OPTIONS= VSFTPD_SSL "Include support for SSL" off \
PIDFILE "unofficial support for pidfile" off
.include <bsd.port.pre.mk>
@ -40,9 +40,25 @@ LDFLAGS+= -L${OPENSSLLIB}
EXTRA_PATCHES+= ${FILESDIR}/pidfile.patch
.endif
# BROKEN on FreeBSD with undefined reference to `__stack_chk_fail_local'
LDFLAGS+= -lssp_nonshared
do-configure:
${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL)
${REINPLACE_CMD} -e \
"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
-e "s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \
${WRKSRC}/builddefs.h
.else
${REINPLACE_CMD} -e \
"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
${WRKSRC}/builddefs.h
.endif
${REINPLACE_CMD} -e "s|^listen=|#listen=|" \
-e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \
${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf
${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \
${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c
${REINPLACE_CMD} \
-e "s|^CC = gcc|CC = ${CC}|" \
-e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \
@ -50,9 +66,6 @@ do-configure:
-e "s| -Wl,-s| -Wl,-s ${LDFLAGS}|" \
${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
@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
${WRKSRC}/vsftpd.conf
@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf ""
@ -60,15 +73,6 @@ do-configure:
"# If using vsftpd in standalone mode, uncomment the next two lines:"
@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# listen=YES"
@${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# background=YES"
${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \
-e 's|delay_failed_logins|delay_failed_login|' \
-e 's|delay_successful_logins|delay_successful_login|' \
${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c
.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL)
${REINPLACE_CMD} -e \
"s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \
${WRKSRC}/builddefs.h
.endif
pre-install:
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

4
ftp/vsftpd/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (vsftpd-2.3.5.tar.gz) = d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1
SIZE (vsftpd-2.3.5.tar.gz) = 187691
SHA256 (vsftpd-3.0.0.tar.gz) = ef70205dcd0c7f03b008b9578fb44c0cbe31e66daab8cfafb9904747c17fc2a8
SIZE (vsftpd-3.0.0.tar.gz) = 193166

21
ftp/vsftpd/files/patch-sysdeputil.c
View File

@ -1,5 +1,5 @@
--- sysdeputil.c.orig 2010-03-26 06:25:33.000000000 +0300
+++ sysdeputil.c 2011-05-17 20:51:35.350022421 +0400
--- sysdeputil.c.orig 2010-03-26 04:25:33.000000000 +0100
+++ sysdeputil.c 2012-04-14 10:31:00.000000000 +0200
@@ -57,7 +57,7 @@
#endif
#define VSF_SYSDEP_HAVE_SHADOW
@ -9,7 +9,20 @@
#define VSF_SYSDEP_HAVE_UTMPX
#define __USE_GNU
@@ -1213,7 +1213,9 @@ vsf_insert_uwtmp(const struct mystr* p_u
@@ -323,8 +323,12 @@
const struct mystr* p_remote_host)
{
int retval;
+#ifdef PAM_USER
pam_item_t item;
+#endif
+#ifdef PAM_RUSER
const char* pam_user_name = 0;
+#endif
struct pam_conv the_conv =
{
&pam_conv_func,
@@ -1213,7 +1217,9 @@
setutxent();
(void) pututxline(&s_utent);
endutxent();
@ -19,7 +32,7 @@
}
void
@@ -1232,7 +1234,9 @@ vsf_remove_uwtmp(void)
@@ -1232,7 +1238,9 @@
(void) pututxline(&s_utent);
endutxent();
s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();