From afb661365daa586a6711392781dc0f0f6992530a Mon Sep 17 00:00:00 2001
From: mharo <mharo@FreeBSD.org>
Date: Mon, 14 Feb 2000 23:20:16 +0000
Subject: update to 4.7a

PR:     16545
Submitted by:   Akinori "Aki" MUSHA <knu@idaemons.org>
---
 mail/imap-uw/files/patch-ac | 18 +++++++++++++++---
 mail/imap-uw/files/patch-ae | 35 ++++++++---------------------------
 2 files changed, 23 insertions(+), 30 deletions(-)

(limited to 'mail/imap-uw/files')

diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 9d324e6..566d1b9 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -32,9 +32,9 @@
  
  ipopd: ipop2d ipop3d
  
---- src/mtest/Makefile.orig	Wed Apr 15 01:42:04 1998
-+++ src/mtest/Makefile	Sat Oct 10 21:48:18 1998
-@@ -39,7 +39,7 @@
+--- src/mtest/Makefile.orig	Wed Apr 15 07:42:04 1998
++++ src/mtest/Makefile	Fri Feb  4 14:37:44 2000
+@@ -39,14 +39,16 @@
  
  CC = `cat $C/CCTYPE`
  CFLAGS = -I$C `cat $C/CFLAGS`
@@ -43,3 +43,15 @@
  
  all:	mtest
  
+-mtest: $(CCLIENTLIB) mtest.o
+-	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
++mtest: $(CCLIENTLIB) mtest.o safegets.o
++	$(CC) $(CFLAGS) -o mtest mtest.o safegets.o $(LDFLAGS)
+ 
+-mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
++mtest.o:  safegets.h $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
++
++safegets.o: safegets.h $C/mail.h
+ 
+ $(CCLIENTLIB):
+ 	cd $C;make
diff --git a/mail/imap-uw/files/patch-ae b/mail/imap-uw/files/patch-ae
index a3b4909..7ede861 100644
--- a/mail/imap-uw/files/patch-ae
+++ b/mail/imap-uw/files/patch-ae
@@ -1,12 +1,12 @@
 --- src/mtest/mtest.c.orig	Sat May 29 08:07:06 1999
-+++ src/mtest/mtest.c	Sun Dec 19 15:29:29 1999
-@@ -95,6 +95,7 @@
- void status (MAILSTREAM *stream);
- void prompt (char *msg,char *txt);
- void smtptest (long debug);
-+char *safegets(char *buf);
- 
- /* Main program - initialization */
++++ src/mtest/mtest.c	Fri Feb  4 12:25:32 2000
+@@ -49,6 +49,7 @@
+ #include "rfc822.h"
+ #include "smtp.h"
+ #include "nntp.h"
++#include "safegets.h"
+ 
+ /* Excellent reasons to hate ifdefs, and why my real code never uses them */
  
 @@ -528,7 +529,7 @@
  void prompt (char *msg,char *txt)
@@ -26,22 +26,3 @@
      if (line[0] == '.') {
        if (line[1] == '\0') break;
        else strcat (text,".");
-@@ -744,4 +745,18 @@
-   else puts ("[Can't open connection to any server]");
-   mail_free_envelope (&msg);
-   mail_free_body (&body);
-+}
-+
-+char *safegets(char *buf) {
-+ char *p;
-+
-+ if (!fgets(buf, MAILTMPLEN, stdin)) {
-+  return NULL;
-+ }
-+
-+ if ((p = strchr(buf, '\n')) != NULL) {
-+  *p = '\0';
-+ }
-+
-+ return buf;
- }
-- 
cgit v1.1