diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2017-01-30 18:04:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2017-01-30 18:04:28 +0000 |
| commit | 8f7fdbd3a373155b856290d605ed56792fa353e3 (patch) | |
| tree | f07c0c081d21c1c1ae2d2b54363f9403c8494672 /ftp/vsftpd/files/patch-sysdeputil.c | |
| parent | ports-mgmt/synth: Upgrade version 1.67a => 1.68 (diff) | |
- fix build for FreeBSD-12
- make portlint happier
Notes
Notes:
svn path=/head/; revision=432861
Diffstat (limited to 'ftp/vsftpd/files/patch-sysdeputil.c')
| -rw-r--r-- | ftp/vsftpd/files/patch-sysdeputil.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/ftp/vsftpd/files/patch-sysdeputil.c b/ftp/vsftpd/files/patch-sysdeputil.c index ffdcae5617d8..504829093dda 100644 --- a/ftp/vsftpd/files/patch-sysdeputil.c +++ b/ftp/vsftpd/files/patch-sysdeputil.c @@ -1,15 +1,25 @@ ---- sysdeputil.c.orig 2012-09-16 06:18:04.000000000 +0200 -+++ sysdeputil.c 2012-10-13 20:20:42.000000000 +0200 -@@ -57,7 +57,7 @@ +--- sysdeputil.c.orig 2012-09-16 04:18:04 UTC ++++ sysdeputil.c +@@ -103,6 +103,7 @@ + #if (defined(__FreeBSD__) && __FreeBSD__ >= 3) + #define VSF_SYSDEP_HAVE_FREEBSD_SENDFILE + #define VSF_SYSDEP_HAVE_SETPROCTITLE ++ #undef VSF_SYSDEP_HAVE_LIBCAP #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 -@@ -323,8 +323,12 @@ + #if defined(__NetBSD__) +@@ -177,8 +178,10 @@ + #include <crypt.h> + #endif + ++#ifdef VSF_SYSDEP_HAVE_LIBCAP + /* Prefer libcap based capabilities over raw syscall capabilities */ + #include <sys/capability.h> ++#endif + + #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP) + #include <linux/unistd.h> +@@ -323,8 +326,12 @@ vsf_sysdep_check_auth(struct mystr* p_us const struct mystr* p_remote_host) { int retval = -1; @@ -22,7 +32,7 @@ struct pam_conv the_conv = { &pam_conv_func, -@@ -1216,7 +1220,9 @@ +@@ -1216,7 +1223,9 @@ vsf_insert_uwtmp(const struct mystr* p_u setutxent(); (void) pututxline(&s_utent); endutxent(); @@ -32,7 +42,7 @@ } void -@@ -1235,7 +1241,9 @@ +@@ -1235,7 +1244,9 @@ vsf_remove_uwtmp(void) (void) pututxline(&s_utent); endutxent(); s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec(); |