pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/poppassd Update poppassd to 4.1.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/210740b00553
branches: trunk
changeset: 601612:210740b00553
user: taca <taca%pkgsrc.org@localhost>
date: Thu Mar 22 14:15:32 2012 +0000
description:
Update poppassd to 4.1.0.
Use the same distfile with qpopper 4.1.0.
diffstat:
mail/poppassd/Makefile | 10 +++-
mail/poppassd/distinfo | 24 ++++------
mail/poppassd/patches/patch-aa | 15 +++++-
mail/poppassd/patches/patch-ab | 16 +++---
mail/poppassd/patches/patch-ac | 91 +++++++++++++++--------------------------
mail/poppassd/patches/patch-ad | 6 +-
mail/poppassd/patches/patch-ae | 12 -----
mail/poppassd/patches/patch-af | 14 +-----
mail/poppassd/patches/patch-ag | 6 +-
9 files changed, 80 insertions(+), 114 deletions(-)
diffs (truncated from 459 to 300 lines):
diff -r 1bd1a51038f2 -r 210740b00553 mail/poppassd/Makefile
--- a/mail/poppassd/Makefile Thu Mar 22 14:14:11 2012 +0000
+++ b/mail/poppassd/Makefile Thu Mar 22 14:15:32 2012 +0000
@@ -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 @@
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 @@
.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 -r 1bd1a51038f2 -r 210740b00553 mail/poppassd/distinfo
--- a/mail/poppassd/distinfo Thu Mar 22 14:14:11 2012 +0000
+++ b/mail/poppassd/distinfo Thu Mar 22 14:15:32 2012 +0000
@@ -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 -r 1bd1a51038f2 -r 210740b00553 mail/poppassd/patches/patch-aa
--- a/mail/poppassd/patches/patch-aa Thu Mar 22 14:14:11 2012 +0000
+++ b/mail/poppassd/patches/patch-aa Thu Mar 22 14:15:32 2012 +0000
@@ -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 @@
+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 -r 1bd1a51038f2 -r 210740b00553 mail/poppassd/patches/patch-ab
--- a/mail/poppassd/patches/patch-ab Thu Mar 22 14:14:11 2012 +0000
+++ b/mail/poppassd/patches/patch-ab Thu Mar 22 14:15:32 2012 +0000
@@ -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 @@
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 -r 1bd1a51038f2 -r 210740b00553 mail/poppassd/patches/patch-ac
--- a/mail/poppassd/patches/patch-ac Thu Mar 22 14:14:11 2012 +0000
+++ b/mail/poppassd/patches/patch-ac Thu Mar 22 14:15:32 2012 +0000
@@ -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>
-+#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 @@
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 @@
/*
* 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 @@
#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 @@
/*
* 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 @@
/*
* 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 @@
"[-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 @@
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 @@
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 @@
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 @@
- 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 @@
- if ( pw->pw_uid <= BLOCK_UID )
-
+- {
+- syslog ( LOG_ERR, "someone tried to change %s's password", userid );
+- WriteToClient ( "500 Not a user account." );
+ /* new pass required */
+ if ( strlen (newpass) == 0 )
- {
-- syslog ( LOG_ERR, "someone tried to change %s's password", userid );
-- WriteToClient ( "500 Not a user account." );
Home |
Main Index |
Thread Index |
Old Index