- Update to 1.0.3

PR:		180508
Submitted by:	ports fury

2 files changed, 42 insertions, 20 deletions

diff --git a/ftp/pftpd/files/patch-plib-support.c b/ftp/pftpd/files/patch-plib-support.c
index 4d2023aecea6..84dfabce5dba 100644
--- a/ftp/pftpd/files/patch-plib-support.c
+++ b/ftp/pftpd/files/patch-plib-support.c
@@ -1,18 +1,32 @@
---- plib/support.c.orig	Thu Jan  9 14:25:01 2003
-+++ plib/support.c	Mon May 23 20:46:01 2005
-@@ -145,6 +145,15 @@
-     pthread_mutex_init(&pwd_lock, NULL);
- }
+--- plib/support.c.orig	Thu Jan  9 22:25:01 2003
++++ plib/support.c	Wed Apr  6 00:38:41 2005
+@@ -369,11 +369,13 @@
+     return code;
+     
+ #else
++    pthread_once_t grp_once;
++    pthread_mutex_t grp_lock;
+     struct group *gp;
+     int i, len;
  
-+static pthread_mutex_t grp_lock;
-+static pthread_once_t grp_once = PTHREAD_ONCE_INIT;
-+
-+static void
-+grp_lock_init(void)
-+{
-+    pthread_mutex_init(&grp_lock, NULL);
-+}
-+
- static char *
- strcopy(const char *str, char **buf, size_t *avail)
- {
+     
+-    pthread_once(&grp_once, grp_lock_init);
++    pthread_once(&grp_once, NULL);
+     pthread_mutex_lock(&grp_lock);
+ 
+     gp = getgrgid(gid);
+@@ -452,11 +454,13 @@
+     return code;
+     
+ #else
++    pthread_once_t grp_once;
++    pthread_mutex_t grp_lock;
+     struct group *gp;
+     int i, len;
+ 
+     
+-    pthread_once(&grp_once, grp_lock_init);
++    pthread_once(&grp_once, NULL);
+     pthread_mutex_lock(&grp_lock);
+ 
+     gp = getgrnam(name);
diff --git a/ftp/pftpd/files/patch-src_rpa.c b/ftp/pftpd/files/patch-src_rpa.c
index 8a1013a485ee..30611a1e5902 100644
--- a/ftp/pftpd/files/patch-src_rpa.c
+++ b/ftp/pftpd/files/patch-src_rpa.c
@@ -9,7 +9,15 @@
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-@@ -196,7 +196,7 @@
+@@ -198,14 +198,14 @@
+     }
+     
+     strcpy(path, "/var/tmp/rpa.XXXXXX");
+-    mktemp(path);
++    mkstemp(path);
+     if (!path[0])
+     {
+ 	syslog(LOG_ERR, "rpa_unix_open: unable to create local socket name");
  	goto Fail;
      }
      
@@ -18,7 +26,7 @@
      usb.sun_family = AF_UNIX;
      strcpy(usb.sun_path, path);
      
-@@ -210,7 +210,7 @@
+@@ -219,7 +219,7 @@
      
      s_snprintf(path, sizeof(path), "%s/%s/unix", PATH_RPAD_DIR, rp->service);
  
@@ -27,7 +35,7 @@
      usb.sun_family = AF_UNIX;
      strcpy(usb.sun_path, path);
      
-@@ -399,8 +399,6 @@
+@@ -408,8 +408,6 @@
      msg.msg_iov = iov;
      msg.msg_iovlen = 1;
      msg.msg_name = NULL;