diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2011-05-22 08:08:15 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2011-05-22 08:08:15 +0000 |
| commit | c6d1e5f573c73db146138771a2be87a04aea40e9 (patch) | |
| tree | 8a91798077630b872ba342e139d6f4794ae0ee8e /ftp/vsftpd | |
| parent | d5d30e7698dea4f8d498e5a5ee4432ae4d4e718b (diff) | |
| download | ports-c6d1e5f573c73db146138771a2be87a04aea40e9.tar.gz ports-c6d1e5f573c73db146138771a2be87a04aea40e9.zip | |
- fix build on FreeBSD 9.0-CURRENT
PR: 157124
Submitted by: Andrey V. Elsukov
Notes
Notes:
svn path=/head/; revision=274428
Diffstat (limited to 'ftp/vsftpd')
| -rw-r--r-- | ftp/vsftpd/Makefile | 4 | ||||
| -rw-r--r-- | ftp/vsftpd/files/patch-sysdeputil.c | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile index b5f35d227892..8ec898d1f1a6 100644 --- a/ftp/vsftpd/Makefile +++ b/ftp/vsftpd/Makefile @@ -31,10 +31,6 @@ OPTIONS= RC_NG "install RC_NG script" off \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 900000 -BROKEN= does not compile on FreeBSD 9.X -.endif - .if defined(WITH_RC_NG) USE_RC_SUBR= vsftpd.sh .endif diff --git a/ftp/vsftpd/files/patch-sysdeputil.c b/ftp/vsftpd/files/patch-sysdeputil.c index 77124fec1d21..becc2bdb4970 100644 --- a/ftp/vsftpd/files/patch-sysdeputil.c +++ b/ftp/vsftpd/files/patch-sysdeputil.c @@ -1,6 +1,15 @@ ---- sysdeputil.c.orig 2009-11-12 04:16:15.000000000 +0100 -+++ sysdeputil.c 2010-01-26 22:30:10.000000000 +0100 -@@ -1213,7 +1213,9 @@ +--- sysdeputil.c.orig 2010-03-26 06:25:33.000000000 +0300 ++++ sysdeputil.c 2011-05-17 20:51:35.350022421 +0400 +@@ -57,7 +57,7 @@ + #endif + #define VSF_SYSDEP_HAVE_SHADOW + #define VSF_SYSDEP_HAVE_USERSHELL +-#define VSF_SYSDEP_HAVE_LIBCAP ++#undef VSF_SYSDEP_HAVE_LIBCAP + #define VSF_SYSDEP_HAVE_UTMPX + + #define __USE_GNU +@@ -1213,7 +1213,9 @@ vsf_insert_uwtmp(const struct mystr* p_u setutxent(); (void) pututxline(&s_utent); endutxent(); @@ -10,7 +19,7 @@ } void -@@ -1232,7 +1234,9 @@ +@@ -1232,7 +1234,9 @@ vsf_remove_uwtmp(void) (void) pututxline(&s_utent); endutxent(); s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec(); |