kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some improvement and fixes for qpopper and poppassd.

Browse source 
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.
This commit is contained in:
obache 2009-12-27 14:17:37 +00:00
parent fe90ac6faf
commit 304b18ed33
11 changed files with 123 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mail/poppassd/Makefile
View file

@ -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 @@ MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q}
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

12
mail/poppassd/distinfo
View file

@ -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

56
mail/poppassd/patches/patch-ac
View file

@ -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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
#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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/*
* 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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
"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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
""
};
@@ -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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/*
* 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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
#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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/*
* 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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/*
* 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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
"[-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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/* 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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/* 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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
{
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca 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.
@@ -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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/* 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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
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 @@ $NetBSD: patch-ac,v 1.8 2005/12/05 14:12:29 taca Exp $
/* 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;

14
mail/poppassd/patches/patch-af
View file

@ -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
USE_REG_STRUCT_RET="default"
@@ -9228,6 +9229,7 @@ gethostbyname \
gettimeofday \
getusershell \
mkdir \

31
mail/qpopper/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.61 2008/01/18 05:08:30 tnn Exp $
# $NetBSD: Makefile,v 1.62 2009/12/27 14:17:37 obache Exp $
#
DISTNAME= qpopper${VERSION}
PKGNAME= qpopper-${VERSION}
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${QPOPPER_MASTER_SITES}
@ -15,10 +15,12 @@ MAINTAINER= mellon@fugue.com
HOMEPAGE= ${QPOPPER_HOMEPAGE}
COMMENT= Qualcomm's POP server for Eudora
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
CONFIGURE_ARGS+= --enable-apop=${QPOPPER_APOP_AUTH:Q} \
--enable-popuid=${QPOPPER_USER:Q} \
--enable-popuid=${QPOPPER_USER} \
--disable-update-abort --without-gdbm
.include "options.mk"
@ -27,37 +29,38 @@ QPOPPER_USER?= pop
QPOPPER_GROUP?= mail
QPOPPER_APOP_AUTH?= ${PKG_SYSCONFDIR}/apop.auth
BUILD_DEFS+= QPOPPER_APOP_AUTH
BUILD_DEFS+= QPOPPER_APOP_AUTH VARBASE
PKG_GROUPS_VARS+= QPOPPER_GROUP
PKG_USERS_VARS+= QPOPPER_USER
.if defined(QPOPPER_SPOOL_DIR)
CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR:Q}
CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR}
.endif
RCD_SCRIPTS= qpopper
MESSAGE_SUBST+= RCD_SCRIPTS=${RCD_SCRIPTS} \
RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
PKG_USERS?= ${QPOPPER_USER}:${QPOPPER_GROUP}
MAKE_ENV+= BINGRP=${BINGRP:Q}
SUBST_CLASSES+= root
SUBST_STAGE.root= pre-configure
SUBST_FILES.root= Makefile.in */Makefile.in
SUBST_SED.root= -e 's,-o root,-o ${ROOT_USER},g'
PKG_USERS= ${QPOPPER_USER}:${QPOPPER_GROUP}
SUBST_CLASSES+= libexec
SUBST_STAGE.libexec= pre-configure
SUBST_FILES.libexec= man/popper.8
SUBST_SED.libexec= -e "s|/usr/local/lib|${PREFIX}/libexec|g"
SUBST_CLASSES+= varbase
SUBST_STAGE.varbase= pre-configure
SUBST_FILES.varbase= popper/main.c
SUBST_VARS.varbase= VARBASE
SPECIAL_PERMS+= sbin/qpopauth ${QPOPPER_USER} ${REAL_ROOT_GROUP} 4511
INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 sbin share/doc share/examples
post-install:
${INSTALL_DATA} ${WRKSRC}/License.txt \
${PREFIX}/share/doc/qpopper.License
${DESTDIR}${PREFIX}/share/doc/qpopper.License
${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config \
${PREFIX}/share/examples
${DESTDIR}${PREFIX}/share/examples
.include "../../mk/bsd.pkg.mk"

7
mail/qpopper/Makefile.common
View file

@ -1,16 +1,17 @@
# $NetBSD: Makefile.common,v 1.20 2006/10/23 08:14:02 rillig Exp $
# $NetBSD: Makefile.common,v 1.21 2009/12/27 14:17:38 obache Exp $
# used by mail/poppassd/Makefile
QPOPPER_MASTER_SITES+= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
http://core.ring.gr.jp/archives/net/mail/qpopper/
QPOPPER_HOMEPAGE= http://www.eudora.com/products/unsupported/qpopper/
QPOPPER_PATCHSITES+= http://www.imasy.or.jp/~ume/ipv6/
QPOPPER_PATCHFILES= qpopper4.0.8-ipv6-20050515.diff.gz
QPOPPER_PATCHFILES= qpopper4.0.9-ipv6-20060626.diff.gz
VERSION= 4.0.9
QPOPPER_FAC?= LOCAL1
BUILD_DEFS+= QPOPPER_FAC
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--enable-log-facility=LOG_${QPOPPER_FAC}
LIBS+= ${LDFLAGS}

14
mail/qpopper/distinfo
View file

@ -1,12 +1,12 @@
$NetBSD: distinfo,v 1.16 2009/10/31 20:08:05 tnn 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) = d1f4e56dbb8eb4b7cc250ca261435ec609f14c23
SHA1 (patch-aa) = 54cb138d4fd3fa8cc8b416b3544b1a954305bf65
SHA1 (patch-ab) = 67d661adce74d0662cab5b644d2e57bfd1d5e3c7
SHA1 (patch-ac) = 6df76adb260bee99eb4165f5ac8dff7a2e685a8a
SHA1 (patch-ad) = 24fe673113eff34f896c05c0f3d71ca235219525
@ -14,7 +14,7 @@ SHA1 (patch-ae) = 1e06159f56c78e63a7960d4d9ca80535752099b2
SHA1 (patch-af) = a2100b026a0bab0be8c99c211ec0bd14d4405f32
SHA1 (patch-ag) = 4b187ab978ead4b751290fe483f6d6a6bf959089
SHA1 (patch-ah) = 22db68feb33452e53c88ce291fdac0e4789d8820
SHA1 (patch-al) = 63fdc28b9c1d292d55464cda13c529ffb2a47b34
SHA1 (patch-am) = fba92571d9225f8c5cacb38a4621127a19151352
SHA1 (patch-al) = 0adad3dcbf89a867c20d804cdbc978fec01570d2
SHA1 (patch-am) = d9c8e6ecf34e673db724aa41df061fc532abd6da
SHA1 (patch-an) = 43e7c20b9c3cfd978255748236efbcbaf2f929ce
SHA1 (patch-ap) = 14ad2349ba690bbdc679a24a8b96da5681af1f18

4
mail/qpopper/files/qpopper.sh
View file

@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: qpopper.sh,v 1.3 2004/12/19 01:33:36 grant Exp $
# $NetBSD: qpopper.sh,v 1.4 2009/12/27 14:17:38 obache Exp $
#
# PROVIDE: qpopper
@ -12,7 +12,7 @@
name=qpopper
rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
pidfile="@VARBASE@/run/${name}.pid"
extra_commands="reload"
load_rc_config $name

16
mail/qpopper/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.9 2003/03/13 07:23:25 itojun Exp $
$NetBSD: patch-aa,v 1.10 2009/12/27 14:17:38 obache Exp $
--- configure- Thu Mar 13 16:16:03 2003
+++ configure Thu Mar 13 16:16:25 2003
@@ -3022,13 +3022,6 @@
--- configure.orig 2009-12-27 12:17:33.000000000 +0000
+++ configure
@@ -3023,13 +3023,6 @@ fi
@ -16,3 +16,11 @@ $NetBSD: patch-aa,v 1.9 2003/03/13 07:23:25 itojun Exp $
if test "$GCC" = yes
then
echo "$as_me:$LINENO: checking for gcc version 2.7.2.3" >&5
@@ -5132,6 +5125,7 @@ fi
ipv6_cv_iruserok_sa=no
:
fi
+fi
USE_REG_STRUCT_RET="default"

18
mail/qpopper/patches/patch-al
View file

@ -1,8 +1,16 @@
$NetBSD: patch-al,v 1.1 2001/06/10 15:08:41 taca Exp $
$NetBSD: patch-al,v 1.2 2009/12/27 14:17:38 obache Exp $
--- Makefile.in.orig Mon Apr 23 07:59:14 2001
--- Makefile.in.orig 2006-03-09 22:32:36.000000000 +0000
+++ Makefile.in
@@ -58,10 +58,10 @@
@@ -26,6 +26,7 @@ MAKEFILE = Makefile
YACC = @YACC@
LEX = @LEX@
INSTALL = @INSTALL@
+DESTDIR =
@SET_MAKE@
@@ -58,10 +59,10 @@ popper_server:
cd ${popper_dir} && ${MAKE} all
install:
@ -10,9 +18,9 @@ $NetBSD: patch-al,v 1.1 2001/06/10 15:08:41 taca Exp $
- echo "Installed man/popper.8 as ${mandir}/man8/popper.8"
- ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/
- echo "Installed man/popauth.8 as ${mandir}/man8/popauth.8"
+ ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8 ${mandir}/man8/qpopper.8
+ ${BSD_INSTALL_MAN} ${top_srcdir}/man/popper.8 ${DESTDIR}${mandir}/man8/qpopper.8
+ @echo "Installed man/popper.8 as ${mandir}/man8/qpopper.8"
+ ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/qpopauth.8
+ ${BSD_INSTALL_MAN} ${top_srcdir}/man/popauth.8 ${DESTDIR}${mandir}/man8/qpopauth.8
+ @echo "Installed man/popauth.8 as ${mandir}/man8/qpopauth.8"
cd ${popper_dir} && ${MAKE} install

32
mail/qpopper/patches/patch-am
View file

@ -1,8 +1,16 @@
$NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
$NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
--- popper/Makefile.in.orig 2005-05-13 19:20:11.000000000 +0000
--- popper/Makefile.in.orig 2006-03-09 22:32:37.000000000 +0000
+++ popper/Makefile.in
@@ -96,6 +96,8 @@ VPATH = @srcdir@
@@ -86,6 +86,7 @@ CC = @CC@
GPERF = @GPERF@
MAKEFILE = Makefile
INSTALL = @INSTALL@
+DESTDIR =
@SET_MAKE@
@@ -96,6 +97,8 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
installdir = @sbindir@
@ -11,7 +19,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
popper_srcdir = ${top_srcdir}/popper
qd_srcdir = ${top_srcdir}/qd
@@ -114,17 +116,20 @@ password_dir = ${base_dir}/password
@@ -114,17 +117,20 @@ password_dir = ${base_dir}/password
OBJS = pop_dele.o pop_dropcopy.o \
@ -35,7 +43,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
SRCS = pop_dele.c pop_dropcopy.c \
pop_get_command.c pop_get_subcommand.c pop_init.c \
@@ -132,7 +137,7 @@ SRCS = pop_dele.c pop_dropc
@@ -132,7 +138,7 @@ SRCS = pop_dele.c pop_dropc
pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
pop_rset.c pop_send.c pop_stat.c pop_updt.c \
pop_user.c pop_xtnd.c pop_xmit.c popper.c \
@ -44,7 +52,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
pop_rpop.c pop_apop.c md5.c pop_auth.c pop_pope.c \
pop_extend.c scram.c hmac.c base64.c pop_util.c \
get_sub_opt.c msg_ptr.c drac.c pop_config.c pop_tls.c \
@@ -181,7 +186,7 @@ USE_PAM = @USE_PAM@
@@ -181,7 +187,7 @@ USE_PAM = @USE_PAM@
.SUFFIXES: .c .o
@ -53,7 +61,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
mangler_library:
cd ${mmangle_dir} && ${MAKE} all
@@ -189,13 +194,18 @@ mangler_library:
@@ -189,13 +195,18 @@ mangler_library:
common_library:
cd ${common_dir} && ${MAKE} all
@ -75,7 +83,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
${common_dir}/libcommon.a
poppassd: common_library
@@ -206,22 +216,35 @@ poppassd: common_library
@@ -206,22 +217,35 @@ poppassd: common_library
-I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@
@ -100,13 +108,13 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
- if [ "x${poppassd}" != "x" ]; then \
- cd ${password_dir} && ${MAKE} $@ ;\
+install: popper popper-standalone ${pop_auth}
+ ${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
+ ${BSD_INSTALL_PROGRAM} popper ${DESTDIR}${libexecdir}/qpopper
+ echo "Installed popper as ${libexecdir}/qpopper"
+ ${INSTALL} -s -m 0755 -o root popper-standalone ${sbindir}/qpopper
+ ${BSD_INSTALL_PROGRAM} popper-standalone ${DESTDIR}${sbindir}/qpopper
+ @echo "Installed standalone popper as ${sbindir}/qpopper"
+ @if [ "x${pop_auth}" != "x" ]; then \
+ ${INSTALL} -s -m 4755 -o ${apop_uid} -g ${BINGRP} ${pop_auth} \
+ ${sbindir}/q${pop_auth}; \
+ ${BSD_INSTALL_PROGRAM} ${pop_auth} \
+ ${DESTDIR}${sbindir}/q${pop_auth}; \
+ echo "Installed popauth as ${sbindir}/q${pop_auth} " \
+ "with uid ${apop_uid}"; \
fi