diff options
Diffstat (limited to 'mail/popper')
-rw-r--r-- | mail/popper/Makefile | 73 | ||||
-rw-r--r-- | mail/popper/distinfo | 2 | ||||
-rw-r--r-- | mail/popper/files/patch-aa | 86 | ||||
-rw-r--r-- | mail/popper/files/patch-ac | 50 | ||||
-rw-r--r-- | mail/popper/files/patch-ad | 215 | ||||
-rw-r--r-- | mail/popper/files/patch-ae | 63 | ||||
-rw-r--r-- | mail/popper/files/patch-af | 44 | ||||
-rw-r--r-- | mail/popper/files/patch-ag | 31 | ||||
-rw-r--r-- | mail/popper/files/patch-ah | 50 | ||||
-rw-r--r-- | mail/popper/files/patch-ai | 94 | ||||
-rw-r--r-- | mail/popper/files/patch-aj | 62 | ||||
-rw-r--r-- | mail/popper/files/patch-ak | 31 | ||||
-rw-r--r-- | mail/popper/files/patch-al | 82 | ||||
-rw-r--r-- | mail/popper/files/patch-am | 76 | ||||
-rw-r--r-- | mail/popper/files/patch-an | 46 | ||||
-rw-r--r-- | mail/popper/files/patch-ao | 26 | ||||
-rw-r--r-- | mail/popper/files/patch-pop_pass.c | 75 | ||||
-rw-r--r-- | mail/popper/files/patch-popauth.c | 11 | ||||
-rw-r--r-- | mail/popper/files/sendto.c | 170 | ||||
-rw-r--r-- | mail/popper/pkg-descr | 6 | ||||
-rw-r--r-- | mail/popper/pkg-install | 39 |
21 files changed, 0 insertions, 1332 deletions
diff --git a/mail/popper/Makefile b/mail/popper/Makefile deleted file mode 100644 index 7a15c56c3a8..00000000000 --- a/mail/popper/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# Created by: pst -# $FreeBSD$ - -PORTNAME= popper -PORTVERSION= 2.53 -PORTREVISION= 5 -CATEGORIES= mail -MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/old/ -DISTNAME= q${PORTNAME}${PORTVERSION} -EXTRACT_SUFX= .tar.Z - -MAINTAINER= ports@FreeBSD.org -COMMENT= Berkeley POP 3 server (now maintained by Qualcomm) - -# Set WITH_POPPER_YOUBIN_SUPPORT variable in the environment to enable -# youbin support. -# -# If WITH_POPPER_APOP_ONLY variable present in the environment, popper builds -# with APOP authentification only. -# -# If WITH_POPPER_DEBUG variable present in the environment, popper builds -# with more verbose debugging. - -USE_CSTD= gnu89 -O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \ - -DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"' - -.if !defined(WITH_POPPER_APOP_ONLY) -LIBS+= -lopie -O_DEFS+= -DOPIE -.else -O_DEFS+= -DAPOP_ONLY -.endif - -.if defined(WITH_POPPER_YOUBIN_SUPPORT) -O_DEFS+= -DYOUBIN -DCALLED_FROM_POPD -.endif - -LIBS+= -lmd -lutil - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-apop=${PREFIX}/etc/popper/pop.auth \ - --with-apopuid=pop -.if defined(WITH_POPPER_DEBUG) -CONFIGURE_ARGS+= --enable-debugging -.endif -CONFIGURE_ENV= O_DEFS="${O_DEFS}" - -MAN8= popauth.8 popper.8 -PLIST_FILES= bin/popauth libexec/popper -PLIST_DIRS= etc/popper - -LATEST_LINK= popper - -PORTSCOUT= limit:^2\. - -NO_STAGE= yes -post-patch: - $(RM) ${WRKSRC}/md5.h - $(CP) ${FILESDIR}/sendto.c ${WRKSRC} - -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -do-install: - cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} -o pop -m 4111 popauth ${PREFIX}/bin - cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} 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 deleted file mode 100644 index aa618cbef4c..00000000000 --- a/mail/popper/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (qpopper2.53.tar.Z) = 5df821a3acce3c4e5f04a046f20887ce679873e756f43b19e22ed244cf55b4ec -SIZE (qpopper2.53.tar.Z) = 198601 diff --git a/mail/popper/files/patch-aa b/mail/popper/files/patch-aa deleted file mode 100644 index f0e4359a14d..00000000000 --- a/mail/popper/files/patch-aa +++ /dev/null @@ -1,86 +0,0 @@ -*** Makefile.in.orig Fri Jul 10 03:44:06 1998 ---- Makefile.in Wed Aug 5 01:26:01 1998 -*************** -*** 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 - -! 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 - - DOCS = README pop3.rfc1081 pop3e.rfc1082 popper.8 - ---- 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 sendto.c - -! 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 sendto.o - - DOCS = README pop3.rfc1081 pop3e.rfc1082 popper.8 - -*************** -*** 47,59 **** - - - -! all: ${TARGET} - - popper: ${OBJS} - ${CC} ${OBJS} -o popper ${LIBS} - -! popauth: popauth.o flock.o -! ${CC} -o popauth popauth.o flock.o ${DBM_LIBS} - - .c.o: - ${CC} -c -I. -I${srcdir} ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@ ---- 47,59 ---- - - - -! all: ${TARGET} popauth - - popper: ${OBJS} - ${CC} ${OBJS} -o popper ${LIBS} - -! popauth: popauth.o -! ${CC} -o popauth popauth.o ${DBM_LIBS} - - .c.o: - ${CC} -c -I. -I${srcdir} ${CFLAGS} ${DEFS} ${O_DEFS} $< -o $@ -*************** -*** 77,85 **** - rm -f config.h config.status config.cache config.log ${TARGET} Makefile - - ${OBJS}: ${INCLUDES} -- pop_dropcopy.o: flock.h -- pop_updt.o: flock.h -- flock.o: flock.h - - - ---- 77,82 ---- diff --git a/mail/popper/files/patch-ac b/mail/popper/files/patch-ac deleted file mode 100644 index b396d290ae7..00000000000 --- a/mail/popper/files/patch-ac +++ /dev/null @@ -1,50 +0,0 @@ ---- popper.8.orig Fri Jul 10 08:44:08 1998 -+++ popper.8 Tue Feb 16 13:17:13 1999 -@@ -16,7 +16,7 @@ - .SH NAME - popper \- pop 3 server - .SH SYNOPSIS --.B /usr/etc/popper -+.B /usr/local/libexec/popper - [ -d ] - [ -s ] - [ -k ] -@@ -136,7 +136,7 @@ - systems with BSD 4.3 syslogging, the server logs (by default) to the - "local0" facility at priority "notice" for all messages except - debugging which is logged at priority "debug". The default log file is --/usr/spool/mqueue/POPlog. These can be changed, if desired. On -+/var/log/messages. These can be changed, if desired. On - systems with 4.2 syslogging all messages are logged to the local log - file, usually /usr/spool/mqueue/syslog. - .SH DEBUGGING -@@ -170,7 +170,7 @@ - .PP - The server implements two extended commands. - .PP --XTND XMIT: Sends a mail message using /usr/lib/sendmail. -+XTND XMIT: Sends a mail message using /usr/sbin/sendmail. - .PP - XTND XLIST header [num]: Extracts and returns the specified header line - for the specified message number. If the "num" parameter is missing, -@@ -178,7 +178,8 @@ - marked for deletion. - .SH FILES - .nf --/usr/spool/mail mail files -+/var/mail mail files -+/etc/ftpusers list of unwelcome/restricted users - /etc/inetd.conf pop program invocation - /etc/syslog.conf logging specifications - ~/.popbull largest bulletin number seen by user ---- popauth.8.orig Thu May 30 09:40:04 1996 -+++ popauth.8 Fri Dec 6 17:12:21 1996 -@@ -34,7 +34,7 @@ - With the `\-delete' 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 -+/usr/local/etc/popper/pop.auth.* POP authorization DB - .SH ACKNOWLEDGEMENTS - This program was derived from MH 6.8.3 - .SH SEE ALSO diff --git a/mail/popper/files/patch-ad b/mail/popper/files/patch-ad deleted file mode 100644 index 620e4d77c1b..00000000000 --- a/mail/popper/files/patch-ad +++ /dev/null @@ -1,215 +0,0 @@ -These paths translate From_ lines into Return-Path: in unix style mailboxes. -If the mailbox is in MMDF format, it does nothing (since MMDF has already -done the Return-Path: translation while writing the message out. - -WARNING: Do not merge these patches in with other patch files. - Keep them separate (Andrey, I mean you). - -- Paul Traina - 17-Feb-1997 - -With old variant of this patch message size was counted incorrectly, -"rpath" variable can be referenced without initialization, second -Return-Path not skipped, fixed now. - -- Andrey Chernov - 8-Oct-1997 - -This patch hits again: wrong mbox size calculation and Return-Path was never -writted out - -- Andrey Chernov - 30-Jun-1998 - -*** pop_dropcopy.c.orig Thu Nov 20 00:20:38 1997 ---- pop_dropcopy.c Tue Jun 30 10:19:40 1998 -*************** -*** 155,160 **** ---- 155,191 ---- - return(ti != 0); - } - -+ char * -+ return_path (const char *unixfrom) -+ { -+ static char tmpbuf[MAXLINELEN]; -+ 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)-2, "Return-Path: %.*s!%.*s", -+ ep - hp, hp, -+ cp - fp, fp); -+ } else -+ snprintf(tmpbuf, sizeof(tmpbuf)-2, "Return-Path: %.*s", -+ cp - fp, fp); -+ strcat(tmpbuf, "\n"); -+ 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 -*************** -*** 279,284 **** ---- 310,316 ---- - char buffer[MAXLINELEN]; /* Read buffer */ - MD5_CTX mdContext; - unsigned char digest[16]; -+ char *rpath = NULL; - - #ifdef DEBUG - if(p->debug) -*************** -*** 343,348 **** ---- 375,383 ---- - (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; -*************** -*** 388,393 **** ---- 423,435 ---- - mp->retr_flag = FALSE; - mp->orig_retr_state = FALSE; - mp->uidl_str = "\n"; -+ mp->return_path = rpath ? strdup(rpath) : NULL; -+ if (rpath) { -+ int i = strlen(rpath) + 1; -+ mp->length += i; -+ p->drop_size += i; -+ mp->lines++; -+ } - #ifdef DEBUG - if(p->debug) - pop_log(p,POP_DEBUG, "Msg %d being added to list", mp->number); -*************** -*** 466,471 **** ---- 508,515 ---- - mp->retr_flag = TRUE; - mp->orig_retr_state = TRUE; - } -+ } else if (rpath && (strncasecmp(buffer,"Return-Path:",12) == 0)) { -+ continue; - } - } else { - content_nchar += nchar; -*************** -*** 505,510 **** ---- 549,555 ---- - int content_length, content_nchar, cont_len; - MD5_CTX mdContext; - unsigned char digest[16]; -+ char *rpath = NULL; - - FILE *mail_drop; /* Streams for fids */ - -*************** -*** 577,582 **** ---- 622,630 ---- - (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; -*************** -*** 622,628 **** - mp->retr_flag = FALSE; - mp->orig_retr_state = FALSE; - mp->uidl_str = "\n"; -! - #ifdef DEBUG - if(p->debug) - pop_log(p,POP_DEBUG, "Msg %d being added to list", mp->number); ---- 670,682 ---- - mp->retr_flag = FALSE; - mp->orig_retr_state = FALSE; - mp->uidl_str = "\n"; -! mp->return_path = rpath ? strdup(rpath) : NULL; -! if (rpath) { -! int i = strlen(rpath) + 1; -! mp->length += i; -! p->drop_size += i; -! mp->lines++; -! } - #ifdef DEBUG - if(p->debug) - pop_log(p,POP_DEBUG, "Msg %d being added to list", mp->number); -*************** -*** 705,710 **** ---- 759,766 ---- - mp->retr_flag = TRUE; - mp->orig_retr_state = TRUE; - } -+ } else if (rpath && (strncasecmp(buffer,"Return-Path:",12) == 0)) { -+ continue; - } - } else { - content_nchar += nchar; ---- popper.h Mon Feb 17 13:15:44 1997 -+++ popper.h Mon Feb 17 13:35:48 1997 -@@ -260,6 +263,8 @@ - Used for RSET cmd. */ - char *uidl_str; /* Cache of the UIDL str for - faster access */ -+ char *return_path; /* Cache of the rpath str for -+ faster access */ - } MsgInfoList; - - typedef struct { /* POP parameter block */ -*** pop_send.c.old Thu Nov 20 00:20:38 1997 ---- pop_send.c Tue Jun 30 10:06:23 1998 -*************** -*** 38,43 **** ---- 38,44 ---- - register int msg_num; - register int msg_lines; - register int uidl_sent = 0; -+ register int rpath_sent = 0; - char buffer[MAXMSGLINELEN]; - - /* Convert the first parameter into an integer */ -*************** -*** 86,91 **** ---- 87,93 ---- - /* Send the header of the message followed by a blank line */ - while (fgets(buffer, MAXMSGLINELEN, p->drop)) { - if (!strncasecmp(buffer, "Content-Length:", 15) || -+ (mp->return_path && !strncasecmp(buffer,"Return-Path:",12)) || - !strncasecmp(buffer, "X-UIDL:", 7)) { /* Skip UIDLs */ - continue; /* Content-Length is MTA dependent, don't send to MUA */ - } -*************** -*** 96,101 **** ---- 98,109 ---- - sprintf(uidl_buf, "%s %s", "X-UIDL:", mp->uidl_str); - pop_sendline(p, uidl_buf); - uidl_sent++; -+ } -+ if (mp->return_path && !rpath_sent && (*buffer=='\n' || -+ !strncasecmp(buffer,"Status:",7) || -+ !strncasecmp(buffer,"Received:",9))) { -+ pop_sendline(p, mp->return_path); -+ rpath_sent++; - } - - pop_sendline(p, buffer); diff --git a/mail/popper/files/patch-ae b/mail/popper/files/patch-ae deleted file mode 100644 index 2dd27afccb4..00000000000 --- a/mail/popper/files/patch-ae +++ /dev/null @@ -1,63 +0,0 @@ -*** configure.orig Fri Jul 10 03:44:06 1998 ---- configure Sat Jul 18 19:38:41 1998 -*************** -*** 836,842 **** - fi - - fi -! if test "$GCC" = yes - then - CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return " - fi ---- 836,842 ---- - fi - - fi -! if test "$GCC" = DISABLE_yes - then - CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return " - fi -*************** -*** 996,1002 **** - AIX*) O_DEFS="$O_DEFS -DAIX" ;; - IRIX*) O_DEFS="-cckr $O_DEFS -DIRIX" ;; - BSD*) O_DEFS="$O_DEFS -DBSD" ;; -! FreeBSD*) O_DEFS="$O_DEFS -DBSD" ;; - Linux*) O_DEFS="$O_DEFS -DLINUX" ;; - SCO*) O_DEFS="$O_DEFS -DPOPSCO -DAUTH_SPECIAL" - LIBS="$LIBS -lsocket -lprot -lm -lx -lc -lndbm -ltinfo" ---- 996,1002 ---- - AIX*) O_DEFS="$O_DEFS -DAIX" ;; - IRIX*) O_DEFS="-cckr $O_DEFS -DIRIX" ;; - BSD*) O_DEFS="$O_DEFS -DBSD" ;; -! FreeBSD*) O_DEFS="$O_DEFS" ;; - Linux*) O_DEFS="$O_DEFS -DLINUX" ;; - SCO*) O_DEFS="$O_DEFS -DPOPSCO -DAUTH_SPECIAL" - LIBS="$LIBS -lsocket -lprot -lm -lx -lc -lndbm -ltinfo" -*************** -*** 1514,1520 **** - netinet/in.h \ - maillock.h \ - ndbm.h \ -- gdbm.h \ - dbm.h \ - shadow.h \ - ---- 1514,1519 ---- -*************** -*** 1859,1865 **** - char gdbm_open(); - - int main() { -! gdbm_open() - ; return 0; } - EOF - if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ---- 1858,1864 ---- - char gdbm_open(); - - int main() { -! DISABLE_gdbm_open() - ; return 0; } - EOF - if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then diff --git a/mail/popper/files/patch-af b/mail/popper/files/patch-af deleted file mode 100644 index dff19989d2b..00000000000 --- a/mail/popper/files/patch-af +++ /dev/null @@ -1,44 +0,0 @@ ---- pop_user.c.orig Fri Jul 10 03:44:08 1998 -+++ pop_user.c Tue Oct 2 20:55:26 2001 -@@ -40,6 +40,12 @@ - - #include "popper.h" - -+#ifdef OPIE -+#include <opie.h> -+int pwok, af_pwok; -+struct opie opiestate; -+#endif /* OPIE */ -+ - /* - * user: Prompt for the user name at the start of a POP session - */ -@@ -62,6 +68,9 @@ - struct stat st; - datum key, value; - # endif -+#ifdef OPIE -+ char prompt[OPIE_CHALLENGE_MAX + 1]; -+#endif /* OPIE */ - - #ifdef KERBEROS - if (p->kerberos && strcmp(p->pop_parm[1], p->user)) { -@@ -167,6 +176,18 @@ - #endif /* APOP */ - - /* Tell the user that the password is required */ -+#ifdef OPIE -+ if (opiechallenge(&opiestate, p->user, prompt) == 0) { -+ pw = getpwnam(p->user); -+ pwok = (pw != NULL) && af_pwok && opiealways(pw->pw_dir); -+ return (pop_msg(p,POP_SUCCESS,"OTP response %s %s for %s.", prompt, -+ pwok ? "requested" : "required", p->user)); -+ } else { -+ pwok = 1; -+ return (pop_msg(p,POP_SUCCESS,"Password required for %s.",p->user)); -+ } -+#else /* OPIE */ - return (pop_msg(p,POP_SUCCESS,"Password required for %s.",p->user)); -+#endif /* OPIE */ - } - diff --git a/mail/popper/files/patch-ag b/mail/popper/files/patch-ag deleted file mode 100644 index e8af268d625..00000000000 --- a/mail/popper/files/patch-ag +++ /dev/null @@ -1,31 +0,0 @@ -*** pop_log.c.bak Thu Jul 2 06:45:52 1998 ---- pop_log.c Thu Jul 2 06:51:21 1998 -*************** -*** 55,61 **** - format = va_arg(ap,char *); - #endif - #ifdef HAVE_VPRINTF -! vsprintf(msgbuf,format,ap); - #else - arg1 = va_arg(ap, char *); - arg2 = va_arg(ap, char *); ---- 55,61 ---- - format = va_arg(ap,char *); - #endif - #ifdef HAVE_VPRINTF -! vsnprintf(msgbuf,sizeof(msgbuf),format,ap); - #else - arg1 = va_arg(ap, char *); - arg2 = va_arg(ap, char *); -*************** -*** 77,83 **** ---- 77,85 ---- - date_time = (char *)ctime(&clock); - date_time[strlen(date_time) - 1] = '\0'; - (void)fprintf(p->trace,"%s [%d] %s\n",date_time, getpid(), msgbuf); -+ #if 0 - (void)fprintf(p->trace,"%s \n", date_time); -+ #endif - (void)fflush(p->trace); - } - else { diff --git a/mail/popper/files/patch-ah b/mail/popper/files/patch-ah deleted file mode 100644 index 6933ec6e386..00000000000 --- a/mail/popper/files/patch-ah +++ /dev/null @@ -1,50 +0,0 @@ -*** pop_msg.c.orig Wed Jul 1 23:54:51 1998 ---- pop_msg.c Thu Jul 2 07:12:46 1998 -*************** -*** 43,48 **** ---- 43,49 ---- - #endif - va_list ap; - register char * mp; -+ int l, len; /* remaining buffer length */ - #ifdef PYRAMID - char * arg1, *arg2, *arg3, *arg4, *arg5, *arg6; - #endif -*************** -*** 67,72 **** ---- 68,74 ---- - #endif - /* Point to the message buffer */ - mp = message; -+ len = sizeof(message); - - /* Format the POP status code at the beginning of the message */ - if (stat == POP_SUCCESS) -*************** -*** 75,86 **** - (void)sprintf (mp,"%s ",POP_ERR); - - /* Point past the POP status indicator in the message message */ -! mp += strlen(mp); - - /* Append the message (formatted, if necessary) */ - if (format) { - #ifdef HAVE_VPRINTF -! vsprintf(mp,format,ap); - #else - # ifdef PYRAMID - (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6); ---- 77,89 ---- - (void)sprintf (mp,"%s ",POP_ERR); - - /* Point past the POP status indicator in the message message */ -! l = strlen(mp); -! len -= l, mp += l; - - /* Append the message (formatted, if necessary) */ - if (format) { - #ifdef HAVE_VPRINTF -! vsnprintf(mp,len-3,format,ap); - #else - # ifdef PYRAMID - (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6); diff --git a/mail/popper/files/patch-ai b/mail/popper/files/patch-ai deleted file mode 100644 index 9ffe31905f9..00000000000 --- a/mail/popper/files/patch-ai +++ /dev/null @@ -1,94 +0,0 @@ ---- pop_dropcopy.c.orig Sun Feb 18 12:27:19 2001 -+++ pop_dropcopy.c Sun Feb 18 12:29:39 2001 -@@ -471,8 +471,10 @@ - *cp++ = '\n'; - *cp = '\0'; - -- mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1; -- p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1; -+ i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2; -+ mp->length += i; -+ p->drop_size += i; -+ mp->lines++; - - /* New UIDs do not dirty the mailspool if NO_STATUS is set. They - are just recalculated each time the popper is run or LMOS is -@@ -483,9 +485,11 @@ - #endif - } - -- } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) { -- cont_len = atoi(buffer + 15); -- MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer)); -+ } else if (!strncasecmp(buffer, "Content-Length:", 15)) { -+ if (CONTENT_LENGTH) { -+ cont_len = atoi(buffer + 15); -+ MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer)); -+ } - continue; /* not part of the message size */ - } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) || - !strncasecmp("Date:", buffer, 5) || -@@ -504,8 +508,10 @@ - if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) { - uidl_found++; - mp->uidl_str = (char *)strdup(cp); -- mp->length += nchar + 1; -- p->drop_size += nchar + 1; -+ len += strlen("X-UIDL: ") + 1; -+ mp->length += len; -+ p->drop_size += len; -+ mp->lines++; - } - } - continue; /* Do not include this value in the message size */ -@@ -717,8 +723,10 @@ - *cp++ = '\n'; - *cp = '\0'; - -- mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1; -- p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1; -+ i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2; -+ mp->length += i; -+ p->drop_size += i; -+ mp->lines++; - - /* New UIDs do not dirty the mailspool if NO_STATUS is set. They - are just recalculated each time the popper is run or LMOS is -@@ -729,11 +737,12 @@ - #endif - } - -- } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) { -- cont_len = atoi(buffer + 15); -- MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer)); -+ } else if (!strncasecmp(buffer, "Content-Length:", 15)) { -+ if (CONTENT_LENGTH) { -+ cont_len = atoi(buffer + 15); -+ MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer)); -+ } - continue; /* Not included in message size */ -- - } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) || - !strncasecmp("Date:", buffer, 5) || - !strncasecmp("Message-Id:",buffer, 11) || -@@ -745,16 +754,16 @@ - int len; - char *cp; - -- uidl_found++; -- - /* Skip over header */ - cp = &buffer[7]; - while (*cp && (*cp == ' ' || *cp == '\t')) cp++; - if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) { - uidl_found++; - mp->uidl_str = (char *)strdup(cp); -- mp->length += nchar + 1; -- p->drop_size += nchar + 1; -+ len += strlen("X-UIDL: ") + 1; -+ mp->length += len; -+ p->drop_size += len; -+ mp->lines++; - } - } - continue; /* Do not include this value in the message size */ diff --git a/mail/popper/files/patch-aj b/mail/popper/files/patch-aj deleted file mode 100644 index f7a69702708..00000000000 --- a/mail/popper/files/patch-aj +++ /dev/null @@ -1,62 +0,0 @@ -*** pop_updt.c.orig Fri Jul 10 03:44:08 1998 ---- pop_updt.c Wed Aug 5 01:14:24 1998 -*************** -*** 126,131 **** ---- 126,134 ---- - mailunlock(); - #endif - } -+ #ifdef YOUBIN -+ sendto_youbin(p->user); -+ #endif - return (POP_SUCCESS); - } - -*************** -*** 328,333 **** ---- 331,339 ---- - mailunlock(); - #endif - (void)fclose(p->drop) ; -+ #ifdef YOUBIN -+ sendto_youbin(p->user); -+ #endif - #ifdef EDQUOT - if (save_errno == EDQUOT) - return pop_msg(p, POP_FAILURE, -*************** -*** 348,353 **** ---- 354,362 ---- - mailunlock(); - #endif - (void)fclose(p->drop); -+ #ifdef YOUBIN -+ sendto_youbin(p->user); -+ #endif - #ifdef EDQUOT - if (save_errno == EDQUOT) - return pop_msg(p, POP_FAILURE, -*************** -*** 452,457 **** ---- 461,469 ---- - mailunlock(); - #endif - (void)fclose(p->drop) ; -+ #ifdef YOUBIN -+ sendto_youbin(p->user); -+ #endif - #ifdef EDQUOT - if (save_errno == EDQUOT) - return pop_msg(p, POP_FAILURE, -*************** -*** 475,480 **** ---- 487,495 ---- - #endif - (void)fclose(p->drop); - } -+ #ifdef YOUBIN -+ sendto_youbin(p->user); -+ #endif - - return(pop_quit(p)); - } diff --git a/mail/popper/files/patch-ak b/mail/popper/files/patch-ak deleted file mode 100644 index 53f66e69d88..00000000000 --- a/mail/popper/files/patch-ak +++ /dev/null @@ -1,31 +0,0 @@ ---- popper.h.orig Mon Jul 30 19:28:19 2001 -+++ popper.h Mon Jul 30 19:30:20 2001 -@@ -31,11 +31,6 @@ - - #ifdef HAVE_SYS_PARAM_H - #include <sys/param.h> --# if (defined(BSD) && (BSD >= 199103)) --# define HAVE_UNISTD_H --# define HAVE_VPRINTF --# define BIND43 --# endif - #endif - - #ifdef BSDI -@@ -60,11 +55,14 @@ - - #define MAXUSERNAMELEN 65 - #define MAXDROPLEN 64 --#define MAXLINELEN 1024 -+/* This program always assume that fgets return whole line, -+ so the buffer must be at least one char bigger than sendmail -+ use, because of >From */ -+#define MAXLINELEN (2048+1) - #define MAXMSGLINELEN MAXLINELEN - #define MAXCMDLEN 4 - #define MAXPARMCOUNT 5 --#define MAXPARMLEN 10 -+#define MAXPARMLEN 32 /* Large enough for 32-byte APOP parm. */ - #define ALLOC_MSGS 20 - - #ifndef OSF1 diff --git a/mail/popper/files/patch-al b/mail/popper/files/patch-al deleted file mode 100644 index c987c0a08e4..00000000000 --- a/mail/popper/files/patch-al +++ /dev/null @@ -1,82 +0,0 @@ -*** pop_parse.c.orig Thu Nov 20 00:20:38 1997 ---- pop_parse.c Mon Jun 29 18:08:45 1998 -*************** -*** 26,31 **** ---- 26,32 ---- - { - char * mp; - register int i; -+ register int parmlen; - - /* Loop through the POP command array */ - for (mp = buf, i = 0; ; i++) { -*************** -*** 45,52 **** - /* Point to the start of the token */ - p->pop_parm[i] = mp; - - /* Search for the first space character (end of the token) */ -! while (!isspace(*mp) && *mp) mp++; - - /* Delimit the token with a null */ - if (*mp) *mp++ = 0; ---- 46,75 ---- - /* Point to the start of the token */ - p->pop_parm[i] = mp; - -+ /* Start counting the length of this token */ -+ parmlen = 0; -+ - /* Search for the first space character (end of the token) */ -! while (!isspace(*mp) && *mp) { -! mp++; -! parmlen++; -! if (parmlen > MAXPARMLEN) { -! /* Truncate parameter to the max. allowable size */ -! *mp = '\0'; -! -! /* Fail with an appropriate message */ -! if (i == 0) { -! pop_msg(p,POP_FAILURE, -! "Command \"%s\" (truncated) exceedes maximum permitted size.", -! p->pop_command); -! } else { -! pop_msg(p,POP_FAILURE, -! "Argument %d \"%s\" (truncated) exceeds maximum permitted size.", -! i, p->pop_parm[i]); -! } -! return(-1); -! } -! } - - /* Delimit the token with a null */ - if (*mp) *mp++ = 0; -*************** -*** 64,73 **** - if(p->pop_command[0] == 'p' && strcmp(p->pop_command,"pass") == 0) { - if (*mp != 0) { - p->pop_parm[1] = mp; -! if (strlen(mp) > 0) { -! mp = mp + strlen(mp) - 1; -! while (*mp == 0xa || *mp == 0xd) *mp-- = 0; -! } - return(1); - } else - return (-1); ---- 87,102 ---- - if(p->pop_command[0] == 'p' && strcmp(p->pop_command,"pass") == 0) { - if (*mp != 0) { - p->pop_parm[1] = mp; -! mp += strlen(mp) - 1; -! while (*mp == 0xa || *mp == 0xd) *mp-- = 0; -! mp = p->pop_parm[1]; -! if (strlen(mp) > MAXPARMLEN) { -! mp[MAXPARMLEN] = '\0'; -! pop_msg(p,POP_FAILURE, -! "Password \"%s\" (truncated) exceeds maximum permitted size.", -! mp); -! return (-1); -! } - return(1); - } else - return (-1); diff --git a/mail/popper/files/patch-am b/mail/popper/files/patch-am deleted file mode 100644 index 597d7e2b6d4..00000000000 --- a/mail/popper/files/patch-am +++ /dev/null @@ -1,76 +0,0 @@ ---- pop_init.c.orig Fri Jul 10 03:44:07 1998 -+++ pop_init.c Mon Jul 30 19:29:00 2001 -@@ -32,6 +32,11 @@ - # include <strings.h> - #endif - -+#ifdef OPIE -+#include <opie.h> -+extern int af_pwok; -+#endif /* OPIE */ -+ - #ifndef HAVE_INDEX - # define index(s,c) strchr(s,c) - # define rindex(s,c) strrchr(s,c) -@@ -113,6 +118,10 @@ - } - #endif /* KERBEROS */ - -+#ifdef OPIE -+ af_pwok = opieaccessfile(p->client); -+#endif /* OPIE */ -+ - return(POP_SUCCESS); - } - -@@ -235,8 +244,8 @@ - - if ((p->trace = fopen(optarg,"a+")) == NULL) { - pop_log(p,POP_PRIORITY, -- "Unable to open trace file \"%s\", err = %d", -- optarg,errno); -+ "Unable to open trace file \"%s\": ", -+ optarg, strerror(errno)); - exit(1); - } - trace_file_name = optarg; -@@ -266,7 +275,8 @@ - len = sizeof(cs); - if (getpeername(sp,(struct sockaddr *)&cs,&len) < 0){ - pop_log(p,POP_PRIORITY, -- "Unable to obtain socket and address of client, err = %d",errno); -+ "Unable to obtain socket and address of client: %s", -+ strerror(errno)); - exit(1); - } - -@@ -281,8 +291,8 @@ - ch = gethostbyaddr((char *) &cs.sin_addr, sizeof(cs.sin_addr), AF_INET); - if (ch == NULL){ - pop_log(p,POP_PRIORITY, -- "(v%s) Unable to get canonical name of client, err = %d", -- VERSION, errno); -+ "(v"VERSION") Unable to get canonical name of client %s: %s", -+ p->ipaddr, hstrerror(h_errno)); - p->client = p->ipaddr; - } - /* Save the cannonical name of the client host in -@@ -360,14 +370,16 @@ - /* Create input file stream for TCP/IP communication */ - if ((p->input = fdopen(sp,"r")) == NULL){ - pop_log(p,POP_PRIORITY, -- "Unable to open communication stream for input, err = %d",errno); -+ "Unable to open communication stream for input: ", -+ strerror(errno)); - exit (1); - } - - /* Create output file stream for TCP/IP communication */ - if ((p->output = fdopen(sp,"w")) == NULL){ - pop_log(p,POP_PRIORITY, -- "Unable to open communication stream for output, err = %d",errno); -+ "Unable to open communication stream for output: ", -+ strerror(errno)); - exit (1); - } - diff --git a/mail/popper/files/patch-an b/mail/popper/files/patch-an deleted file mode 100644 index cac9402c982..00000000000 --- a/mail/popper/files/patch-an +++ /dev/null @@ -1,46 +0,0 @@ ---- pop_uidl.c.orig Thu Jul 9 16:44:08 1998 -+++ pop_uidl.c Thu May 25 00:45:38 2000 -@@ -59,7 +59,7 @@ - - sprintf(buffer, "%d %s", msg_id, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; -- return (pop_msg (p,POP_SUCCESS, buffer)); -+ return (pop_msg (p,POP_SUCCESS, "%s", buffer)); - } - } else { - /* yes, we can do this */ -@@ -98,6 +98,7 @@ - { - static char buf[MAXLINELEN]; - char *cp; -+ char *bp; - - fseek(p->drop, mp->offset, 0); - while (fgets(buf, sizeof(buf), p->drop) != NULL) { -@@ -105,6 +106,8 @@ - if (!strncasecmp("From:", buf, 5)) { - cp = index(buf, ':'); - while (*++cp && (*cp == ' ' || *cp == '\t')); -+ if ((bp = index(cp, NEWLINE)) != NULL) -+ *bp = 0; - return(cp); - } - } -@@ -149,7 +152,7 @@ - sprintf(buffer, "%d %s", msg_id, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; - sprintf(buffer, "%s %d %.128s", buffer, mp->length, from_hdr(p, mp)); -- return (pop_msg (p,POP_SUCCESS, buffer)); -+ return (pop_msg (p,POP_SUCCESS, "%s", buffer)); - } - } else { - /* yes, we can do this */ -@@ -165,7 +168,7 @@ - - sprintf(buffer, "%d %s", x, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; -- sprintf(buffer, "%s %d %.128s", buffer, mp->length, from_hdr(p, mp)); -+ sprintf(buffer, "%s %d %.128s\n", buffer, mp->length, from_hdr(p, mp)); - pop_sendline(p, buffer); - } - } diff --git a/mail/popper/files/patch-ao b/mail/popper/files/patch-ao deleted file mode 100644 index c07cd3e1d55..00000000000 --- a/mail/popper/files/patch-ao +++ /dev/null @@ -1,26 +0,0 @@ ---- pop_apop.c.orig Fri Jul 10 00:44:07 1998 -+++ pop_apop.c Tue Sep 14 23:02:05 2004 -@@ -180,17 +180,18 @@ - return(pop_auth_fail(p, POP_FAILURE, "not authorized")); - } - --#ifdef GDBM -- gdbm_close (db); --#else -- dbm_close (db); --#endif - (void) close(f); - - MD5Init(&mdContext); - MD5Update(&mdContext, (unsigned char *)p->md5str, strlen(p->md5str)); - MD5Update(&mdContext, (unsigned char *)obscure(ddatum.dptr), (ddatum.dsize - 1)); - MD5Final(digest, &mdContext); -+ -+#ifdef GDBM -+ gdbm_close (db); -+#else -+ dbm_close (db); -+#endif - - cp = buffer; - for (ep = (dp = digest) + sizeof digest / sizeof digest[0]; diff --git a/mail/popper/files/patch-pop_pass.c b/mail/popper/files/patch-pop_pass.c deleted file mode 100644 index a1f1e8caac9..00000000000 --- a/mail/popper/files/patch-pop_pass.c +++ /dev/null @@ -1,75 +0,0 @@ ---- pop_pass.c.orig 1998-07-10 03:44:07.000000000 +0400 -+++ pop_pass.c 2012-01-09 03:03:30.395199055 +0400 -@@ -19,6 +19,12 @@ - #include <pwd.h> - #include "popper.h" - -+#ifdef OPIE -+#include <opie.h> -+extern int pwok; -+extern struct opie opiestate; -+#endif /* OPIE */ -+ - #define SLEEP_SECONDS 10 - - -@@ -487,16 +493,28 @@ - POP * p; - struct passwd * pw; - { -+#if defined(BSD) && (BSD >= 199306) -+ /* Check password change and expire times before granting access */ -+ time_t now = time((time_t *) NULL); -+ -+ if ((pw->pw_change && now > pw->pw_change) || -+ (pw->pw_expire && now > pw->pw_expire)) -+ goto error; -+#endif -+ - /* We don't accept connections from users with null passwords */ -- /* Compare the supplied password with the password file entry */ -+ if ((pw->pw_passwd == NULL) || (*pw->pw_passwd == '\0')) -+ goto error; - -- if ((pw->pw_passwd == NULL) || (*pw->pw_passwd == '\0') || -- strcmp(crypt(p->pop_parm[1], pw->pw_passwd), pw->pw_passwd)) { -- sleep(SLEEP_SECONDS); -- return (pop_msg(p,POP_FAILURE, pwerrmsg, p->user)); -- } -+ /* Compare the supplied password with the password file entry */ -+ if (strcmp(crypt(p->pop_parm[1], pw->pw_passwd), pw->pw_passwd)) -+ goto error; - - return(POP_SUCCESS); -+ -+ error: -+ sleep(SLEEP_SECONDS); -+ return (pop_msg(p,POP_FAILURE, pwerrmsg, p->user)); - } - - #endif /* AUTH_SPECIAL */ -@@ -611,12 +629,23 @@ - return(pop_msg(p, POP_FAILURE, "\"%s\": shell not found.", p->user)); - #endif - -- if ((p->kerberos ? auth_user_kerberos(p, pw) : auth_user(p, pwp)) -+#ifdef OPIE -+ if (opieverify(&opiestate, p->pop_parm[1])) { -+ if (pwok) { -+#endif /* OPIE */ -+ if ((p->kerberos ? auth_user_kerberos(p, &pw) : auth_user(p, pwp)) - != POP_SUCCESS) { - pop_log(p,POP_PRIORITY,"Failed attempted login to %s from host %s", - p->user, p->client); - return(POP_FAILURE); - } -+#ifdef OPIE -+ } else { -+ sleep(SLEEP_SECONDS); -+ return (pop_msg(p,POP_FAILURE, pwerrmsg, p->user)); -+ } -+ } -+#endif /* OPIE */ - - #ifdef SECURENISPLUS - seteuid(uid_save); diff --git a/mail/popper/files/patch-popauth.c b/mail/popper/files/patch-popauth.c deleted file mode 100644 index cb5d02993af..00000000000 --- a/mail/popper/files/patch-popauth.c +++ /dev/null @@ -1,11 +0,0 @@ ---- popauth.c.orig Tue Aug 12 04:39:27 2003 -+++ popauth.c Tue Aug 12 04:39:31 2003 -@@ -97,7 +97,7 @@ - #endif - (void) vfprintf(stderr, fmt, ap); - (void) fprintf(stderr, "\n"); -- va_end(fmt); -+ va_end(ap); - exit(1); - /*NOTREACHED*/ - } diff --git a/mail/popper/files/sendto.c b/mail/popper/files/sendto.c deleted file mode 100644 index ff4b9b181b1..00000000000 --- a/mail/popper/files/sendto.c +++ /dev/null @@ -1,170 +0,0 @@ -#ifdef YOUBIN -/* - * Program: $RCSfile: sendto.c,v $ $Revision: 1.1 $ - * - * Purpose: Send a message with UDP packet. - * Invoked from mh-inc-folder-hook. - * - * Usage: sendto <host> <service> <message> - * - * Author: K.Agusa agusa@nuie.nagoya-u.ac.jp - * S.Yamamoto yamamoto@nuie.nagoya-u.ac.jp - * - * Modified: K.Makimura macky@agusa.nuie.nagoya-u.ac.jp - * - * Date: 1993/07/24 - * Modified: $Date: 1998/08/04 22:41:00 $ - * - * Copyright: K.Agusa and S.Yamamoto 1993 - 94 - * - * The X Consortium, and any party obtaining a copy of these files from - * the X Consortium, directly or indirectly, is granted, free of charge, - * a full and unrestricted irrevocable, world-wide, paid up, royalty-free, - * nonexclusive right and license to deal in this software and documentation - * files (the "Software"), including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons who receive copies from any such - * party to do so. This license includes without limitation a license to do - * the foregoing actions under any patents of the party supplying this - * software to the X Consortium. - */ - -#ifndef lint -static char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/param.h> -#include <netinet/in.h> -#include <netdb.h> -#include <stdio.h> - -/* - * Platform definitions. - */ - -#if defined(SVR4) && !defined(SYSV) -#define SYSV -#endif /* defined(SVR4) && !defined(SYSV) */ - -/* - * For compatibility. - */ - -#ifdef SYSV -#include <string.h> /* For strchr(). */ -#else /* not SYSV */ -#include <strings.h> -#if !defined(strchr) && !defined(strrchr) -#define strchr(str, c) index((str), (c)) -#define strrchr(str, c) rindex((str), (c)) -#endif /* !defined(strchr) && !defined(strrchr) */ -#endif /* not SYSV */ - -#ifdef SYSV -#define bzero(dst, len) memset((dst), '\0', (len)) -#define bcopy(src, dst, len) memcpy((dst), (src), (len)) -#endif - -static struct sockaddr_in sa; /* Server address. */ -static int sockid; /* Socket Id. */ -static char err_msg[256]; - -static char * -udp_init(host, service) -char *host; -char *service; -{ - struct hostent *hp; /* Result of host name lookup. */ - struct servent *sp; /* Result of service lookup. */ - - if ((hp = gethostbyname(host)) == NULL) { - sprintf(err_msg, "No such host: %s", host); - return (err_msg); - } - if ((sp = getservbyname(service, "udp")) == NULL) { - sprintf(err_msg, "No such service: %s", service); - return (err_msg); - } - if ((sockid = socket(hp->h_addrtype, SOCK_DGRAM, 0)) < 0) { - sprintf(err_msg, "Error in getting socket"); - return (err_msg); - } - - bzero((char *)&sa, sizeof(sa)); - sa.sin_family = hp->h_addrtype; - bcopy((char *)hp->h_addr, (char *)&sa.sin_addr, hp->h_length); - sa.sin_port = sp->s_port; - - return ((char *)NULL); -} - -static char * -udp_send(message) -char *message; -{ - int len; - - len = strlen(message); - if (sendto(sockid, message, len, 0, (struct sockaddr *)&sa, sizeof(sa)) != len) { - sprintf(err_msg, "Error in sending packet"); - return (err_msg); - } - return ((char *)NULL); -} - -#ifndef CALLED_FROM_POPD - -void -main(argc, argv) -int argc; -char **argv; -{ - char *msg; - char *prog_name; - - if ((prog_name = strrchr(argv[0], '/')) != NULL) { - prog_name++; - } else { - prog_name = argv[0]; - } - - if (argc != 4) { - fprintf(stderr, "%s: Usage: sendto <host> <service> <message>\n", - prog_name); - exit(1); - } - if ((msg = udp_init(argv[1], argv[2])) != NULL) { - fprintf(stderr, "%s: %s\n", prog_name, msg); - exit(1); - } - if ((msg = udp_send(argv[3])) != NULL) { - fprintf(stderr, "%s: %s\n", prog_name, msg); - exit(1); - } - exit(0); -} - -#else /* CALLED_FROM_POPD */ - -#ifndef YOUBINSERVICE -#define YOUBINSERVICE "biff" /* For patch to popd. */ -#endif /* not YOUBINSERVICE */ - -void -sendto_youbin(username) -char *username; -{ - char msg[256]; - - if (udp_init("localhost", YOUBINSERVICE) != NULL) { - return; - } - sprintf(msg, "U %s", username); - udp_send(msg); -} - -#endif /* CALLED_FROM_POPD */ -#endif /* YOUBIN */ diff --git a/mail/popper/pkg-descr b/mail/popper/pkg-descr deleted file mode 100644 index 4485bee07a7..00000000000 --- a/mail/popper/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This is a POP 3 server useful for dealing with remote mail reader clients -such as Eudora. - -Don't forget to edit /etc/inetd.conf to enable the server after installation. - -WWW: http://www.eudora.com/qpopper/ diff --git a/mail/popper/pkg-install b/mail/popper/pkg-install deleted file mode 100644 index ef42d381b19..00000000000 --- a/mail/popper/pkg-install +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# - -if [ "$2" != "PRE-INSTALL" ]; then - exit 0 -fi - -USER=pop -UID=68 -GID=6 -GROUP=mail - -if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi - -if ! pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -s "/sbin/nologin" -d "/nonexistent" -c "Post Office Owner" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi -fi - -usrdir=${PKG_PREFIX}/etc/popper -if [ ! -d $usrdir ]; then - mkdir -p $usrdir -fi -chown ${USER}:daemon $usrdir -chmod 700 $usrdir |