summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>1997-10-07 20:37:24 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>1997-10-07 20:37:24 +0000
commit40239124bb89589c608141ef44e09d578dc7610d (patch)
tree64061d3dcaf0cb8189938a9de3dfe63cb686bc65 /mail
parentAdd support for shared libraries (C libraries only). (diff)
Upgrade to 2.4b2
Fix two longstanding bugs in Return-Path patch: 1) possible uninitialized "rpath" variable usage 2) wrong message size, return_path not counted
Notes
Notes: svn path=/head/; revision=8161
Diffstat (limited to 'mail')
-rw-r--r--mail/popper/Makefile40
-rw-r--r--mail/popper/distinfo2
-rw-r--r--mail/popper/files/patch-aa144
-rw-r--r--mail/popper/files/patch-ab49
-rw-r--r--mail/popper/files/patch-ad214
-rw-r--r--mail/popper/files/patch-ae128
-rw-r--r--mail/popper/files/patch-ag19
-rw-r--r--mail/qpopper/Makefile40
-rw-r--r--mail/qpopper/distinfo2
9 files changed, 340 insertions, 298 deletions
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 3de4965704fa..6a1aab2ad6f1 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: popper
-# Version required: 2.3
+# Version required: 2.4b2
# Date created: 1 April 1995
# Whom: pst
#
-# $Id: Makefile,v 1.14 1997/04/02 01:38:22 ache Exp $
+# $Id: Makefile,v 1.15 1997/04/23 04:27:18 ache Exp $
#
-DISTNAME= qpopper2.3
-PKGNAME= qpopper-2.3
+DISTNAME= qpopper2.4b2
+PKGNAME= qpopper-2.4b2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
EXTRACT_SUFX= .tar.Z
@@ -21,4 +21,36 @@ MAINTAINER= pst@freebsd.org
NO_PACKAGE= "Needs POP UID"
+O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
+ -DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
+ -DPOPUID='\"pop\"' \
+ -DNONAUTHFILE='\"/etc/ftpusers\"'
+
+.if !defined(APOP_ONLY)
+.if exists(/usr/lib/libskey.a)
+P_LIBS= -lskey
+O_DEFS+= -DSKEY
+.endif
+.else
+O_DEFS+= -DAPOP_ONLY
+.endif
+
+P_LIBS+= -lmd -lcrypt -lutil
+
+GNU_CONFIGURE= yes
+CONFIGURE_ENV+= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+
+MAN8= popauth.8 popper.8
+
+post-patch:
+ $(RM) ${WRKSRC}/md5.h
+
+do-install:
+ cd ${WRKSRC} && \
+ ${INSTALL_PROGRAM} -o pop -m 4111 popauth ${PREFIX}/bin
+ cd ${WRKSRC} && \
+ ${INSTALL_PROGRAM} -g mail -m 2111 popper ${PREFIX}/libexec
+ cd ${WRKSRC} && \
+ ${INSTALL_MAN} ${MAN8} ${PREFIX}/man/man8
+
.include <bsd.port.mk>
diff --git a/mail/popper/distinfo b/mail/popper/distinfo
index 678830b43bda..081e55b09bbc 100644
--- a/mail/popper/distinfo
+++ b/mail/popper/distinfo
@@ -1 +1 @@
-MD5 (qpopper2.3.tar.Z) = 62c92a8707d2913539671f0c39611fec
+MD5 (qpopper2.4b2.tar.Z) = 374d77e10b29db6d7cc1df8b54b2ae7f
diff --git a/mail/popper/files/patch-aa b/mail/popper/files/patch-aa
index be2892c8bd5d..1997deb61533 100644
--- a/mail/popper/files/patch-aa
+++ b/mail/popper/files/patch-aa
@@ -1,71 +1,93 @@
-*** pop_dropcopy.c.orig Sat Mar 29 07:30:36 1997
---- pop_dropcopy.c Wed Apr 23 07:34:06 1997
+*** Makefile.in.orig Fri Jul 25 21:42:06 1997
+--- Makefile.in Tue Oct 7 19:43:23 1997
***************
-*** 54,60 ****
- # define L_XTND SEEK_END
- #endif
+*** 1,20 ****
+! CSRCS = flock.c pop_dele.c pop_dropcopy.c \
+ pop_get_command.c pop_get_subcommand.c pop_init.c \
+ pop_last.c pop_list.c pop_log.c pop_lower.c \
+ 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_rpop.c pop_apop.c md5.c pop_auth.c
-! #include "md5.h"
+! OBJS = flock.o pop_dele.o pop_dropcopy.o \
+ pop_get_command.o pop_get_subcommand.o pop_init.o \
+ 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_rpop.o pop_apop.o md5.o pop_auth.o
- /* This macro comes from Mark Crispin's c-client code */
+ DOCS = README pop3.rfc1081 pop3e.rfc1082 popper.8
---- 54,60 ----
- # define L_XTND SEEK_END
- #endif
+--- 1,20 ----
+! CSRCS = pop_dele.c pop_dropcopy.c \
+ pop_get_command.c pop_get_subcommand.c pop_init.c \
+ pop_last.c pop_list.c pop_log.c pop_lower.c \
+ 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 \
+! pop_rpop.c pop_apop.c pop_auth.c
-! #include <md5.h>
+! OBJS = pop_dele.o pop_dropcopy.o \
+ pop_get_command.o pop_get_subcommand.o pop_init.o \
+ 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 \
+! pop_rpop.o pop_apop.o pop_auth.o
- /* This macro comes from Mark Crispin's c-client code */
+ DOCS = README pop3.rfc1081 pop3e.rfc1082 popper.8
***************
-*** 755,760 ****
---- 755,761 ----
- the SERVER maildrop */
- FILE *tf; /* The temp file */
- int tfn;
-+ char template[POP_TMPSIZE]; /* Temp name holder */
- char buffer[MAXLINELEN]; /* Read buffer */
- long offset; /* Old/New boundary */
- int nchar; /* Bytes written/read */
+*** 32,38 ****
+ DEFS = @DEFS@
+ O_DEFS = @O_DEFS@
+
+! TARGET = @TARGET@
+
+ INSTALLDIR = /usr/local/lib
+
+--- 32,38 ----
+ DEFS = @DEFS@
+ O_DEFS = @O_DEFS@
+
+! TARGET = popper
+
+ INSTALLDIR = /usr/local/lib
+
***************
-*** 794,799 ****
---- 795,811 ----
- }
- #endif
-
-+ /* First create a unique file. Would prefer mkstemp, but Ultrix...*/
-+ strcpy(template,POP_TMPDROP);
-+ if (((tfn=mkstemp(template)) == -1) ||
-+ ((tf=fdopen(tfn, "w+")) == NULL)) { /* failure, bail out */
-+ pop_log(p,POP_PRIORITY,
-+ "Unable to create temporary temporary maildrop '%s': %s",template,
-+ (errno < sys_nerr) ? sys_errlist[errno] : "") ;
-+ return pop_msg(p,POP_FAILURE,
-+ "System error, can't create temporary file.");
-+ }
-+
- /* Here we work to make sure the user doesn't cause us to remove or
- * write over existing files by limiting how much work we do while
- * running as root.
+*** 54,61 ****
+ ${TARGET}: ${OBJS}
+ ${CC} ${OBJS} -o ${TARGET} ${LIBS}
+
+! popauth: popauth.o flock.o
+! ${CC} -o popauth popauth.o flock.o
+
+ .c.o:
+ ${CC} -c -I. ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
+--- 54,61 ----
+ ${TARGET}: ${OBJS}
+ ${CC} ${OBJS} -o ${TARGET} ${LIBS}
+
+! popauth: popauth.o
+! ${CC} -o popauth popauth.o
+
+ .c.o:
+ ${CC} -c -I. ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@
***************
-*** 807,812 ****
---- 819,837 ----
- pwp->pw_gid = mybuf.st_gid;
- # endif
- #endif
-+
-+ /* Now give this file to the user */
-+ (void) chown(template, (UID_T)pwp->pw_uid, (GID_T)pwp->pw_gid);
-+ /* (void) chmod(template,0600); umask now handles this */
-+
-+ /* Now link this file to the temporary maildrop. If this fails it
-+ * is probably because the temporary maildrop already exists. If so,
-+ * this is ok. We can just go on our way, because by the time we try
-+ * to write into the file we will be running as the user.
-+ */
-+ (void) link(template,p->temp_drop);
-+ (void) fclose(tf);
-+ (void) unlink(template);
-
- /* Now we run as the user. */
- (void) setgid((GID_T)pwp->pw_gid);
+*** 76,84 ****
+ rm -f core *.o *.Z* config.h config.status config.cache config.log
+
+ ${OBJS}: ${INCLUDES}
+- pop_dropcopy.o: flock.h
+- pop_updt.o: flock.h
+- flock.o: flock.h
+
+
+
+--- 76,81 ----
diff --git a/mail/popper/files/patch-ab b/mail/popper/files/patch-ab
index 8bb2bbdbbf12..77c7c2213fa8 100644
--- a/mail/popper/files/patch-ab
+++ b/mail/popper/files/patch-ab
@@ -93,40 +93,35 @@ SKEY + pw_expire patches
/* Tell the user that the password is required */
return (pop_msg(p,POP_SUCCESS,"Password required for %s.",p->user));
}
-*** popper.h.orig Tue Apr 1 00:10:18 1997
---- popper.h Wed Apr 23 07:33:12 1997
+*** popper.h.orig Fri Jul 25 21:42:08 1997
+--- popper.h Tue Oct 7 20:26:58 1997
***************
-*** 35,40 ****
---- 35,43 ----
- # define HAVE_VSPRINTF
- # define BIND43
- # endif
-+ # if (defined(BSD) && (BSD >= 199306))
-+ # define BSD44_DBM
-+ # endif
+*** 25,37 ****
+ # include <net/errno.h>
+ #endif
+
+! #ifdef HAVE_PARAM_H
+ #include <sys/param.h>
+- # if (defined(BSD) && (BSD >= 199103))
+- # define HAVE_UNISTD_H
+- # define HAVE_VPRINTF
+- # define BIND43
+- # endif
#endif
#ifdef BSDI
-***************
-*** 114,120 ****
- # define POP_MAILDIR "/var/mail"
- # define POP_DROP "/var/mail/.%s.pop"
- # define POP_TMPDROP "/var/mail/tmpXXXXXX"
-! # define POP_TMPXMIT "/var/mail/xmitXXXXXX"
- # define MAIL_COMMAND "/usr/sbin/sendmail"
- # define OSDONE
+--- 25,32 ----
+ # include <net/errno.h>
#endif
---- 117,123 ----
- # define POP_MAILDIR "/var/mail"
- # define POP_DROP "/var/mail/.%s.pop"
- # define POP_TMPDROP "/var/mail/tmpXXXXXX"
-! # define POP_TMPXMIT "/var/tmp/xmitXXXXXX"
- # define MAIL_COMMAND "/usr/sbin/sendmail"
- # define OSDONE
+
+! #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
#endif
+
+ #ifdef BSDI
***************
-*** 353,358 ****
---- 356,364 ----
+*** 304,309 ****
+--- 299,307 ----
extern AUTH_DAT kdata;
#endif /* KERBEROS */
diff --git a/mail/popper/files/patch-ad b/mail/popper/files/patch-ad
index 76efb0426422..9b5c12381d94 100644
--- a/mail/popper/files/patch-ad
+++ b/mail/popper/files/patch-ad
@@ -7,104 +7,122 @@ WARNING: Do not merge these patches in with other patch files.
-- Paul Traina
17-Feb-1997
---- pop_dropcopy.c Mon Feb 17 13:14:18 1997
-+++ pop_dropcopy.c Mon Feb 17 15:51:37 1997
-@@ -160,6 +160,37 @@
- return(ti != 0);
- }
-
-+char *
-+return_path (const char *unixfrom)
-+{
-+ static char tmpbuf[BUFSIZ];
-+ int fromlen = sizeof("From ") - 1;
-+ const char *fp, *hp, *cp, *ep;
-+
-+ /* if it doesn't start with a From_, it's not */
-+ if (strncmp(unixfrom, "From ", fromlen))
-+ return NULL;
-+
-+ fp = unixfrom + fromlen;
-+ hp = cp = strchr(fp, ' ');
-+ while (hp = strchr(++hp, 'r'))
-+ if (!strncmp(hp, "remote from", sizeof("remote from") - 1)) {
-+ hp = strrchr(hp, ' ');
-+ break;
-+ }
-+
-+ if (hp) {
-+ ep = strrchr(++hp, '\n');
-+ snprintf(tmpbuf, sizeof(tmpbuf), "Return-Path: %.*s!%.*s\n",
-+ ep - hp, hp,
-+ cp - fp, fp);
-+ } else
-+ snprintf(tmpbuf, sizeof(tmpbuf), "Return-Path: %.*s\n",
-+ cp - fp, fp);
-+
-+ return tmpbuf;
-+}
-+
- /* Hashing to a spool directory helps reduce the lookup time for sites
- * with thousands of mail spool files. Unix uses a linear list to
- * save directory information and the following methods attempt to
-@@ -284,6 +315,7 @@
- char buffer[MAXLINELEN]; /* Read buffer */
- MD5_CTX mdContext;
- unsigned char digest[16];
-+ char *rpath;
-
- #ifdef DEBUG
- if(p->debug)
-@@ -349,6 +381,12 @@
- (p->mmdf_separator ? !strcmp(p->mmdf_separator, buffer) :
- isfromline(buffer))) {
-
-+ if (!p->mmdf_separator) {
-+ rpath = return_path(buffer);
-+ if (rpath)
-+ snprintf(buffer, sizeof(buffer), rpath);
-+ }
-+
- if (expecting_trailer) {
- /* skip over the MMDF trailer */
- expecting_trailer = 0;
-@@ -394,6 +432,7 @@
- mp->retr_flag = FALSE;
- mp->orig_retr_state = FALSE;
- mp->uidl_str = "\n";
-+ mp->return_path = rpath ? strdup(rpath) : NULL;
- #ifdef DEBUG
- if(p->debug)
- pop_log(p,POP_DEBUG, "Msg %d being added to list", mp->number);
-@@ -511,6 +550,7 @@
- int content_length, content_nchar, cont_len;
- MD5_CTX mdContext;
- unsigned char digest[16];
-+ char *rpath;
-
- FILE *mail_drop; /* Streams for fids */
-
-@@ -583,6 +623,12 @@
- (p->mmdf_separator ? !strcmp(p->mmdf_separator, buffer) :
- isfromline(buffer))) {
-
-+ if (!p->mmdf_separator) {
-+ rpath = return_path(buffer);
-+ if (rpath)
-+ snprintf(buffer, sizeof(buffer), rpath);
-+ }
-+
- if (expecting_trailer) {
- expecting_trailer = 0;
- continue;
-@@ -628,6 +674,7 @@
- mp->retr_flag = FALSE;
- mp->orig_retr_state = FALSE;
- mp->uidl_str = "\n";
-+ mp->return_path = rpath ? strdup(rpath) : NULL;
-
- #ifdef DEBUG
- if(p->debug)
+With old variant of this patch message size was counted incorrectly
+and "rpath" variable can be referenced without initialization,
+fixed now.
+ -- Andrey Chernov
+ 8-Oct-1997
+
+*** pop_dropcopy.c.orig Fri Jul 25 21:42:07 1997
+--- pop_dropcopy.c Wed Oct 8 00:07:19 1997
+***************
+*** 151,156 ****
+--- 151,187 ----
+ return(ti != 0);
+ }
+
++ char *
++ return_path (const char *unixfrom)
++ {
++ static char tmpbuf[BUFSIZ];
++ int fromlen = sizeof("From ") - 1;
++ const char *fp, *hp, *cp, *ep;
++
++ /* if it doesn't start with a From_, it's not */
++ if (strncmp(unixfrom, "From ", fromlen))
++ return NULL;
++
++ fp = unixfrom + fromlen;
++ hp = cp = strchr(fp, ' ');
++ while (hp = strchr(++hp, 'r'))
++ if (!strncmp(hp, "remote from", sizeof("remote from") - 1)) {
++ hp = strrchr(hp, ' ');
++ break;
++ }
++
++ if (hp) {
++ ep = strrchr(++hp, '\n');
++ snprintf(tmpbuf, sizeof(tmpbuf), "Return-Path: %.*s!%.*s\n",
++ ep - hp, hp,
++ cp - fp, fp);
++ } else
++ snprintf(tmpbuf, sizeof(tmpbuf), "Return-Path: %.*s\n",
++ cp - fp, fp);
++
++ return tmpbuf;
++ }
++
+ /* Hashing to a spool directory helps reduce the lookup time for sites
+ * with thousands of mail spool files. Unix uses a linear list to
+ * save directory information and the following methods attempt to
+***************
+*** 275,280 ****
+--- 306,312 ----
+ char buffer[MAXLINELEN]; /* Read buffer */
+ MD5_CTX mdContext;
+ unsigned char digest[16];
++ char *rpath = NULL;
+
+ #ifdef DEBUG
+ if(p->debug)
+***************
+*** 340,345 ****
+--- 372,380 ----
+ (p->mmdf_separator ? !strcmp(p->mmdf_separator, buffer) :
+ isfromline(buffer))) {
+
++ if (!p->mmdf_separator)
++ rpath = return_path(buffer);
++
+ if (expecting_trailer) {
+ /* skip over the MMDF trailer */
+ expecting_trailer = 0;
+***************
+*** 385,390 ****
+--- 420,428 ----
+ mp->retr_flag = FALSE;
+ mp->orig_retr_state = FALSE;
+ mp->uidl_str = "\n";
++ mp->return_path = rpath ? strdup(rpath) : NULL;
++ if (rpath)
++ mp->length += strlen(rpath) + 1;
+ #ifdef DEBUG
+ if(p->debug)
+ pop_log(p,POP_DEBUG, "Msg %d being added to list", mp->number);
+***************
+*** 502,507 ****
+--- 540,546 ----
+ int content_length, content_nchar, cont_len;
+ MD5_CTX mdContext;
+ unsigned char digest[16];
++ char *rpath = NULL;
+
+ FILE *mail_drop; /* Streams for fids */
+
+***************
+*** 574,579 ****
+--- 613,621 ----
+ (p->mmdf_separator ? !strcmp(p->mmdf_separator, buffer) :
+ isfromline(buffer))) {
+
++ if (!p->mmdf_separator)
++ rpath = return_path(buffer);
++
+ if (expecting_trailer) {
+ expecting_trailer = 0;
+ continue;
+***************
+*** 619,624 ****
+--- 661,669 ----
+ mp->retr_flag = FALSE;
+ mp->orig_retr_state = FALSE;
+ mp->uidl_str = "\n";
++ mp->return_path = rpath ? strdup(rpath) : NULL;
++ if (rpath)
++ mp->length += strlen(rpath) + 1;
+
+ #ifdef DEBUG
+ if(p->debug)
--- pop_send.c Mon Feb 17 13:14:25 1997
+++ pop_send.c Mon Feb 17 13:15:28 1997
@@ -84,6 +84,9 @@
diff --git a/mail/popper/files/patch-ae b/mail/popper/files/patch-ae
index 18009bb1f7df..7bf8181f3111 100644
--- a/mail/popper/files/patch-ae
+++ b/mail/popper/files/patch-ae
@@ -1,84 +1,46 @@
-*** make.44bsd.orig Mon Mar 31 21:47:57 1997
---- make.44bsd Wed Apr 23 07:58:19 1997
+*** configure.orig Fri Jul 25 21:42:06 1997
+--- configure Tue Oct 7 22:37:01 1997
***************
-*** 3,32 ****
-
- # Defines are described in the INSTALL document.
-
-! PROG=popper popauth
-! MAN8=popper.8 popauth.8
- SRCS= pop_dele.c pop_dropcopy.c pop_get_command.c pop_get_subcommand.c \
- pop_init.c pop_last.c pop_list.c pop_log.c pop_lower.c 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 pop_rpop.c pop_apop.c md5.c pop_auth.c
-! #SRCS+= flock.c mktemp.c
-!
-! BINDIR=/usr/local/libexec
-! MANDIR=/usr/local/man/man
-
-! #LDADD+= -lcrypt -lndbm
-
-! CFLAGS+=-DHAVE_PARAM_H
-
- # if you want APOP support, uncomment the next line
-! #CFLAGS+=-DAPOP=\"/etc/pop.auth\" -DPOPUID=\"pop\"
-
- # if you want RPOP support, uncomment the next line
- #CFLAGS+=-DRPOP
-
- # if you want to block POP access for anyone in /etc/ftpusers, uncomment
-! #CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
-
- .include <bsd.prog.mk>
--
---- 3,51 ----
-
- # Defines are described in the INSTALL document.
-
-! SUBDIR=popauth
-!
-! PROG= popper
-! MAN8= popper.8 # FreeBSD
-! MAN= popper.8 # NetBSD/OpenBSD
-!
- SRCS= pop_dele.c pop_dropcopy.c pop_get_command.c pop_get_subcommand.c \
- pop_init.c pop_last.c pop_list.c pop_log.c pop_lower.c 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 pop_rpop.c pop_apop.c pop_auth.c
-! #SRCS+= md5.c flock.c mktemp.c
-
-! PREFIX?=/usr/local
-! BINDIR=${PREFIX}/libexec
-! MANDIR=${PREFIX}/man/man
-!
-! CFLAGS+=-DHAVE_PARAM_H -DSETPROCTITLE
-! LDADD+=-lutil
-! DPADD+=${LIBUTIL}
-!
-! .if !defined(APOP_ONLY)
-! .if exists(/usr/lib/libskey.a) && exists(/usr/lib/libmd.a)
-! DPADD+=${LIBSKEY}
-! LDADD+=-lskey
-! CFLAGS+=-DSKEY
-! .endif
-! .endif
-
-! LDADD+=-lmd -lcrypt
-! DPADD+=${LIBMD} ${LIBCRYPT}
-
- # if you want APOP support, uncomment the next line
-! CFLAGS+=-DAPOP=\"${PREFIX}/etc/popper/pop.auth\" -DPOPUID=\"pop\"
-!
-! .if defined(APOP_ONLY)
-! CFLAGS+=-DAPOP_ONLY
-! .endif
-
- # if you want RPOP support, uncomment the next line
- #CFLAGS+=-DRPOP
-
- # if you want to block POP access for anyone in /etc/ftpusers, uncomment
-! CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
-
- .include <bsd.prog.mk>
+*** 828,834 ****
+ fi
+
+ fi
+! if test "$GCC" = yes
+ then
+ CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return"
+ fi
+--- 828,834 ----
+ fi
+
+ fi
+! if test "$GCC" = DISABLE_yes
+ then
+ CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return"
+ fi
+***************
+*** 1354,1360 ****
+ netinet/in.h \
+ maillock.h \
+ ndbm.h \
+- gdbm.h \
+
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+--- 1354,1359 ----
+***************
+*** 1697,1703 ****
+ char gdbm_open();
+
+ int main() {
+! gdbm_open()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+--- 1696,1702 ----
+ char gdbm_open();
+
+ int main() {
+! DISABLE_gdbm_open()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
diff --git a/mail/popper/files/patch-ag b/mail/popper/files/patch-ag
deleted file mode 100644
index c7231fe9d930..000000000000
--- a/mail/popper/files/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-*** pop_apop.c.bak Sat Mar 29 07:30:36 1997
---- pop_apop.c Wed Apr 23 07:31:21 1997
-***************
-*** 34,40 ****
- #endif
-
- #include "popper.h"
-! #include "md5.h"
-
- /*
- * Obscure password so a cleartext search doesn't come up with
---- 34,40 ----
- #endif
-
- #include "popper.h"
-! #include <md5.h>
-
- /*
- * Obscure password so a cleartext search doesn't come up with
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 3de4965704fa..6a1aab2ad6f1 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: popper
-# Version required: 2.3
+# Version required: 2.4b2
# Date created: 1 April 1995
# Whom: pst
#
-# $Id: Makefile,v 1.14 1997/04/02 01:38:22 ache Exp $
+# $Id: Makefile,v 1.15 1997/04/23 04:27:18 ache Exp $
#
-DISTNAME= qpopper2.3
-PKGNAME= qpopper-2.3
+DISTNAME= qpopper2.4b2
+PKGNAME= qpopper-2.4b2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
EXTRACT_SUFX= .tar.Z
@@ -21,4 +21,36 @@ MAINTAINER= pst@freebsd.org
NO_PACKAGE= "Needs POP UID"
+O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
+ -DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
+ -DPOPUID='\"pop\"' \
+ -DNONAUTHFILE='\"/etc/ftpusers\"'
+
+.if !defined(APOP_ONLY)
+.if exists(/usr/lib/libskey.a)
+P_LIBS= -lskey
+O_DEFS+= -DSKEY
+.endif
+.else
+O_DEFS+= -DAPOP_ONLY
+.endif
+
+P_LIBS+= -lmd -lcrypt -lutil
+
+GNU_CONFIGURE= yes
+CONFIGURE_ENV+= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+
+MAN8= popauth.8 popper.8
+
+post-patch:
+ $(RM) ${WRKSRC}/md5.h
+
+do-install:
+ cd ${WRKSRC} && \
+ ${INSTALL_PROGRAM} -o pop -m 4111 popauth ${PREFIX}/bin
+ cd ${WRKSRC} && \
+ ${INSTALL_PROGRAM} -g mail -m 2111 popper ${PREFIX}/libexec
+ cd ${WRKSRC} && \
+ ${INSTALL_MAN} ${MAN8} ${PREFIX}/man/man8
+
.include <bsd.port.mk>
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 678830b43bda..081e55b09bbc 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1 +1 @@
-MD5 (qpopper2.3.tar.Z) = 62c92a8707d2913539671f0c39611fec
+MD5 (qpopper2.4b2.tar.Z) = 374d77e10b29db6d7cc1df8b54b2ae7f