pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/poppassd Fix the problem on NetBSD 3.0BETA and la...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7718aa051fa1
branches: trunk
changeset: 495615:7718aa051fa1
user: taca <taca%pkgsrc.org@localhost>
date: Wed Jun 15 05:26:20 2005 +0000
description:
Fix the problem on NetBSD 3.0BETA and later noted by Martti Kuparinen
on tech-pkg.
Bump PKGREVISION.
diffstat:
mail/poppassd/Makefile | 3 +-
mail/poppassd/distinfo | 4 +-
mail/poppassd/patches/patch-ac | 49 +++++++++++++++++++++--------------------
3 files changed, 29 insertions(+), 27 deletions(-)
diffs (236 lines):
diff -r 70368456a0b5 -r 7718aa051fa1 mail/poppassd/Makefile
--- a/mail/poppassd/Makefile Wed Jun 15 04:43:09 2005 +0000
+++ b/mail/poppassd/Makefile Wed Jun 15 05:26:20 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/06/14 06:24:39 taca Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/15 05:26:20 taca Exp $
#
DISTNAME= qpopper${VERSION}
+PKGREVISION= 1
PKGNAME= poppassd-${VERSION}
CATEGORIES= mail
MASTER_SITES= ${QPOPPER_MASTER_SITES}
diff -r 70368456a0b5 -r 7718aa051fa1 mail/poppassd/distinfo
--- a/mail/poppassd/distinfo Wed Jun 15 04:43:09 2005 +0000
+++ b/mail/poppassd/distinfo Wed Jun 15 05:26:20 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/06/01 21:00:39 adrianp Exp $
+$NetBSD: distinfo,v 1.12 2005/06/15 05:26:20 taca Exp $
SHA1 (qpopper4.0.8.tar.gz) = 161038e6088b4952eedaf85fafa9f3b10eb40a01
RMD160 (qpopper4.0.8.tar.gz) = 4a1dc2aaa6ef1330a76dfed5330d658a45e7d1d2
@@ -8,7 +8,7 @@
Size (qpopper4.0.8-ipv6-20050515.diff.gz) = 11479 bytes
SHA1 (patch-aa) = 0dd1bdc832d00bd640e7003afea28f0d90c2f975
SHA1 (patch-ab) = 713698d5834b569a0ee08088567a71e218d50550
-SHA1 (patch-ac) = db8329f0937554be80a88f4754b37f3a69bd70aa
+SHA1 (patch-ac) = 66e6e30cf3e5983538fa4f3265a5244783ffeac9
SHA1 (patch-ad) = 01036ef18732b3a7576ac79e35ea9b027e2eef63
SHA1 (patch-ae) = fa5febd4eedccdbd5610821b222a689193993bae
SHA1 (patch-af) = 76ad4e1f557876dd1adf6c74f97512ad2fd8b92d
diff -r 70368456a0b5 -r 7718aa051fa1 mail/poppassd/patches/patch-ac
--- a/mail/poppassd/patches/patch-ac Wed Jun 15 04:43:09 2005 +0000
+++ b/mail/poppassd/patches/patch-ac Wed Jun 15 05:26:20 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/10/20 14:18:42 taca Exp $
+$NetBSD: patch-ac,v 1.7 2005/06/15 05:26:20 taca Exp $
---- password/poppassd.c.orig Wed Oct 20 15:12:58 2004
+--- password/poppassd.c.orig 2005-06-15 14:14:48.000000000 +0900
+++ password/poppassd.c
-@@ -167,8 +167,13 @@
+@@ -171,8 +171,13 @@
/* LANMAN allows up to 14 char passwords (truncates if longer), but tacacs
only seems to allow 11. */
@@ -16,7 +16,7 @@
#include "config.h"
-@@ -176,6 +181,8 @@
+@@ -180,6 +185,8 @@
#include <sys/stat.h>
#include <sys/wait.h>
@@ -25,7 +25,7 @@
#if HAVE_SYS_NETINET_IN_H
# include <sys/netinet/in.h>
#endif
-@@ -273,7 +280,7 @@ void get_client_info ( POP *p, BOOL n
+@@ -274,7 +281,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 );
@@ -34,15 +34,16 @@
/*
* External prototypes
-@@ -294,6 +301,7 @@ pop_result auth_user ( POP *p, char *pas
+@@ -295,6 +302,8 @@ pop_result auth_user ( POP *p, char *pas
static char *P1[] =
{
+ "changing local password for *\nold password: ", /* BSD */
++ "old password: ", /* NetBSD>=3.0 */
"changing password for *\nold password: ", /* shadow */
"enter login password: ", /* Solaris */
"old smb password: ", /* smb */
-@@ -323,6 +331,7 @@ static char *P4[] =
+@@ -324,6 +333,7 @@ static char *P4[] =
{
"password changed. ", /* shadow */
"password changed ", /* smb */
@@ -50,7 +51,7 @@
""
};
-@@ -337,6 +346,8 @@ char msg_buf [ 2048 ] = ""
+@@ -338,6 +348,8 @@ char msg_buf [ 2048 ] = ""
char *pwd_binary = PASSWD_BINARY;
char *smb_binary = SMBPASSWD_BINARY;
@@ -59,7 +60,7 @@
/*
* Be careful using TRACE in an 'if' statement!
-@@ -346,18 +357,19 @@ char *smb_binary = SM
+@@ -347,18 +359,19 @@ char *smb_binary = SM
#define RUN_PASSWD 1
#define RUN_SMBPASSWD 2
@@ -81,7 +82,7 @@
#ifdef HAS_SHADOW
struct spwd *spwd;
-@@ -375,8 +387,6 @@ int main ( int argc, char *argv[] )
+@@ -376,8 +389,6 @@ int main ( int argc, char *argv[] )
pname = ptr + 1;
}
@@ -90,7 +91,7 @@
/*
* Set up some stuff in -p- so we can call Qpopper routines
*/
-@@ -384,6 +394,17 @@ int main ( int argc, char *argv[] )
+@@ -385,6 +396,17 @@ int main ( int argc, char *argv[] )
p.AuthType = noauth;
p.myname = pname;
@@ -108,7 +109,7 @@
/*
* Handle command-line options
*/
-@@ -392,9 +413,9 @@ int main ( int argc, char *argv[] )
+@@ -393,9 +415,9 @@ int main ( int argc, char *argv[] )
{
switch (nopt)
{
@@ -121,7 +122,7 @@
"[-t trace-file] [-v] [-y log-facility]\n",
pname );
exit (1);
-@@ -411,20 +432,34 @@ int main ( int argc, char *argv[] )
+@@ -412,20 +434,34 @@ int main ( int argc, char *argv[] )
verbose = TRUE;
break;
@@ -158,7 +159,7 @@
break;
case 't':
-@@ -475,6 +510,10 @@ int main ( int argc, char *argv[] )
+@@ -476,6 +512,10 @@ int main ( int argc, char *argv[] )
"Avoiding reverse lookups (-R)" );
break;
@@ -169,7 +170,7 @@
case 'y': /* log facility */
if ( optarg == NULL || *optarg == '\0' ) {
err_msg ( HERE, "-y value expected" );
-@@ -562,44 +601,50 @@ int main ( int argc, char *argv[] )
+@@ -563,44 +603,50 @@ int main ( int argc, char *argv[] )
return 1;
}
@@ -247,7 +248,7 @@
return 1;
}
-@@ -631,6 +676,20 @@ int main ( int argc, char *argv[] )
+@@ -633,6 +679,20 @@ int main ( int argc, char *argv[] )
return 0;
}
@@ -268,7 +269,7 @@
/* Run a child process to do the password change */
-@@ -651,6 +710,10 @@ void runchild ( char *userid, char *oldp
+@@ -653,6 +713,10 @@ void runchild ( char *userid, char *oldp
exit ( 1 );
}
@@ -279,7 +280,7 @@
/* fork child process to talk to password program */
pid = fork();
-@@ -675,10 +738,16 @@ void runchild ( char *userid, char *oldp
+@@ -677,10 +741,16 @@ void runchild ( char *userid, char *oldp
wpid = waitpid ( pid, &wstat, 0 );
if ( wpid < 0 )
{
@@ -299,7 +300,7 @@
if ( pid != wpid )
{
-@@ -700,7 +769,6 @@ void runchild ( char *userid, char *oldp
+@@ -702,7 +772,6 @@ void runchild ( char *userid, char *oldp
WriteToClient ("500 Server error (abnormal exit), get help!");
exit(1);
}
@@ -307,7 +308,7 @@
close ( master ); /* done with the pty */
}
else /* Child */
-@@ -782,6 +850,13 @@ int dochild (int master, char *slavedev,
+@@ -784,6 +853,13 @@ int dochild (int master, char *slavedev,
chdir ("/");
umask (0);
@@ -321,7 +322,7 @@
/*
* 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.
-@@ -880,6 +955,7 @@ void writestring (int fd, char *s)
+@@ -885,6 +961,7 @@ void writestring (int fd, char *s)
int talktochild (int master, char *userid, char *oldpass, char *newpass,
char *emess, int asroot)
{
@@ -329,7 +330,7 @@
char buf[BUFSIZE];
char pswd[BUFSIZE+1];
-@@ -921,6 +997,8 @@ int talktochild (int master, char *useri
+@@ -926,6 +1003,8 @@ int talktochild (int master, char *useri
if ( !expect(master, P4, buf) )
TRACE ( trace_file, POP_DEBUG, HERE, "no response -- assuming OK" );
@@ -338,7 +339,7 @@
return SUCCESS;
}
-@@ -950,8 +1028,12 @@ int match (char *str, char *pat)
+@@ -955,8 +1034,12 @@ int match (char *str, char *pat)
strlen(pat), debug_str(pat, strlen(pat), 1) );
while (*str && *pat) {
@@ -353,7 +354,7 @@
/* ignore multiple space sequences */
if (*pat == ' ' && isspace (*str)) {
-@@ -1050,7 +1132,11 @@ int expect (int master, char **expected,
+@@ -1055,7 +1138,11 @@ int expect (int master, char **expected,
if ( m < 0 ) {
err_msg ( HERE, "read error from child" );
return FAILURE;
Home |
Main Index |
Thread Index |
Old Index