summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/qpopper/Makefile16
-rw-r--r--mail/qpopper/Makefile.common8
-rw-r--r--mail/qpopper/distinfo31
-rw-r--r--mail/qpopper/patches/patch-aa16
-rw-r--r--mail/qpopper/patches/patch-ab6
-rw-r--r--mail/qpopper/patches/patch-ac6
-rw-r--r--mail/qpopper/patches/patch-ad10
-rw-r--r--mail/qpopper/patches/patch-ae13
-rw-r--r--mail/qpopper/patches/patch-ag10
-rw-r--r--mail/qpopper/patches/patch-ah67
-rw-r--r--mail/qpopper/patches/patch-al35
-rw-r--r--mail/qpopper/patches/patch-am129
-rw-r--r--mail/qpopper/patches/patch-an22
-rw-r--r--mail/qpopper/patches/patch-ap22
14 files changed, 162 insertions, 229 deletions
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 075dc9485d8..f6087abfa02 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2009/12/27 14:17:37 obache Exp $
+# $NetBSD: Makefile,v 1.63 2012/03/22 14:13:28 taca Exp $
#
DISTNAME= qpopper${VERSION}
PKGNAME= qpopper-${VERSION}
-PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${QPOPPER_MASTER_SITES}
@@ -43,10 +42,15 @@ MESSAGE_SUBST+= RCD_SCRIPTS=${RCD_SCRIPTS} \
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+= prefix
+SUBST_STAGE.prefix= pre-configure
+SUBST_FILES.prefix= man/popper.8
+SUBST_SED.prefix= -e "s|@PREFIX@|${PREFIX}|g"
+
+SUBST_CLASSES+= sysconf
+SUBST_STAGE.sysconf= pre-configure
+SUBST_FILES.sysconf= man/popauth.8
+SUBST_SED.sysconf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
SUBST_CLASSES+= varbase
SUBST_STAGE.varbase= pre-configure
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index 0a5ecd1f9d7..6a6d7fdfd7c 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.21 2009/12/27 14:17:38 obache Exp $
+# $NetBSD: Makefile.common,v 1.22 2012/03/22 14:13:28 taca 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.9-ipv6-20060626.diff.gz
+#QPOPPER_PATCHSITES+= http://www.imasy.or.jp/~ume/ipv6/
+#QPOPPER_PATCHFILES= qpopper4.0.9-ipv6-20060626.diff.gz
-VERSION= 4.0.9
+VERSION= 4.1.0
QPOPPER_FAC?= LOCAL1
BUILD_DEFS+= QPOPPER_FAC
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 5a6ec939b55..298d5d5886b 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.17 2009/12/27 14:17:38 obache Exp $
+$NetBSD: distinfo,v 1.18 2012/03/22 14:13:28 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) = 54cb138d4fd3fa8cc8b416b3544b1a954305bf65
-SHA1 (patch-ab) = 67d661adce74d0662cab5b644d2e57bfd1d5e3c7
-SHA1 (patch-ac) = 6df76adb260bee99eb4165f5ac8dff7a2e685a8a
-SHA1 (patch-ad) = 24fe673113eff34f896c05c0f3d71ca235219525
-SHA1 (patch-ae) = 1e06159f56c78e63a7960d4d9ca80535752099b2
+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) = 01f137b2020c8f6d72e6b0c09fe29632c6662994
+SHA1 (patch-ab) = e79751be12082f1d1a92c3e02d9a44a9db672152
+SHA1 (patch-ac) = 1593366df600fc52b84b1ca6e8a825142c9c7400
+SHA1 (patch-ad) = b07be058c29e35b67e2f3cce4e00c022be867c62
+SHA1 (patch-ae) = ddd042f2a428c3aa4d942851937a2f43e9a68f0b
SHA1 (patch-af) = a2100b026a0bab0be8c99c211ec0bd14d4405f32
-SHA1 (patch-ag) = 4b187ab978ead4b751290fe483f6d6a6bf959089
-SHA1 (patch-ah) = 22db68feb33452e53c88ce291fdac0e4789d8820
-SHA1 (patch-al) = 0adad3dcbf89a867c20d804cdbc978fec01570d2
-SHA1 (patch-am) = d9c8e6ecf34e673db724aa41df061fc532abd6da
-SHA1 (patch-an) = 43e7c20b9c3cfd978255748236efbcbaf2f929ce
-SHA1 (patch-ap) = 14ad2349ba690bbdc679a24a8b96da5681af1f18
+SHA1 (patch-ag) = 401408f7c6150ec41cecb85d166e7e338b9a9e5f
+SHA1 (patch-al) = 93d3c6cc3deee57c707abeb131febbd057a1ef57
+SHA1 (patch-am) = 05cc53a56205d4db8bb7914437e788117d58b212
+SHA1 (patch-ap) = 1a9df8496a0190fc56db04630b415b04ba125a21
diff --git a/mail/qpopper/patches/patch-aa b/mail/qpopper/patches/patch-aa
index 5f2f1f1d77d..f71dd02708f 100644
--- a/mail/qpopper/patches/patch-aa
+++ b/mail/qpopper/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2009/12/27 14:17:38 obache Exp $
+$NetBSD: patch-aa,v 1.11 2012/03/22 14:13:29 taca Exp $
---- configure.orig 2009-12-27 12:17:33.000000000 +0000
+--- configure.orig 2010-10-02 00:22:09.000000000 +0000
+++ configure
-@@ -3023,13 +3023,6 @@ fi
+@@ -3523,13 +3523,6 @@ fi
@@ -15,12 +15,4 @@ $NetBSD: patch-aa,v 1.10 2009/12/27 14:17:38 obache 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"
+ { echo "$as_me:$LINENO: checking for gcc version 2.7.2.3" >&5
diff --git a/mail/qpopper/patches/patch-ab b/mail/qpopper/patches/patch-ab
index 73ad47dd1cc..b98128e6c84 100644
--- a/mail/qpopper/patches/patch-ab
+++ b/mail/qpopper/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2001/06/10 15:08:41 taca Exp $
+$NetBSD: patch-ab,v 1.9 2012/03/22 14:13:29 taca Exp $
---- popper/popauth.c.orig Wed Apr 4 09:23:41 2001
+--- popper/popauth.c.orig 2011-05-30 19:13:40.000000000 +0000
+++ popper/popauth.c
-@@ -168,7 +168,7 @@
+@@ -192,7 +192,7 @@ static struct mods {
#define APOP_AUTH 1
{ "apopauth" },
#define POP_AUTH 2
diff --git a/mail/qpopper/patches/patch-ac b/mail/qpopper/patches/patch-ac
index bf4673a12e7..45c3072a8d1 100644
--- a/mail/qpopper/patches/patch-ac
+++ b/mail/qpopper/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2006/01/08 17:34:47 joerg Exp $
+$NetBSD: patch-ac,v 1.12 2012/03/22 14:13:29 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 */
diff --git a/mail/qpopper/patches/patch-ad b/mail/qpopper/patches/patch-ad
index c85842105f3..b06c6e306e1 100644
--- a/mail/qpopper/patches/patch-ad
+++ b/mail/qpopper/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.5 2006/01/08 17:34:47 joerg Exp $
+$NetBSD: patch-ad,v 1.6 2012/03/22 14:13:29 taca Exp $
---- popper/pop_init.c.orig 2006-01-08 17:27:18.000000000 +0000
+--- popper/pop_init.c.orig 2011-05-30 19:13:39.000000000 +0000
+++ popper/pop_init.c
-@@ -211,7 +211,6 @@
- #endif /* HAVE_HSTRERROR */
- #endif /* INET6 */
+@@ -213,7 +213,6 @@
+ # endif /* HAVE_HSTRERROR */
+ #endif /* not INET6 */
-extern int errno;
int no_rev_lookup; /* Avoid reverse lookup? */
diff --git a/mail/qpopper/patches/patch-ae b/mail/qpopper/patches/patch-ae
index c787ff000de..e4eb0ad62bf 100644
--- a/mail/qpopper/patches/patch-ae
+++ b/mail/qpopper/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.11 2001/06/10 15:08:41 taca Exp $
+$NetBSD: patch-ae,v 1.12 2012/03/22 14:13:29 taca Exp $
---- man/popauth.8.orig Wed Apr 4 09:23:13 2001
+--- man/popauth.8.orig 2011-05-30 19:13:39.000000000 +0000
+++ man/popauth.8
@@ -7,11 +7,11 @@
.\" See License.txt file for terms and conditions for modification and
@@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.11 2001/06/10 15:08:41 taca Exp $
[
.BI \-trace " tracefile"
] [
-@@ -46,18 +46,18 @@
+@@ -46,18 +46,18 @@ popauth \-\- manipulate POP authorizatio
]
.SH DESCRIPTION
@@ -39,7 +39,12 @@ $NetBSD: patch-ae,v 1.11 2001/06/10 15:08:41 taca Exp $
just like the \fIpasswd\fR program. It then updates the authorization DB.
With the
-@@ -89,4 +89,4 @@
+@@ -85,8 +85,8 @@ With the
+ switch, the super-user or master POP user can remove
+ a user entry from the authorization DB.
+ .SH FILES
+-/etc/pop.auth.* POP authorization DB
++@PKG_SYSCONFDIR@/etc/pop.auth.* POP authorization DB
.SH ACKNOWLEDGEMENTS
This program was derived from MH 6.8.3
.SH SEE ALSO
diff --git a/mail/qpopper/patches/patch-ag b/mail/qpopper/patches/patch-ag
index f1ec682ff93..a48384704bc 100644
--- a/mail/qpopper/patches/patch-ag
+++ b/mail/qpopper/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.8 2001/06/10 15:08:41 taca Exp $
+$NetBSD: patch-ag,v 1.9 2012/03/22 14:13:29 taca Exp $
---- man/popper.8.orig Wed Apr 4 09:23:13 2001
+--- man/popper.8.orig 2011-05-30 19:13:39.000000000 +0000
+++ man/popper.8
@@ -19,7 +19,7 @@
.SH NAME
- qpopper \-\- POP3 server (v4.0)
+ qpopper \-\- POP3 server (v4.1)
.SH SYNOPSIS
-.B /usr/local/lib/popper
-+.B /usr/local/lib/qpopper
++.B @PREFIX@/libexec/qpopper
[
.I [ address ]
.I [ ":" ]
-@@ -800,7 +803,7 @@
+@@ -829,7 +829,7 @@ Connection closed by foreign host.
.PP
The server implements several extended commands.
.PP
diff --git a/mail/qpopper/patches/patch-ah b/mail/qpopper/patches/patch-ah
deleted file mode 100644
index 184d270cbd8..00000000000
--- a/mail/qpopper/patches/patch-ah
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-ah,v 1.9 2009/10/31 20:08:05 tnn Exp $
-
---- popper/popper.c.orig 2006-03-09 23:32:38.000000000 +0100
-+++ popper/popper.c
-@@ -150,7 +150,7 @@ char ** argv;
- char message [ MAXLINELEN ];
- pop_result rslt = POP_FAILURE;
- char * tgetline();
-- char * getline();
-+ char * get_line();
-
- /*
- * seed random with the current time to nearest second
-@@ -425,7 +425,7 @@ jmp_buf env;
- */
-
- char
--*getline ( char *str, int size, POP *pPOP )
-+*get_line ( char *str, int size, POP *pPOP )
- {
- char *p = NULL;
- int nRead = 0;
-@@ -433,7 +433,7 @@ char
- int nBufSz = sizeof ( pPOP->pcInBuf );
-
-
-- _DEBUG_LOG2 ( pPOP, "getline(%p,%d)", str, size );
-+ _DEBUG_LOG2 ( pPOP, "get_line(%p,%d)", str, size );
-
- /*
- * See if there's a line in our input buffer
-@@ -472,7 +472,7 @@ char
- pPOP->pcInStart - pPOP->pcInBuf );
- pPOP->pcInStart = pPOP->pcInEnd = pPOP->pcInBuf;
- }
-- _DEBUG_LOG3 ( pPOP, "getline() returning %d: '%.*s'",
-+ _DEBUG_LOG3 ( pPOP, "get_line() returning %d: '%.*s'",
- strlen(str), MIN(25, (int) strlen(str)), str );
- return ( str );
- } /* got a line */
-@@ -560,7 +560,7 @@ char
- } /* found a '\n' */
- } /* loop and discard until we see a '\n' */
-
-- _DEBUG_LOG2 ( pPOP, "getline() returning %d ('%c')",
-+ _DEBUG_LOG2 ( pPOP, "get_line() returning %d ('%c')",
- strlen(str), *str );
- return ( str );
- } /* nRoom == 0 */
-@@ -583,7 +583,7 @@ char
- break;
- } /* main loop */
-
-- _DEBUG_LOG0 ( pPOP, "getline() returning NULL" );
-+ _DEBUG_LOG0 ( pPOP, "get_line() returning NULL" );
- return ( NULL );
- }
-
-@@ -614,7 +614,7 @@ tgetline ( char *str, int size, POP *p,
- VERSION, timeout, p->user, p->client, p->ipaddr );
- }
- else
-- str = getline ( str, size, p );
-+ str = get_line ( str, size, p );
-
- alarm ( 0 );
- signal ( SIGALRM, SIG_DFL );
diff --git a/mail/qpopper/patches/patch-al b/mail/qpopper/patches/patch-al
index bdc03b4fb7e..bb2b0d490dc 100644
--- a/mail/qpopper/patches/patch-al
+++ b/mail/qpopper/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2009/12/27 14:17:38 obache Exp $
+$NetBSD: patch-al,v 1.3 2012/03/22 14:13:29 taca Exp $
---- Makefile.in.orig 2006-03-09 22:32:36.000000000 +0000
+--- Makefile.in.orig 2011-05-30 19:13:39.000000000 +0000
+++ Makefile.in
-@@ -26,6 +26,7 @@ MAKEFILE = Makefile
+@@ -40,6 +40,7 @@ MAKEFILE = Makefile
YACC = @YACC@
LEX = @LEX@
INSTALL = @INSTALL@
@@ -10,18 +10,33 @@ $NetBSD: patch-al,v 1.2 2009/12/27 14:17:38 obache Exp $
@SET_MAKE@
-@@ -58,10 +59,10 @@ popper_server:
+@@ -72,25 +73,10 @@ popper_server:
cd ${popper_dir} && ${MAKE} all
install:
-- ${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8 ${mandir}/man8/
-- 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"
-+ ${BSD_INSTALL_MAN} ${top_srcdir}/man/popper.8 ${DESTDIR}${mandir}/man8/qpopper.8
+- @if [ ! -d ${prefix} ]; then \
+- ${base_dir}/mkdir-sh "${prefix}" "0755" "root" ; \
+- fi
+-
+- @if [ ! -d ${mandir} ]; then \
+- ${base_dir}/mkdir-sh "${mandir}" "0755" "root" ; \
+- fi
+-
+- @if [ ! -d ${mandir}/man8 ]; then \
+- mkdir -m 0755 ${mandir}/man8; \
+- chown root ${mandir}/man8; \
+- fi
+-
+- @${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8 ${mandir}/man8/
+- @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"
+-
++ ${BSD_INSTALL_MAN} ${top_srcdir}/man/popper.8 ${DESTDIR}${mandir}/man8/qpopper.8
+ @echo "Installed man/popper.8 as ${mandir}/man8/qpopper.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
+ cd ${popper_dir} && ${MAKE} install
clean:
diff --git a/mail/qpopper/patches/patch-am b/mail/qpopper/patches/patch-am
index 82c5c76fc43..788aec914c0 100644
--- a/mail/qpopper/patches/patch-am
+++ b/mail/qpopper/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
+$NetBSD: patch-am,v 1.7 2012/03/22 14:13:29 taca Exp $
---- popper/Makefile.in.orig 2006-03-09 22:32:37.000000000 +0000
+--- popper/Makefile.in.orig 2011-05-30 19:13:39.000000000 +0000
+++ popper/Makefile.in
-@@ -86,6 +86,7 @@ CC = @CC@
+@@ -99,6 +99,7 @@ CC = @CC@
GPERF = @GPERF@
MAKEFILE = Makefile
INSTALL = @INSTALL@
@@ -10,7 +10,7 @@ $NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
@SET_MAKE@
-@@ -96,6 +97,8 @@ VPATH = @srcdir@
+@@ -109,6 +110,8 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
installdir = @sbindir@
@@ -19,7 +19,7 @@ $NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
popper_srcdir = ${top_srcdir}/popper
qd_srcdir = ${top_srcdir}/qd
-@@ -114,17 +117,20 @@ password_dir = ${base_dir}/password
+@@ -127,7 +130,7 @@ password_dir = ${base_dir}/password
OBJS = pop_dele.o pop_dropcopy.o \
@@ -28,31 +28,19 @@ $NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
pop_last.o pop_list.o pop_log.o pop_lower.o \
pop_msg.o pop_parse.o pop_pass.o pop_quit.o \
pop_rset.o pop_send.o pop_stat.o pop_updt.o \
- pop_user.o pop_xtnd.o pop_xmit.o popper.o \
-- pop_bull.o xtnd_xlst.o pop_uidl.o mktemp.o \
-+ pop_bull.o xtnd_xlst.o pop_uidl.o \
- pop_rpop.o pop_apop.o md5.o pop_auth.o pop_pope.o \
- pop_extend.o scram.o hmac.o base64.o pop_util.o \
+@@ -137,7 +140,10 @@ OBJS = pop_dele.o pop_dropc
+ pop_extend.o scram.o hmac.o pop_util.o \
get_sub_opt.o msg_ptr.o drac.o pop_config.o pop_tls.o \
pop_tls_openssl.o pop_tls_sslplus.o sslplus_utils.o \
-- main.o pop_cache.o genpath.o
-+ pop_cache.o genpath.o
+- main.o pop_cache.o genpath.o pop_sasl.o
++ pop_cache.o genpath.o pop_sasl.o
+
+INETDOBJ = main.o pop_init.o
+STANDOBJ = main-stand.o pop_init-stand.o
SRCS = pop_dele.c pop_dropcopy.c \
pop_get_command.c pop_get_subcommand.c pop_init.c \
-@@ -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 \
-- pop_bull.c xtnd_xlst.c pop_uidl.c mktemp.c \
-+ pop_bull.c xtnd_xlst.c pop_uidl.c \
- 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 +187,7 @@ USE_PAM = @USE_PAM@
+@@ -198,7 +204,7 @@ pam_sample = ${top_srcdir}/sample
.SUFFIXES: .c .o
@@ -61,29 +49,31 @@ $NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
mangler_library:
cd ${mmangle_dir} && ${MAKE} all
-@@ -189,13 +195,18 @@ mangler_library:
+@@ -206,14 +212,20 @@ mangler_library:
common_library:
cd ${common_dir} && ${MAKE} all
--popper: ${OBJS} mangler_library common_library
-- ${CC} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
-+popper: ${INETDOBJ} ${OBJS} mangler_library common_library
-+ ${CC} ${INETDOBJ} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
+-popper: ${OBJS} ${MISSING_OBJS} mangler_library common_library
+- ${CC} ${OBJS} ${MISSING_OBJS} -o popper \
++popper: ${INETDOBJ} ${OBJS} ${MISSING_OBJS} mangler_library common_library
++ ${CC} ${INETDOBJ} ${OBJS} ${MISSING_OBJS} -o popper \
++ ${mmangle_dir}/libmangle.a \
++ -I${common_srcdir} ${common_dir}/libcommon.a \
++ ${LIBS} ${LDFLAGS}
++
++popper-standalone: ${STANDOBJ} ${OBJS} ${MISSING_OBJS} mangler_library common_library
++ ${CC} ${STANDOBJ} ${OBJS} ${MISSING_OBJS} -o popper-standalone \
+ ${mmangle_dir}/libmangle.a \
-I${common_srcdir} ${common_dir}/libcommon.a \
${LIBS} ${LDFLAGS}
-+popper-standalone: ${STANDOBJ} ${OBJS} mangler_library common_library
-+ ${CC} ${STANDOBJ} ${OBJS} -o popper-standalone \
-+ ${mmangle_dir}/libmangle.a -I${common_srcdir} \
-+ ${common_dir}/libcommon.a ${LIBS}
-+
- popauth: ${POPAUTHOBJS}
-- ${CC} -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${DBM_LIBS} \
-+ ${CC} -o popauth ${POPAUTHOBJS} ${LIBS} ${NETWORK_LIBS} ${DBM_LIBS} \
+ popauth: ${POPAUTHOBJS} ${MISSING_OBJS}
+- ${CC} -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} \
++ ${CC} -o popauth ${POPAUTHOBJS} ${LIBS} ${NETWORK_LIBS} \
+ ${DBM_LIBS} ${MISSING_OBJS} \
${common_dir}/libcommon.a
- poppassd: common_library
-@@ -206,22 +217,35 @@ poppassd: common_library
+@@ -225,47 +237,36 @@ poppassd: common_library
-I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@
@@ -101,32 +91,53 @@ $NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
+
${SRCS}:
${POPAUTHSRCS}:
-
--install: popper ${pop_auth}
-- ${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
-- echo "Installed popper as ${installdir}/popper"
-- if [ "x${poppassd}" != "x" ]; then \
-- cd ${password_dir} && ${MAKE} $@ ;\
-+install: popper popper-standalone ${pop_auth}
+ ${MISSING_SRCS}:
+
+ install: popper ${pop_auth}
+- @if [ ! -d ${installdir} ]; then \
+- ${base_dir}/mkdir-sh "${installdir}" "0755" "root:wheel" ; \
+- fi
+-
+- @${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
+- @echo "Installed popper as ${installdir}/popper"
+ ${BSD_INSTALL_PROGRAM} popper ${DESTDIR}${libexecdir}/qpopper
-+ echo "Installed popper as ${libexecdir}/qpopper"
++ @echo "Installed popper as ${libexecdir}/qpopper"
+ ${BSD_INSTALL_PROGRAM} popper-standalone ${DESTDIR}${sbindir}/qpopper
+ @echo "Installed standalone popper as ${sbindir}/qpopper"
-+ @if [ "x${pop_auth}" != "x" ]; then \
-+ ${BSD_INSTALL_PROGRAM} ${pop_auth} \
-+ ${DESTDIR}${sbindir}/q${pop_auth}; \
-+ echo "Installed popauth as ${sbindir}/q${pop_auth} " \
-+ "with uid ${apop_uid}"; \
+
+ @if [ "x${poppassd}" != "x" ]; then \
+ cd ${password_dir} && ${MAKE} install ;\
fi
-- if [ "x${pop_auth}" != "x" ]; then \
-- ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
-- ${installdir}/${pop_auth}; \
-- echo "Installed popauth as ${installdir}/${pop_auth} " \
-- "with uid ${apop_uid}"; \
-- ${installdir}/${pop_auth} -init -safe; \
-+ if [ "x${poppassd}" != "x" ]; then \
-+ cd ${password_dir} && ${MAKE} $@ ;\
+- @if [ "x${pop_auth}" != "x" ]; then \
+- ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
+- ${installdir}/${pop_auth}; \
+- echo "Installed popauth as ${installdir}/${pop_auth} " \
+- "with uid ${apop_uid}"; \
+- if [ "x${apop_dir}" != "x" ]; then \
+- if [ ! -d "${apop_dir}" ]; then \
+- ${base_dir}/mkdir-sh "${apop_dir}" "0700" "${apop_uid}:0" ; \
+- echo "Created directory ${apop_dir}" ; \
+- fi \
+- fi ; \
+- echo "Initializing popauth database"; \
+- ${installdir}/${pop_auth} -init -safe; \
+- fi
+-
+- @if [ "x${USE_PAM}" != "x" ]; then \
+- echo "Checking for pam.d file..."; \
+- if [ ! -e ${pam_file} ]; then \
+- if [ -e ${pam_sample} ]; then \
+- ${INSTALL} -m 0444 -o root ${pam_sample} ${pam_file} ; \
+- echo "Created ${pam_file}"; \
+- else \
+- echo "can't find ${pam_sample} file"; \
+- fi \
+- fi \
++ @if [ "x${pop_auth}" != "x" ]; then \
++ ${BSD_INSTALL_PROGRAM} ${pop_auth} \
++ ${DESTDIR}${sbindir}/q${pop_auth}; \
++ echo "Installed popauth as ${sbindir}/q${pop_auth}" ;\
fi
- if [ "x${USE_PAM}" != "x" ]; then \
+ clean:
diff --git a/mail/qpopper/patches/patch-an b/mail/qpopper/patches/patch-an
deleted file mode 100644
index 7f83d64815f..00000000000
--- a/mail/qpopper/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/05/04 05:59:05 taca Exp $
-
---- popper/pop_bull.c.orig Wed Feb 21 10:15:17 2001
-+++ popper/pop_bull.c
-@@ -702,7 +702,7 @@
- int msg_num;
- int msg_vis_num = 0;
- int msg_ends_in_nl = 0;
-- char bullName [ 256 ];
-+ char bullName [ MAXLINELEN ];
- MsgInfoList *mp; /* Pointer to message info list */
-
-
-@@ -716,7 +716,7 @@
- msg_num = p->msg_count;
- p->msg_count = ( ( ( p->msg_count - 1 ) / ALLOC_MSGS ) + 1 ) * ALLOC_MSGS;
-
-- sprintf ( bullName, "%s/%s", p->bulldir, name );
-+ Qsnprintf ( bullName, sizeof bullName, "%s/%s", p->bulldir, name );
- bull = fopen ( bullName, "r" );
- if ( bull == NULL ) {
- pop_log ( p, POP_PRIORITY, HERE,
diff --git a/mail/qpopper/patches/patch-ap b/mail/qpopper/patches/patch-ap
index 61ec0ccbc6d..2498241403b 100644
--- a/mail/qpopper/patches/patch-ap
+++ b/mail/qpopper/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2005/06/01 20:55:16 adrianp Exp $
+$NetBSD: patch-ap,v 1.4 2012/03/22 14:13:29 taca Exp $
---- popper/main.c.orig 2005-05-28 17:29:10.000000000 +0100
+--- popper/main.c.orig 2011-05-30 19:13:39.000000000 +0000
+++ popper/main.c
-@@ -246,6 +246,7 @@ main ( int argc, char *argv[] )
+@@ -310,6 +310,7 @@ main ( int argc, char *argv[] )
fd_set fdset_templ;
fd_set fdset_read;
int fd_flags = 0;
@@ -10,24 +10,24 @@ $NetBSD: patch-ap,v 1.3 2005/06/01 20:55:16 adrianp Exp $
#ifdef USE_PAM
-@@ -625,7 +626,10 @@ main ( int argc, char *argv[] )
- "listening using socket fd %d",
- sockfd );
+@@ -781,7 +782,10 @@ main ( int argc, char *argv[] )
+ TRACE ( trace_file, POP_DEBUG, HERE, "listening using socket fd %d",
+ sockfd );
-- listen ( sockfd, 5 );
+- listen ( sockfd, 5 );
+#ifndef SOMAXCONN
+#define SOMAXCONN 5
+#endif
+ listen ( sockfd, SOMAXCONN );
- /*
- * Set file descriptor to be non-blocking in case there isn't really a
-@@ -655,6 +659,16 @@ main ( int argc, char *argv[] )
+ /*
+ * Set file descriptor to be non-blocking in case there isn't really a
+@@ -823,6 +827,16 @@ main ( int argc, char *argv[] )
signal ( SIGHUP, VOIDSTAR hupit );
signal ( SIGTERM, VOIDSTAR cleanup );
+#ifndef PIDFILE
-+#define PIDFILE "/var/run/qpopper.pid"
++#define PIDFILE "@VARBASE@/run/qpopper.pid"
+#endif
+ fp = fopen(PIDFILE, "w");
+ if (fp == NULL) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 10:09:32 +0000