From 593910a3eb0651a92a4f54a59d06075383cf6cb0 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 12 Sep 1999 15:02:31 +0000
Subject: [PATCH] upgrade to proftpd 1.2.0pre6

---
 net/proftpd/Makefile         |  4 ++--
 net/proftpd/files/md5        |  6 +++---
 net/proftpd/patches/patch-ab | 11 -----------
 net/proftpd/patches/patch-ad | 15 ++++++++++++---
 4 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 net/proftpd/patches/patch-ab

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 83b8437d611..247b7fcf4fc 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.11 1999/09/08 19:12:57 brad Exp $
+# $OpenBSD: Makefile,v 1.12 1999/09/12 15:02:31 brad Exp $
 # $FreeBSD: Makefile,v 1.7 1999/02/12 21:55:04 obrien Exp $
 
-DISTNAME=	proftpd-1.2.0pre5
+DISTNAME=	proftpd-1.2.0pre6
 PKGNAME=	proftpd-1.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.tos.net/pub/proftpd/ \
diff --git a/net/proftpd/files/md5 b/net/proftpd/files/md5
index a08d07dd55e..c6606903ae5 100644
--- a/net/proftpd/files/md5
+++ b/net/proftpd/files/md5
@@ -1,3 +1,3 @@
-MD5 (proftpd-1.2.0pre5.tar.gz) = 624b0f59c70a706abc02afec2a87bd3a
-RMD160 (proftpd-1.2.0pre5.tar.gz) = 6f427a7834b4cef6f17d196bb8d7d637cbcd8587
-SHA1 (proftpd-1.2.0pre5.tar.gz) = d34d1163821f66d1707ddb3b2df964d04d9d3c56
+MD5 (proftpd-1.2.0pre6.tar.gz) = f29634071a39db8572ec0c5c7310cc2b
+RMD160 (proftpd-1.2.0pre6.tar.gz) = 85de89921cc0d10f3d91a026e1227bd0f129a46a
+SHA1 (proftpd-1.2.0pre6.tar.gz) = 08d4e6cb3bda7a38d37d4ab484d3f5465e222207
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
deleted file mode 100644
index 55b91ae14fc..00000000000
--- a/net/proftpd/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pool.c.orig	Thu Sep  9 17:01:07 1999
-+++ src/pool.c	Thu Sep  9 17:02:36 1999
-@@ -337,6 +337,8 @@
-      */
-     strncpy(&new_pool->symbol,symbol,strlen(symbol));
-     blok->h.first_avail += strlen(symbol);
-+    /* must maintain alignment */
-+    blok->h.first_avail += (strlen(symbol) / POOL_HDR_BYTES + 1) * POOL_HDR_BYTES;
-   }
-   
-   new_pool->free_first_avail = blok->h.first_avail;
diff --git a/net/proftpd/patches/patch-ad b/net/proftpd/patches/patch-ad
index 806e8a89e34..bb557e297ee 100644
--- a/net/proftpd/patches/patch-ad
+++ b/net/proftpd/patches/patch-ad
@@ -1,5 +1,5 @@
---- src/log.c.orig	Sat Oct 17 22:24:41 1998
-+++ src/log.c	Mon Dec 14 15:14:12 1998
+--- src/log.c.orig	Fri Sep 10 17:17:02 1999
++++ src/log.c	Sun Sep 12 10:32:18 1999
 @@ -44,7 +44,7 @@
  static int syslog_discard = FALSE;
  static int logstderr = TRUE;
@@ -9,7 +9,16 @@
  static int set_facility = -1;
  static char *syslog_fn = NULL;
  static char *syslog_hostname;
-@@ -718,7 +718,7 @@
+@@ -710,7 +710,7 @@
+   log(priority,facility,buf);
+ }
+ 
+-/* Like log_pri(), but sends the log entry in the LOG_AUTHPRIV
++/* Like log_pri(), but sends the log entry in the LOG_FTP
+  * facility (presumable it doesn't need to be seen by everyone
+  */
+ 
+@@ -725,7 +725,7 @@
  
    buf[1023] = '\0';