Updated poppassd to 4.0.4

* Fixed DOS attack seen on some systems.
* Fixed "noop has null function" log entry.
* Allow '-p' to be used when APOP not defined (noted by Daniel Senie).
* Enforce ClearTextPassword even without APOP (noted by Daniel Senie).
* Restrict clear-text-password=never to APOP.
* Restrict clear-text-password=tls to QPOP_SSL.
* Fixed qpopper hanging on I/O error on some platforms.

4 files changed, 25 insertions, 25 deletions

diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index d3bd295bdd6..0873112ee16 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 03:37:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/05/02 16:16:55 martti Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -7,14 +7,14 @@ CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 
 PATCH_SITES=		http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=		qpopper4.0.3-ipv6-20010504.diff.gz
+PATCHFILES=		qpopper4.0.4-ipv6-20020502.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		http://www.eudora.com/qpopper/
 COMMENT=		Qualcomm's password change server mainly for Eudora
 
-VERSION=		4.0.3
+VERSION=		4.0.4
 USE_BUILDLINK_ONLY=	# defined
 CONFIGURE_ARGS+=	--enable-poppassd
 CONFIGURE_ENV+=	CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"'
diff --git a/mail/poppassd/distinfo b/mail/poppassd/distinfo
index cba5605ef4f..941d534234f 100644
--- a/mail/poppassd/distinfo
+++ b/mail/poppassd/distinfo
@@ -1,9 +1,9 @@
+$NetBSD: distinfo,v 1.2 2002/05/02 16:16:55 martti Exp $
 
-
-SHA1 (qpopper4.0.3.tar.gz) = 67b343a57e10250c98eb87660e6d563be6c018cc
-Size (qpopper4.0.3.tar.gz) = 2326127 bytes
-SHA1 (qpopper4.0.3-ipv6-20010504.diff.gz) = cc74bffbd769a6589ee945916a33b17ea4d7873f
-Size (qpopper4.0.3-ipv6-20010504.diff.gz) = 21263 bytes
+SHA1 (qpopper4.0.4.tar.gz) = c8b35bfa79000e3f1d67574c93d8d8ef580cd57c
+Size (qpopper4.0.4.tar.gz) = 2261992 bytes
+SHA1 (qpopper4.0.4-ipv6-20020502.diff.gz) = 7af76478f249684ebc02938d9a4a8cc728a52b91
+Size (qpopper4.0.4-ipv6-20020502.diff.gz) = 21535 bytes
 SHA1 (patch-aa) = 3dfad411477bae676ec4ea3dadf1d47d53ce1383
-SHA1 (patch-ab) = ba6795e6b6e1cd4565f76747f4af3a5f9c70fc5b
-SHA1 (patch-ac) = 0b53ae1c11a922546708b1a71bb8ee57f05608ee
+SHA1 (patch-ab) = 2ab7597bacf172a7c2405f2d1f0c9040dbab66b8
+SHA1 (patch-ac) = f8e12e7d1c2b8ed4df8a696165be6b012716fdfe
diff --git a/mail/poppassd/patches/patch-ab b/mail/poppassd/patches/patch-ab
index ccae146f7b6..cf231b8f2c4 100644
--- a/mail/poppassd/patches/patch-ab
+++ b/mail/poppassd/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/06/10 15:15:06 taca Exp $
+$NetBSD: patch-ab,v 1.2 2002/05/02 16:16:56 martti Exp $
 
---- password/Makefile.in.orig	Mon May  7 10:00:48 2001
-+++ password/Makefile.in
+--- password/Makefile.in.orig	Fri Apr  5 04:38:33 2002
++++ password/Makefile.in	Thu May  2 14:22:07 2002
 @@ -30,7 +30,7 @@
  VPATH           =   @srcdir@
  prefix          =   @prefix@
@@ -15,8 +15,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/06/10 15:15:06 taca Exp $
  all: ${poppassd}
  
  install:
--	${INSTALL} -m 4755 -o root -g root poppassd ${installdir}/poppassd; \
-+	@${INSTALL} -m 4755 -o root -g wheel poppassd ${installdir}/poppassd; \
+-	${INSTALL} -m 4755 -o root -g 0 poppassd ${installdir}/poppassd; \
++	${INSTALL} -m 4755 -o root -g wheel poppassd ${installdir}/poppassd; \
  	echo "Installed poppassd as ${installdir}/poppassd" 
  
  poppassd: ${OBJS} ${common_dir}/libcommon.a
diff --git a/mail/poppassd/patches/patch-ac b/mail/poppassd/patches/patch-ac
index cee1ec60177..853f6562b94 100644
--- a/mail/poppassd/patches/patch-ac
+++ b/mail/poppassd/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
+$NetBSD: patch-ac,v 1.2 2002/05/02 16:16:56 martti Exp $
 
---- password/poppassd.c.orig	Sun Jun 10 22:54:40 2001
-+++ password/poppassd.c
+--- password/poppassd.c.orig	Fri Apr  5 04:38:36 2002
++++ password/poppassd.c	Thu May  2 09:03:15 2002
 @@ -167,8 +167,13 @@
  /* LANMAN allows up to 14 char passwords (truncates if longer), but tacacs
     only seems to allow 11. */
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
  
  #include "config.h"
  
-@@ -294,6 +299,7 @@
+@@ -283,6 +288,7 @@
  
  static char *P1[] =
     {
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
       "changing password for *\nold password: ",  /* shadow */
       "enter login password: ",                   /* Solaris */
       "old smb password: ",                       /* smb */
-@@ -353,7 +359,7 @@
+@@ -342,7 +348,7 @@
      char           oldpass [BUFSIZE]   = "";
      char           newpass [BUFSIZE]   = "";
      int            nopt                = -1;
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
      int            mode                = 0;
      char          *ptr                 = NULL;
      POP            p;
-@@ -375,8 +381,6 @@
+@@ -364,8 +370,6 @@
              pname = ptr + 1;
      }
  
@@ -42,7 +42,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
      /*
       * Set up some stuff in -p- so we can call Qpopper routines
       */
-@@ -384,6 +388,17 @@
+@@ -373,6 +377,17 @@
      p.AuthType            = noauth;
      p.myname              = pname;
  
@@ -60,7 +60,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
      /*
       * Handle command-line options
       */
-@@ -392,9 +407,9 @@
+@@ -381,9 +396,9 @@
      {
          switch (nopt)
          {
@@ -73,7 +73,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
                                    "[-t trace-file] [-v] [-y log-facility]\n",
                            pname );
                  exit (1);
-@@ -411,20 +426,34 @@
+@@ -400,20 +415,34 @@
                  verbose = TRUE;
                  break;
  
@@ -110,7 +110,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/10 15:15:07 taca Exp $
                  break;
  
             case 't':
-@@ -781,6 +810,11 @@
+@@ -770,6 +799,11 @@
  
     chdir ("/");
     umask (0);