pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail some improvement and fixes for qpopper and poppassd.
details: https://anonhg.NetBSD.org/pkgsrc/rev/80f51fcca436
branches: trunk
changeset: 568921:80f51fcca436
user: obache <obache%pkgsrc.org@localhost>
date: Sun Dec 27 14:17:37 2009 +0000
description:
some improvement and fixes for qpopper and poppassd.
qpopper:
* add user-destdir support
* add ${QPOPPER_USER}:${QPOPPER_GROUP} to PKG_USERS, fixes PR#28807.
* honor VARBASE.
common:
* update ipv6 patch to appropriate one for base version.
* some pkglint cleanup.
Bump PKGREVISION.
diffstat:
mail/poppassd/Makefile | 10 ++-----
mail/poppassd/distinfo | 12 ++++----
mail/poppassd/patches/patch-ac | 56 +++++++++++++++++++++---------------------
mail/poppassd/patches/patch-af | 14 ++++++++--
mail/qpopper/Makefile | 31 ++++++++++++----------
mail/qpopper/Makefile.common | 7 +++--
mail/qpopper/distinfo | 14 +++++-----
mail/qpopper/files/qpopper.sh | 4 +-
mail/qpopper/patches/patch-aa | 16 +++++++++---
mail/qpopper/patches/patch-al | 18 +++++++++---
mail/qpopper/patches/patch-am | 32 +++++++++++++++---------
11 files changed, 123 insertions(+), 91 deletions(-)
diffs (truncated from 608 to 300 lines):
diff -r 74bd99144af3 -r 80f51fcca436 mail/poppassd/Makefile
--- a/mail/poppassd/Makefile Sun Dec 27 00:00:55 2009 +0000
+++ b/mail/poppassd/Makefile Sun Dec 27 14:17:37 2009 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2008/06/12 02:14:35 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/12/27 14:17:38 obache Exp $
#
DISTNAME= qpopper${VERSION}
PKGNAME= poppassd-${VERSION}
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${QPOPPER_MASTER_SITES}
@@ -27,12 +28,7 @@
INSTALLATION_DIRS= ${PKGMANDIR}/man8 share/doc libexec
# popper makefile doesn't have an install target...
INSTALL_DIRS= password
-
-do-build:
-.for DIR in common password
- cd ${WRKSRC}/${DIR}; ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_TARGET}
-.endfor
+BUILD_DIRS= common password
post-install:
${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
diff -r 74bd99144af3 -r 80f51fcca436 mail/poppassd/distinfo
--- a/mail/poppassd/distinfo Sun Dec 27 00:00:55 2009 +0000
+++ b/mail/poppassd/distinfo Sun Dec 27 14:17:37 2009 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.16 2008/06/12 02:14:35 joerg Exp $
+$NetBSD: distinfo,v 1.17 2009/12/27 14:17:38 obache 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 (qpopper4.0.8-ipv6-20050515.diff.gz) = 3ccd51fa8fb1633c34dee19e6d50351cb649a3c1
-RMD160 (qpopper4.0.8-ipv6-20050515.diff.gz) = 0ca9a8893e31933d8bf33a3cfa4d88fde511ed5e
-Size (qpopper4.0.8-ipv6-20050515.diff.gz) = 11479 bytes
SHA1 (patch-aa) = 0dd1bdc832d00bd640e7003afea28f0d90c2f975
SHA1 (patch-ab) = 0c51cede93abbcc7c25025063b3da8e3d8f1a048
-SHA1 (patch-ac) = 2da65909cdbf8932c1ee7d65b41e115fa961a040
+SHA1 (patch-ac) = 22084cab73f3bbf5a4bbad719e2a5de3ca9683bd
SHA1 (patch-ad) = 01036ef18732b3a7576ac79e35ea9b027e2eef63
SHA1 (patch-ae) = fa5febd4eedccdbd5610821b222a689193993bae
-SHA1 (patch-af) = 76ad4e1f557876dd1adf6c74f97512ad2fd8b92d
+SHA1 (patch-af) = 3ef194b6b1819e6aa7415a48180894c11fc8fb33
SHA1 (patch-ag) = 6df76adb260bee99eb4165f5ac8dff7a2e685a8a
diff -r 74bd99144af3 -r 80f51fcca436 mail/poppassd/patches/patch-ac
--- a/mail/poppassd/patches/patch-ac Sun Dec 27 00:00:55 2009 +0000
+++ b/mail/poppassd/patches/patch-ac Sun Dec 27 14:17:37 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
+$NetBSD: patch-ac,v 1.9 2009/12/27 14:17:38 obache Exp $
---- password/poppassd.c.orig Mon Dec 5 10:45:21 2005
+--- password/poppassd.c.orig 2009-12-27 13:05:39.000000000 +0000
+++ password/poppassd.c
@@ -171,8 +171,13 @@
/* LANMAN allows up to 14 char passwords (truncates if longer), but tacacs
@@ -25,7 +25,7 @@
#if HAVE_SYS_NETINET_IN_H
# include <sys/netinet/in.h>
#endif
-@@ -257,7 +264,7 @@ int dochild (int master, char *slave
+@@ -251,7 +258,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,7 +34,7 @@
int match (char *str, char *pat);
int expect (int master, char **expected, char *buf);
void getemess (int master, char **expected, char *buf);
-@@ -274,7 +281,7 @@ void get_client_info ( POP *p, BOOL n
+@@ -268,7 +275,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 );
@@ -43,7 +43,7 @@
/*
* External prototypes
-@@ -295,6 +302,8 @@ pop_result auth_user ( POP *p, char *pas
+@@ -289,6 +296,8 @@ pop_result auth_user ( POP *p, char *pas
static char *P1[] =
{
@@ -52,7 +52,7 @@
"changing password for *\nold password: ", /* shadow */
"enter login password: ", /* Solaris */
"old smb password: ", /* smb */
-@@ -324,6 +333,7 @@ static char *P4[] =
+@@ -318,6 +327,7 @@ static char *P4[] =
{
"password changed. ", /* shadow */
"password changed ", /* smb */
@@ -60,7 +60,7 @@
""
};
-@@ -338,6 +348,8 @@ char msg_buf [ 2048 ] = ""
+@@ -332,6 +342,8 @@ char msg_buf [ 2048 ] = ""
char *pwd_binary = PASSWD_BINARY;
char *smb_binary = SMBPASSWD_BINARY;
@@ -69,7 +69,7 @@
/*
* Be careful using TRACE in an 'if' statement!
-@@ -347,18 +359,19 @@ char *smb_binary = SM
+@@ -341,18 +353,19 @@ char *smb_binary = SM
#define RUN_PASSWD 1
#define RUN_SMBPASSWD 2
@@ -91,7 +91,7 @@
#ifdef HAS_SHADOW
struct spwd *spwd;
-@@ -376,8 +389,6 @@ int main ( int argc, char *argv[] )
+@@ -370,8 +383,6 @@ int main ( int argc, char *argv[] )
pname = ptr + 1;
}
@@ -100,7 +100,7 @@
/*
* Set up some stuff in -p- so we can call Qpopper routines
*/
-@@ -385,6 +396,17 @@ int main ( int argc, char *argv[] )
+@@ -379,6 +390,17 @@ int main ( int argc, char *argv[] )
p.AuthType = noauth;
p.myname = pname;
@@ -118,7 +118,7 @@
/*
* Handle command-line options
*/
-@@ -393,9 +415,9 @@ int main ( int argc, char *argv[] )
+@@ -387,9 +409,9 @@ int main ( int argc, char *argv[] )
{
switch (nopt)
{
@@ -131,7 +131,7 @@
"[-t trace-file] [-v] [-y log-facility]\n",
pname );
exit (1);
-@@ -412,20 +434,34 @@ int main ( int argc, char *argv[] )
+@@ -406,20 +428,34 @@ int main ( int argc, char *argv[] )
verbose = TRUE;
break;
@@ -149,14 +149,14 @@
TRACE ( trace_file, POP_DEBUG, HERE,
- "Changing SMB passwords using %s", smb_binary );
+ "Changing SMB password using %s", smb_binary );
-+ break;
-+
+ break;
+
+ case 'P':
+ mode |= RUN_PASSWD;
+ TRACE ( trace_file, POP_DEBUG, HERE,
+ "Changing standard password enabled" );
- break;
-
++ break;
++
+
case 'p':
mode |= RUN_PASSWD;
@@ -168,7 +168,7 @@
break;
case 't':
-@@ -476,6 +512,10 @@ int main ( int argc, char *argv[] )
+@@ -470,6 +506,10 @@ int main ( int argc, char *argv[] )
"Avoiding reverse lookups (-R)" );
break;
@@ -179,7 +179,7 @@
case 'y': /* log facility */
if ( optarg == NULL || *optarg == '\0' ) {
err_msg ( HERE, "-y value expected" );
-@@ -563,44 +603,50 @@ int main ( int argc, char *argv[] )
+@@ -557,44 +597,50 @@ int main ( int argc, char *argv[] )
return 1;
}
@@ -257,7 +257,7 @@
return 1;
}
-@@ -633,6 +679,20 @@ int main ( int argc, char *argv[] )
+@@ -627,6 +673,20 @@ int main ( int argc, char *argv[] )
return 0;
}
@@ -278,7 +278,7 @@
/* Run a child process to do the password change */
-@@ -653,6 +713,10 @@ void runchild ( char *userid, char *oldp
+@@ -647,6 +707,10 @@ void runchild ( char *userid, char *oldp
exit ( 1 );
}
@@ -289,7 +289,7 @@
/* fork child process to talk to password program */
pid = fork();
-@@ -665,7 +729,7 @@ void runchild ( char *userid, char *oldp
+@@ -659,7 +723,7 @@ void runchild ( char *userid, char *oldp
if ( pid > 0 ) /* Parent */
{
@@ -298,7 +298,7 @@
{
logit ( trace_file, LOG_ERR, HERE,
"%s failed for %s", smb ? "smbpasswd" : "passwd", userid );
-@@ -677,10 +741,16 @@ void runchild ( char *userid, char *oldp
+@@ -671,10 +735,16 @@ void runchild ( char *userid, char *oldp
wpid = waitpid ( pid, &wstat, 0 );
if ( wpid < 0 )
{
@@ -318,7 +318,7 @@
if ( pid != wpid )
{
-@@ -702,7 +772,6 @@ void runchild ( char *userid, char *oldp
+@@ -696,7 +766,6 @@ void runchild ( char *userid, char *oldp
WriteToClient ("500 Server error (abnormal exit), get help!");
exit(1);
}
@@ -326,7 +326,7 @@
close ( master ); /* done with the pty */
}
else /* Child */
-@@ -784,6 +853,13 @@ int dochild (int master, char *slavedev,
+@@ -778,6 +847,13 @@ int dochild (int master, char *slavedev,
chdir ("/");
umask (0);
@@ -340,7 +340,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.
-@@ -883,20 +959,19 @@ void writestring (int fd, char *s)
+@@ -877,20 +953,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 +365,7 @@
/* wait for current password prompt */
if (!expect(master, P1, buf)) return FAILURE;
-@@ -926,6 +1001,10 @@ int talktochild (int master, char *useri
+@@ -920,6 +995,10 @@ int talktochild (int master, char *useri
if ( !expect(master, P4, buf) )
TRACE ( trace_file, POP_DEBUG, HERE, "no response -- assuming OK" );
@@ -376,7 +376,7 @@
return SUCCESS;
}
-@@ -955,8 +1034,12 @@ int match (char *str, char *pat)
+@@ -949,8 +1028,12 @@ int match (char *str, char *pat)
strlen(pat), debug_str(pat, strlen(pat), 1) );
while (*str && *pat) {
@@ -391,7 +391,7 @@
/* ignore multiple space sequences */
if (*pat == ' ' && isspace (*str)) {
-@@ -1055,7 +1138,11 @@ int expect (int master, char **expected,
+@@ -1049,7 +1132,11 @@ int expect (int master, char **expected,
if ( m < 0 ) {
err_msg ( HERE, "read error from child" );
return FAILURE;
diff -r 74bd99144af3 -r 80f51fcca436 mail/poppassd/patches/patch-af
--- a/mail/poppassd/patches/patch-af Sun Dec 27 00:00:55 2009 +0000
+++ b/mail/poppassd/patches/patch-af Sun Dec 27 14:17:37 2009 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-af,v 1.1 2004/10/20 14:18:42 taca Exp $
+$NetBSD: patch-af,v 1.2 2009/12/27 14:17:38 obache Exp $
---- configure.orig 2004-10-20 14:19:23.833010000 +0900
+--- configure.orig 2009-12-27 13:05:39.000000000 +0000
+++ configure
-@@ -9227,6 +9227,7 @@ gethostbyname \
+@@ -5132,6 +5132,7 @@ fi
+ ipv6_cv_iruserok_sa=no
+ :
+ fi
++fi
+
+
Home |
Main Index |
Thread Index |
Old Index