Update poppassd to 4.1.0.

Use the same distfile with qpopper 4.1.0.

9 files changed, 80 insertions, 114 deletions

diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index 6d05592af40..4118520b293 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2009/12/27 14:17:38 obache Exp $
+# $NetBSD: Makefile,v 1.27 2012/03/22 14:15:32 taca Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
 PKGNAME=		poppassd-${VERSION}
-PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${QPOPPER_MASTER_SITES}
 
@@ -17,6 +16,11 @@ COMMENT=		Qualcomm's password change server mainly for Eudora
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_FILES.prefix=	man/poppassd.8 password/poppassd.c
+SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+
 .include "../../mail/qpopper/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-poppassd --without-pam
@@ -25,6 +29,8 @@ MAKE_ENV+=	ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
 
 .include "options.mk"
 
+SPECIAL_PERMS+=	libexec/poppassd ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4755
+
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 share/doc libexec
 # popper makefile doesn't have an install target...
 INSTALL_DIRS=		password
diff --git a/mail/poppassd/distinfo b/mail/poppassd/distinfo
index 13301edf057..16bcbfc086e 100644
--- a/mail/poppassd/distinfo
+++ b/mail/poppassd/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.17 2009/12/27 14:17:38 obache Exp $
+$NetBSD: distinfo,v 1.18 2012/03/22 14:15:32 taca Exp $
 
-SHA1 (qpopper4.0.9-ipv6-20060626.diff.gz) = f141b8604f9d3d85369a87c3bd449e74528d97a5
-RMD160 (qpopper4.0.9-ipv6-20060626.diff.gz) = a546b435247d236536aead7909056566e0820174
-Size (qpopper4.0.9-ipv6-20060626.diff.gz) = 10986 bytes
-SHA1 (qpopper4.0.9.tar.gz) = 5629aa86d92fe10565021980882dffb733ce73d9
-RMD160 (qpopper4.0.9.tar.gz) = b48a68cd9e282bfb3d78c6b53f3dee7c97bdf77d
-Size (qpopper4.0.9.tar.gz) = 2767261 bytes
-SHA1 (patch-aa) = 0dd1bdc832d00bd640e7003afea28f0d90c2f975
-SHA1 (patch-ab) = 0c51cede93abbcc7c25025063b3da8e3d8f1a048
-SHA1 (patch-ac) = 22084cab73f3bbf5a4bbad719e2a5de3ca9683bd
-SHA1 (patch-ad) = 01036ef18732b3a7576ac79e35ea9b027e2eef63
-SHA1 (patch-ae) = fa5febd4eedccdbd5610821b222a689193993bae
-SHA1 (patch-af) = 3ef194b6b1819e6aa7415a48180894c11fc8fb33
-SHA1 (patch-ag) = 6df76adb260bee99eb4165f5ac8dff7a2e685a8a
+SHA1 (qpopper4.1.0.tar.gz) = 7806c230cb2b87d131c356de6ce85160650b5aea
+RMD160 (qpopper4.1.0.tar.gz) = 5254dd252739b2465795a0161bc2fed82adffbcc
+Size (qpopper4.1.0.tar.gz) = 1239530 bytes
+SHA1 (patch-aa) = f80e0e2c820aa93ddfab40b6506edd44a78b1e04
+SHA1 (patch-ab) = b5e9e55a8bbfe1edd5a63abfeff44dc6ee853701
+SHA1 (patch-ac) = 5f6ea3f46f88e2569bb2665d168955384c52b090
+SHA1 (patch-ad) = 049020d3c93fda18734eb07034faf5640f33c24c
+SHA1 (patch-af) = 83488041a0bf7e5bae07bf4e32ab065735a696f5
+SHA1 (patch-ag) = 1593366df600fc52b84b1ca6e8a825142c9c7400
diff --git a/mail/poppassd/patches/patch-aa b/mail/poppassd/patches/patch-aa
index 13c33bf923e..9bc228cb013 100644
--- a/mail/poppassd/patches/patch-aa
+++ b/mail/poppassd/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/01/29 15:45:00 taca Exp $
+$NetBSD: patch-aa,v 1.3 2012/03/22 14:15:32 taca Exp $
 
---- man/poppassd.8.orig	2001-03-21 08:43:24.000000000 +0900
+--- man/poppassd.8.orig	2011-05-30 19:13:39.000000000 +0000
 +++ man/poppassd.8
 @@ -6,33 +6,36 @@
  .\" See License.txt file for terms and conditions for modification and
@@ -109,8 +109,17 @@ $NetBSD: patch-aa,v 1.2 2004/01/29 15:45:00 taca Exp $
 +Instructs
 +.I poppassd
 +to change the smb password and specifies the path to the executable 
-+to use.  The default is /usr/bin/smbpasswd.
++to use.  The default is @PREFIX@/bin/smbpasswd.
 +.TP
  .BI \-t " tracefile"
  Turns on debug tracing, and causes all trace and log output to be
  written to the file specified as
+@@ -125,7 +146,7 @@ through
+ .TP
+ .B /usr/bin/passwd password-change program
+ .TP
+-.B /usr/bin/smbpasswd smb password-change program
++.B @PREFIX@/bin/smbpasswd smb password-change program
+ 
+ .SH SEE ALSO
+ popper(8), popauth(8), inetd(8), inetd.conf(4)
diff --git a/mail/poppassd/patches/patch-ab b/mail/poppassd/patches/patch-ab
index 087d50025f9..e2ece80d097 100644
--- a/mail/poppassd/patches/patch-ab
+++ b/mail/poppassd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2008/06/12 02:14:35 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2012/03/22 14:15:32 taca Exp $
 
---- 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 @@
+--- password/Makefile.in.orig	2011-05-30 19:13:39.000000000 +0000
++++ password/Makefile.in
+@@ -37,7 +37,7 @@ srcdir          =   @srcdir@
  VPATH           =   @srcdir@
  prefix          =   @prefix@
  exec_prefix     =   @exec_prefix@
@@ -11,12 +11,12 @@ $NetBSD: patch-ab,v 1.5 2008/06/12 02:14:35 joerg Exp $
  
  common_srcdir   =   ${top_srcdir}/common
  popper_srcdir   =   ${top_srcdir}/popper
-@@ -80,7 +80,7 @@
+@@ -88,7 +88,7 @@ INSTALL         =   @INSTALL@
  all: ${poppassd}
  
  install:
--	${INSTALL} -m 4755 -o root -g 0 poppassd ${installdir}/poppassd; \
-+	${INSTALL} -m 555 -o ${ROOT_USER} -g ${ROOT_GROUP} poppassd ${DESTDIR}${installdir}/poppassd; \
- 	echo "Installed poppassd as ${installdir}/poppassd" 
+-	@${INSTALL} -m 4755 -o root -g 0 poppassd ${installdir}/poppassd
++	@${BSD_INSTALL_PROGRAM} poppassd ${DESTDIR}${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 3f602efe4e6..eb678e7677a 100644
--- a/mail/poppassd/patches/patch-ac
+++ b/mail/poppassd/patches/patch-ac
@@ -1,31 +1,30 @@
-$NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
+$NetBSD: patch-ac,v 1.10 2012/03/22 14:15:32 taca Exp $
 
---- password/poppassd.c.orig	2009-12-27 13:05:39.000000000 +0000
+--- password/poppassd.c.orig	2011-05-30 19:13:39.000000000 +0000
 +++ password/poppassd.c
-@@ -171,8 +171,13 @@
+@@ -171,14 +171,20 @@
  /* LANMAN allows up to 14 char passwords (truncates if longer), but tacacs
     only seems to allow 11. */
  
 +#ifndef PASSWD_BINARY
  #define PASSWD_BINARY "/usr/bin/passwd"         /* TBD: config.h */
+-#define SMBPASSWD_BINARY "/usr/bin/smbpasswd"   /* TBD: config.h */
 +#endif
 +
 +#ifndef SMBPASSWD_BINARY
- #define SMBPASSWD_BINARY "/usr/bin/smbpasswd"   /* TBD: config.h */
++#define SMBPASSWD_BINARY "@PREFIX@/bin/smbpasswd"   /* TBD: config.h */
 +#endif
  
  #include "config.h"
  
-@@ -180,6 +185,8 @@
+ #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
- 
 +#include <signal.h>
-+
+ 
  #if HAVE_SYS_NETINET_IN_H
  #  include <sys/netinet/in.h>
- #endif
-@@ -251,7 +258,7 @@ int     dochild (int master, char *slave
+@@ -251,7 +257,7 @@ int     dochild (int master, char *slave
  int     findpty (char **slave);
  void    writestring (int fd, char *s);
  int     talktochild (int master, char *user, char *oldpass, char *newpass,
@@ -34,15 +33,14 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  int     match (char *str, char *pat);
  int     expect (int master, char **expected, char *buf);
  void    getemess (int master, char **expected, char *buf);
-@@ -268,7 +275,7 @@ void    get_client_info ( POP *p, BOOL n
+@@ -268,6 +274,7 @@ void    get_client_info ( POP *p, BOOL n
  char   *sock_ntop ( struct sockaddr *p, int salen );
  int     sock_port ( struct sockaddr *p, int salen );
  char   *debug_str ( char *p, int inLen, int order );
--
 +void	reapchild (int);
  
+ 
  /*
-  * External prototypes
 @@ -289,6 +296,8 @@ pop_result auth_user ( POP *p, char *pas
  
  static char *P1[] =
@@ -69,14 +67,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  
  /*
   * Be careful using TRACE in an 'if' statement!
-@@ -341,18 +353,19 @@ char          *smb_binary           = SM
- #define RUN_PASSWD 1
- #define RUN_SMBPASSWD 2
- 
--
- int main ( int argc, char *argv[] )
- {
-     char           line    [BUFSIZE]   = "";
+@@ -348,11 +360,13 @@ int main ( int argc, char *argv[] )
      char           oldpass [BUFSIZE]   = "";
      char           newpass [BUFSIZE]   = "";
      int            nopt                = -1;
@@ -91,7 +82,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  
  #ifdef HAS_SHADOW
      struct spwd *spwd;
-@@ -370,8 +383,6 @@ int main ( int argc, char *argv[] )
+@@ -370,8 +384,6 @@ int main ( int argc, char *argv[] )
              pname = ptr + 1;
      }
  
@@ -100,7 +91,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
      /*
       * Set up some stuff in -p- so we can call Qpopper routines
       */
-@@ -379,6 +390,17 @@ int main ( int argc, char *argv[] )
+@@ -379,6 +391,17 @@ int main ( int argc, char *argv[] )
      p.AuthType            = noauth;
      p.myname              = pname;
  
@@ -118,7 +109,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
      /*
       * Handle command-line options
       */
-@@ -387,9 +409,9 @@ int main ( int argc, char *argv[] )
+@@ -387,9 +410,9 @@ int main ( int argc, char *argv[] )
      {
          switch (nopt)
          {
@@ -131,7 +122,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
                                    "[-t trace-file] [-v] [-y log-facility]\n",
                            pname );
                  exit (1);
-@@ -406,20 +428,34 @@ int main ( int argc, char *argv[] )
+@@ -406,6 +429,13 @@ int main ( int argc, char *argv[] )
                  verbose = TRUE;
                  break;
  
@@ -145,10 +136,8 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
             case 's':
                  mode |= RUN_SMBPASSWD;
                  if ( optarg != NULL && *optarg != '\0' )
-                     smb_binary = optarg;
-                 TRACE ( trace_file, POP_DEBUG, HERE,
--                        "Changing SMB passwords using %s", smb_binary );
-+                        "Changing SMB password using %s", smb_binary );
+@@ -414,6 +444,13 @@ int main ( int argc, char *argv[] )
+                         "Changing SMB passwords using %s", smb_binary );
                  break;
  
 +           case 'P':
@@ -161,14 +150,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
             case 'p':
                  mode |= RUN_PASSWD;
                  if ( optarg != NULL && *optarg != '\0' )
-                     pwd_binary = optarg;
-                 TRACE ( trace_file, POP_DEBUG, HERE,
--                        "Changing standard passwords using %s", pwd_binary );
-+                        "Changing standard password using %s", pwd_binary );
-                 break;
- 
-            case 't':
-@@ -470,6 +506,10 @@ int main ( int argc, char *argv[] )
+@@ -470,6 +507,10 @@ int main ( int argc, char *argv[] )
                          "Avoiding reverse lookups (-R)" );
                  break;
  
@@ -179,7 +161,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
              case 'y': /* log facility */
                  if ( optarg == NULL || *optarg == '\0' ) {
                      err_msg ( HERE, "-y value expected" );
-@@ -557,44 +597,50 @@ int main ( int argc, char *argv[] )
+@@ -557,44 +598,51 @@ int main ( int argc, char *argv[] )
          return 1;
      }
  
@@ -207,7 +189,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
 -    if ((spwd = getspnam(userid)) == NULL)
 -          pw->pw_passwd = "";
 -    else
--          pw->pw_passwd = spwd->sp_pwdp;
+           pw->pw_passwd = spwd->sp_pwdp;
 +	if ((spwd = getspnam(userid)) == NULL)
 +	    pw->pw_passwd = "";
 +	else
@@ -248,16 +230,17 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  
 -    if ( pw->pw_uid <= BLOCK_UID )
 - 
-+    /* new pass required */
-+    if ( strlen (newpass) == 0 )
-     {
+-    {
 -        syslog ( LOG_ERR, "someone tried to change %s's password", userid );
 -        WriteToClient ( "500 Not a user account." );
++    /* new pass required */
++    if ( strlen (newpass) == 0 )
++   {
 +        WriteToClient ("500 New password required.");
          return 1;
      }
  
-@@ -627,6 +673,20 @@ int main ( int argc, char *argv[] )
+@@ -627,6 +675,20 @@ int main ( int argc, char *argv[] )
      return 0;
  }
  
@@ -278,7 +261,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  
  /* Run a child process to do the password change */
  
-@@ -647,6 +707,10 @@ void runchild ( char *userid, char *oldp
+@@ -647,6 +709,10 @@ void runchild ( char *userid, char *oldp
          exit ( 1 );
      }
  
@@ -289,7 +272,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
    /* fork child process to talk to password program */
  
    pid = fork();
-@@ -659,7 +723,7 @@ void runchild ( char *userid, char *oldp
+@@ -659,7 +725,7 @@ void runchild ( char *userid, char *oldp
  
    if ( pid > 0 )   /* Parent */
    {
@@ -298,7 +281,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
      {
        logit ( trace_file, LOG_ERR, HERE, 
                "%s failed for %s", smb ? "smbpasswd" : "passwd", userid );
-@@ -671,10 +735,16 @@ void runchild ( char *userid, char *oldp
+@@ -671,10 +737,16 @@ void runchild ( char *userid, char *oldp
      wpid = waitpid ( pid, &wstat, 0 );
      if ( wpid < 0 )
      {
@@ -318,15 +301,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  
      if ( pid != wpid )
      {
-@@ -696,7 +766,6 @@ void runchild ( char *userid, char *oldp
-       WriteToClient ("500 Server error (abnormal exit), get help!");
-       exit(1);
-     }
--
-     close ( master ); /* done with the pty */
-   }
-   else      /* Child */
-@@ -778,6 +847,13 @@ int dochild (int master, char *slavedev,
+@@ -778,6 +850,13 @@ int dochild (int master, char *slavedev,
     chdir ("/");
     umask (0);
  
@@ -340,7 +315,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  /*
   * Become the user and run passwd. Linux shadowed passwd doesn't need
   * to be run as root with the username passed on the command line.
-@@ -877,20 +953,19 @@ void writestring (int fd, char *s)
+@@ -877,20 +956,19 @@ void writestring (int fd, char *s)
   * that the password wasn't changed).
   */
  int talktochild (int master, char *userid, char *oldpass, char *newpass,
@@ -365,7 +340,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
         /* wait for current password prompt */
         if (!expect(master, P1, buf)) return FAILURE;
  
-@@ -920,6 +995,10 @@ int talktochild (int master, char *useri
+@@ -920,6 +998,10 @@ int talktochild (int master, char *useri
       if ( !expect(master, P4, buf) )
          TRACE ( trace_file, POP_DEBUG, HERE, "no response -- assuming OK" );
  
@@ -376,7 +351,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
       return SUCCESS;
  }
  
-@@ -949,8 +1028,12 @@ int match (char *str, char *pat)
+@@ -949,8 +1031,12 @@ int match (char *str, char *pat)
             strlen(pat), debug_str(pat, strlen(pat), 1) );
  
     while (*str && *pat) {
@@ -391,7 +366,7 @@ $NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
  
       /* ignore multiple space sequences */
       if (*pat == ' ' && isspace (*str)) {
-@@ -1049,7 +1132,11 @@ int expect (int master, char **expected,
+@@ -1049,7 +1135,11 @@ int expect (int master, char **expected,
          if ( m < 0 ) {
             err_msg ( HERE, "read error from child" );
             return FAILURE;
diff --git a/mail/poppassd/patches/patch-ad b/mail/poppassd/patches/patch-ad
index ebe2f3475dd..a4cb7a6491a 100644
--- a/mail/poppassd/patches/patch-ad
+++ b/mail/poppassd/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/10/20 14:18:42 taca Exp $
+$NetBSD: patch-ad,v 1.2 2012/03/22 14:15:32 taca Exp $
 
---- config.h.in.orig	2004-10-20 14:19:23.413009000 +0900
+--- config.h.in.orig	2011-05-30 19:13:39.000000000 +0000
 +++ config.h.in
-@@ -58,6 +58,9 @@
+@@ -66,6 +66,9 @@
  /* Define if you don't have vprintf but do have _doprnt.  */
  #undef HAVE_DOPRNT
  
diff --git a/mail/poppassd/patches/patch-ae b/mail/poppassd/patches/patch-ae
deleted file mode 100644
index 27b43e144c4..00000000000
--- a/mail/poppassd/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/10/20 14:18:42 taca Exp $
-
---- configure.in.orig	2004-10-20 14:19:23.863020000 +0900
-+++ configure.in
-@@ -1440,6 +1440,7 @@ gethostbyname \
- gettimeofday \
- getusershell \
- mkdir \
-+setlogin \
- socket \
- strdup \
- strerror \
diff --git a/mail/poppassd/patches/patch-af b/mail/poppassd/patches/patch-af
index e139cd5314d..54b59bd9bd6 100644
--- a/mail/poppassd/patches/patch-af
+++ b/mail/poppassd/patches/patch-af
@@ -1,16 +1,8 @@
-$NetBSD: patch-af,v 1.2 2009/12/27 14:17:38 obache Exp $
+$NetBSD: patch-af,v 1.3 2012/03/22 14:15:32 taca Exp $
 
---- configure.orig	2009-12-27 13:05:39.000000000 +0000
+--- configure.orig	2010-10-02 00:22:09.000000000 +0000
 +++ configure
-@@ -5132,6 +5132,7 @@ fi
-       ipv6_cv_iruserok_sa=no
-       :
-     fi
-+fi
- 
- 
- USE_REG_STRUCT_RET="default"
-@@ -9228,6 +9229,7 @@ gethostbyname \
+@@ -11221,6 +11221,7 @@ gethostbyname \
  gettimeofday \
  getusershell \
  mkdir \
diff --git a/mail/poppassd/patches/patch-ag b/mail/poppassd/patches/patch-ag
index e5bf371fa51..6a308c112d0 100644
--- a/mail/poppassd/patches/patch-ag
+++ b/mail/poppassd/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2006/01/08 17:22:29 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2012/03/22 14:15:32 taca Exp $
 
---- popper/popper.h.orig	2006-01-08 17:09:15.000000000 +0000
+--- popper/popper.h.orig	2011-05-30 19:13:40.000000000 +0000
 +++ popper/popper.h
-@@ -287,8 +287,6 @@ typedef struct _pop_tls             pop_
+@@ -308,8 +308,6 @@ typedef struct _pop_sasl            pop_
  #  define WILDCARD_SHELL    "/POPPER/ANY/SHELL/"
  #endif /* CHECK_SHELL */