From 44c1c9cce1b035970daaa41d8227d072c463066d Mon Sep 17 00:00:00 2001 From: frueauf Date: Mon, 10 Jan 2000 22:50:16 +0000 Subject: Update fetchmail to 5.2.3. fetchmail-5.2.3 (Tue Jan 4 01:56:11 EST 2000), 18421 lines: * Ken Estes's patch to check for unreachable UIDL file due to bad NFS mount. * Jorge Godoy's replacement pt_BR.po and various minor translation fixes. * Javier Kohen's replacement for es.po. * Munechika SUMIKAWA's patch to make IPv6 version build when POP2 is enabled. * Russian translation removed; it was badly garbled. * Added Rick van Rein's fetchmaildistrib script to the contrib directory. * Gunther Leber's cleanup patches. * Note to translators: The bodies of the login-error and timeout-error form letters have been changed in driver.c. fetchmail-5.2.2 (Sun Dec 26 09:31:07 EST 1999), 18365 lines: * Arrange for fetchmail to restart itself quietly when the rc file is touched. * Improvements to IPv6 code from Jun-ichiro itojun Hagino . * Drastic simplification of UIDL code, suggested by Ken Estes. fetchmail-5.2.1 (Sun Dec 19 23:08:53 EST 1999), 18330 lines: * Added FAQ item R10 on timeouts during messages. * Fixed indentation problem in fetchmailconf. * Federico Schwindt's patch to fix broken SSL configuration. * Fixes to use fetchmail with IPv6 enabled on glibc without inet6-apps installed; thanks to Arkadiusz Mis'kiewicz. * Interpret IMAP PREAUTH tag correctly (from Joerg Dorchain). * Upgraded to version 0.21 of smbutil.c. FAQ item S2 now documents how to set a domain name. --- mail/fetchmail/Makefile | 8 ++++---- mail/fetchmail/files/md5 | 4 ++-- mail/fetchmail/files/patch-sum | 8 ++++---- mail/fetchmail/patches/patch-ab | 35 ++++------------------------------- mail/fetchmail/patches/patch-ac | 25 ++++--------------------- mail/fetchmail/patches/patch-ad | 14 ++++++++++++++ mail/fetchmail/patches/patch-ba | 30 ------------------------------ 7 files changed, 32 insertions(+), 92 deletions(-) create mode 100644 mail/fetchmail/patches/patch-ad delete mode 100644 mail/fetchmail/patches/patch-ba (limited to 'mail') diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index e1b98c0b5ea..093176ed261 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.60 2000/01/09 01:28:34 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2000/01/10 22:50:16 frueauf Exp $ # -DISTNAME= fetchmail-5.2.0 +DISTNAME= fetchmail-5.2.3 CATEGORIES= mail MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ \ http://www.tuxedo.org/~esr/fetchmail/ \ http://sunsite.unc.edu/pub/Linux/system/mail/pop/ MAINTAINER= mycroft@netbsd.org -HOMEPAGE= http://www.tuxedo.org/~esr/fetchmail/ +HOMEPAGE= http://www.tuxedo.org/~esr/fetchmail/ BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf @@ -43,7 +43,7 @@ pre-configure: post-build: tbl ${WRKSRC}/fetchmail.tbl >${WRKSRC}/fetchmail.man - + post-install: ${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${FDOC} cd ${WRKSRC} && ${INSTALL_DATA} \ diff --git a/mail/fetchmail/files/md5 b/mail/fetchmail/files/md5 index ae4d87967ca..e66c3c385eb 100644 --- a/mail/fetchmail/files/md5 +++ b/mail/fetchmail/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.38 1999/12/01 12:43:04 frueauf Exp $ +$NetBSD: md5,v 1.39 2000/01/10 22:50:17 frueauf Exp $ -MD5 (fetchmail-5.2.0.tar.gz) = 3fadbabedb501b26662ce9c5d939e86d +MD5 (fetchmail-5.2.3.tar.gz) = ad21b1ac6a062bd8b8236c1e33299bf3 diff --git a/mail/fetchmail/files/patch-sum b/mail/fetchmail/files/patch-sum index 24ee80a0da2..9b2f0198e21 100644 --- a/mail/fetchmail/files/patch-sum +++ b/mail/fetchmail/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.6 1999/11/21 18:37:58 frueauf Exp $ +$NetBSD: patch-sum,v 1.7 2000/01/10 22:50:17 frueauf Exp $ MD5 (patch-aa) = cc1298297934cf1b0821583ef27ac5d9 -MD5 (patch-ab) = dcbd9a50e28acc1bd321e776add01826 -MD5 (patch-ac) = aa44698fac33efbe0576f591ac4d4150 -MD5 (patch-ba) = 498ab1120edc90111572689f142c953b +MD5 (patch-ab) = 32e8423a8750fe451c76cbcc31418ecd +MD5 (patch-ac) = 9e39b55d1919bb0a3d95d4e9ecdb1c06 +MD5 (patch-ad) = da45661a42aca654307a83b8d00c6a18 diff --git a/mail/fetchmail/patches/patch-ab b/mail/fetchmail/patches/patch-ab index 81bbbabc8f5..664a2270075 100644 --- a/mail/fetchmail/patches/patch-ab +++ b/mail/fetchmail/patches/patch-ab @@ -1,35 +1,8 @@ -$NetBSD: patch-ab,v 1.10 1999/10/01 10:49:52 agc Exp $ +$NetBSD: patch-ab,v 1.11 2000/01/10 22:50:17 frueauf Exp $ ---- Makefile.in.orig Wed Sep 22 06:27:27 1999 -+++ Makefile.in Fri Oct 1 11:45:47 1999 -@@ -82,9 +82,16 @@ - ETAGS = etags - CTAGS = ctags - -+OPSYS!= uname -s -+ -+.if ${OPSYS} == "SunOS" -+MD5OBJ= md5c.o -+MD5SRC= ${srcdir}/md5c.c -+.endif -+ - 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 sink.o \ -- rfc822.o smtp.o xmalloc.o uid.o mxget.o md5c.o md5ify.o rpa.o \ -+ rfc822.o smtp.o xmalloc.o uid.o mxget.o ${MD5OBJ} md5ify.o rpa.o \ - interface.o netrc.o base64.o error.o unmime.o conf.o checkalias.o \ - smbdes.o smbencrypt.o smbmd4.o smbutil.o - -@@ -96,7 +103,7 @@ - $(srcdir)/options.c $(srcdir)/daemon.c $(srcdir)/driver.c \ - $(srcdir)/sink.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 \ -+ ${MD5SRC} $(srcdir)/md5ify.c $(srcdir)/rpa.c \ - $(srcdir)/interface.c $(srcdir)/netrc.c $(srcdir)/base64.c \ - $(srcdir)/error.c $(srcdir)/unmime.c $(srcdir)/conf.c \ - $(srcdir)/checkalias.c $(srcdir)/smbdes.c $(srcdir)/smbencrypt.c \ -@@ -151,7 +158,7 @@ +--- Makefile.in.orig Tue Jan 4 07:58:45 2000 ++++ Makefile.in Mon Jan 10 21:34:27 2000 +@@ -152,7 +152,7 @@ @echo "Installing fetchmail binary..." $(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail @echo "Installing fetchmail configurator..." diff --git a/mail/fetchmail/patches/patch-ac b/mail/fetchmail/patches/patch-ac index 90ef62e860c..0378e3c0897 100644 --- a/mail/fetchmail/patches/patch-ac +++ b/mail/fetchmail/patches/patch-ac @@ -1,25 +1,8 @@ -$NetBSD: patch-ac,v 1.6 1999/11/21 18:37:58 frueauf Exp $ +$NetBSD: patch-ac,v 1.7 2000/01/10 22:50:18 frueauf Exp $ ---- configure.in.orig Sun Nov 7 23:50:31 1999 -+++ configure.in Sun Nov 21 18:21:39 1999 -@@ -287,13 +287,9 @@ - - AC_ARG_ENABLE(inet6, - [ --enable-inet6 support IPv6 (requires the inet6-apps library)], -- [ unset ac_cv_lib_inet6_getaddrinfo; AC_CHECK_LIB(inet6,getaddrinfo,, -- [ unset ac_cv_lib_inet6_getaddrinfo; -- LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; -- AC_CHECK_LIB(inet6, getaddrinfo,, -- [ echo 'configure: cannot find libinet6, which is required for IPv6 support.'; -- exit 1]) ]) ] -- [with_inet6=no]) -+ [ AC_CHECK_FUNCS(getaddrinfo, -+ [AC_DEFINE(INET6, 1)], -+ [echo 'configure: cannot find getaddrinfo which is required for inet6 support.'; exit 1]) ]) - test "$with_inet6" = "yes" && AC_DEFINE(INET6_ENABLE) - - AC_ARG_ENABLE(netsec, -@@ -496,7 +492,7 @@ +--- configure.in.orig Tue Jan 4 07:57:37 2000 ++++ configure.in Mon Jan 10 21:37:25 2000 +@@ -509,7 +509,7 @@ LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib" LIBS="$LIBS -lhesiod" else diff --git a/mail/fetchmail/patches/patch-ad b/mail/fetchmail/patches/patch-ad new file mode 100644 index 00000000000..54a8e440936 --- /dev/null +++ b/mail/fetchmail/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.6 2000/01/10 22:50:18 frueauf Exp $ + +--- acconfig.h-orig Sun Dec 19 18:17:58 1999 ++++ acconfig.h Mon Jan 10 22:09:15 2000 +@@ -14,6 +14,9 @@ + Leave the following blank line there!! Autoheader needs it. */ + + ++/* Define to 1 if you have MD5 */ ++#undef HAVE_MD5 ++ + /* Define to 1 if NLS is requested. */ + #undef ENABLE_NLS + diff --git a/mail/fetchmail/patches/patch-ba b/mail/fetchmail/patches/patch-ba deleted file mode 100644 index b14d0feec38..00000000000 --- a/mail/fetchmail/patches/patch-ba +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ba,v 1.7 1999/07/07 23:28:13 itojun Exp $ - ---- socket.c.orig Tue Feb 2 18:33:38 1999 -+++ socket.c Mon Jun 7 23:12:27 1999 -@@ -96,6 +96,7 @@ - void *request = NULL; - int requestlen; - #endif /* NET_SECURITY */ -+ int i; - - #ifdef HAVE_SOCKETPAIR - if (plugin) -@@ -122,7 +123,17 @@ - - ret: - #else /* NET_SECURITY */ -+#if 0 - i = inner_connect(ai, NULL, 0, NULL, NULL, "fetchmail", NULL); -+#else -+ i = socket(ai->ai_family, ai->ai_socktype, 0); -+ if (i < 0) -+ return -1; -+ if (connect(i, (struct sockaddr *) ai->ai_addr, ai->ai_addrlen) < 0) { -+ close(i); -+ return -1; -+ } -+#endif - #endif /* NET_SECURITY */ - - freeaddrinfo(ai); -- cgit v1.2.3