Upgrade to 4.5.1.

7 files changed, 36 insertions, 96 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index cae878338f7..8bd4c096faf 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.9 1998/06/18 15:25:24 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/07/04 04:41:35 mycroft Exp $
 # $FreeBSD Id: Makefile,v 1.55 1998/01/29 17:13:07 ache Exp
 #
 
-DISTNAME=       fetchmail-4.3.9
+DISTNAME=       fetchmail-4.5.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 
-MAINTAINER=	ve@sci.fi
+MAINTAINER=	mycroft@netbsd.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
@@ -14,7 +14,7 @@ CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
 .include "../../mk/bsd.prefs.mk"
 
 .if exists(/usr/lib/libkrb.a) && (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
-CONFIGURE_ARGS += --with-kerberos=/usr
+CONFIGURE_ARGS += --with-kerberos=yes
 .endif
 
 FDOC=   ${PREFIX}/share/doc/fetchmail
diff --git a/mail/fetchmail/files/md5 b/mail/fetchmail/files/md5
index 74a61e925ce..699c23af71a 100644
--- a/mail/fetchmail/files/md5
+++ b/mail/fetchmail/files/md5
@@ -1 +1 @@
-MD5 (fetchmail-4.3.9.tar.gz) = 9fb3b16358e9f4e4e98dcd9783a82a70
+MD5 (fetchmail-4.5.1.tar.gz) = 6e8848fefa96891e3a46f3f1aeea3b6a
diff --git a/mail/fetchmail/patches/patch-aa b/mail/fetchmail/patches/patch-aa
index 0e961a19a8d..3df96650a61 100644
--- a/mail/fetchmail/patches/patch-aa
+++ b/mail/fetchmail/patches/patch-aa
@@ -1,20 +1,12 @@
-*** md5ify.c.orig	Fri Nov  8 20:13:11 1996
---- md5ify.c	Wed Jun 11 06:34:20 1997
-***************
-*** 16,22 ****
-  #include <string.h>
-  #endif
-  
-! #include "md5.h"
-  
-  char *
-  MD5Digest (s)
---- 16,23 ----
-  #include <string.h>
-  #endif
-  
-! #include <sys/types.h>
-! #include <md5.h>
-  
-  char *
-  MD5Digest (s)
+--- md5ify.c.orig	Wed May 27 08:56:11 1998
++++ md5ify.c	Sat Jul  4 00:25:57 1998
+@@ -17,7 +17,8 @@
+ #include <string.h>
+ #endif
+ 
+-#include "md5.h"
++#include <sys/types.h>
++#include <md5.h>
+ 
+ char *
+ MD5Digest (s)
diff --git a/mail/fetchmail/patches/patch-ab b/mail/fetchmail/patches/patch-ab
index 2d0ca2d8e0d..84f6f232392 100644
--- a/mail/fetchmail/patches/patch-ab
+++ b/mail/fetchmail/patches/patch-ab
@@ -1,20 +1,29 @@
---- Makefile.in.orig	Tue Oct 14 06:12:14 1997
-+++ Makefile.in	Thu Oct 16 06:55:05 1997
-@@ -82,7 +82,7 @@
+--- Makefile.in.orig	Tue Jun 30 22:04:42 1998
++++ Makefile.in	Sat Jul  4 00:38:31 1998
+@@ -80,7 +80,7 @@
  
  protobjs = rcfile_y.o rcfile_l.o socket.o getpass.o pop2.o pop3.o imap.o \
         etrn.o fetchmail.o env.o options.o daemon.o driver.o rfc822.o smtp.o \
 -       xmalloc.o uid.o mxget.o md5c.o md5ify.o rpa.o interface.o netrc.o \
 +       xmalloc.o uid.o mxget.o md5ify.o rpa.o interface.o netrc.o \
-        base64.o error.o
+        base64.o error.o unmime.o conf.o is_ip_alias.o
  
  objs = $(protobjs) $(extras) $(EXTRAOBJ)
-@@ -93,7 +93,7 @@
+@@ -91,7 +91,7 @@
         $(srcdir)/options.c $(srcdir)/daemon.c 				\
         $(srcdir)/driver.c $(srcdir)/rfc822.c $(srcdir)/smtp.c		\
         $(srcdir)/xmalloc.c $(srcdir)/uid.c $(srcdir)/mxget.c 		\
 -       $(srcdir)/md5c.c $(srcdir)/md5ify.c $(srcdir)/rpa.c	  	\
 +       $(srcdir)/md5ify.c $(srcdir)/rpa.c              \
         $(srcdir)/interface.c $(srcdir)/netrc.c $(srcdir)/base64.c	\
-        $(srcdir)/error.c
- 
+        $(srcdir)/error.c $(srcdir)/unmime.c $(srcdir)/conf.c		\
+        $(srcdir)/is_ip_alias.c
+@@ -135,7 +135,7 @@
+ 	@echo "Installing fetchmail binary..."
+ 	$(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail
+ 	@echo "Installing fetchmail configurator..."
+-	$(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
++	$(INSTALL_PROGRAM:N-s) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
+ 	@echo "Installing manual page..."
+ 	$(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
+ 	ln -f -s $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
diff --git a/mail/fetchmail/patches/patch-ac b/mail/fetchmail/patches/patch-ac
deleted file mode 100644
index 9231957f75f..00000000000
--- a/mail/fetchmail/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- fetchmail.h.orig	Sun Jan 18 18:39:32 1998
-+++ fetchmail.h	Sat Feb 28 12:21:24 1998
-@@ -28,6 +28,7 @@
- #define		USERNAMELEN	40	/* max POP3 arg length (RFC1939) */
- #define		IDLEN		128	/* max length of UID (RFC1939) */
- 
-+#undef		MSGBUFSIZE
- #define		MSGBUFSIZE	2048   	/* size of message read buffer */
- #define		PASSWORDLEN	64	/* max password length */
- #define		DIGESTLEN	33	/* length of MD5 digest */
diff --git a/mail/fetchmail/patches/patch-ba b/mail/fetchmail/patches/patch-ba
deleted file mode 100644
index 1a7dc9f84a0..00000000000
--- a/mail/fetchmail/patches/patch-ba
+++ /dev/null
@@ -1,53 +0,0 @@
---- driver.c.orig	Thu Mar  5 23:16:28 1998
-+++ driver.c	Mon Mar 16 03:20:15 1998
-@@ -54,6 +54,11 @@
- #include <krb.h>
- #define krb_get_err_text(e) (krb_err_txt[e])
- #else
-+#if defined(__NetBSD__)
-+#define krb_get_err_text(e) (krb_err_txt[e])
-+#include <kerberosIV/krb.h>
-+#include <kerberosIV/des.h>
-+#else
- #if defined(__FreeBSD__) || defined(__linux__)
- #define krb_get_err_text(e) (krb_err_txt[e])
- #include <krb.h>
-@@ -62,6 +67,7 @@
- #include <krb.h>
- #include <des.h>
- #endif /* ! defined (__FreeBSD__) */
-+#endif /* ! defined (__NetBSD__) */
- #endif /* ! defined (__bsdi__) */
- #include <netinet/in.h>
- #include <netdb.h>
-@@ -1594,7 +1600,7 @@
- kerberos_auth (socket, canonical) 
- /* authenticate to the server host using Kerberos V4 */
- int socket;		/* socket to server host */
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- char *canonical;	/* server name */
- #else
- const char *canonical;	/* server name */
---- imap.c.orig	Tue Mar  3 16:34:02 1998
-+++ imap.c	Mon Mar 16 03:15:37 1998
-@@ -18,12 +18,18 @@
- #ifdef KERBEROS_V4
- #if defined (__bsdi__)
- #include <des.h>
-+#include <krb.h>
- #define krb_get_err_text(e) (krb_err_txt[e])
- #endif
-+#if defined (__NetBSD__)
-+#define krb_get_err_text(e) (krb_err_txt[e])
-+#include <kerberosIV/krb.h>
-+#else
- #if defined (__FreeBSD__) || defined(__linux__)
- #define krb_get_err_text(e) (krb_err_txt[e])
--#endif
- #include <krb.h>
-+#endif
-+#endif
- #endif /* KERBEROS_V4 */
- 
- #ifdef GSSAPI
diff --git a/mail/fetchmail/pkg/PLIST b/mail/fetchmail/pkg/PLIST
index 46fba34200d..a7a3b3ea7b7 100644
--- a/mail/fetchmail/pkg/PLIST
+++ b/mail/fetchmail/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 1998/02/28 11:35:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/07/04 04:41:36 mycroft Exp $
 bin/fetchmail
+bin/fetchmailconf
 man/man1/fetchmail.1.gz
+man/man1/fetchmailconf.1.gz
 share/doc/fetchmail/README
 share/doc/fetchmail/COPYING
 share/doc/fetchmail/FAQ