Index: head/ftp/vsftpd/files/patch-utility
===================================================================
--- head/ftp/vsftpd/files/patch-utility	(revision 432860)
+++ head/ftp/vsftpd/files/patch-utility	(nonexistent)
@@ -1,13 +0,0 @@
---- utility.c.orig      Fri Jul  2 18:26:30 2004
-+++ utility.c   Mon Oct 10 01:19:02 2005
-@@ -33,6 +33,10 @@
- void
- bug(const char* p_text)
- {
-+  static int inside_bug = 0;
-+  if (inside_bug)
-+    vsf_sysutil_exit(1);
-+  inside_bug++;
-   /* Rats. Try and write the reason to the network for diagnostics */
-   vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
-   (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);

Property changes on: head/ftp/vsftpd/files/patch-utility
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ftp/vsftpd/files/patch-sysdeputil.c
===================================================================
--- head/ftp/vsftpd/files/patch-sysdeputil.c	(revision 432860)
+++ head/ftp/vsftpd/files/patch-sysdeputil.c	(revision 432861)
@@ -1,44 +1,54 @@
---- 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;
 +#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,
-@@ -1216,7 +1220,9 @@
+@@ -1216,7 +1223,9 @@ vsf_insert_uwtmp(const struct mystr* p_u
    setutxent();
    (void) pututxline(&s_utent);
    endutxent();
 +#if !defined(__FreeBSD__)
    updwtmpx(WTMPX_FILE, &s_utent);
 +#endif
  }
  
  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();
 +#if !defined(__FreeBSD__)
    updwtmpx(WTMPX_FILE, &s_utent);
 +#endif
  }
  
  #endif /* !VSF_SYSDEP_HAVE_UTMPX */
Index: head/ftp/vsftpd/files/patch-sysstr.c
===================================================================
--- head/ftp/vsftpd/files/patch-sysstr.c	(revision 432860)
+++ head/ftp/vsftpd/files/patch-sysstr.c	(revision 432861)
@@ -1,11 +1,11 @@
---- 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)
  {
 -  enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown;
 +  enum EVSFSysUtilOpenMode open_mode = (enum EVSFSysUtilOpenMode) kVSFSysStrOpenUnknown;
    switch (mode)
    {
      case kVSFSysStrOpenReadOnly:
Index: head/ftp/vsftpd/files/patch-utility.c
===================================================================
--- head/ftp/vsftpd/files/patch-utility.c	(nonexistent)
+++ head/ftp/vsftpd/files/patch-utility.c	(revision 432861)
@@ -0,0 +1,13 @@
+--- 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)
+ {
++  static int inside_bug = 0;
++  if (inside_bug)
++    vsf_sysutil_exit(1);
++  inside_bug++;
+   /* Rats. Try and write the reason to the network for diagnostics */
+   vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
+   (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);

Property changes on: head/ftp/vsftpd/files/patch-utility.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/ftp/vsftpd/pkg-plist
===================================================================
--- head/ftp/vsftpd/pkg-plist	(revision 432860)
+++ head/ftp/vsftpd/pkg-plist	(revision 432861)
@@ -1,45 +1,45 @@
 libexec/vsftpd
 man/man5/vsftpd.conf.5.gz
 man/man8/vsftpd.8.gz
-@exec if ! pw groupshow ftp 2>/dev/null; then pw groupadd ftp -g 14; fi
-@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
-@unexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi
+@preexec if ! pw groupshow ftp 2>/dev/null; then pw groupadd ftp -g 14; fi
+@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
+@preunexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi
 etc/vsftpd.conf.dist
-@exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
-@unexec rmdir /var/ftp 2>/dev/null || true
-@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
+@postexec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
+@postunexec rmdir /var/ftp 2>/dev/null || true
+@postexec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
 @dir %%DATADIR%%/empty
 %%PORTDOCS%%%%DOCSDIR%%/AUDIT
 %%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/Changelog
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/README
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.conf
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.xinetd
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD/README
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG/README
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG/hosts.allow
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/README
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_HOSTS/README
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/README
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/logins.txt
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/vsftpd.conf
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/vsftpd.pam
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2/README
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.security
 %%PORTDOCS%%%%DOCSDIR%%/README.ssl
 %%PORTDOCS%%%%DOCSDIR%%/REFS
 %%PORTDOCS%%%%DOCSDIR%%/REWARD
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/DESIGN
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/IMPLEMENTATION
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/OVERVIEW
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/TRUST
 %%PORTDOCS%%%%DOCSDIR%%/SIZE
 %%PORTDOCS%%%%DOCSDIR%%/SPEED
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/TUNING