svn commit: r432861 - in head/ftp/vsftpd: . files
Dirk Meyer
dinoex at FreeBSD.org
Mon Jan 30 18:04:30 UTC 2017
Author: dinoex
Date: Mon Jan 30 18:04:28 2017
New Revision: 432861
URL: https://svnweb.freebsd.org/changeset/ports/432861
Log:
- fix build for FreeBSD-12
- make portlint happier
Added:
head/ftp/vsftpd/files/patch-utility.c
- copied, changed from r432860, head/ftp/vsftpd/files/patch-utility
Deleted:
head/ftp/vsftpd/files/patch-utility
Modified:
head/ftp/vsftpd/files/patch-sysdeputil.c
head/ftp/vsftpd/files/patch-sysstr.c
head/ftp/vsftpd/pkg-plist
Modified: head/ftp/vsftpd/files/patch-sysdeputil.c
==============================================================================
--- head/ftp/vsftpd/files/patch-sysdeputil.c Mon Jan 30 17:49:17 2017 (r432860)
+++ head/ftp/vsftpd/files/patch-sysdeputil.c Mon Jan 30 18:04:28 2017 (r432861)
@@ -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();
Modified: head/ftp/vsftpd/files/patch-sysstr.c
==============================================================================
--- head/ftp/vsftpd/files/patch-sysstr.c Mon Jan 30 17:49:17 2017 (r432860)
+++ head/ftp/vsftpd/files/patch-sysstr.c Mon Jan 30 18:04:28 2017 (r432861)
@@ -1,6 +1,6 @@
---- sysstr.c.orig 2011-12-14 18:26:39.000000000 +0800
-+++ sysstr.c 2012-07-24 11:27:18.000000000 +0800
-@@ -74,7 +74,7 @@
+--- sysstr.c.orig 2011-12-14 10:26:39 UTC
++++ sysstr.c
+@@ -74,7 +74,7 @@ str_chdir(const struct mystr* p_str)
int
str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)
{
Copied and modified: head/ftp/vsftpd/files/patch-utility.c (from r432860, head/ftp/vsftpd/files/patch-utility)
==============================================================================
--- head/ftp/vsftpd/files/patch-utility Mon Jan 30 17:49:17 2017 (r432860, copy source)
+++ head/ftp/vsftpd/files/patch-utility.c Mon Jan 30 18:04:28 2017 (r432861)
@@ -1,6 +1,6 @@
---- utility.c.orig Fri Jul 2 18:26:30 2004
-+++ utility.c Mon Oct 10 01:19:02 2005
-@@ -33,6 +33,10 @@
+--- utility.c.orig 2012-09-16 04:09:09 UTC
++++ utility.c
+@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
void
bug(const char* p_text)
{
Modified: head/ftp/vsftpd/pkg-plist
==============================================================================
--- head/ftp/vsftpd/pkg-plist Mon Jan 30 17:49:17 2017 (r432860)
+++ head/ftp/vsftpd/pkg-plist Mon Jan 30 18:04:28 2017 (r432861)
@@ -1,13 +1,13 @@
libexec/vsftpd
man/man5/vsftpd.conf.5.gz
man/man8/vsftpd.8.gz
- at exec if ! pw groupshow ftp 2>/dev/null; then pw groupadd ftp -g 14; fi
- at exec if ! pw usershow ftp 2>/dev/null; then pw useradd ftp -g ftp -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous FTP"; fi
- at unexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi
+ at preexec if ! pw groupshow ftp 2>/dev/null; then pw groupadd ftp -g 14; fi
+ at preexec if ! pw usershow ftp 2>/dev/null; then pw useradd ftp -g ftp -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous FTP"; fi
+ at preunexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi
etc/vsftpd.conf.dist
- at exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
- at unexec rmdir /var/ftp 2>/dev/null || true
- at exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
+ at postexec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
+ at postunexec rmdir /var/ftp 2>/dev/null || true
+ at postexec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
@dir %%DATADIR%%/empty
%%PORTDOCS%%%%DOCSDIR%%/AUDIT
%%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
More information about the svn-ports-all
mailing list